|
216 | 216 | }, |
217 | 217 | "disableTextWrap": false, |
218 | 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)", |
| 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)", |
220 | 220 | "fullMetaSearch": false, |
221 | 221 | "includeNullMetadata": true, |
222 | 222 | "legendFormat": "__auto", |
|
1354 | 1354 | "allowCustomValue": false, |
1355 | 1355 | "current": { |
1356 | 1356 | "text": "All", |
1357 | | - "value": [ |
1358 | | - "$__all" |
1359 | | - ] |
| 1357 | + "value": "$__all" |
1360 | 1358 | }, |
1361 | 1359 | "datasource": { |
1362 | 1360 | "type": "prometheus", |
1363 | 1361 | "uid": "${datasource}" |
1364 | 1362 | }, |
1365 | | - "definition": "query_result({__name__=~\"s3nd_upload_active|uploads\"})", |
| 1363 | + "definition": "label_values(s3nd_upload_parts_active,site)", |
1366 | 1364 | "description": "", |
1367 | 1365 | "includeAll": true, |
1368 | 1366 | "multi": true, |
1369 | 1367 | "name": "site", |
1370 | 1368 | "options": [], |
1371 | 1369 | "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)", |
1374 | 1372 | "refId": "PrometheusVariableQueryEditor-VariableQuery" |
1375 | 1373 | }, |
1376 | 1374 | "refresh": 1, |
1377 | | - "regex": "/site=\"(?<text>[^\"]+)/g", |
| 1375 | + "regex": "", |
1378 | 1376 | "sort": 1, |
1379 | 1377 | "type": "query" |
1380 | 1378 | }, |
1381 | 1379 | { |
1382 | 1380 | "allowCustomValue": false, |
1383 | 1381 | "current": { |
1384 | 1382 | "text": "All", |
1385 | | - "value": [ |
1386 | | - "$__all" |
1387 | | - ] |
| 1383 | + "value": "$__all" |
1388 | 1384 | }, |
1389 | | - "definition": "label_values(uploads{site=~\"$site\"},service)", |
| 1385 | + "definition": "label_values(s3nd_upload_parts_active{site=~\"$site\"},service)", |
1390 | 1386 | "includeAll": true, |
1391 | 1387 | "multi": true, |
1392 | 1388 | "name": "service", |
1393 | 1389 | "options": [], |
1394 | 1390 | "query": { |
1395 | 1391 | "qryType": 1, |
1396 | | - "query": "label_values(uploads{site=~\"$site\"},service)", |
| 1392 | + "query": "label_values(s3nd_upload_parts_active{site=~\"$site\"},service)", |
1397 | 1393 | "refId": "PrometheusVariableQueryEditor-VariableQuery" |
1398 | 1394 | }, |
1399 | 1395 | "refresh": 1, |
|
1403 | 1399 | ] |
1404 | 1400 | }, |
1405 | 1401 | "time": { |
1406 | | - "from": "now-12h", |
| 1402 | + "from": "now-1h", |
1407 | 1403 | "to": "now" |
1408 | 1404 | }, |
1409 | 1405 | "timepicker": {}, |
|
0 commit comments