openstack
/
salt-formula-nova
Code Issues Proposed changes

Use "nova_api" as the backend name 

And similarly for nova-metadata-api and nova-novncproxy-websocket.

"nova_api" is used instead of "nova-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: Id4d6fb6788fedeb9cc15eddfe59a0ad4ddc32699
This commit is contained in:
Éric Lemoine 2016-11-22 13:41:38 +00:00
parent 12017cdbbf
commit 13ffb55b8a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nova/files/nova_influxdb.json
View File

@ -1240,7 +1240,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-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\" = 'nova_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1266,7 +1266,7 @@
},
{
"key": "backend",
"value": "nova-api"
"value": "nova_api"
},
{
"condition": "AND",
@ -1349,7 +1349,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-metadata-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\" = 'nova_metadata_api' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1375,7 +1375,7 @@
},
{
"key": "backend",
"value": "nova-metadata-api"
"value": "nova_metadata_api"
},
{
"condition": "AND",
@ -1458,7 +1458,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-novncproxy-websocket' 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\" = 'nova_novncproxy_websocket' AND \"state\" = 'up' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1484,7 +1484,7 @@
},
{
"key": "backend",
"value": "nova-novncproxy-websocket"
"value": "nova_novncproxy_websocket"
},
{
"condition": "AND",
@ -1591,7 +1591,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-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\" = 'nova_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1617,7 +1617,7 @@
},
{
"key": "backend",
"value": "nova-api"
"value": "nova_api"
},
{
"condition": "AND",
@ -1700,7 +1700,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-metadata-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\" = 'nova_metadata_api' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1726,7 +1726,7 @@
},
{
"key": "backend",
"value": "nova-metadata-api"
"value": "nova_metadata_api"
},
{
"condition": "AND",
@ -1809,7 +1809,7 @@
"groupByTags": [],
"measurement": "haproxy_backend_servers",
"policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_servers\" WHERE \"environment_label\" =~ /^$environment$/ AND \"backend\" = 'nova-novncproxy-websocket' 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\" = 'nova_novncproxy_websocket' AND \"state\" = 'down' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false,
"refId": "A",
"resultFormat": "time_series",
@ -1835,7 +1835,7 @@
},
{
"key": "backend",
"value": "nova-novncproxy-websocket"
"value": "nova_novncproxy_websocket"
},
{
"condition": "AND",