Skip to content

Commit 8d826f8

Browse files
ionthegeekionthegeek
authored
Add Branch ID variable to postgres_mixin Grafana dashboard (#9)
This commit adds a variable `$branch` to the `postgres_mixin` Grafana dashboard for the PlanetScale-specific `database_branch_id` label. The `$db` variable definition has been updated so it is now scoped within a branch. All panels have been updated to use the new variable if set.
1 parent 193afae commit 8d826f8

File tree

1 file changed

+51
-17
lines changed

1 file changed

+51
-17
lines changed

‎postgres_mixin/dashboards/postgres-overview.json‎

Lines changed: 51 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"uid": "$datasource"
116116
},
117117
"dsType": "prometheus",
118-
"expr": "sum(irate(pg_stat_database_xact_commit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])) + sum(irate(pg_stat_database_xact_rollback{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
118+
"expr": "sum(irate(pg_stat_database_xact_commit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])) + sum(irate(pg_stat_database_xact_rollback{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
119119
"format": "time_series",
120120
"groupBy": [
121121
{
@@ -258,7 +258,7 @@
258258
"uid": "$datasource"
259259
},
260260
"dsType": "prometheus",
261-
"expr": "sum(irate(pg_stat_database_tup_fetched{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
261+
"expr": "sum(irate(pg_stat_database_tup_fetched{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
262262
"format": "time_series",
263263
"groupBy": [
264264
{
@@ -315,7 +315,7 @@
315315
"uid": "$datasource"
316316
},
317317
"dsType": "prometheus",
318-
"expr": "sum(irate(pg_stat_database_tup_returned{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
318+
"expr": "sum(irate(pg_stat_database_tup_returned{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
319319
"format": "time_series",
320320
"groupBy": [
321321
{
@@ -372,7 +372,7 @@
372372
"uid": "$datasource"
373373
},
374374
"dsType": "prometheus",
375-
"expr": "sum(irate(pg_stat_database_tup_inserted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
375+
"expr": "sum(irate(pg_stat_database_tup_inserted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
376376
"format": "time_series",
377377
"groupBy": [
378378
{
@@ -429,7 +429,7 @@
429429
"uid": "$datasource"
430430
},
431431
"dsType": "prometheus",
432-
"expr": "sum(irate(pg_stat_database_tup_updated{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
432+
"expr": "sum(irate(pg_stat_database_tup_updated{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
433433
"format": "time_series",
434434
"groupBy": [
435435
{
@@ -486,7 +486,7 @@
486486
"uid": "$datasource"
487487
},
488488
"dsType": "prometheus",
489-
"expr": "sum(irate(pg_stat_database_tup_deleted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
489+
"expr": "sum(irate(pg_stat_database_tup_deleted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval]))",
490490
"format": "time_series",
491491
"groupBy": [
492492
{
@@ -631,7 +631,7 @@
631631
"uid": "$datasource"
632632
},
633633
"dsType": "prometheus",
634-
"expr": "irate(pg_stat_bgwriter_buffers_alloc_total{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
634+
"expr": "irate(pg_stat_bgwriter_buffers_alloc_total{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])",
635635
"format": "time_series",
636636
"groupBy": [
637637
{
@@ -686,7 +686,7 @@
686686
"uid": "$datasource"
687687
},
688688
"dsType": "prometheus",
689-
"expr": "irate(pg_stat_bgwriter_buffers_backend_fsync_total{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
689+
"expr": "irate(pg_stat_bgwriter_buffers_backend_fsync_total{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])",
690690
"format": "time_series",
691691
"groupBy": [
692692
{
@@ -741,7 +741,7 @@
741741
"uid": "$datasource"
742742
},
743743
"dsType": "prometheus",
744-
"expr": "irate(pg_stat_bgwriter_buffers_backend_total{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
744+
"expr": "irate(pg_stat_bgwriter_buffers_backend_total{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])",
745745
"format": "time_series",
746746
"groupBy": [
747747
{
@@ -796,7 +796,7 @@
796796
"uid": "$datasource"
797797
},
798798
"dsType": "prometheus",
799-
"expr": "irate(pg_stat_bgwriter_buffers_clean_total{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
799+
"expr": "irate(pg_stat_bgwriter_buffers_clean_total{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])",
800800
"format": "time_series",
801801
"groupBy": [
802802
{
@@ -851,7 +851,7 @@
851851
"uid": "$datasource"
852852
},
853853
"dsType": "prometheus",
854-
"expr": "irate(pg_stat_bgwriter_buffers_checkpoint_total{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
854+
"expr": "irate(pg_stat_bgwriter_buffers_checkpoint_total{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])",
855855
"format": "time_series",
856856
"groupBy": [
857857
{
@@ -1007,7 +1007,7 @@
10071007
"uid": "$datasource"
10081008
},
10091009
"dsType": "prometheus",
1010-
"expr": "sum(pg_stat_database_deadlocks{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"})",
1010+
"expr": "sum(pg_stat_database_deadlocks{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"})",
10111011
"format": "time_series",
10121012
"groupBy": [
10131013
{
@@ -1064,7 +1064,7 @@
10641064
},
10651065
"dsType": "prometheus",
10661066
"editorMode": "code",
1067-
"expr": "sum(pg_stat_database_conflicts{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"})",
1067+
"expr": "sum(pg_stat_database_conflicts{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"})",
10681068
"format": "time_series",
10691069
"groupBy": [
10701070
{
@@ -1203,7 +1203,7 @@
12031203
"datasource": {
12041204
"uid": "$datasource"
12051205
},
1206-
"expr": "round(sum by (datname) (rate(pg_stat_database_blks_hit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])) / (sum by (datname)(rate(pg_stat_database_blks_hit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])) + sum by (datname)(rate(pg_stat_database_blks_read{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])))*100,0.001)",
1206+
"expr": "round(sum by (datname) (rate(pg_stat_database_blks_hit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])) / (sum by (datname)(rate(pg_stat_database_blks_hit{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])) + sum by (datname)(rate(pg_stat_database_blks_read{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}[$__rate_interval])))*100,0.001)",
12071207
"format": "time_series",
12081208
"legendFormat": "{{datname}} - cache hit rate",
12091209
"refId": "A",
@@ -1296,7 +1296,7 @@
12961296
"datasource": {
12971297
"uid": "$datasource"
12981298
},
1299-
"expr": "pg_stat_database_numbackends{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}",
1299+
"expr": "pg_stat_database_numbackends{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\"}",
13001300
"format": "time_series",
13011301
"intervalFactor": 2,
13021302
"legendFormat": "{{datname}} - {{__name__}}",
@@ -1398,20 +1398,54 @@
13981398
"type": "query",
13991399
"useTags": false
14001400
},
1401+
{
1402+
"allValue": ".+",
1403+
"current": {
1404+
"selected": true,
1405+
"text": [
1406+
"All"
1407+
],
1408+
"value": [
1409+
"$__all"
1410+
]
1411+
},
1412+
"datasource": {
1413+
"uid": "$datasource"
1414+
},
1415+
"definition": "label_values(pg_up{job=~\"$job\"},database_branch_id)",
1416+
"hide": 0,
1417+
"includeAll": true,
1418+
"label": "Branch ID",
1419+
"multi": true,
1420+
"name": "branch",
1421+
"options": [],
1422+
"query": {
1423+
"query": "label_values(pg_up{job=~\"$job\"},database_branch_id)",
1424+
"refId": "StandardVariableQuery"
1425+
},
1426+
"refresh": 2,
1427+
"regex": "",
1428+
"skipUrlSync": false,
1429+
"sort": 0,
1430+
"tagValuesQuery": "",
1431+
"tagsQuery": "",
1432+
"type": "query",
1433+
"useTags": false
1434+
},
14011435
{
14021436
"allValue": ".+",
14031437
"datasource": {
14041438
"uid": "$datasource"
14051439
},
1406-
"definition": "label_values(pg_stat_database_tup_fetched{job=~\"$job\",instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
1440+
"definition": "label_values(pg_stat_database_tup_fetched{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\",datname!~\"template.*|postgres\"},datname)",
14071441
"hide": 0,
14081442
"includeAll": true,
14091443
"label": "Database",
14101444
"multi": false,
14111445
"name": "db",
14121446
"options": [],
14131447
"query": {
1414-
"query": "label_values(pg_stat_database_tup_fetched{job=~\"$job\",instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
1448+
"query": "label_values(pg_stat_database_tup_fetched{job=~\"$job\",instance=~\"$instance\",database_branch_id=~\"$branch\",datname!~\"template.*|postgres\"},datname)",
14151449
"refId": "StandardVariableQuery"
14161450
},
14171451
"refresh": 2,

0 commit comments

Comments
 (0)