Merge lp:~jacekn/mojo/mojo-specs into lp:mojo/mojo-specs

[Jacek Nykis]

Improve prometheus charm-testing spec so that it verifies relations

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

Per IRC, the charm testing directory needs to be named the same as the charm for the upgrade-charm stuff to automagically work (i.e. charm-testing/prometheus2).

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[lp:~jacekn/mojo/mojo-specs]

108. By Jacek Nykis on 2018-06-28

Improve prometheus charm-testing spec so that it verifies relations

Reviewed-on: https://code.launchpad.net/~jacekn/mojo/mojo-specs/+merge/348674
Reviewed-by: Tom Haddon <email address hidden>

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 108

=== renamed directory 'charm-testing/prometheus' => 'charm-testing/prometheus2'
=== modified file 'charm-testing/prometheus2/collect'
--- charm-testing/prometheus/collect	2018-01-23 00:08:06 +0000
+++ charm-testing/prometheus2/collect	2018-06-28 13:56:55 +0000
@@ -1,5 +1,25 @@
 # Services, primary charms
-prometheus              cs:prometheus
-
-# subordinates
-nrpe                    cs:nrpe
+prometheus2                  cs:prometheus2
+prometheus-pushgateway       cs:prometheus-pushgateway
+prometheus-alertmanager      cs:prometheus-alertmanager
+prometheus-snmp-exporter     cs:prometheus-snmp-exporter
+prometheus-blackbox-exporter cs:prometheus-blackbox-exporter
+grafana                      cs:grafana
+
+# NOTE: subordinates, no basenode needed
+nrpe                         cs:nrpe
+telegraf                     cs:telegraf
+
+# basenode/ mappings
+prometheus2/exec.d                           @
+prometheus2/exec.d/basenode                  lp:~canonical-sysadmins/basenode/trunk
+prometheus-pushgateway/exec.d                @
+prometheus-pushgateway/exec.d/basenode       lp:~canonical-sysadmins/basenode/trunk
+prometheus-alertmanager/exec.d               @
+prometheus-alertmanager/exec.d/basenode      lp:~canonical-sysadmins/basenode/trunk
+prometheus-snmp-exporter/exec.d              @
+prometheus-snmp-exporter/exec.d/basenode     lp:~canonical-sysadmins/basenode/trunk
+prometheus-blackbox-exporter/exec.d          @
+prometheus-blackbox-exporter/exec.d/basenode lp:~canonical-sysadmins/basenode/trunk
+grafana/exec.d                               @
+grafana/exec.d/basenode                      lp:~canonical-sysadmins/basenode/trunk

=== modified file 'charm-testing/prometheus2/deploy'
--- charm-testing/prometheus/deploy	2018-01-23 00:08:06 +0000
+++ charm-testing/prometheus2/deploy	2018-06-28 13:56:55 +0000
@@ -1,16 +1,87 @@
 prometheus:
     series: {{series}}
     services:
-        prometheus:
-            charm: prometheus
-            expose: true
-            options:
-                prometheus_registration_authtoken: "testing"
-                external_url: "http://prometheus.testing.local/"
+        prometheus2:
+            charm: prometheus2
+            expose: true
+            options:
+                scrape-interval: 20s
+                prometheus_registration_listen: 0.0.0.0
+                daemon-args: --storage.tsdb.retention=9d
+            expose: true
+        grafana:
+            charm: grafana
+            expose: true
+            options:
+                anonymous: True
+                install_file: http://archive.admin.canonical.com/other/grafana/grafana_latest_amd64.deb
+        prometheus-pushgateway:
+            charm: prometheus-pushgateway
+            expose: true
+        prometheus-alertmanager:
+            charm: prometheus-alertmanager
+            expose: true
+            options:
+                smtp_from: [e-mail]
+        prometheus-snmp-exporter:
+            charm: prometheus-snmp-exporter
+            expose: true
+            options:
+                snmp_community: dummy
+        prometheus-blackbox-exporter:
+            charm: prometheus-blackbox-exporter
+            expose: true
+            options:
+              modules: |
+                http_2xx:
+                  http:
+                    method: GET
+                  prober: http
+                  timeout: 10s
+                tcp_connect:
+                  prober: tcp
+                  timeout: 10s
+        telegraf:
+            charm: telegraf
+            options:
+                interval: 15s
+                flush_jitter: '5s'
+                flush_interval: '16s'
+                tags: "environment=devel"
+                hostname: 'UNIT_NAME'
+                extra_options: |
+                    inputs:
+                        cpu:
+                            percpu: true
+                            fielddrop: ["time_*"]
+                        net:
+                            interfaces: ["eth0"]
+                            fielddrop: ["icmp*", "udp*", "tcp_*", "ip_*"]
+                        disk:
+                            ignore_fs: ["tmpfs", "devtmpfs"]
+                        diskio:
+                            skip_serial_number: true
         nrpe:
             charm: nrpe
             {% if series == "xenial" %}options:
                 swap: '-w 90% -c 75% -n OK'{% endif %}
+    relations:
+        - ["telegraf:juju-info", "prometheus2:juju-info"]
+        - ["telegraf:juju-info", "prometheus-pushgateway"]
+        - ["telegraf:juju-info", "prometheus-alertmanager"]
+        - ["telegraf:juju-info", "prometheus-snmp-exporter"]
+        - ["telegraf:juju-info", "prometheus-blackbox-exporter"]
+        - ["telegraf:juju-info", "grafana"]
+        - ["nrpe", "prometheus2"]
+        - ["nrpe", "prometheus-pushgateway"]
+        - ["nrpe", "prometheus-alertmanager"]
+        - ["nrpe", "prometheus-snmp-exporter"]
+        - ["nrpe", "prometheus-blackbox-exporter"]
+        - ["nrpe", "grafana"]
 
-    relations:
-        - ["prometheus:nrpe-external-master", "nrpe:nrpe-external-master"]
+        - ["prometheus2:grafana-source",       "grafana:grafana-source"]
+        - ["prometheus2:target",               "prometheus-pushgateway"]
+        - ["prometheus2:alertmanager-service", "prometheus-alertmanager:alertmanager-service"]
+        - ["prometheus2:snmp-exporter",        "prometheus-snmp-exporter:snmp-exporter"]
+        - ["prometheus2:blackbox-exporter",    "prometheus-blackbox-exporter:blackbox-exporter"]
+        - ["prometheus2:target",               "telegraf:prometheus-client"]

=== modified file 'charm-testing/prometheus2/post-deploy'
--- charm-testing/prometheus/post-deploy	2018-01-23 00:08:06 +0000
+++ charm-testing/prometheus2/post-deploy	2018-06-28 13:56:55 +0000
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-PROMETHEUS=$(juju status --format=yaml prometheus 2>&1 | sed -nr '/^ {8}public-address/s/.*://p')
+PROMETHEUS=$(juju status --format=yaml prometheus2 2>&1 | sed -nr '/^ {8}public-address/s/.*://p')
 
 if [ -z "${PROMETHEUS}" ]; then
-    echo "No prometheus instances"
+    echo "No prometheus2 instances"
     exit 1
 fi
 
@@ -18,9 +18,18 @@
         echo "####################"
         exit 1
     fi
+    echo "Calling unit to ensure telegraf targets were registered correctly"
+    echo 'curl -f -s -S -g http://${UNIT}:9090/api/v1/query?query=up{job=\"telegraf\"}|grep telegraf'
+    curl -f -s -S -g http://${UNIT}:9090/api/v1/query?query=up{job=\"telegraf\"}|grep telegraf
+    if [ $? -ne 0 ]; then
+        echo "####################"
+        echo "# E2E Check Failed #"
+        echo "####################"
+        exit 1
+    fi
 done
 
 # If we are here it means no checks failed
-echo "####################"
-echo "# E2E Check Passed #"
-echo "####################"
+echo "#####################"
+echo "# E2E Checks Passed #"
+echo "#####################"