Skip to content

Commit 7d72dfb

Browse files
NikolaySNikolayS
committed
Add 'All' database filter option to Dashboard 2 (pgss) + fix it in Dashboard 4 (ASH)
1 parent 26ce415 commit 7d72dfb

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

‎config/grafana/dashboards/Dashboard_2_Aggregated_query_analysis.json‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
"targets": [
561561
{
562562
"editorMode": "code",
563-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
563+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
564564
"interval": "20",
565565
"legendFormat": "{{queryid}}",
566566
"range": true,
@@ -679,7 +679,7 @@
679679
"targets": [
680680
{
681681
"editorMode": "code",
682-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_exec_time_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
682+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_exec_time_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
683683
"interval": "20",
684684
"legendFormat": "{{queryid}}",
685685
"range": true,
@@ -800,7 +800,7 @@
800800
"targets": [
801801
{
802802
"editorMode": "code",
803-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_exec_time_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
803+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_exec_time_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
804804
"interval": "20",
805805
"legendFormat": "{{queryid}}",
806806
"range": true,
@@ -919,7 +919,7 @@
919919
"targets": [
920920
{
921921
"editorMode": "code",
922-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_plan_time_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
922+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_plan_time_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
923923
"interval": "20",
924924
"legendFormat": "{{queryid}}",
925925
"range": true,
@@ -1040,7 +1040,7 @@
10401040
"targets": [
10411041
{
10421042
"editorMode": "code",
1043-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_plan_time_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1043+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_plan_time_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
10441044
"interval": "20",
10451045
"legendFormat": "{{queryid}}",
10461046
"range": true,
@@ -1160,7 +1160,7 @@
11601160
"targets": [
11611161
{
11621162
"editorMode": "code",
1163-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_rows{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1163+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_rows{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
11641164
"interval": "20",
11651165
"legendFormat": "{{queryid}}",
11661166
"range": true,
@@ -1280,7 +1280,7 @@
12801280
"targets": [
12811281
{
12821282
"editorMode": "code",
1283-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_rows{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1283+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_rows{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
12841284
"interval": "20",
12851285
"legendFormat": "{{queryid}}",
12861286
"range": true,
@@ -1399,7 +1399,7 @@
13991399
"targets": [
14001400
{
14011401
"editorMode": "code",
1402-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_hit_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1402+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_hit_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
14031403
"interval": "20",
14041404
"legendFormat": "{{queryid}}",
14051405
"range": true,
@@ -1520,7 +1520,7 @@
15201520
"targets": [
15211521
{
15221522
"editorMode": "code",
1523-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_hit_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1523+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_hit_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
15241524
"interval": "20",
15251525
"legendFormat": "{{queryid}}",
15261526
"range": true,
@@ -1639,7 +1639,7 @@
16391639
"targets": [
16401640
{
16411641
"editorMode": "code",
1642-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_read_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1642+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_read_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
16431643
"interval": "20",
16441644
"legendFormat": "{{queryid}}",
16451645
"range": true,
@@ -1760,7 +1760,7 @@
17601760
"targets": [
17611761
{
17621762
"editorMode": "code",
1763-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_read_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1763+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_read_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
17641764
"interval": "20",
17651765
"legendFormat": "{{queryid}}",
17661766
"range": true,
@@ -1879,7 +1879,7 @@
18791879
"targets": [
18801880
{
18811881
"editorMode": "code",
1882-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_written_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
1882+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_written_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
18831883
"interval": "20",
18841884
"legendFormat": "{{queryid}}",
18851885
"range": true,
@@ -2000,7 +2000,7 @@
20002000
"targets": [
20012001
{
20022002
"editorMode": "code",
2003-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_written_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2003+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_written_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
20042004
"interval": "20",
20052005
"legendFormat": "{{queryid}}",
20062006
"range": true,
@@ -2119,7 +2119,7 @@
21192119
"targets": [
21202120
{
21212121
"editorMode": "code",
2122-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_dirtied_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2122+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_dirtied_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
21232123
"interval": "20",
21242124
"legendFormat": "{{queryid}}",
21252125
"range": true,
@@ -2240,7 +2240,7 @@
22402240
"targets": [
22412241
{
22422242
"editorMode": "code",
2243-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_dirtied_total{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2243+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_shared_bytes_dirtied_total{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
22442244
"interval": "20",
22452245
"legendFormat": "{{queryid}}",
22462246
"range": true,
@@ -2359,7 +2359,7 @@
23592359
"targets": [
23602360
{
23612361
"editorMode": "code",
2362-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_bytes{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2362+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_bytes{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
23632363
"interval": "20",
23642364
"legendFormat": "{{queryid}}",
23652365
"range": true,
@@ -2478,7 +2478,7 @@
24782478
"targets": [
24792479
{
24802480
"editorMode": "code",
2481-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_bytes{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2481+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_bytes{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
24822482
"interval": "20",
24832483
"legendFormat": "{{queryid}}",
24842484
"range": true,
@@ -2597,7 +2597,7 @@
25972597
"targets": [
25982598
{
25992599
"editorMode": "code",
2600-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_fpi{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2600+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_fpi{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
26012601
"interval": "20",
26022602
"legendFormat": "{{queryid}}",
26032603
"range": true,
@@ -2715,7 +2715,7 @@
27152715
"targets": [
27162716
{
27172717
"editorMode": "code",
2718-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_fpi{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2718+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_wal_fpi{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
27192719
"interval": "20",
27202720
"legendFormat": "{{queryid}}",
27212721
"range": true,
@@ -2834,7 +2834,7 @@
28342834
"targets": [
28352835
{
28362836
"editorMode": "code",
2837-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_read{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2837+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_read{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
28382838
"interval": "20",
28392839
"legendFormat": "{{queryid}}",
28402840
"range": true,
@@ -2953,7 +2953,7 @@
29532953
"targets": [
29542954
{
29552955
"editorMode": "code",
2956-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_read{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
2956+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_read{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
29572957
"interval": "20",
29582958
"legendFormat": "{{queryid}}",
29592959
"range": true,
@@ -3072,7 +3072,7 @@
30723072
"targets": [
30733073
{
30743074
"editorMode": "code",
3075-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_written{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
3075+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_written{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
30763076
"interval": "20",
30773077
"legendFormat": "{{queryid}}",
30783078
"range": true,
@@ -3191,7 +3191,7 @@
31913191
"targets": [
31923192
{
31933193
"editorMode": "code",
3194-
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_written{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=\"$db_name\"}[$__rate_interval]))",
3194+
"expr": "topk($top_n, irate(pgwatch_pg_stat_statements_temp_bytes_written{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval])/irate(pgwatch_pg_stat_statements_calls{cluster='$cluster_name', node_name='$node_name', datname=~\"$db_name\"}[$__rate_interval]))",
31953195
"interval": "20",
31963196
"legendFormat": "{{queryid}}",
31973197
"range": true,
@@ -3295,12 +3295,15 @@
32953295
"type": "query"
32963296
},
32973297
{
3298+
"allowCustomValue": false,
32983299
"current": {
3299-
"text": "target_database",
3300-
"value": "target_database"
3300+
"text": "All",
3301+
"value": ["$__all"]
33013302
},
33023303
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3304+
"includeAll": true,
33033305
"label": "DB name",
3306+
"multi": true,
33043307
"name": "db_name",
33053308
"options": [],
33063309
"query": {

‎config/grafana/dashboards/Dashboard_4_Wait_Sampling_Dashboard.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@
10151015
]
10161016
},
10171017
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
1018+
"includeAll": true,
10181019
"label": "DB name",
10191020
"multi": true,
10201021
"name": "db_name",

0 commit comments

Comments
 (0)