Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: StorageGRID overview panel is a missing query #1930

Merged
merged 2 commits into from
Apr 13, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions grafana/dashboards/storagegrid/overview.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"targets": [
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -169,7 +169,7 @@
},
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_usable_space_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"} + storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_usable_space_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"} + storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -179,7 +179,7 @@
},
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})/sum by(site_name)(storagegrid_storage_utilization_usable_space_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"} + storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "100*sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})/sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_usable_space_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"} + storagegrid_storage_utilization_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -193,7 +193,15 @@
{
"id": "filterFieldsByName",
"options": {
"include": {}
"include": {
"names": [
"cluster",
"site_name",
"Value #A",
"Value #B",
"Value #C"
]
}
}
},
{
Expand Down Expand Up @@ -305,7 +313,7 @@
"targets": [
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_metadata_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_metadata_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"instant": true,
"interval": "",
Expand All @@ -314,7 +322,7 @@
},
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_metadata_allowed_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_metadata_allowed_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -324,7 +332,7 @@
},
{
"exemplar": false,
"expr": "sum by(site_name,cluster)(storagegrid_storage_utilization_metadata_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})/sum by(site_name)(storagegrid_storage_utilization_metadata_allowed_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"expr": "100*sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_metadata_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})/sum by(site_name,cluster,datacenter)(storagegrid_storage_utilization_metadata_allowed_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\"})",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -340,9 +348,11 @@
"options": {
"include": {
"names": [
"cluster",
"site_name",
"Value #A",
"Value #B",
"cluster"
"Value #C"
]
}
}
Expand All @@ -356,7 +366,9 @@
"options": {
"excludeByName": {},
"indexByName": {
"Value #B": 2,
"Value #A": 4,
"Value #B": 3,
"Value #C": 2,
"cluster": 1,
"site_name": 0
},
Expand Down Expand Up @@ -1097,7 +1109,7 @@
"targets": [
{
"exemplar": false,
"expr": "topk($TopResources, avg by(cluster,tenant)(storagegrid_tenant_usage_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsageBytes\"}))",
"expr": "topk($TopResources, avg by(cluster,tenant,datacenter)(storagegrid_tenant_usage_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsageBytes\"}))",
"format": "time_series",
"hide": false,
"interval": "",
Expand Down Expand Up @@ -1185,7 +1197,7 @@
"targets": [
{
"exemplar": false,
"expr": "topk($TopResources, avg by(cluster,tenant)(storagegrid_tenant_usage_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsedPercent\"}/storagegrid_tenant_usage_quota_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsedPercent\"}))",
"expr": "topk($TopResources, avg by(cluster,tenant,datacenter)(storagegrid_tenant_usage_data_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsedPercent\"}/storagegrid_tenant_usage_quota_bytes{datacenter=~\"$Datacenter\",cluster=~\"$Cluster\",tenant=~\"$TopTenantUsedPercent\"}))",
"format": "time_series",
"interval": "",
"legendFormat": "{{cluster}} - {{tenant}}",
Expand Down Expand Up @@ -2316,7 +2328,7 @@
"allValue": null,
"current": {},
"datasource": "${DS_PROMETHEUS}",
"definition": "query_result(topk($TopResources, avg by(tenant)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"definition": "query_result(topk($TopResources, avg by(tenant,datacenter)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"description": null,
"error": null,
"hide": 2,
Expand All @@ -2326,7 +2338,7 @@
"name": "TopTenantUsageBytes",
"options": [],
"query": {
"query": "query_result(topk($TopResources, avg by(tenant)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"query": "query_result(topk($TopResources, avg by(tenant,datacenter)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"refId": "StandardVariableQuery"
},
"refresh": 1,
Expand Down Expand Up @@ -2385,7 +2397,7 @@
"allValue": null,
"current": {},
"datasource": "${DS_PROMETHEUS}",
"definition": "query_result(topk($TopResources, avg by(tenant)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}])/avg_over_time(storagegrid_tenant_usage_quota_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"definition": "query_result(topk($TopResources, avg by(tenant,datacenter)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}])/avg_over_time(storagegrid_tenant_usage_quota_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"description": null,
"error": null,
"hide": 2,
Expand All @@ -2395,7 +2407,7 @@
"name": "TopTenantUsedPercent",
"options": [],
"query": {
"query": "query_result(topk($TopResources, avg by(tenant)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}])/avg_over_time(storagegrid_tenant_usage_quota_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"query": "query_result(topk($TopResources, avg by(tenant,datacenter)(avg_over_time(storagegrid_tenant_usage_data_bytes{cluster=~\"$Cluster\"}[${__range}])/avg_over_time(storagegrid_tenant_usage_quota_bytes{cluster=~\"$Cluster\"}[${__range}]))))",
"refId": "StandardVariableQuery"
},
"refresh": 1,
Expand Down Expand Up @@ -2506,5 +2518,5 @@
"timezone": "",
"title": "StorageGrid: Overview",
"uid": "",
"version": 2
"version": 3
}