Skip to content

Commit

Permalink
Add support for the cos_agent relation
Browse files Browse the repository at this point in the history 
This supports grafana dashboards and metrics scraping from the ceph
mgr prometheus module.

Have to build with charmcraft 2.6 for dependency handling

Also remove zed tests as it's EOL

Change-Id: I8b2f132a4997d205119f7afe2a1ab6b2ae4c0134
cherry-picked from 868adde

Change-Id: Idd479cef04a24ea64af643bd6e142ac40906e86c
func-test-pr: openstack-charmers/zaza-openstack-tests#1208
  • Loading branch information
@sabaini @lmlg
sabaini authored and lmlg committed May 13, 2024
1 parent 07af099 commit 37daaf0
Show file tree
Hide file tree
Showing 25 changed files with 15,803 additions and 536 deletions.
3,792 changes: 3,792 additions & 0 deletions ceph-mon/files/grafana_dashboards/ceph-cluster-advanced.json
View file

Large diffs are not rendered by default.

1,269 changes: 1,269 additions & 0 deletions ceph-mon/files/grafana_dashboards/ceph-cluster.json
View file

Large diffs are not rendered by default.

348 changes: 348 additions & 0 deletions ceph-mon/files/grafana_dashboards/cephfs-overview.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,348 @@
{
"__inputs": [ ],
"__requires": [
{
"id": "grafana",
"name": "Grafana",
"type": "grafana",
"version": "5.3.2"
},
{
"id": "graph",
"name": "Graph",
"type": "panel",
"version": "5.0.0"
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"showIn": 0,
"tags": [ ],
"type": "dashboard"
}
]
},
"description": "",
"editable": false,
"gnetId": null,
"graphTooltip": 0,
"hideControls": false,
"id": null,
"links": [ ],
"panels": [
{
"collapse": false,
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"panels": [ ],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": true,
"title": "MDS Performance",
"titleSize": "h6",
"type": "row"
},
{
"aliasColors": { },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${prometheusds}",
"description": "",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 1
},
"id": 3,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"sideWidth": null,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [ ],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [
{
"alias": "/.*Reads/",
"transform": "negative-Y"
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(ceph_objecter_op_r{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "Read Ops",
"refId": "A"
},
{
"expr": "sum(rate(ceph_objecter_op_w{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}[$__rate_interval]))",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "Write Ops",
"refId": "B"
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "MDS Workload - $mds_servers",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [ ]
},
"yaxes": [
{
"format": "none",
"label": "Reads(-) / Writes (+)",
"logBase": 1,
"max": null,
"min": 0,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": 0,
"show": true
}
]
},
{
"aliasColors": { },
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${prometheusds}",
"description": "",
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 9,
"w": 12,
"x": 12,
"y": 1
},
"id": 4,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"sideWidth": null,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [ ],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"repeat": null,
"seriesOverrides": [ ],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "ceph_mds_server_handle_client_request{job=~\"$job\", ceph_daemon=~\"($mds_servers).*\"}",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{ceph_daemon}}",
"refId": "A"
}
],
"thresholds": [ ],
"timeFrom": null,
"timeShift": null,
"title": "Client Request Load - $mds_servers",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": [ ]
},
"yaxes": [
{
"format": "none",
"label": "Client Requests",
"logBase": 1,
"max": null,
"min": 0,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": 0,
"show": true
}
]
}
],
"refresh": "30s",
"rows": [ ],
"schemaVersion": 16,
"style": "dark",
"tags": [
"ceph-mixin"
],
"templating": {
"list": [
{
"allValue": ".+",
"current": { },
"datasource": "${prometheusds}",
"hide": 2,
"includeAll": true,
"label": "cluster",
"multi": true,
"name": "cluster",
"options": [ ],
"query": "label_values(ceph_osd_metadata, cluster)",
"refresh": 1,
"regex": "(.*)",
"sort": 1,
"tagValuesQuery": "",
"tags": [ ],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": ".+",
"current": { },
"datasource": "${prometheusds}",
"hide": 0,
"includeAll": true,
"label": "job",
"multi": true,
"name": "job",
"options": [ ],
"query": "label_values(ceph_osd_metadata{}, job)",
"refresh": 1,
"regex": "(.*)",
"sort": 1,
"tagValuesQuery": "",
"tags": [ ],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": { },
"datasource": "${prometheusds}",
"hide": 0,
"includeAll": true,
"label": "MDS Server",
"multi": false,
"name": "mds_servers",
"options": [ ],
"query": "label_values(ceph_mds_inodes{job=~\"$job\"}, ceph_daemon)",
"refresh": 1,
"regex": "",
"sort": 1,
"tagValuesQuery": "",
"tags": [ ],
"tagsQuery": "",
"type": "query",
"useTags": false
}
]
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "",
"title": "MDS Performance",
"uid": "tbO9LAiZz",
"version": 0
}
Loading

0 comments on commit 37daaf0

Please sign in to comment.