Use "keystone_public_api" as the backend name
And similarly for keystone-admin-api.
"keystone_public_api" is used instead of "keystone-public-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: I692548719cedbf5686912f32cb1cd148b364bb21
diff --git a/keystone/files/grafana_influxdb.json b/keystone/files/grafana_influxdb.json
index e047354..36cc2b8 100644
--- a/keystone/files/grafana_influxdb.json
+++ b/keystone/files/grafana_influxdb.json
@@ -1075,7 +1075,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'keystone-public-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\" = 'keystone_public_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1101,7 +1101,7 @@
},
{
"key": "backend",
- "value": "keystone-public-api"
+ "value": "keystone_public_api"
},
{
"condition": "AND",
@@ -1183,7 +1183,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'keystone-admin-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\" = 'keystone_admin_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1209,7 +1209,7 @@
},
{
"key": "backend",
- "value": "keystone-admin-api"
+ "value": "keystone_admin_api"
},
{
"condition": "AND",
@@ -1315,7 +1315,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'keystone-public-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\" = 'keystone_public_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1341,7 +1341,7 @@
},
{
"key": "backend",
- "value": "keystone-public-api"
+ "value": "keystone_public_api"
},
{
"condition": "AND",
@@ -1423,7 +1423,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
- "query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'keystone-admin-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\" = 'keystone_admin_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@@ -1449,7 +1449,7 @@
},
{
"key": "backend",
- "value": "keystone-admin-api"
+ "value": "keystone_admin_api"
},
{
"condition": "AND",