Fix HAproxy dashboard

* missing WHERE clause for the backend status
* remove the GROUP_BY clause to avoid flapping

Change-Id: Ifab23ad13e2621d5eb50a53753ebe63d44ae785a
Related-bug: #1554993
This commit is contained in:
Swann Croiset 2016-11-23 13:52:01 +01:00
parent 9a747fb362
commit 768d468bf8
1 changed files with 15 additions and 12 deletions

View File

@ -337,11 +337,13 @@
"tags": [ "tags": [
{ {
"key": "hostname", "key": "hostname",
"operator": "=~",
"value": "/$server/" "value": "/$server/"
}, },
{ {
"condition": "AND", "condition": "AND",
"key": "resource", "key": "resource",
"operator": "=",
"value": "vip__management" "value": "vip__management"
} }
] ]
@ -391,7 +393,7 @@
"thresholdMarkers": true "thresholdMarkers": true
}, },
"id": 16, "id": 16,
"interval": ">60s", "interval": "",
"links": [], "links": [],
"maxDataPoints": 100, "maxDataPoints": 100,
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
@ -413,17 +415,11 @@
"dsType": "influxdb", "dsType": "influxdb",
"fill": "", "fill": "",
"function": "last", "function": "last",
"groupBy": [ "groupBy": [],
{ "hide": false,
"params": [
"auto"
],
"type": "time"
}
],
"measurement": "haproxy_backend_status", "measurement": "haproxy_backend_status",
"policy": "default", "policy": "default",
"query": "SELECT last(\"value\") FROM \"haproxy_backend_status\" WHERE \"hostname\" =~ /$server/ AND $timeFilter GROUP BY time($interval)", "query": "SELECT \"value\" FROM \"haproxy_backend_status\" WHERE \"hostname\" =~ /$server/ AND \"backend\" =~ /^$service$/ AND $timeFilter",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@ -444,7 +440,14 @@
"tags": [ "tags": [
{ {
"key": "hostname", "key": "hostname",
"operator": "=~",
"value": "/$server/" "value": "/$server/"
},
{
"condition": "AND",
"key": "backend",
"operator": "=~",
"value": "/^$service$/"
} }
] ]
} }
@ -3006,5 +3009,5 @@
}, },
"timezone": "browser", "timezone": "browser",
"title": "HAProxy", "title": "HAProxy",
"version": 3 "version": 4
} }