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

[Alvaro Uria]

[JuanJo Ciarlante (jjo)]

review: Approve (lgtm)

diff --git a/README.md b/README.md
index 3e7fb67..4017b49 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ make lint
 # Contributing Quickstart Guide
 
 git clone git+ssh://git.launchpad.net/~canonical-bootstack/bootstack-ops/+git/bootstack-ops
+
 cd bootstack-ops
 
 git checkout -b myfeature
@@ -22,3 +23,32 @@ git commit ...
 git push origin myfeature
 
 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