Skip to content

Commit e56c069

Browse files
s0neas0nea
committed
ceph-capacity-quick-view: add capacity allocation
- Add the capacity allocation ratio column to the Ceph Quota Per Resource panel - Add a region filter to filter all panels on the dashboard Signed-off-by: Tatjana Dehler <tatjana.dehler@clyso.com>
1 parent 1d506bb commit e56c069

3 files changed

Lines changed: 64 additions & 16 deletions

File tree

‎charts/ceph-operations/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: ceph-operations
33
description: Ceph operations bundle
44
type: application
5-
version: 1.8.9
5+
version: 1.8.10
66
maintainers:
77
- name: sumitarora2786
88
- name: richardtief

‎charts/ceph-operations/perses-dashboards-global/ceph-capacity-quick-view.json‎

Lines changed: 61 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"name": "thanos-global-st1-eu-de-1-query"
129129
},
130130
"minStep": "",
131-
"query": "ceph_cluster_total_bytes",
131+
"query": "ceph_cluster_total_bytes{region=~\"$region\"}",
132132
"seriesNameFormat": ""
133133
}
134134
}
@@ -145,7 +145,7 @@
145145
"name": "thanos-global-st1-eu-de-1-query"
146146
},
147147
"minStep": "",
148-
"query": "ceph_cluster_total_used_bytes",
148+
"query": "ceph_cluster_total_used_bytes{region=~\"$region\"}",
149149
"seriesNameFormat": ""
150150
}
151151
}
@@ -162,7 +162,7 @@
162162
"name": "thanos-global-st1-eu-de-1-query"
163163
},
164164
"minStep": "",
165-
"query": "1 - (ceph_cluster_total_bytes - ceph_cluster_total_used_bytes) / ceph_cluster_total_bytes",
165+
"query": "1 - (ceph_cluster_total_bytes{region=~\"$region\"} - ceph_cluster_total_used_bytes{region=~\"$region\"}) / ceph_cluster_total_bytes{region=~\"$region\"}",
166166
"seriesNameFormat": ""
167167
}
168168
}
@@ -248,7 +248,7 @@
248248
"kind": "PrometheusDatasource"
249249
},
250250
"minStep": "",
251-
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\"} * on (region, pool_id) group_right(name) ceph_pool_max_avail\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")",
251+
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\", region=~\"$region\"} * on (region, pool_id) group_right(name) ceph_pool_max_avail\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")",
252252
"seriesNameFormat": ""
253253
}
254254
}
@@ -260,7 +260,7 @@
260260
"plugin": {
261261
"kind": "PrometheusTimeSeriesQuery",
262262
"spec": {
263-
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\"} * on (region, pool_id) group_right(name) ceph_pool_stored\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")"
263+
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\", region=~\"$region\"} * on (region, pool_id) group_right(name) ceph_pool_stored\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")"
264264
}
265265
}
266266
}
@@ -271,7 +271,7 @@
271271
"plugin": {
272272
"kind": "PrometheusTimeSeriesQuery",
273273
"spec": {
274-
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\"} * on (region, pool_id) group_right(name) ceph_pool_percent_used\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")",
274+
"query": "label_replace(\n sum by (region, name) (\n ceph_pool_metadata{name=~\"(.*).data\", region=~\"$region\"} * on (region, pool_id) group_right(name) ceph_pool_percent_used\n )\n, \"region_name\", \"$1\", \"name\", \"(.*).rgw.buckets.data\")",
275275
"seriesNameFormat": ""
276276
}
277277
}
@@ -347,9 +347,20 @@
347347
"hide": false,
348348
"name": "value #3"
349349
},
350+
{
351+
"format": {
352+
"unit": "percent-decimal"
353+
},
354+
"header": "Capacity Allocation Ratio",
355+
"name": "value #7"
356+
},
350357
{
351358
"hide": true,
352359
"name": "timestamp"
360+
},
361+
{
362+
"hide": true,
363+
"name": "resource"
353364
}
354365
],
355366
"density": "compact",
@@ -371,7 +382,7 @@
371382
"kind": "PrometheusTimeSeriesQuery",
372383
"spec": {
373384
"minStep": "",
374-
"query": "max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)",
385+
"query": "max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)",
375386
"seriesNameFormat": ""
376387
}
377388
}
@@ -387,7 +398,7 @@
387398
"kind": "PrometheusDatasource"
388399
},
389400
"minStep": "",
390-
"query": "sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)",
401+
"query": "sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)",
391402
"seriesNameFormat": ""
392403
}
393404
}
@@ -403,7 +414,7 @@
403414
"kind": "PrometheusDatasource"
404415
},
405416
"minStep": "",
406-
"query": "(\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n) - (\n sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n)",
417+
"query": "(\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n) - (\n sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n)",
407418
"seriesNameFormat": ""
408419
}
409420
}
@@ -419,7 +430,7 @@
419430
"kind": "PrometheusDatasource"
420431
},
421432
"minStep": "",
422-
"query": "sum(global:limes_consolidated_domain_usage{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)",
433+
"query": "sum(global:limes_consolidated_domain_usage{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)",
423434
"seriesNameFormat": ""
424435
}
425436
}
@@ -435,7 +446,7 @@
435446
"kind": "PrometheusDatasource"
436447
},
437448
"minStep": "",
438-
"query": "(\n sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n) / (\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n)",
449+
"query": "(\n sum(global:limes_consolidated_domain_quota{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n) / (\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n)",
439450
"seriesNameFormat": ""
440451
}
441452
}
@@ -451,11 +462,22 @@
451462
"kind": "PrometheusDatasource"
452463
},
453464
"minStep": "",
454-
"query": "(\n sum(global:limes_consolidated_domain_usage{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n) / (\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\"}) by (region, full_resource)\n)",
465+
"query": "(\n sum(global:limes_consolidated_domain_usage{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n) / (\n max(global:limes_consolidated_cluster_capacity{full_resource=~\"ceph/(.*)\", region=~\"$region\"}) by (region, full_resource)\n)",
455466
"seriesNameFormat": ""
456467
}
457468
}
458469
}
470+
},
471+
{
472+
"kind": "TimeSeriesQuery",
473+
"spec": {
474+
"plugin": {
475+
"kind": "PrometheusTimeSeriesQuery",
476+
"spec": {
477+
"query": "sum(\n label_replace(\n limes_project_used_and_or_committed_per_az{service_name=\"ceph\", region=~\"$region\"}, \"full_resource\", \"ceph/$1\", \"resource\", \"(.*)\"\n )\n) by (region, full_resource)\n/\nsum(\n label_replace(\n limes_cluster_capacity{service_name=\"ceph\", region=~\"$region\"}, \"full_resource\", \"ceph/$1\", \"resource\", \"(.*)\"\n )\n) by (region, full_resource)"
478+
}
479+
}
480+
}
459481
}
460482
]
461483
}
@@ -465,6 +487,12 @@
465487
{
466488
"kind": "Grid",
467489
"spec": {
490+
"display": {
491+
"title": "",
492+
"collapse": {
493+
"open": true
494+
}
495+
},
468496
"items": [
469497
{
470498
"x": 0,
@@ -497,7 +525,27 @@
497525
}
498526
}
499527
],
500-
"variables": [],
528+
"variables": [
529+
{
530+
"kind": "ListVariable",
531+
"spec": {
532+
"display": {
533+
"name": "Region",
534+
"hidden": false
535+
},
536+
"defaultValue": "$__all",
537+
"allowAllValue": true,
538+
"allowMultiple": true,
539+
"plugin": {
540+
"kind": "PrometheusLabelValuesVariable",
541+
"spec": {
542+
"labelName": "region"
543+
}
544+
},
545+
"name": "region"
546+
}
547+
}
548+
],
501549
"duration": "1h",
502550
"refreshInterval": "0s"
503551
}

‎charts/ceph-operations/plugindefinition.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ kind: PluginDefinition
66
metadata:
77
name: ceph-operations
88
spec:
9-
version: 1.8.7
9+
version: 1.8.8
1010
displayName: Ceph operations bundle
1111
description: Operations bundle for the Ceph storage backend
1212
docMarkDownUrl: https://raw.githubusercontent.com/cobaltcore-dev/cloud-storage-operations/main/ceph-operations/README.md
1313
icon: https://raw.githubusercontent.com/cobaltcore-dev/cloud-storage-operations/main/ceph-operations/ceph-logo.png
1414
helmChart:
1515
name: ceph-operations
1616
repository: oci://ghcr.io/cobaltcore-dev/cloud-storage-operations/charts
17-
version: 1.8.7
17+
version: 1.8.8
1818
options:
1919
- name: prometheusRules.create
2020
description: Create Prometheus rules

0 commit comments

Comments
 (0)