Skip to content

Commit 7636cad

Browse files
jhoblittjhoblitt
authored
Merge pull request #1085 from lsst-it/IT-6370/deliverator-dashboard-prepare-for-s3nd_-metric-prefix
 (fleet/grafana-dashboards) add s3nd_s3_ prefix to deliverator metrics
2 parents 5e31243 + a40a3ef commit 7636cad

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎fleet/lib/grafana-dashboards/dashboards/deliverator-summary.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
"uid": "${datasource}"
112112
},
113113
"disableTextWrap": false,
114-
"editorMode": "builder",
115-
"expr": "sum by(service) (irate(tcp_info_bytes_sent{site=~\"$site\", service=~\"$service\"}[$__interval])) * 8",
114+
"editorMode": "code",
115+
"expr": "sum by(service) (\n irate(tcp_info_bytes_sent{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_bytes_sent_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
116116
"fullMetaSearch": false,
117117
"includeNullMetadata": true,
118118
"legendFormat": "__auto",
@@ -215,8 +215,8 @@
215215
"uid": "${datasource}"
216216
},
217217
"disableTextWrap": false,
218-
"editorMode": "builder",
219-
"expr": "sum by(service) (uploads{site=~\"$site\", service=~\"$service\"})",
218+
"editorMode": "code",
219+
"expr": "sum by(service) (\n uploads{site=~\"$site\", service=~\"$service\"}\n or\n s3nd_upload_active{site=~\"$site\", service=~\"$service\"}\n)",
220220
"fullMetaSearch": false,
221221
"includeNullMetadata": true,
222222
"legendFormat": "__auto",
@@ -318,8 +318,8 @@
318318
"uid": "${datasource}"
319319
},
320320
"disableTextWrap": false,
321-
"editorMode": "builder",
322-
"expr": "sum by(service) (irate(tcp_info_bytes_received{site=~\"$site\", service=~\"$service\"}[$__interval])) * 8",
321+
"editorMode": "code",
322+
"expr": "sum by(service) (\n irate(tcp_info_bytes_received{site=~\"$site\", service=~\"$service\"}[$__interval])\n or \n irate(s3nd_s3_tcp_info_bytes_received_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
323323
"fullMetaSearch": false,
324324
"includeNullMetadata": true,
325325
"legendFormat": "__auto",
@@ -421,8 +421,8 @@
421421
"uid": "${datasource}"
422422
},
423423
"disableTextWrap": false,
424-
"editorMode": "builder",
425-
"expr": "sum by(service) (irate(tcp_info_bytes_acked{site=~\"$site\", service=~\"$service\"}[$__interval])) * 8",
424+
"editorMode": "code",
425+
"expr": "sum by(service) (\n irate(tcp_info_bytes_acked{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_bytes_acked_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
426426
"fullMetaSearch": false,
427427
"includeNullMetadata": true,
428428
"legendFormat": "__auto",
@@ -524,8 +524,8 @@
524524
"uid": "${datasource}"
525525
},
526526
"disableTextWrap": false,
527-
"editorMode": "builder",
528-
"expr": "sum by(service) (irate(tcp_info_bytes_retrans{site=~\"$site\", service=~\"$service\"}[$__interval])) * 8",
527+
"editorMode": "code",
528+
"expr": "sum by(service) (\n irate(tcp_info_bytes_acked{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_bytes_acked_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
529529
"fullMetaSearch": false,
530530
"includeNullMetadata": true,
531531
"legendFormat": "__auto",
@@ -625,8 +625,8 @@
625625
"type": "prometheus",
626626
"uid": "${datasource}"
627627
},
628-
"editorMode": "builder",
629-
"expr": "sum by(service) (rate(tcp_info_total_retrans{site=~\"$site\", service=~\"$service\"}[$__interval]))",
628+
"editorMode": "code",
629+
"expr": "sum by(service) (\n irate(tcp_info_total_retrans{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_total_retrans_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
630630
"legendFormat": "__auto",
631631
"range": true,
632632
"refId": "A"
@@ -723,8 +723,8 @@
723723
"type": "prometheus",
724724
"uid": "${datasource}"
725725
},
726-
"editorMode": "builder",
727-
"expr": "sum by(service) (rate(tcp_info_sacked{site=~\"$site\", service=~\"$service\"}[$__interval]))",
726+
"editorMode": "code",
727+
"expr": "sum by(service) (\n irate(tcp_info_sacked{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_sacked_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
728728
"legendFormat": "__auto",
729729
"range": true,
730730
"refId": "A"
@@ -821,8 +821,8 @@
821821
"type": "prometheus",
822822
"uid": "${datasource}"
823823
},
824-
"editorMode": "builder",
825-
"expr": "sum by(service) (rate(tcp_info_retrans{site=~\"$site\", service=~\"$service\"}[$__interval]))",
824+
"editorMode": "code",
825+
"expr": "sum by(service) (\n irate(tcp_info_retrans{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_retrans_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
826826
"legendFormat": "__auto",
827827
"range": true,
828828
"refId": "A"
@@ -919,8 +919,8 @@
919919
"type": "prometheus",
920920
"uid": "${datasource}"
921921
},
922-
"editorMode": "builder",
923-
"expr": "sum by(service) (rate(tcp_info_lost{site=~\"$site\", service=~\"$service\"}[$__interval]))",
922+
"editorMode": "code",
923+
"expr": "sum by(service) (\n irate(tcp_info_lost{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_lost_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
924924
"legendFormat": "__auto",
925925
"range": true,
926926
"refId": "A"
@@ -1018,7 +1018,7 @@
10181018
"uid": "${datasource}"
10191019
},
10201020
"editorMode": "code",
1021-
"expr": "sum by(service) (rate(tcp_info_reord_seen{site=~\"$site\", service=~\"$service\"}[$__interval]))",
1021+
"expr": "sum by(service) (\n irate(tcp_info_reord_seen{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_reord_seen_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
10221022
"legendFormat": "__auto",
10231023
"range": true,
10241024
"refId": "A"
@@ -1116,9 +1116,9 @@
11161116
"uid": "${datasource}"
11171117
},
11181118
"disableTextWrap": false,
1119-
"editorMode": "builder",
1119+
"editorMode": "code",
11201120
"exemplar": true,
1121-
"expr": "sum by(service) (rate(tcp_info_rcv_ooopack{site=~\"$site\", service=~\"$service\"}[$__interval]))",
1121+
"expr": "sum by(service) (\n irate(tcp_info_rcv_ooopack{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_rcv_ooopack_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
11221122
"fullMetaSearch": false,
11231123
"includeNullMetadata": true,
11241124
"legendFormat": "__auto",
@@ -1219,7 +1219,7 @@
12191219
"uid": "${datasource}"
12201220
},
12211221
"editorMode": "code",
1222-
"expr": "sum by(service) (rate(tcp_info_fackets{site=~\"$site\", service=~\"$service\"}[$__interval]))",
1222+
"expr": "sum by(service) (\n irate(tcp_info_fackets{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_fackets_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
12231223
"legendFormat": "__auto",
12241224
"range": true,
12251225
"refId": "A"
@@ -1318,7 +1318,7 @@
13181318
},
13191319
"disableTextWrap": false,
13201320
"editorMode": "code",
1321-
"expr": "sum by(service) (rate(tcp_info_dsack_dups{site=~\"$site\", service=~\"$service\"}[$__interval]))",
1321+
"expr": "sum by(service) (\n irate(tcp_info_dsack_dups{site=~\"$site\", service=~\"$service\"}[$__interval])\n or\n irate(s3nd_s3_tcp_info_dsack_dups_total{site=~\"$site\", service=~\"$service\"}[$__interval])\n) * 8",
13221322
"fullMetaSearch": false,
13231323
"includeNullMetadata": true,
13241324
"legendFormat": "__auto",
@@ -1382,14 +1382,14 @@
13821382
"$__all"
13831383
]
13841384
},
1385-
"definition": "label_values(uploads,service)",
1385+
"definition": "label_values(uploads{site=~\"$site\"},service)",
13861386
"includeAll": true,
13871387
"multi": true,
13881388
"name": "service",
13891389
"options": [],
13901390
"query": {
13911391
"qryType": 1,
1392-
"query": "label_values(uploads,service)",
1392+
"query": "label_values(uploads{site=~\"$site\"},service)",
13931393
"refId": "PrometheusVariableQueryEditor-VariableQuery"
13941394
},
13951395
"refresh": 1,

0 commit comments

Comments
 (0)