Skip to content

Commit fd0792c

Browse files
author
Dementii Priadko
committed
fix(reporter): fix and improve metric queries, improve data reliability
1 parent 8c501d6 commit fd0792c

13 files changed

+524
-227
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -691,13 +691,13 @@
691691
"text": "default",
692692
"value": "default"
693693
},
694-
"definition": "label_values(pgwatch_settings_configured,cluster)",
694+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
695695
"label": "Cluster name",
696696
"name": "cluster_name",
697697
"options": [],
698698
"query": {
699699
"qryType": 1,
700-
"query": "label_values(pgwatch_settings_configured,cluster)",
700+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
701701
"refId": "PrometheusVariableQueryEditor-VariableQuery"
702702
},
703703
"refresh": 1,
@@ -709,13 +709,13 @@
709709
"text": "postgres_ai",
710710
"value": "postgres_ai"
711711
},
712-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
712+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
713713
"label": "Node name",
714714
"name": "node_name",
715715
"options": [],
716716
"query": {
717717
"qryType": 1,
718-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
718+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
719719
"refId": "PrometheusVariableQueryEditor-VariableQuery"
720720
},
721721
"refresh": 1,
@@ -727,13 +727,13 @@
727727
"text": "workloaddb",
728728
"value": "workloaddb"
729729
},
730-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
730+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
731731
"label": "DB name",
732732
"name": "db_name",
733733
"options": [],
734734
"query": {
735735
"qryType": 1,
736-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
736+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
737737
"refId": "PrometheusVariableQueryEditor-VariableQuery"
738738
},
739739
"refresh": 1,

‎config/grafana/dashboards/Dashboard_12_SLRU.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -756,14 +756,14 @@
756756
"text": "default",
757757
"value": "default"
758758
},
759-
"definition": "label_values(pgwatch_settings_configured,cluster)",
759+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
760760
"description": "",
761761
"label": "Cluster",
762762
"name": "cluster_name",
763763
"options": [],
764764
"query": {
765765
"qryType": 1,
766-
"query": "label_values(pgwatch_settings_configured,cluster)",
766+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
767767
"refId": "PrometheusVariableQueryEditor-VariableQuery"
768768
},
769769
"refresh": 1,
@@ -775,13 +775,13 @@
775775
"text": "postgres_ai",
776776
"value": "postgres_ai"
777777
},
778-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
778+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
779779
"label": "Node",
780780
"name": "node_name",
781781
"options": [],
782782
"query": {
783783
"qryType": 1,
784-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
784+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
785785
"refId": "PrometheusVariableQueryEditor-VariableQuery"
786786
},
787787
"refresh": 1,
@@ -793,13 +793,13 @@
793793
"text": "workloaddb",
794794
"value": "workloaddb"
795795
},
796-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
796+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
797797
"label": "DB name",
798798
"name": "db_name",
799799
"options": [],
800800
"query": {
801801
"qryType": 1,
802-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
802+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
803803
"refId": "PrometheusVariableQueryEditor-VariableQuery"
804804
},
805805
"refresh": 1,

‎config/grafana/dashboards/Dashboard_1_Node_performance_overview.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3100,13 +3100,13 @@
31003100
"text": "default",
31013101
"value": "default"
31023102
},
3103-
"definition": "label_values(pgwatch_settings_configured,cluster)",
3103+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
31043104
"label": "Cluster name",
31053105
"name": "cluster_name",
31063106
"options": [],
31073107
"query": {
31083108
"qryType": 1,
3109-
"query": "label_values(pgwatch_settings_configured,cluster)",
3109+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
31103110
"refId": "PrometheusVariableQueryEditor-VariableQuery"
31113111
},
31123112
"refresh": 1,
@@ -3118,13 +3118,13 @@
31183118
"text": "postgres_ai",
31193119
"value": "postgres_ai"
31203120
},
3121-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3121+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
31223122
"label": "Node name",
31233123
"name": "node_name",
31243124
"options": [],
31253125
"query": {
31263126
"qryType": 1,
3127-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3127+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
31283128
"refId": "PrometheusVariableQueryEditor-VariableQuery"
31293129
},
31303130
"refresh": 1,
@@ -3136,13 +3136,13 @@
31363136
"text": "workloaddb",
31373137
"value": "workloaddb"
31383138
},
3139-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3139+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
31403140
"label": "DB name",
31413141
"name": "db_name",
31423142
"options": [],
31433143
"query": {
31443144
"qryType": 1,
3145-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3145+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
31463146
"refId": "PrometheusVariableQueryEditor-VariableQuery"
31473147
},
31483148
"refresh": 1,

‎config/grafana/dashboards/Dashboard_2_Aggregated_query_analysis.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,13 +3263,13 @@
32633263
"text": "local",
32643264
"value": "local"
32653265
},
3266-
"definition": "label_values(pgwatch_settings_configured,cluster)",
3266+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
32673267
"label": "Cluster name",
32683268
"name": "cluster_name",
32693269
"options": [],
32703270
"query": {
32713271
"qryType": 1,
3272-
"query": "label_values(pgwatch_settings_configured,cluster)",
3272+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
32733273
"refId": "PrometheusVariableQueryEditor-VariableQuery"
32743274
},
32753275
"refresh": 1,
@@ -3281,13 +3281,13 @@
32813281
"text": "node-01",
32823282
"value": "node-01"
32833283
},
3284-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3284+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
32853285
"label": "Node name",
32863286
"name": "node_name",
32873287
"options": [],
32883288
"query": {
32893289
"qryType": 1,
3290-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3290+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
32913291
"refId": "PrometheusVariableQueryEditor-VariableQuery"
32923292
},
32933293
"refresh": 1,
@@ -3299,13 +3299,13 @@
32993299
"text": "target_database",
33003300
"value": "target_database"
33013301
},
3302-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3302+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
33033303
"label": "DB name",
33043304
"name": "db_name",
33053305
"options": [],
33063306
"query": {
33073307
"qryType": 1,
3308-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3308+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
33093309
"refId": "PrometheusVariableQueryEditor-VariableQuery"
33103310
},
33113311
"refresh": 1,

‎config/grafana/dashboards/Dashboard_3_Single_query_analysis.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,13 +2181,13 @@
21812181
"text": "local",
21822182
"value": "local"
21832183
},
2184-
"definition": "label_values(pgwatch_settings_configured,cluster)",
2184+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
21852185
"label": "Cluster name",
21862186
"name": "cluster_name",
21872187
"options": [],
21882188
"query": {
21892189
"qryType": 1,
2190-
"query": "label_values(pgwatch_settings_configured,cluster)",
2190+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
21912191
"refId": "PrometheusVariableQueryEditor-VariableQuery"
21922192
},
21932193
"refresh": 1,
@@ -2199,13 +2199,13 @@
21992199
"text": "node-01",
22002200
"value": "node-01"
22012201
},
2202-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
2202+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
22032203
"label": "Node name",
22042204
"name": "node_name",
22052205
"options": [],
22062206
"query": {
22072207
"qryType": 1,
2208-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
2208+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
22092209
"refId": "PrometheusVariableQueryEditor-VariableQuery"
22102210
},
22112211
"refresh": 1,
@@ -2217,13 +2217,13 @@
22172217
"text": "postgres",
22182218
"value": "postgres"
22192219
},
2220-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
2220+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
22212221
"label": "DB name",
22222222
"name": "db_name",
22232223
"options": [],
22242224
"query": {
22252225
"qryType": 1,
2226-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
2226+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
22272227
"refId": "PrometheusVariableQueryEditor-VariableQuery"
22282228
},
22292229
"refresh": 1,

‎config/grafana/dashboards/Dashboard_4_Wait_Sampling_Dashboard.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -975,13 +975,13 @@
975975
"text": "default",
976976
"value": "default"
977977
},
978-
"definition": "label_values(pgwatch_settings_configured,cluster)",
978+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
979979
"label": "Cluster name",
980980
"name": "cluster_name",
981981
"options": [],
982982
"query": {
983983
"qryType": 1,
984-
"query": "label_values(pgwatch_settings_configured,cluster)",
984+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
985985
"refId": "PrometheusVariableQueryEditor-VariableQuery"
986986
},
987987
"refresh": 1,
@@ -993,13 +993,13 @@
993993
"text": "postgres_ai",
994994
"value": "postgres_ai"
995995
},
996-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
996+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
997997
"label": "Node name",
998998
"name": "node_name",
999999
"options": [],
10001000
"query": {
10011001
"qryType": 1,
1002-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
1002+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
10031003
"refId": "PrometheusVariableQueryEditor-VariableQuery"
10041004
},
10051005
"refresh": 1,
@@ -1011,13 +1011,13 @@
10111011
"text": "workloaddb",
10121012
"value": "workloaddb"
10131013
},
1014-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
1014+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
10151015
"label": "DB name",
10161016
"name": "db_name",
10171017
"options": [],
10181018
"query": {
10191019
"qryType": 1,
1020-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
1020+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
10211021
"refId": "PrometheusVariableQueryEditor-VariableQuery"
10221022
},
10231023
"refresh": 1,

‎config/grafana/dashboards/Dashboard_7_Autovacuum_and_bloat.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@
165165
"text": "default",
166166
"value": "default"
167167
},
168-
"definition": "label_values(pgwatch_settings_configured,cluster)",
168+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
169169
"label": "Cluster name",
170170
"name": "cluster_name",
171171
"options": [],
172172
"query": {
173173
"qryType": 1,
174-
"query": "label_values(pgwatch_settings_configured,cluster)",
174+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
175175
"refId": "PrometheusVariableQueryEditor-VariableQuery"
176176
},
177177
"refresh": 1,
@@ -183,13 +183,13 @@
183183
"text": "prod-db",
184184
"value": "prod-db"
185185
},
186-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
186+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
187187
"label": "Node name",
188188
"name": "node_name",
189189
"options": [],
190190
"query": {
191191
"qryType": 1,
192-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
192+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
193193
"refId": "PrometheusVariableQueryEditor-VariableQuery"
194194
},
195195
"refresh": 1,
@@ -201,13 +201,13 @@
201201
"text": "postgres",
202202
"value": "postgres"
203203
},
204-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
204+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
205205
"label": "DB name",
206206
"name": "db_name",
207207
"options": [],
208208
"query": {
209209
"qryType": 1,
210-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
210+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
211211
"refId": "PrometheusVariableQueryEditor-VariableQuery"
212212
},
213213
"refresh": 1,

‎config/grafana/dashboards/Dashboard_8_Table_Stats.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,13 +3250,13 @@
32503250
"text": "default",
32513251
"value": "default"
32523252
},
3253-
"definition": "label_values(pgwatch_settings_configured,cluster)",
3253+
"definition": "label_values(pgwatch_db_size_size_b,cluster)",
32543254
"label": "Cluster name",
32553255
"name": "cluster_name",
32563256
"options": [],
32573257
"query": {
32583258
"qryType": 1,
3259-
"query": "label_values(pgwatch_settings_configured,cluster)",
3259+
"query": "label_values(pgwatch_db_size_size_b,cluster)",
32603260
"refId": "PrometheusVariableQueryEditor-VariableQuery"
32613261
},
32623262
"refresh": 1,
@@ -3268,13 +3268,13 @@
32683268
"text": "postgres_ai",
32693269
"value": "postgres_ai"
32703270
},
3271-
"definition": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3271+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
32723272
"label": "Node name",
32733273
"name": "node_name",
32743274
"options": [],
32753275
"query": {
32763276
"qryType": 1,
3277-
"query": "label_values(pgwatch_settings_configured{cluster=\"$cluster_name\"},node_name)",
3277+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\"},node_name)",
32783278
"refId": "PrometheusVariableQueryEditor-VariableQuery"
32793279
},
32803280
"refresh": 1,
@@ -3286,13 +3286,13 @@
32863286
"text": "workloaddb",
32873287
"value": "workloaddb"
32883288
},
3289-
"definition": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3289+
"definition": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
32903290
"label": "DB name",
32913291
"name": "db_name",
32923292
"options": [],
32933293
"query": {
32943294
"qryType": 1,
3295-
"query": "label_values(pgwatch_pg_database_wraparound_age_datfrozenxid{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
3295+
"query": "label_values(pgwatch_db_size_size_b{cluster=\"$cluster_name\", node_name=\"$node_name\", datname!=\"template1\"},datname)",
32963296
"refId": "PrometheusVariableQueryEditor-VariableQuery"
32973297
},
32983298
"refresh": 1,

0 commit comments

Comments
 (0)