Merge bootstack-ops:aluria-sprint into bootstack-ops:master

[Alvaro Uria]

README.md update around Reporting bundle
ops-bundle.codetree to branch charmstore charms locally

Unmerged commits

8bd9916... by Alvaro Uria on 2017-01-20

[aluria,r=] reporting: README update, codetree bundle

diff --git a/README.md b/README.md
index 81c4f94..86414c0 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,39 @@ make lint
 
 # Contributing Quickstart Guide
 
-git clone git+ssh://git.launchpad.net/~canonical-bootstack/+git/opsbundle
+git clone git+ssh://git.launchpad.net/~canonical-bootstack/bootstack-ops/+git/bootstack-ops
 
 git checkout -b myfeature
 
-git push git+ssh://git.launchpad.net/~{YOUR-LP-ACCOUNT}/canonical-bootstack/+git/opsbundle mybranch
+git push git+ssh://git.launchpad.net/~canonical-bootstack/bootstack-ops/+git/bootstack-ops mybranch
 
 Create a MR on LP UI.
+
+# Reporting
+
+* If egress filters are a concern, charms can be branched locally by
+  using ops-bundle.codetree
+
+* juju-deployer stages
+   bootstack-reporting
+     prometheus
+     grafana
+     prometheus-alertmanagera
+
+   bootstack-reporting-agents
+     telegraf
+
+* Other notes
+ Services smooshed into a KVM due to LP bugs around snap and LXC/LXD.
+   Only prometheus uses snap for now
+
+ grafana
+   needs access to secrets.yaml to set an admin password
+   needs several proxy rules to download from CDNs
+
+ prometheus-alertmanager
+   charm's metadata.yaml needs series 'xenial' to be added
+
+ Manual configurations
+   prometheus-openstack-exporter
+   grafana-ps45 dashboard imported to staging
diff --git a/ops-bundle.codetree b/ops-bundle.codetree
new file mode 100644
index 0000000..f2d3329
--- /dev/null
+++ b/ops-bundle.codetree
@@ -0,0 +1,5 @@
+# Reporting
+xenial/prometheus                 cs:~prometheus-charmers/prometheus
+xenial/grafana                    cs:~prometheus-charmers/grafana
+xenial/prometheus-alertmanager    cs:~prometheus-charmers/trusty/prometheus-alertmanager
+xenial/telegraf                   cs:telegraf