Merge bootstack-ops:chrome0-add-prom into bootstack-ops:master

[Peter Sabaini]

Add a minimal production stage for the opsbundle

[JuanJo Ciarlante (jjo)]

LGTM, tnx -- later will see the commonality between devel/ and production/
then move them to parent directory (it's also in mojo search path),
also move common/* scripts.

review: Approve

diff --git a/.gitignore b/.gitignore
index 7b12c6a..198fe80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ tmp/
 *.pyc
 .DS_Store
 *.swo
+*~
 
 # Setuptools distribution folder.
 /dist/
diff --git a/ops-bundle/production/juju_bundle_export.py b/ops-bundle/production/juju_bundle_export.py
new file mode 120000
index 0000000..4210522
--- /dev/null
+++ b/ops-bundle/production/juju_bundle_export.py
@@ -0,0 +1 @@
+../common/juju_bundle_export.py
\ No newline at end of file
diff --git a/ops-bundle/production/juju_bundle_export.sh b/ops-bundle/production/juju_bundle_export.sh
new file mode 120000
index 0000000..627c615
--- /dev/null
+++ b/ops-bundle/production/juju_bundle_export.sh
@@ -0,0 +1 @@
+../common/juju_bundle_export.sh
\ No newline at end of file
diff --git a/ops-bundle/production/opsdeploy-prometheus.yaml b/ops-bundle/production/opsdeploy-prometheus.yaml
new file mode 100644
index 0000000..f9fd133
--- /dev/null
+++ b/ops-bundle/production/opsdeploy-prometheus.yaml
@@ -0,0 +1,37 @@
+#_config: &PROMSTACK_TO   0
+_config: &PROMSTACK_TO   "infra=0"
+nil:
+    inherits: bsdeploy
+    services: {}
+
+ops-bundle-prometheus:
+    inherits: [ secrets, bsdeploy ]
+    series: xenial
+    overrides:
+        snap_proxy: "http://10.76.12.1:8000"
+    services:
+        # snap -> needs to be at metal or juju2 lxd
+        prometheus:
+            charm: prometheus
+            to: *PROMSTACK_TO
+            options:
+        # non snap -> could be LXC'd
+        grafana:
+            charm: grafana
+            to: *PROMSTACK_TO
+            options:
+                install_file: https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb
+
+        # subord -> will land on relation to ppal services (os-hosts or nova-compute, etc)
+        telegraf:
+            charm: telegraf
+            options:
+                hostname: '{unit}'
+                prometheus_output_port: default
+
+    relations:
+# Connect the grafana -> prometheus -> telegraf stack
+        - ["prometheus:grafana-source", "grafana:grafana-source"]
+        - ["telegraf:prometheus-client", "prometheus:target"]
+# Deploy telegraf on : os-hosts xor nova-compute, etc
+        - ["telegraf:juju-info", "os-hosts"]
diff --git a/ops-bundle/production/prometheus.codetree b/ops-bundle/production/prometheus.codetree
new file mode 100644
index 0000000..cd999eb
--- /dev/null
+++ b/ops-bundle/production/prometheus.codetree
@@ -0,0 +1,7 @@
+# Reporting
+prometheus                 git+https://git.launchpad.net/prometheus-charm
+grafana                    git+https://git.launchpad.net/grafana-charm
+#prometheus-alertmanager    git+https://git.launchpad.net/prometheus-alertmanager-charm
+telegraf                   git+https://git.launchpad.net/telegraf-charm
+#prometheus-openstack-exporter cs:~jjo/prometheus-openstack-exporter
+#prometheus-openstack-exporter git+https://git.launchpad.net/~jjo/bootstack-ops/+git/prometheus-openstack-exporter-charm