Skip to content

Commit 34ac390

Browse files
authored
Merge pull request #1097 from lsst-it/IT-6370/deliverator-1.10.0
(fleet/grafana-dashboards) update Deliverator Summary for v1.10.0
2 parents a6271b5 + 5123276 commit 34ac390

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
},
217217
"disableTextWrap": false,
218218
"editorMode": "code",
219-
"expr": "sum by(service) (\n uploads{site=~\"$site\", service=~\"$service\"}\n or\n s3nd_upload_active{site=~\"$site\", service=~\"$service\"}\n)",
219+
"expr": "sum by(service) (\n uploads{site=~\"$site\", service=~\"$service\"}\n or\n s3nd_upload_active{site=~\"$site\", service=~\"$service\"}\n or\n s3nd_upload_parts_active{site=~\"$site\", service=~\"$service\"}\n)",
220220
"fullMetaSearch": false,
221221
"includeNullMetadata": true,
222222
"legendFormat": "__auto",
@@ -1354,46 +1354,42 @@
13541354
"allowCustomValue": false,
13551355
"current": {
13561356
"text": "All",
1357-
"value": [
1358-
"$__all"
1359-
]
1357+
"value": "$__all"
13601358
},
13611359
"datasource": {
13621360
"type": "prometheus",
13631361
"uid": "${datasource}"
13641362
},
1365-
"definition": "query_result({__name__=~\"s3nd_upload_active|uploads\"})",
1363+
"definition": "label_values(s3nd_upload_parts_active,site)",
13661364
"description": "",
13671365
"includeAll": true,
13681366
"multi": true,
13691367
"name": "site",
13701368
"options": [],
13711369
"query": {
1372-
"qryType": 3,
1373-
"query": "query_result({__name__=~\"s3nd_upload_active|uploads\"})",
1370+
"qryType": 1,
1371+
"query": "label_values(s3nd_upload_parts_active,site)",
13741372
"refId": "PrometheusVariableQueryEditor-VariableQuery"
13751373
},
13761374
"refresh": 1,
1377-
"regex": "/site=\"(?<text>[^\"]+)/g",
1375+
"regex": "",
13781376
"sort": 1,
13791377
"type": "query"
13801378
},
13811379
{
13821380
"allowCustomValue": false,
13831381
"current": {
13841382
"text": "All",
1385-
"value": [
1386-
"$__all"
1387-
]
1383+
"value": "$__all"
13881384
},
1389-
"definition": "label_values(uploads{site=~\"$site\"},service)",
1385+
"definition": "label_values(s3nd_upload_parts_active{site=~\"$site\"},service)",
13901386
"includeAll": true,
13911387
"multi": true,
13921388
"name": "service",
13931389
"options": [],
13941390
"query": {
13951391
"qryType": 1,
1396-
"query": "label_values(uploads{site=~\"$site\"},service)",
1392+
"query": "label_values(s3nd_upload_parts_active{site=~\"$site\"},service)",
13971393
"refId": "PrometheusVariableQueryEditor-VariableQuery"
13981394
},
13991395
"refresh": 1,
@@ -1403,7 +1399,7 @@
14031399
]
14041400
},
14051401
"time": {
1406-
"from": "now-12h",
1402+
"from": "now-1h",
14071403
"to": "now"
14081404
},
14091405
"timepicker": {},

0 commit comments

Comments
 (0)