Skip to content

Commit d23b0b2

Browse files
sysadmindsysadmind
authored
Merge pull request prometheus-community#647 from grafana/rgeyer/mixin-dashboard-linting
Dashboard linting improvements for mixin
2 parents 9bd9d83 + 9003ac8 commit d23b0b2

File tree

1 file changed

+57
-83
lines changed

1 file changed

+57
-83
lines changed

‎postgres_mixin/dashboards/postgres-overview.json‎

Lines changed: 57 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"bars": false,
2626
"dashLength": 10,
2727
"dashes": false,
28-
"datasource": "Postgres Overview",
28+
"datasource": "$datasource",
2929
"editable": true,
3030
"error": false,
3131
"fieldConfig": {
@@ -77,7 +77,7 @@
7777
{
7878
"alias": "fetched",
7979
"dsType": "prometheus",
80-
"expr": "sum(irate(pg_stat_database_tup_fetched{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
80+
"expr": "sum(irate(pg_stat_database_tup_fetched{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
8181
"format": "time_series",
8282
"groupBy": [
8383
{
@@ -131,7 +131,7 @@
131131
{
132132
"alias": "fetched",
133133
"dsType": "prometheus",
134-
"expr": "sum(irate(pg_stat_database_tup_returned{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
134+
"expr": "sum(irate(pg_stat_database_tup_returned{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
135135
"format": "time_series",
136136
"groupBy": [
137137
{
@@ -185,7 +185,7 @@
185185
{
186186
"alias": "fetched",
187187
"dsType": "prometheus",
188-
"expr": "sum(irate(pg_stat_database_tup_inserted{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
188+
"expr": "sum(irate(pg_stat_database_tup_inserted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
189189
"format": "time_series",
190190
"groupBy": [
191191
{
@@ -239,7 +239,7 @@
239239
{
240240
"alias": "fetched",
241241
"dsType": "prometheus",
242-
"expr": "sum(irate(pg_stat_database_tup_updated{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
242+
"expr": "sum(irate(pg_stat_database_tup_updated{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
243243
"format": "time_series",
244244
"groupBy": [
245245
{
@@ -293,7 +293,7 @@
293293
{
294294
"alias": "fetched",
295295
"dsType": "prometheus",
296-
"expr": "sum(irate(pg_stat_database_tup_deleted{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
296+
"expr": "sum(irate(pg_stat_database_tup_deleted{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
297297
"format": "time_series",
298298
"groupBy": [
299299
{
@@ -396,7 +396,7 @@
396396
"rgba(237, 129, 40, 0.89)",
397397
"rgba(50, 172, 45, 0.97)"
398398
],
399-
"datasource": "Postgres Overview",
399+
"datasource": "$datasource",
400400
"decimals": 0,
401401
"editable": true,
402402
"error": false,
@@ -460,7 +460,7 @@
460460
"targets": [
461461
{
462462
"dsType": "prometheus",
463-
"expr": "sum(irate(pg_stat_database_xact_commit{datname=~\"$db\",instance=~\"$instance\"}[5m])) + sum(irate(pg_stat_database_xact_rollback{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
463+
"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]))",
464464
"format": "time_series",
465465
"groupBy": [
466466
{
@@ -530,7 +530,7 @@
530530
"bars": false,
531531
"dashLength": 10,
532532
"dashes": false,
533-
"datasource": "Postgres Overview",
533+
"datasource": "$datasource",
534534
"decimals": 1,
535535
"editable": true,
536536
"error": false,
@@ -584,7 +584,7 @@
584584
{
585585
"alias": "Buffers Allocated",
586586
"dsType": "prometheus",
587-
"expr": "irate(pg_stat_bgwriter_buffers_alloc_total{instance='$instance'}[5m])",
587+
"expr": "irate(pg_stat_bgwriter_buffers_alloc{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
588588
"format": "time_series",
589589
"groupBy": [
590590
{
@@ -636,7 +636,7 @@
636636
{
637637
"alias": "Buffers Allocated",
638638
"dsType": "prometheus",
639-
"expr": "irate(pg_stat_bgwriter_buffers_backend_fsync_total{instance='$instance'}[5m])",
639+
"expr": "irate(pg_stat_bgwriter_buffers_backend_fsync{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
640640
"format": "time_series",
641641
"groupBy": [
642642
{
@@ -688,7 +688,7 @@
688688
{
689689
"alias": "Buffers Allocated",
690690
"dsType": "prometheus",
691-
"expr": "irate(pg_stat_bgwriter_buffers_backend_total{instance='$instance'}[5m])",
691+
"expr": "irate(pg_stat_bgwriter_buffers_backend{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
692692
"format": "time_series",
693693
"groupBy": [
694694
{
@@ -740,7 +740,7 @@
740740
{
741741
"alias": "Buffers Allocated",
742742
"dsType": "prometheus",
743-
"expr": "irate(pg_stat_bgwriter_buffers_clean_total{instance='$instance'}[5m])",
743+
"expr": "irate(pg_stat_bgwriter_buffers_clean{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
744744
"format": "time_series",
745745
"groupBy": [
746746
{
@@ -792,7 +792,7 @@
792792
{
793793
"alias": "Buffers Allocated",
794794
"dsType": "prometheus",
795-
"expr": "irate(pg_stat_bgwriter_buffers_checkpoint_total{instance='$instance'}[5m])",
795+
"expr": "irate(pg_stat_bgwriter_buffers_checkpoint{job=~\"$job\",instance=~\"$instance\"}[$__rate_interval])",
796796
"format": "time_series",
797797
"groupBy": [
798798
{
@@ -889,7 +889,7 @@
889889
"bars": false,
890890
"dashLength": 10,
891891
"dashes": false,
892-
"datasource": "Postgres Overview",
892+
"datasource": "$datasource",
893893
"editable": true,
894894
"error": false,
895895
"fieldConfig": {
@@ -939,7 +939,7 @@
939939
{
940940
"alias": "conflicts",
941941
"dsType": "prometheus",
942-
"expr": "sum(rate(pg_stat_database_deadlocks{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
942+
"expr": "sum(rate(pg_stat_database_deadlocks{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
943943
"format": "time_series",
944944
"groupBy": [
945945
{
@@ -991,7 +991,7 @@
991991
{
992992
"alias": "deadlocks",
993993
"dsType": "prometheus",
994-
"expr": "sum(rate(pg_stat_database_conflicts{datname=~\"$db\",instance=~\"$instance\"}[5m]))",
994+
"expr": "sum(rate(pg_stat_database_conflicts{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}[$__rate_interval]))",
995995
"format": "time_series",
996996
"groupBy": [
997997
{
@@ -1088,7 +1088,7 @@
10881088
"bars": false,
10891089
"dashLength": 10,
10901090
"dashes": false,
1091-
"datasource": "Postgres Overview",
1091+
"datasource": "$datasource",
10921092
"editable": true,
10931093
"error": false,
10941094
"fieldConfig": {
@@ -1136,10 +1136,10 @@
11361136
"steppedLine": false,
11371137
"targets": [
11381138
{
1139-
"expr": "sum(pg_stat_database_blks_hit{datname=~\"$db\",instance=~\"$instance\"}) / (sum(pg_stat_database_blks_hit{datname=~\"$db\",instance=~\"$instance\"}) + sum(pg_stat_database_blks_read{datname=~\"$db\",instance=~\"$instance\"}))",
1139+
"expr": "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])))",
11401140
"format": "time_series",
11411141
"intervalFactor": 2,
1142-
"legendFormat": "cache hit rate",
1142+
"legendFormat": "{{datname}} - cache hit rate",
11431143
"refId": "A",
11441144
"step": 240
11451145
}
@@ -1191,7 +1191,7 @@
11911191
"bars": false,
11921192
"dashLength": 10,
11931193
"dashes": false,
1194-
"datasource": "Postgres Overview",
1194+
"datasource": "$datasource",
11951195
"editable": true,
11961196
"error": false,
11971197
"fieldConfig": {
@@ -1239,10 +1239,10 @@
12391239
"steppedLine": false,
12401240
"targets": [
12411241
{
1242-
"expr": "pg_stat_database_numbackends{datname=~\"$db\",instance=~\"$instance\"}",
1242+
"expr": "pg_stat_database_numbackends{datname=~\"$db\",job=~\"$job\",instance=~\"$instance\"}",
12431243
"format": "time_series",
12441244
"intervalFactor": 2,
1245-
"legendFormat": "{{__name__}}",
1245+
"legendFormat": "{{datname}} - {{__name__}}",
12461246
"refId": "A",
12471247
"step": 240
12481248
}
@@ -1299,24 +1299,32 @@
12991299
"templating": {
13001300
"list": [
13011301
{
1302-
"allValue": ".*",
1303-
"current": {
1304-
"selected": false,
1305-
"text": "All",
1306-
"value": "$__all"
1307-
},
1308-
"datasource": "Postgres Overview",
1309-
"definition": "",
13101302
"hide": 0,
1311-
"includeAll": true,
1312-
"label": null,
1303+
"includeAll": false,
1304+
"label": "Data Source",
13131305
"multi": false,
1314-
"name": "instance",
1306+
"name": "datasource",
13151307
"options": [],
1316-
"query": "label_values(up{job=~\"postgres.*\"},instance)",
1308+
"query": "prometheus",
13171309
"refresh": 1,
13181310
"regex": "",
13191311
"skipUrlSync": false,
1312+
"type": "datasource"
1313+
},
1314+
{
1315+
"allValue": ".+",
1316+
"datasource": "$datasource",
1317+
"definition": "label_values(pg_up, job)",
1318+
"hide": 0,
1319+
"includeAll": true,
1320+
"label": "job",
1321+
"multi": true,
1322+
"name": "job",
1323+
"options": [],
1324+
"query": "label_values(pg_up, job)",
1325+
"refresh": 0,
1326+
"regex": "",
1327+
"skipUrlSync": false,
13201328
"sort": 0,
13211329
"tagValuesQuery": "",
13221330
"tags": [],
@@ -1325,21 +1333,16 @@
13251333
"useTags": false
13261334
},
13271335
{
1328-
"allValue": ".*",
1329-
"current": {
1330-
"selected": false,
1331-
"text": "All",
1332-
"value": "$__all"
1333-
},
1334-
"datasource": "Postgres Overview",
1335-
"definition": "label_values(pg_stat_database_tup_fetched{instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
1336+
"allValue": ".+",
1337+
"datasource": "$datasource",
1338+
"definition": "",
13361339
"hide": 0,
13371340
"includeAll": true,
1338-
"label": "db",
1339-
"multi": false,
1340-
"name": "db",
1341+
"label": "instance",
1342+
"multi": true,
1343+
"name": "instance",
13411344
"options": [],
1342-
"query": "label_values(pg_stat_database_tup_fetched{instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
1345+
"query": "label_values(up{job=~\"$job\"},instance)",
13431346
"refresh": 1,
13441347
"regex": "",
13451348
"skipUrlSync": false,
@@ -1351,48 +1354,19 @@
13511354
"useTags": false
13521355
},
13531356
{
1354-
"current": {
1355-
"selected": false,
1356-
"text": "Postgres Overview",
1357-
"value": "Postgres Overview"
1358-
},
1357+
"allValue": ".+",
1358+
"datasource": "$datasource",
1359+
"definition": "label_values(pg_stat_database_tup_fetched{instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
13591360
"hide": 0,
1360-
"includeAll": false,
1361-
"label": "datasource",
1361+
"includeAll": true,
1362+
"label": "db",
13621363
"multi": false,
1363-
"name": "datasource",
1364+
"name": "db",
13641365
"options": [],
1365-
"query": "prometheus",
1366+
"query": "label_values(pg_stat_database_tup_fetched{instance=~\"$instance\",datname!~\"template.*|postgres\"},datname)",
13661367
"refresh": 1,
13671368
"regex": "",
13681369
"skipUrlSync": false,
1369-
"type": "datasource"
1370-
},
1371-
{
1372-
"allValue": null,
1373-
"current": {
1374-
"selected": true,
1375-
"text": "postgres",
1376-
"value": "postgres"
1377-
},
1378-
"datasource": "$datasource",
1379-
"definition": "label_values(pg_up, job)",
1380-
"hide": 0,
1381-
"includeAll": false,
1382-
"label": "job",
1383-
"multi": false,
1384-
"name": "job",
1385-
"options": [
1386-
{
1387-
"selected": true,
1388-
"text": "postgres",
1389-
"value": "postgres"
1390-
}
1391-
],
1392-
"query": "label_values(pg_up, job)",
1393-
"refresh": 0,
1394-
"regex": "",
1395-
"skipUrlSync": false,
13961370
"sort": 0,
13971371
"tagValuesQuery": "",
13981372
"tags": [],

0 commit comments

Comments
 (0)