From 815f0f6a39750c226634d3cfbae25c3d520276d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 24 Nov 2016 13:12:40 +0000 Subject: [PATCH] Use "glance_registry_api" as the backend name "glance_registry_api" is used instead of "glance-registry-api" as the backend name in the haproxy configuration. Ideally, we should not rely on names defined in the user configuration, but we have no solution for this right now. Change-Id: Id4472aaf644a8c7103fa5ae660124bb75cfadc64 --- glance/files/grafana_influxdb.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glance/files/grafana_influxdb.json b/glance/files/grafana_influxdb.json index 9b8a81c..b88b663 100644 --- a/glance/files/grafana_influxdb.json +++ b/glance/files/grafana_influxdb.json @@ -1279,7 +1279,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "policy": "default", - "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'glance-registry-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", + "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'glance_registry_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -1305,7 +1305,7 @@ }, { "key": "backend", - "value": "glance-registry-api" + "value": "glance_registry_api" }, { "condition": "AND", @@ -1519,7 +1519,7 @@ "groupByTags": [], "measurement": "haproxy_backend_servers", "policy": "default", - "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'glance-registry-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", + "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'glance_registry_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -1545,7 +1545,7 @@ }, { "key": "backend", - "value": "glance-registry-api" + "value": "glance_registry_api" }, { "condition": "AND",