Skip to content

Commit aa24ed7

Browse files
nasenovnasenov
committed
fix: make dashboards portable across different grafana instances
1 parent 72c625f commit aa24ed7

8 files changed

Lines changed: 207 additions & 207 deletions

File tree

‎config/monitoring/grafana/dashboards/pgbackrest.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
{
7474
"datasource": {
7575
"type": "prometheus",
76-
"uid": "PROMETHEUS"
76+
"uid": "${DS_PROMETHEUS}"
7777
},
7878
"fieldConfig": {
7979
"defaults": {
@@ -126,7 +126,7 @@
126126
{
127127
"datasource": {
128128
"type": "prometheus",
129-
"uid": "PROMETHEUS"
129+
"uid": "${DS_PROMETHEUS}"
130130
},
131131
"expr": "time()-ccp_backrest_oldest_full_backup_time_seconds{pg_cluster=\"[[cluster]]\", role=\"master\"}",
132132
"format": "table",
@@ -142,7 +142,7 @@
142142
{
143143
"datasource": {
144144
"type": "prometheus",
145-
"uid": "PROMETHEUS"
145+
"uid": "${DS_PROMETHEUS}"
146146
},
147147
"fieldConfig": {
148148
"defaults": {
@@ -316,7 +316,7 @@
316316
{
317317
"datasource": {
318318
"type": "prometheus",
319-
"uid": "PROMETHEUS"
319+
"uid": "${DS_PROMETHEUS}"
320320
},
321321
"expr": "min(ccp_backrest_last_incr_backup_time_since_completion_seconds{pg_cluster=\"[[cluster]]\", role=\"master\"}) without(deployment,instance,ip,pod)",
322322
"format": "time_series",
@@ -329,7 +329,7 @@
329329
{
330330
"datasource": {
331331
"type": "prometheus",
332-
"uid": "PROMETHEUS"
332+
"uid": "${DS_PROMETHEUS}"
333333
},
334334
"expr": "min(ccp_backrest_last_diff_backup_time_since_completion_seconds{pg_cluster=\"[[cluster]]\", role=\"master\"}) without(deployment, instance,ip,pod)",
335335
"hide": false,
@@ -340,7 +340,7 @@
340340
{
341341
"datasource": {
342342
"type": "prometheus",
343-
"uid": "PROMETHEUS"
343+
"uid": "${DS_PROMETHEUS}"
344344
},
345345
"expr": "min(ccp_backrest_last_full_backup_time_since_completion_seconds{pg_cluster=\"[[cluster]]\", role=\"master\"}) without(deployment, instance,ip,pod)",
346346
"hide": false,
@@ -351,7 +351,7 @@
351351
{
352352
"datasource": {
353353
"type": "prometheus",
354-
"uid": "PROMETHEUS"
354+
"uid": "${DS_PROMETHEUS}"
355355
},
356356
"expr": "min(ccp_archive_command_status_seconds_since_last_archive{pg_cluster=\"[[cluster]]\", role=\"master\"}) without(deployment, instance,ip,pod)",
357357
"hide": false,
@@ -366,7 +366,7 @@
366366
{
367367
"datasource": {
368368
"type": "prometheus",
369-
"uid": "PROMETHEUS"
369+
"uid": "${DS_PROMETHEUS}"
370370
},
371371
"fieldConfig": {
372372
"defaults": {
@@ -495,7 +495,7 @@
495495
{
496496
"datasource": {
497497
"type": "prometheus",
498-
"uid": "PROMETHEUS"
498+
"uid": "${DS_PROMETHEUS}"
499499
},
500500
"expr": "min(ccp_backrest_last_info_backup_runtime_seconds{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"incr\"}) without (deployment,instance,pod,ip)",
501501
"format": "time_series",
@@ -508,7 +508,7 @@
508508
{
509509
"datasource": {
510510
"type": "prometheus",
511-
"uid": "PROMETHEUS"
511+
"uid": "${DS_PROMETHEUS}"
512512
},
513513
"expr": "min(ccp_backrest_last_info_backup_runtime_seconds{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"diff\"}) without (deployment,instance,pod,ip)",
514514
"hide": false,
@@ -519,7 +519,7 @@
519519
{
520520
"datasource": {
521521
"type": "prometheus",
522-
"uid": "PROMETHEUS"
522+
"uid": "${DS_PROMETHEUS}"
523523
},
524524
"expr": "min(ccp_backrest_last_info_backup_runtime_seconds{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"full\"}) without (deployment,instance,pod,ip)",
525525
"hide": false,
@@ -534,7 +534,7 @@
534534
{
535535
"datasource": {
536536
"type": "prometheus",
537-
"uid": "PROMETHEUS"
537+
"uid": "${DS_PROMETHEUS}"
538538
},
539539
"description": "",
540540
"fieldConfig": {
@@ -664,7 +664,7 @@
664664
{
665665
"datasource": {
666666
"type": "prometheus",
667-
"uid": "PROMETHEUS"
667+
"uid": "${DS_PROMETHEUS}"
668668
},
669669
"expr": "min(ccp_backrest_last_info_repo_backup_size_bytes{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"incr\"}) without (deployment, instance,pod,ip)",
670670
"format": "time_series",
@@ -677,7 +677,7 @@
677677
{
678678
"datasource": {
679679
"type": "prometheus",
680-
"uid": "PROMETHEUS"
680+
"uid": "${DS_PROMETHEUS}"
681681
},
682682
"expr": "min(ccp_backrest_last_info_repo_backup_size_bytes{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"diff\"}) without (deployment,instance,pod,ip)",
683683
"hide": false,
@@ -688,7 +688,7 @@
688688
{
689689
"datasource": {
690690
"type": "prometheus",
691-
"uid": "PROMETHEUS"
691+
"uid": "${DS_PROMETHEUS}"
692692
},
693693
"expr": "min(ccp_backrest_last_info_repo_backup_size_bytes{pg_cluster=\"[[cluster]]\", role=\"master\", backup_type=\"full\"}) without (deployment,instance,pod,ip)",
694694
"hide": false,
@@ -703,7 +703,7 @@
703703
{
704704
"datasource": {
705705
"type": "prometheus",
706-
"uid": "PROMETHEUS"
706+
"uid": "${DS_PROMETHEUS}"
707707
},
708708
"description": "",
709709
"fieldConfig": {
@@ -879,7 +879,7 @@
879879
{
880880
"datasource": {
881881
"type": "prometheus",
882-
"uid": "PROMETHEUS"
882+
"uid": "${DS_PROMETHEUS}"
883883
},
884884
"expr": "avg(idelta(ccp_archive_command_status_failed_count{pg_cluster=\"[[cluster]]\", role=\"master\"}[1m])) without (instance,ip)",
885885
"format": "time_series",
@@ -892,7 +892,7 @@
892892
{
893893
"datasource": {
894894
"type": "prometheus",
895-
"uid": "PROMETHEUS"
895+
"uid": "${DS_PROMETHEUS}"
896896
},
897897
"expr": "avg(idelta(ccp_archive_command_status_archived_count{pg_cluster=\"[[cluster]]\", role=\"master\"}[1m])) without (instance,pod, ip)",
898898
"hide": false,
@@ -916,7 +916,7 @@
916916
"current": {},
917917
"datasource": {
918918
"type": "prometheus",
919-
"uid": "PROMETHEUS"
919+
"uid": "${DS_PROMETHEUS}"
920920
},
921921
"definition": "label_values(pg_cluster)",
922922
"hide": 0,

‎config/monitoring/grafana/dashboards/pgbouncer_direct.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
{
6565
"datasource": {
6666
"type": "prometheus",
67-
"uid": "PROMETHEUS"
67+
"uid": "${DS_PROMETHEUS}"
6868
},
6969
"fieldConfig": {
7070
"defaults": {
@@ -146,7 +146,7 @@
146146
{
147147
"datasource": {
148148
"type": "prometheus",
149-
"uid": "PROMETHEUS"
149+
"uid": "${DS_PROMETHEUS}"
150150
},
151151
"editorMode": "code",
152152
"expr": "sum(ccp_pgbouncer_pools_client_active{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"})",
@@ -159,7 +159,7 @@
159159
{
160160
"datasource": {
161161
"type": "prometheus",
162-
"uid": "PROMETHEUS"
162+
"uid": "${DS_PROMETHEUS}"
163163
},
164164
"editorMode": "code",
165165
"expr": "sum(ccp_pgbouncer_pools_client_waiting{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"})",
@@ -172,7 +172,7 @@
172172
{
173173
"datasource": {
174174
"type": "prometheus",
175-
"uid": "PROMETHEUS"
175+
"uid": "${DS_PROMETHEUS}"
176176
},
177177
"editorMode": "code",
178178
"expr": "sum(ccp_pgbouncer_pools_server_active{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"})",
@@ -185,7 +185,7 @@
185185
{
186186
"datasource": {
187187
"type": "prometheus",
188-
"uid": "PROMETHEUS"
188+
"uid": "${DS_PROMETHEUS}"
189189
},
190190
"editorMode": "code",
191191
"expr": "sum(ccp_pgbouncer_pools_server_idle{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"})",
@@ -198,7 +198,7 @@
198198
{
199199
"datasource": {
200200
"type": "prometheus",
201-
"uid": "PROMETHEUS"
201+
"uid": "${DS_PROMETHEUS}"
202202
},
203203
"editorMode": "code",
204204
"expr": "sum(ccp_pgbouncer_pools_server_used{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"})",
@@ -215,7 +215,7 @@
215215
{
216216
"datasource": {
217217
"type": "prometheus",
218-
"uid": "PROMETHEUS"
218+
"uid": "${DS_PROMETHEUS}"
219219
},
220220
"fieldConfig": {
221221
"defaults": {
@@ -297,7 +297,7 @@
297297
{
298298
"datasource": {
299299
"type": "prometheus",
300-
"uid": "PROMETHEUS"
300+
"uid": "${DS_PROMETHEUS}"
301301
},
302302
"editorMode": "code",
303303
"expr": "ccp_pgbouncer_lists_item_count{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\"}",
@@ -314,7 +314,7 @@
314314
{
315315
"datasource": {
316316
"type": "prometheus",
317-
"uid": "PROMETHEUS"
317+
"uid": "${DS_PROMETHEUS}"
318318
},
319319
"fieldConfig": {
320320
"defaults": {
@@ -398,7 +398,7 @@
398398
{
399399
"datasource": {
400400
"type": "prometheus",
401-
"uid": "PROMETHEUS"
401+
"uid": "${DS_PROMETHEUS}"
402402
},
403403
"editorMode": "code",
404404
"expr": "ccp_pgbouncer_databases_current_connections{cluster_name=~\"[[cluster_name]]\", pod=~\"[[pgbnode]]\", name=~\"[[pool]]\"} / ccp_pgbouncer_databases_pool_size{cluster_name=~\"[[cluster_name]]\", pod=~\"[[pgbnode]]\", name=~\"[[pool]]\"}",
@@ -415,7 +415,7 @@
415415
{
416416
"datasource": {
417417
"type": "prometheus",
418-
"uid": "PROMETHEUS"
418+
"uid": "${DS_PROMETHEUS}"
419419
},
420420
"description": "",
421421
"fieldConfig": {
@@ -498,7 +498,7 @@
498498
{
499499
"datasource": {
500500
"type": "prometheus",
501-
"uid": "PROMETHEUS"
501+
"uid": "${DS_PROMETHEUS}"
502502
},
503503
"editorMode": "code",
504504
"expr": "sum(ccp_pgbouncer_clients_wait_seconds{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\", database=~\"[[pool]]\"}) by (pool,state)",
@@ -515,7 +515,7 @@
515515
{
516516
"datasource": {
517517
"type": "prometheus",
518-
"uid": "PROMETHEUS"
518+
"uid": "${DS_PROMETHEUS}"
519519
},
520520
"fieldConfig": {
521521
"defaults": {
@@ -597,7 +597,7 @@
597597
{
598598
"datasource": {
599599
"type": "prometheus",
600-
"uid": "PROMETHEUS"
600+
"uid": "${DS_PROMETHEUS}"
601601
},
602602
"editorMode": "code",
603603
"expr": "sum(ccp_pgbouncer_servers_close_needed{cluster_name=~\"[[cluster_name]]\",pod=~\"[[pgbnode]]\", database=~\"[[pool]]\"}) by (state)",
@@ -623,7 +623,7 @@
623623
"current": {},
624624
"datasource": {
625625
"type": "prometheus",
626-
"uid": "PROMETHEUS"
626+
"uid": "${DS_PROMETHEUS}"
627627
},
628628
"definition": "label_values(up{exp_type='pgbouncer'},cluster_name)",
629629
"hide": 0,
@@ -649,7 +649,7 @@
649649
"current": {},
650650
"datasource": {
651651
"type": "prometheus",
652-
"uid": "PROMETHEUS"
652+
"uid": "${DS_PROMETHEUS}"
653653
},
654654
"definition": "label_values(up{cluster_name=\"[[cluster_name]]\",exp_type='pgbouncer'},pod)",
655655
"hide": 0,
@@ -675,7 +675,7 @@
675675
"current": {},
676676
"datasource": {
677677
"type": "prometheus",
678-
"uid": "PROMETHEUS"
678+
"uid": "${DS_PROMETHEUS}"
679679
},
680680
"definition": "label_values(ccp_pgbouncer_databases_pool_size{cluster_name=\"[[cluster_name]]\", pod=\"[[pgbnode]]\"},name)",
681681
"hide": 0,

0 commit comments

Comments
 (0)