Merge "Update expected code for http_response"
diff --git a/glance/files/grafana_dashboards/glance_prometheus.json b/glance/files/grafana_dashboards/glance_prometheus.json
index 8042e74..9573799 100644
--- a/glance/files/grafana_dashboards/glance_prometheus.json
+++ b/glance/files/grafana_dashboards/glance_prometheus.json
@@ -3,7 +3,7 @@
"description": "Monitors Glance cluster using Prometheus. Shows overall cluster processes and usage.",
"editable": true,
"gnetId": 315,
- "graphTooltip": 0,
+ "graphTooltip": 1,
"hideControls": false,
"id": null,
"links": [],
@@ -1355,6 +1355,6 @@
},
"timezone": "browser",
"title": "Glance",
- "version": 1
+ "version": 2
}
{% endraw %}
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 %}
-
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