Merge bootstack-ops:prometheus-sprint-sq2 into bootstack-ops:master

[JuanJo Ciarlante]

diff --git a/Makefile b/Makefile
index 2952592..bc42ed3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,5 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	yamllint -c .yamllint.config ops-bundle.yaml
+	test -x /usr/bin/yamllint && yamllint -c .yamllint.config ops-bundle.yaml || true
+	python -c 'import yaml,sys;yaml.load(sys.stdin)' < ops-bundle.yaml
diff --git a/README.md b/README.md
index 81c4f94..3e7fb67 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,15 @@ 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
+cd bootstack-ops
 
 git checkout -b myfeature
 
-git push git+ssh://git.launchpad.net/~{YOUR-LP-ACCOUNT}/canonical-bootstack/+git/opsbundle mybranch
+<... hack ...>
+
+git commit ...
+
+git push origin myfeature
 
 Create a MR on LP UI.
diff --git a/ops-bundle.yaml b/ops-bundle.yaml
index 08a1293..d0b22d8 100644
--- a/ops-bundle.yaml
+++ b/ops-bundle.yaml
@@ -3,6 +3,13 @@ config: &MONITORING ["lxc:infra=2"]
 
 inherits: ops-secrets
 
+# reporting: prometheus + grafana + alertmanager stack
+# Because snaps fail inside LXC lp#1611078 (xenial/lxd) lp#1582394 (xenial/lxc),
+# we need a KVM, then we smoosh all services into.
+config: &REPORTING_SVC_TO   "reporting=0"
+config: &REGION             bootstack-CUSTOMER
+config: &NAGIOS_CONTEXT     bootstack-CUSTOMER
+
 logging:
   services:
     elasticsearch:
@@ -19,31 +26,32 @@ logging:
 
     rsyslog-elasticsearch:
       charm: rsyslog-elasticsearch
-      relations:
-        - [rsyslog-elasticsearch, elasticsearch]
-        - [rsyslog-elasticsearch, ceilometer]
-        - [rsyslog-elasticsearch, cinder]
-        - [rsyslog-elasticsearch, glance]
-        - [rsyslog-elasticsearch, glance-simplestreams-sync]
-        - [rsyslog-elasticsearch, heat]
-        - [rsyslog-elasticsearch, keystone]
-        - [rsyslog-elasticsearch, landscape]
-        - [rsyslog-elasticsearch, landscape-apache]
-        - [rsyslog-elasticsearch, landscape-haproxy]
-        - [rsyslog-elasticsearch, landscape-msg]
-        - [rsyslog-elasticsearch, landscape-postgresql]
-        - [rsyslog-elasticsearch, mongodb]
-        - [rsyslog-elasticsearch, mysql]
-        - [rsyslog-elasticsearch, ncc-memcached]
-        - [rsyslog-elasticsearch, neutron-api]
-        - [rsyslog-elasticsearch, neutron-gateway]
-        - [rsyslog-elasticsearch, nova-cloud-controller]
-        - [rsyslog-elasticsearch, openstack-dashboard]
-        - [rsyslog-elasticsearch, rabbitmq-server]
-        - [rsyslog-elasticsearch, swift-proxy]
-        - [rsyslog-elasticsearch, nagios]
-        - [rsyslog-elasticsearch, infra]
-        - [rsyslog-elasticsearch, os-hosts]
+
+    relations:
+      - [rsyslog-elasticsearch, elasticsearch]
+      - [rsyslog-elasticsearch, ceilometer]
+      - [rsyslog-elasticsearch, cinder]
+      - [rsyslog-elasticsearch, glance]
+      - [rsyslog-elasticsearch, glance-simplestreams-sync]
+      - [rsyslog-elasticsearch, heat]
+      - [rsyslog-elasticsearch, keystone]
+      - [rsyslog-elasticsearch, landscape]
+      - [rsyslog-elasticsearch, landscape-apache]
+      - [rsyslog-elasticsearch, landscape-haproxy]
+      - [rsyslog-elasticsearch, landscape-msg]
+      - [rsyslog-elasticsearch, landscape-postgresql]
+      - [rsyslog-elasticsearch, mongodb]
+      - [rsyslog-elasticsearch, mysql]
+      - [rsyslog-elasticsearch, ncc-memcached]
+      - [rsyslog-elasticsearch, neutron-api]
+      - [rsyslog-elasticsearch, neutron-gateway]
+      - [rsyslog-elasticsearch, nova-cloud-controller]
+      - [rsyslog-elasticsearch, openstack-dashboard]
+      - [rsyslog-elasticsearch, rabbitmq-server]
+      - [rsyslog-elasticsearch, swift-proxy]
+      - [rsyslog-elasticsearch, nagios]
+      - [rsyslog-elasticsearch, infra]
+      - [rsyslog-elasticsearch, os-hosts]
 
 monitoring:
   services:
@@ -98,4 +106,76 @@ monitoring:
     - ["nagios:juju-info", "thruk-agent:general-info"]
     - [nrpe, "thruk-agent:nrpe-external-master"]
 
+
+# reporting: create a KVM with maas' tag=reporting as reporting/0
+bootstack-reporting-stage0:
+  inherits: [bootstack-stage2-complete]
+  services:
+    reporting:
+      charm: ubuntu
+      constraints: tags=reporting
+
+# reporting: smoosh prometheus + grafana + alertmanager into reporting/0
+bootstack-reporting:
+  inherits: [bootstack-reporting-stage0]
+  override:
+      nagios_context: *NAGIOS_CONTEXT
+      nagios_servicegroups: *REGION
+  services:
+    prometheus:
+      #charm: cs:~prometheus-charmers/prometheus
+      charm: prometheus
+      num_units: 1
+      to: *REPORTING_SVC_TO
+      options:
+        ## XXX(jjo): depends on customer setup (maas-proxy) ->
+        snap_proxy: http://10.76.12.1:8000/
+        ## XXX(jjo): need to charm openstack-exporter, for now point to the manually deployed install:
+        ##           https://github.com/CanonicalLtd/prometheus-openstack-exporter
+        static-targets: 'localhost:9183'
+    grafana:
+      #charm: cs:~prometheus-charmers/grafana
+      charm: grafana
+      num_units: 1
+      to: *REPORTING_SVC_TO
+      options:
+        ## XXX: default deb archive at packagecloud.io redirects to:
+        ## packagecloud-repositories.s3.dualstack.us-west-1.amazonaws.com
+        install_file: https://grafanarel.s3.amazonaws.com/builds/grafana-data_4.1.1-1484211277_amd64.deb
+        # ops-agents.yaml would need to set ->
+        #                datasources: 'prometheus,BootStack Prometheus,proxy,http://172.12.x.x:9090,,'
+        ## XXX: must go to secrets.yaml
+        admin_password: admin
+    prometheus-alertmanager:
+      #charm: cs:~prometheus-charmers/trusty/prometheus-alertmanager
+      charm: prometheus-alertmanager
+      to: *REPORTING_SVC_TO
+  relations:
+    - ["grafana:grafana-source", "prometheus:grafana-source"]
+    - ["prometheus:alertmanager-service", "prometheus-alertmanager:alertmanager-service"]
+
+# reporting: deploy telegraf subordinate into every metal or containerized node,
+# XXX: below stanza will need to be autogenerated (ala landscape-client) against:
+# - metals (= os-hosts)
+# - all LXC'd services
+
+bootstack-reporting-agents:
+  inherits: [bootstack-reporting]
+  services:
+    telegraf:
+      #charm: cs:telegraf
+      charm: telegraf
+      options:
+#       prometheus_output_port: "9103"
+#       extra_plugins: |
+#         [[inputs.bcache]]
+#         [[inputs.conntrack]]
+#         [[inputs.sysstat]]
+#         sadc_path = "/usr/lib/sysstat/sadc"
+#         activities = ["DISK"]
+
+  relations:
+    - [ telegraf, os-hosts ]
+    - [ "prometheus:target", "telegraf:prometheus-client"]
+
 # vim: si et sw=2 ts=2