Skip to content

Commit 1bc20da

Browse files
fschlichfschlich
authored
fix datasource, $exported_namespace variable in grafana nginx dashboard (#9092)
* grafana/dashboards/nginx.json: re-add exported_namespace as a variable (was deleted entirely in #9523) * dashboards/nginx.json: switch around ingress and namespace selectors, and rename "Exported Namespace" to "Ingress Namespace" authored by tghartland at https://gist.github.com/tghartland/9147d88f991a95d4bab0fa7278c237eb * dashboards/nginx.json: make "Ingress Request Volume" and "Ingress Success Rate" panels look at selected Ingress Namespaces only, and rename two panel titels to use the renamed variable as suggested by tghartland in #9092 (comment) * dashboards/nginx.json: apply Ingress Namespace selection to "Ingress Percentile Response Times and Transfer Rates" as well this is from #9092 (comment) also by tghartland
1 parent 3a887f2 commit 1bc20da

File tree

1 file changed

+40
-16
lines changed

1 file changed

+40
-16
lines changed

‎deploy/grafana/dashboards/nginx.json‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@
530530
"steppedLine": false,
531531
"targets": [
532532
{
533-
"expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress), 0.001)",
533+
"expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",exported_namespace=~\"$exported_namespace\",ingress=~\"$ingress\"}[2m])) by (ingress), 0.001)",
534534
"format": "time_series",
535535
"hide": false,
536536
"instant": false,
@@ -637,7 +637,7 @@
637637
"steppedLine": false,
638638
"targets": [
639639
{
640-
"expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[2m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
640+
"expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",exported_namespace=~\"$exported_namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[2m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",exported_namespace=~\"$exported_namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
641641
"format": "time_series",
642642
"instant": false,
643643
"interval": "10s",
@@ -1183,7 +1183,7 @@
11831183
],
11841184
"targets": [
11851185
{
1186-
"expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
1186+
"expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le, ingress))",
11871187
"format": "table",
11881188
"hide": false,
11891189
"instant": true,
@@ -1192,7 +1192,7 @@
11921192
"refId": "C"
11931193
},
11941194
{
1195-
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
1195+
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le, ingress))",
11961196
"format": "table",
11971197
"hide": false,
11981198
"instant": true,
@@ -1201,7 +1201,7 @@
12011201
"refId": "D"
12021202
},
12031203
{
1204-
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
1204+
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le, ingress))",
12051205
"format": "table",
12061206
"hide": false,
12071207
"instant": true,
@@ -1210,7 +1210,7 @@
12101210
"refId": "E"
12111211
},
12121212
{
1213-
"expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
1213+
"expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (ingress)",
12141214
"format": "table",
12151215
"hide": false,
12161216
"instant": true,
@@ -1220,7 +1220,7 @@
12201220
"refId": "F"
12211221
},
12221222
{
1223-
"expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
1223+
"expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (ingress)",
12241224
"format": "table",
12251225
"instant": true,
12261226
"intervalFactor": 1,
@@ -1312,7 +1312,7 @@
13121312
"targets": [
13131313
{
13141314
"exemplar": true,
1315-
"expr": "histogram_quantile(0.80, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le))",
1315+
"expr": "histogram_quantile(0.80, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le))",
13161316
"format": "time_series",
13171317
"hide": false,
13181318
"instant": false,
@@ -1323,7 +1323,7 @@
13231323
},
13241324
{
13251325
"exemplar": true,
1326-
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le))",
1326+
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le))",
13271327
"format": "time_series",
13281328
"hide": false,
13291329
"instant": false,
@@ -1335,7 +1335,7 @@
13351335
{
13361336
"editorMode": "code",
13371337
"exemplar": true,
1338-
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le))",
1338+
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le))",
13391339
"format": "time_series",
13401340
"hide": false,
13411341
"instant": false,
@@ -1345,7 +1345,7 @@
13451345
"refId": "E"
13461346
}
13471347
],
1348-
"title": "Ingress Percentile Response Times",
1348+
"title": "Ingress Percentile Response Times (Ingress Namespaces)",
13491349
"type": "timeseries"
13501350
},
13511351
{
@@ -1377,14 +1377,14 @@
13771377
"targets": [
13781378
{
13791379
"exemplar": true,
1380-
"expr": "sum(increase(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le)",
1380+
"expr": "sum(increase(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\",exported_namespace=~\"$exported_namespace\"}[2m])) by (le)",
13811381
"format": "heatmap",
13821382
"interval": "",
13831383
"legendFormat": "{{le}}",
13841384
"refId": "A"
13851385
}
13861386
],
1387-
"title": "Ingress Request Latency Heatmap",
1387+
"title": "Ingress Request Latency Heatmap (Ingress Namespaces)",
13881388
"tooltip": {
13891389
"show": true,
13901390
"showHistogram": true
@@ -1561,7 +1561,31 @@
15611561
"query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\",controller_class=~\"$controller_class\"}, controller_pod) ",
15621562
"refresh": 1,
15631563
"regex": "",
1564-
"sort": 0,
1564+
"sort": 1,
1565+
"tagValuesQuery": "",
1566+
"tags": [],
1567+
"tagsQuery": "",
1568+
"type": "query",
1569+
"useTags": false
1570+
},
1571+
{
1572+
"allValue": ".*",
1573+
"current": {
1574+
"tags": [],
1575+
"text": "All",
1576+
"value": "$__all"
1577+
},
1578+
"datasource": "${DS_PROMETHEUS}",
1579+
"hide": 0,
1580+
"includeAll": true,
1581+
"label": "Ingress Namespace",
1582+
"multi": false,
1583+
"name": "exported_namespace",
1584+
"options": [],
1585+
"query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}, exported_namespace) ",
1586+
"refresh": 1,
1587+
"regex": "",
1588+
"sort": 1,
15651589
"tagValuesQuery": "",
15661590
"tags": [],
15671591
"tagsQuery": "",
@@ -1582,10 +1606,10 @@
15821606
"multi": false,
15831607
"name": "ingress",
15841608
"options": [],
1585-
"query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}, ingress) ",
1609+
"query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\",exported_namespace=~\"$exported_namespace\"}, ingress) ",
15861610
"refresh": 1,
15871611
"regex": "",
1588-
"sort": 2,
1612+
"sort": 1,
15891613
"tagValuesQuery": "",
15901614
"tags": [],
15911615
"tagsQuery": "",

0 commit comments

Comments
 (0)