commit dff1b464cdd3239e4ac0870b5c46497c3898bfc3
author Jakub Pavlik <pavlk.jakub@gmail.com> Thu Jun 29 09:21:36 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jun 29 09:21:37 2017 +0000
tree c9137eeb827468cadfead6b146220558017d0418
parent bfd7f344a63069851713e46ce00ebb1d94b1aa79
parent 8131596308f46599641eaf339a1d94bac41d012d

Merge "Managing filesystem_store_datadir variable"

glance/meta/prometheus.yml

diff --git a/glance/meta/prometheus.yml b/glance/meta/prometheus.yml
index 4b1f8e1..7085f59 100644
--- a/glance/meta/prometheus.yml
+++ b/glance/meta/prometheus.yml
@@ -13,6 +13,16 @@
         summary: "Endpoint check for '{{ $labels.service }}' is down"
         description: >-
             Endpoint check for '{{ $labels.service }}' is down for 2 minutes
-{% endraw %}
+    GlanceErrorLogsTooHigh:
+{%- endraw %}
+      {%- set log_threshold = prometheus_server.get('alert', {}).get('GlanceErrorLogsTooHigh', {}).get('var', {}).get('threshold', 0.2 ) %}
+      if: >-
+        sum(rate(log_messages{service="cinder",level=~"error|emergency|fatal"}[5m])) without (level) > {{ log_threshold }}
+{%- raw %}
+      labels:
+        severity: warning
+        service: "{{ $labels.service }}"
+      annotations:
+        summary: 'Too many errors in {{ $labels.service }} logs'
+        description: 'The rate of errors in {{ $labels.service }} logs over the last 5 minutes is too high on node {{ $labels.host }} (current value={{ $value }}, threshold={%- endraw %}{{ log_threshold }}).'
 {%- endif %}
-

glance/meta/telegraf.yml

diff --git a/glance/meta/telegraf.yml b/glance/meta/telegraf.yml
index 11d6b0d..bdacc59 100644
--- a/glance/meta/telegraf.yml
+++ b/glance/meta/telegraf.yml
@@ -5,4 +5,5 @@
     http_response:
       glance-api:
         address: "http://{{ server.bind.address|replace('0.0.0.0', '127.0.0.1') }}:{{ server.bind.port }}/"
+        expected_code: 300
 {%- endif %}
\ No newline at end of file

metadata/service/support.yml

diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 39ef63a..a711054 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -15,3 +15,5 @@
         enabled: true
       prometheus:
         enabled: true
+      telegraf:
+        enabled: true