Skip to content

Commit 14abda1

Browse files
NikolaySNikolayS
committed
Merge branch 'fix/dashboard02-drilldown-db-name' into 'main'
fix(dashboards): emit clean var-db_name in drill-down links Closes #207 See merge request postgres-ai/postgresai!274
2 parents 56348ef + 0916c30 commit 14abda1

11 files changed

Lines changed: 173 additions & 157 deletions

‎config/grafana/dashboards/Dashboard_10_Index health.json‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@
353353
"oneClick": false,
354354
"targetBlank": true,
355355
"title": "Query Analysis",
356-
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}"
356+
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}"
357357
}
358358
]
359359
}
@@ -391,7 +391,7 @@
391391
"targets": [
392392
{
393393
"editorMode": "code",
394-
"expr": "topk($top_n, pgwatch_pg_class_relation_size_bytes{relkind=\"105\", cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"})",
394+
"expr": "topk($top_n, pgwatch_pg_class_relation_size_bytes{relkind=\"105\", cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"})",
395395
"interval": "20",
396396
"legendFormat": "{{schemaname}}.{{relname}}",
397397
"range": true,
@@ -487,7 +487,7 @@
487487
"oneClick": false,
488488
"targetBlank": true,
489489
"title": "Query Analysis",
490-
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}"
490+
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}"
491491
}
492492
]
493493
}
@@ -525,7 +525,7 @@
525525
"targets": [
526526
{
527527
"editorMode": "code",
528-
"expr": "topk($top_n, pgwatch_pg_btree_bloat_bloat_pct{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"})",
528+
"expr": "topk($top_n, pgwatch_pg_btree_bloat_bloat_pct{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"})",
529529
"interval": "20",
530530
"legendFormat": "{{schemaname}}.{{tblname}}.{{idxname}}",
531531
"range": true,
@@ -608,7 +608,7 @@
608608
"oneClick": false,
609609
"targetBlank": true,
610610
"title": "Query Analysis",
611-
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&var-db_name=$db_name&from=${__from:date}&to=${__to:date}"
611+
"url": "/d/db52944d-b025-4e18-b70b-89c0af3e7e41/tmp?orgId=1&var-query_id=${__field.labels.queryid}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}&var-cluster_name=$cluster_name&var-node_name=$node_name&${db_name:queryparam}&from=${__from:date}&to=${__to:date}"
612612
}
613613
]
614614
}
@@ -646,7 +646,7 @@
646646
"targets": [
647647
{
648648
"editorMode": "code",
649-
"expr": "topk($top_n, pgwatch_pg_btree_bloat_bloat_size{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"})",
649+
"expr": "topk($top_n, pgwatch_pg_btree_bloat_bloat_size{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"})",
650650
"interval": "20",
651651
"legendFormat": "{{schemaname}}.{{tblname}}.{{idxname}}",
652652
"range": true,
@@ -760,7 +760,7 @@
760760
"targets": [
761761
{
762762
"editorMode": "code",
763-
"expr": "topk($top_n, irate(pgwatch_pg_stat_all_indexes_idx_tup_read{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
763+
"expr": "topk($top_n, irate(pgwatch_pg_stat_all_indexes_idx_tup_read{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
764764
"interval": "20",
765765
"legendFormat": "{{schemaname}}.{{relname}}.{{indexrelname}}",
766766
"range": true,
@@ -861,7 +861,7 @@
861861
"targets": [
862862
{
863863
"editorMode": "code",
864-
"expr": "topk($top_n, irate(pgwatch_pg_stat_all_indexes_idx_tup_fetch{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
864+
"expr": "topk($top_n, irate(pgwatch_pg_stat_all_indexes_idx_tup_fetch{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
865865
"interval": "20",
866866
"legendFormat": "{{schemaname}}.{{relname}}.{{indexrelname}}",
867867
"range": true,
@@ -975,7 +975,7 @@
975975
"targets": [
976976
{
977977
"editorMode": "code",
978-
"expr": "topk($top_n, irate(pgwatch_pg_statio_all_indexes_idx_blks_read{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])) * on() group_left() last_over_time(pgwatch_settings_numeric_value{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\", setting_name=\"block_size\"}[1d])",
978+
"expr": "topk($top_n, irate(pgwatch_pg_statio_all_indexes_idx_blks_read{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])) * on() group_left() last_over_time(pgwatch_settings_numeric_value{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\", setting_name=\"block_size\"}[1d])",
979979
"interval": "20",
980980
"legendFormat": "{{schemaname}}.{{relname}}.{{indexrelname}}",
981981
"range": true,
@@ -1076,7 +1076,7 @@
10761076
"targets": [
10771077
{
10781078
"editorMode": "code",
1079-
"expr": "topk($top_n, irate(pgwatch_pg_statio_all_indexes_idx_blks_hit{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])) * on() group_left() last_over_time(pgwatch_settings_numeric_value{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\", setting_name=\"block_size\"}[1d])",
1079+
"expr": "topk($top_n, irate(pgwatch_pg_statio_all_indexes_idx_blks_hit{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])) * on() group_left() last_over_time(pgwatch_settings_numeric_value{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\", setting_name=\"block_size\"}[1d])",
10801080
"interval": "20",
10811081
"legendFormat": "{{schemaname}}.{{relname}}.{{indexrelname}}",
10821082
"range": true,
@@ -1200,6 +1200,8 @@
12001200
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
12011201
"label": "DB name",
12021202
"name": "db_name",
1203+
"multi": true,
1204+
"includeAll": true,
12031205
"options": [],
12041206
"query": {
12051207
"qryType": 1,

‎config/grafana/dashboards/Dashboard_12_SLRU.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"targets": [
137137
{
138138
"editorMode": "code",
139-
"expr": "irate(pgwatch_pg_stat_slru_blks_hit{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])",
139+
"expr": "irate(pgwatch_pg_stat_slru_blks_hit{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])",
140140
"interval": "10",
141141
"legendFormat": "{{name}}",
142142
"range": true,
@@ -235,7 +235,7 @@
235235
{
236236
"disableTextWrap": false,
237237
"editorMode": "builder",
238-
"expr": "irate(pgwatch_pg_stat_slru_blks_exists{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
238+
"expr": "irate(pgwatch_pg_stat_slru_blks_exists{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
239239
"fullMetaSearch": false,
240240
"includeNullMetadata": true,
241241
"interval": "10",
@@ -337,7 +337,7 @@
337337
{
338338
"disableTextWrap": false,
339339
"editorMode": "builder",
340-
"expr": "irate(pgwatch_pg_stat_slru_blks_read{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
340+
"expr": "irate(pgwatch_pg_stat_slru_blks_read{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
341341
"fullMetaSearch": false,
342342
"includeNullMetadata": true,
343343
"interval": "10",
@@ -439,7 +439,7 @@
439439
{
440440
"disableTextWrap": false,
441441
"editorMode": "builder",
442-
"expr": "irate(pgwatch_pg_stat_slru_blks_written{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
442+
"expr": "irate(pgwatch_pg_stat_slru_blks_written{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
443443
"fullMetaSearch": false,
444444
"includeNullMetadata": true,
445445
"interval": "10",
@@ -541,7 +541,7 @@
541541
{
542542
"disableTextWrap": false,
543543
"editorMode": "code",
544-
"expr": "irate(pgwatch_pg_stat_slru_blks_zeroed{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
544+
"expr": "irate(pgwatch_pg_stat_slru_blks_zeroed{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
545545
"fullMetaSearch": false,
546546
"includeNullMetadata": true,
547547
"interval": "10",
@@ -643,7 +643,7 @@
643643
{
644644
"disableTextWrap": false,
645645
"editorMode": "builder",
646-
"expr": "irate(pgwatch_pg_stat_slru_truncates{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
646+
"expr": "irate(pgwatch_pg_stat_slru_truncates{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
647647
"fullMetaSearch": false,
648648
"includeNullMetadata": true,
649649
"interval": "10",
@@ -745,7 +745,7 @@
745745
{
746746
"disableTextWrap": false,
747747
"editorMode": "builder",
748-
"expr": "irate(pgwatch_pg_stat_slru_flushes{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=\"$db_name\"}[$__rate_interval])",
748+
"expr": "irate(pgwatch_pg_stat_slru_flushes{cluster=\"$cluster_name\", node_name=\"$node_name\", datname=~\"$db_name\"}[$__rate_interval])",
749749
"fullMetaSearch": false,
750750
"includeNullMetadata": true,
751751
"interval": "10",
@@ -813,6 +813,8 @@
813813
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
814814
"label": "DB name",
815815
"name": "db_name",
816+
"multi": true,
817+
"includeAll": true,
816818
"options": [],
817819
"query": {
818820
"qryType": 1,
@@ -834,4 +836,4 @@
834836
"title": "12. SLRU cache stats",
835837
"uid": "slru_stats",
836838
"version": 2
837-
}
839+
}

‎config/grafana/dashboards/Dashboard_13_Lock_waits.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@
10941094
"hide": 0,
10951095
"includeAll": true,
10961096
"allValue": ".*",
1097-
"multi": false,
1097+
"multi": true,
10981098
"name": "db_name",
10991099
"options": [],
11001100
"query": {

0 commit comments

Comments
 (0)