Skip to content

Commit 8382d63

Browse files
cloud-j-lunacloud-j-luna
authored
feat: improve variable query and add support for instance filter (#34)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added a "service" filter to dashboards for more granular Prometheus job selection. * Updated dashboards to use the new "service" variable for filtering metrics. * Shortened dashboard time ranges for more recent data visibility. * **Chores** * Incremented dashboard versions to reflect updates. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 5ec102a commit 8382d63

File tree

2 files changed

+75
-29
lines changed

2 files changed

+75
-29
lines changed

‎deploy/grafana/provisioning/dashboards/node-drilldown.json‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
},
9393
"disableTextWrap": false,
9494
"editorMode": "builder",
95-
"expr": "proxy_node_health{type=\"$proxy_type\", node=\"$node\"}",
95+
"expr": "proxy_node_health{type=\"$proxy_type\", node=\"$node\", job=\"$service\"}",
9696
"fullMetaSearch": false,
9797
"includeNullMetadata": true,
9898
"legendFormat": "__auto",
@@ -162,7 +162,7 @@
162162
},
163163
"disableTextWrap": false,
164164
"editorMode": "builder",
165-
"expr": "proxy_request_status_count{type=\"$proxy_type\", node=\"$node\"}",
165+
"expr": "proxy_request_status_count{type=\"$proxy_type\", node=\"$node\", job=\"$service\"}",
166166
"fullMetaSearch": false,
167167
"includeNullMetadata": true,
168168
"legendFormat": "{{status_code}}",
@@ -230,7 +230,7 @@
230230
},
231231
"disableTextWrap": false,
232232
"editorMode": "builder",
233-
"expr": "proxy_request_count{type=\"$proxy_type\", node=\"$node\"}",
233+
"expr": "proxy_request_count{type=\"$proxy_type\", node=\"$node\", job=\"$service\"}",
234234
"fullMetaSearch": false,
235235
"includeNullMetadata": true,
236236
"legendFormat": "__auto",
@@ -330,7 +330,7 @@
330330
},
331331
"disableTextWrap": false,
332332
"editorMode": "builder",
333-
"expr": "rate(proxy_request_status_count{type=\"$proxy_type\", node=\"$node\"}[$__rate_interval])",
333+
"expr": "rate(proxy_request_status_count{type=\"$proxy_type\", node=\"$node\", job=\"$service\"}[$__rate_interval])",
334334
"fullMetaSearch": false,
335335
"includeNullMetadata": false,
336336
"legendFormat": "{{status_code}}",
@@ -400,8 +400,8 @@
400400
"uid": "${datasource}"
401401
},
402402
"disableTextWrap": false,
403-
"editorMode": "code",
404-
"expr": "proxy_request_status_count{type=\"$proxy_type\", node=\"$node\"}",
403+
"editorMode": "builder",
404+
"expr": "proxy_request_status_count{type=\"$proxy_type\", node=\"$node\", job=\"$service\"}",
405405
"fullMetaSearch": false,
406406
"includeNullMetadata": false,
407407
"legendFormat": "{{status_code}}",
@@ -428,12 +428,12 @@
428428
"type": "prometheus",
429429
"uid": "${datasource}"
430430
},
431-
"definition": "label_values(type)",
431+
"definition": "label_values(proxy_node_count{job=\"$service\"},type)",
432432
"name": "proxy_type",
433433
"options": [],
434434
"query": {
435435
"qryType": 1,
436-
"query": "label_values(type)",
436+
"query": "label_values(proxy_node_count{job=\"$service\"},type)",
437437
"refId": "PrometheusVariableQueryEditor-VariableQuery"
438438
},
439439
"refresh": 1,
@@ -449,12 +449,12 @@
449449
"type": "prometheus",
450450
"uid": "${datasource}"
451451
},
452-
"definition": "label_values({type=\"$proxy_type\"},node)",
452+
"definition": "label_values(proxy_request_count{type=\"$proxy_type\", job=\"$service\"},node)",
453453
"name": "node",
454454
"options": [],
455455
"query": {
456456
"qryType": 1,
457-
"query": "label_values({type=\"$proxy_type\"},node)",
457+
"query": "label_values(proxy_request_count{type=\"$proxy_type\", job=\"$service\"},node)",
458458
"refId": "PrometheusVariableQueryEditor-VariableQuery"
459459
},
460460
"refresh": 1,
@@ -474,16 +474,39 @@
474474
"refresh": 1,
475475
"regex": "",
476476
"type": "datasource"
477+
},
478+
{
479+
"current": {
480+
"text": "rpc-proxy",
481+
"value": "rpc-proxy"
482+
},
483+
"datasource": {
484+
"type": "prometheus",
485+
"uid": "${datasource}"
486+
},
487+
"definition": "label_values(proxy_node_count,job)",
488+
"description": "Proxy service instance",
489+
"label": "Service",
490+
"name": "service",
491+
"options": [],
492+
"query": {
493+
"qryType": 1,
494+
"query": "label_values(proxy_node_count,job)",
495+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
496+
},
497+
"refresh": 1,
498+
"regex": "",
499+
"type": "query"
477500
}
478501
]
479502
},
480503
"time": {
481-
"from": "now-6h",
504+
"from": "now-30m",
482505
"to": "now"
483506
},
484507
"timepicker": {},
485508
"timezone": "browser",
486509
"title": "Node Drilldown",
487510
"uid": "dejf2gnqpl5hca",
488-
"version": 5
511+
"version": 11
489512
}

‎deploy/grafana/provisioning/dashboards/overview.json‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585
"disableTextWrap": false,
8686
"editorMode": "builder",
87-
"expr": "proxy_node_count",
87+
"expr": "proxy_node_count{job=\"$service\"}",
8888
"fullMetaSearch": false,
8989
"includeNullMetadata": true,
9090
"legendFormat": "{{type}}",
@@ -152,8 +152,8 @@
152152
"uid": "${datasource}"
153153
},
154154
"disableTextWrap": false,
155-
"editorMode": "code",
156-
"expr": "sum(rate(proxy_request_count[1m]))",
155+
"editorMode": "builder",
156+
"expr": "sum(rate(proxy_request_count{job=\"$service\"}[1m]))",
157157
"fullMetaSearch": false,
158158
"includeNullMetadata": false,
159159
"legendFormat": "__auto",
@@ -277,8 +277,8 @@
277277
"uid": "${datasource}"
278278
},
279279
"disableTextWrap": false,
280-
"editorMode": "code",
281-
"expr": "sum(rate(proxy_request_count[1m]))",
280+
"editorMode": "builder",
281+
"expr": "sum(rate(proxy_request_count{job=\"$service\"}[1m]))",
282282
"fullMetaSearch": false,
283283
"includeNullMetadata": false,
284284
"interval": "",
@@ -345,8 +345,8 @@
345345
"uid": "${datasource}"
346346
},
347347
"disableTextWrap": false,
348-
"editorMode": "code",
349-
"expr": "sum(proxy_request_count)",
348+
"editorMode": "builder",
349+
"expr": "sum(proxy_request_count{job=\"$service\"})",
350350
"fullMetaSearch": false,
351351
"includeNullMetadata": false,
352352
"legendFormat": "__auto",
@@ -459,8 +459,8 @@
459459
"uid": "${datasource}"
460460
},
461461
"disableTextWrap": false,
462-
"editorMode": "code",
463-
"expr": "rate(proxy_request_count{type=\"$proxy_type\"}[1m])",
462+
"editorMode": "builder",
463+
"expr": "rate(proxy_request_count{type=\"$proxy_type\", job=\"$service\"}[1m])",
464464
"fullMetaSearch": false,
465465
"includeNullMetadata": true,
466466
"legendFormat": "{{node}}",
@@ -555,8 +555,8 @@
555555
"uid": "${datasource}"
556556
},
557557
"disableTextWrap": false,
558-
"editorMode": "code",
559-
"expr": "sum by (status_code) (rate(proxy_request_status_count{type=\"$proxy_type\"}[$__rate_interval]))",
558+
"editorMode": "builder",
559+
"expr": "sum by(status_code) (rate(proxy_request_status_count{type=\"$proxy_type\", job=\"$service\"}[$__rate_interval]))",
560560
"fullMetaSearch": false,
561561
"includeNullMetadata": false,
562562
"legendFormat": "{{status_code}}",
@@ -649,9 +649,9 @@
649649
"uid": "${datasource}"
650650
},
651651
"disableTextWrap": false,
652-
"editorMode": "code",
652+
"editorMode": "builder",
653653
"exemplar": false,
654-
"expr": "proxy_node_health{type=\"$proxy_type\"}",
654+
"expr": "proxy_node_health{type=\"$proxy_type\", job=\"$service\"}",
655655
"fullMetaSearch": false,
656656
"includeNullMetadata": true,
657657
"instant": false,
@@ -689,7 +689,7 @@
689689
"type": "prometheus",
690690
"uid": "${datasource}"
691691
},
692-
"definition": "label_values(proxy_node_count,type)",
692+
"definition": "label_values(proxy_node_count{job=\"$service\"},type)",
693693
"hide": 1,
694694
"includeAll": true,
695695
"label": "Proxy Type",
@@ -698,7 +698,7 @@
698698
"options": [],
699699
"query": {
700700
"qryType": 1,
701-
"query": "label_values(proxy_node_count,type)",
701+
"query": "label_values(proxy_node_count{job=\"$service\"},type)",
702702
"refId": "PrometheusVariableQueryEditor-VariableQuery"
703703
},
704704
"refresh": 1,
@@ -718,16 +718,39 @@
718718
"refresh": 1,
719719
"regex": "",
720720
"type": "datasource"
721+
},
722+
{
723+
"current": {
724+
"text": "rpc-proxy",
725+
"value": "rpc-proxy"
726+
},
727+
"datasource": {
728+
"type": "prometheus",
729+
"uid": "${datasource}"
730+
},
731+
"definition": "label_values(proxy_node_count,job)",
732+
"description": "Proxy service instance",
733+
"label": "Service",
734+
"name": "service",
735+
"options": [],
736+
"query": {
737+
"qryType": 1,
738+
"query": "label_values(proxy_node_count,job)",
739+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
740+
},
741+
"refresh": 1,
742+
"regex": "",
743+
"type": "query"
721744
}
722745
]
723746
},
724747
"time": {
725-
"from": "now-30m",
748+
"from": "now-15m",
726749
"to": "now"
727750
},
728751
"timepicker": {},
729752
"timezone": "browser",
730753
"title": "Proxy Overview",
731754
"uid": "dej3l52x401kwf",
732-
"version": 7
755+
"version": 10
733756
}

0 commit comments

Comments
 (0)