openstack
/
salt-formula-cinder
Code Issues Proposed changes

Use "cinder_api" as the backend name 

"cinder_api" is used instead of "cinder-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: I09e484fc7a94852b62946928f22e7220597f5599
This commit is contained in:
Éric Lemoine 2016-11-22 10:54:50 +00:00
parent 21330a8c45
commit 8a81a75f22
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/files/grafana_influxdb.json
View File

@ -1202,7 +1202,7 @@
],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'cinder-api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval)",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'cinder_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1228,7 +1228,7 @@
},
{
"key": "backend",
"value": "cinder-api"
"value": "cinder_api"
},
{
"condition": "AND",
@ -1327,7 +1327,7 @@
],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'cinder-api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval)",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'cinder_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1353,7 +1353,7 @@
},
{
"key": "backend",
"value": "cinder-api"
"value": "cinder_api"
},
{
"condition": "AND",