]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
monitoring: convert newline character to LF
authorPatrick Seidensal <pseidensal@suse.com>
Fri, 11 Jun 2021 08:49:11 +0000 (10:49 +0200)
committerPatrick Seidensal <pseidensal@suse.com>
Wed, 16 Jun 2021 07:10:32 +0000 (09:10 +0200)
Convert newline character from CRLF in `rbd-details.json` to LF, so that
it will be consistent with all the other dashboard JSON files.

Fixes: https://tracker.ceph.com/issues/51212
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
monitoring/grafana/dashboards/rbd-details.json

index 68fffad1ed07524b8256631e19c1bf5de6af2623..59932a5ee05fccfb0e0bffd67b5e257c011626d0 100644 (file)
-{\r
-  "__inputs": [],\r
-  "__requires": [\r
-    {\r
-      "type": "grafana",\r
-      "id": "grafana",\r
-      "name": "Grafana",\r
-      "version": "5.3.3"\r
-    },\r
-    {\r
-      "type": "panel",\r
-      "id": "graph",\r
-      "name": "Graph",\r
-      "version": "5.0.0"\r
-    }\r
-  ],\r
-  "annotations": {\r
-    "list": [\r
-      {\r
-        "builtIn": 1,\r
-        "datasource": "-- Grafana --",\r
-        "enable": true,\r
-        "hide": true,\r
-        "iconColor": "rgba(0, 211, 255, 1)",\r
-        "name": "Annotations & Alerts",\r
-        "type": "dashboard"\r
-      }\r
-    ]\r
-  },\r
-  "description": "Detailed Performance of RBD Images (IOPS/Throughput/Latency)",\r
-  "editable": false,\r
-  "gnetId": null,\r
-  "graphTooltip": 0,\r
-  "id": null,\r
-  "iteration": 1584428820779,\r
-  "links": [],\r
-  "panels": [\r
-    {\r
-      "aliasColors": {},\r
-      "bars": false,\r
-      "dashLength": 10,\r
-      "dashes": false,\r
-      "datasource": "$Datasource",\r
-      "fill": 1,\r
-      "gridPos": {\r
-        "h": 9,\r
-        "w": 8,\r
-        "x": 0,\r
-        "y": 0\r
-      },\r
-      "id": 6,\r
-      "legend": {\r
-        "avg": false,\r
-        "current": false,\r
-        "hideEmpty": false,\r
-        "hideZero": false,\r
-        "max": false,\r
-        "min": false,\r
-        "show": true,\r
-        "total": false,\r
-        "values": false\r
-      },\r
-      "lines": true,\r
-      "linewidth": 1,\r
-      "links": [],\r
-      "nullPointMode": "null as zero",\r
-      "percentage": false,\r
-      "pointradius": 5,\r
-      "points": false,\r
-      "renderer": "flot",\r
-      "seriesOverrides": [],\r
-      "spaceLength": 10,\r
-      "stack": false,\r
-      "steppedLine": false,\r
-      "targets": [\r
-        {\r
-          "expr": "irate(ceph_rbd_write_ops{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Write",\r
-          "refId": "A"\r
-        },\r
-        {\r
-          "expr": "irate(ceph_rbd_read_ops{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Read",\r
-          "refId": "B"\r
-        }\r
-      ],\r
-      "thresholds": [],\r
-      "timeFrom": null,\r
-      "timeShift": null,\r
-      "title": "IOPS",\r
-      "tooltip": {\r
-        "shared": true,\r
-        "sort": 0,\r
-        "value_type": "individual"\r
-      },\r
-      "type": "graph",\r
-      "xaxis": {\r
-        "buckets": null,\r
-        "mode": "time",\r
-        "name": null,\r
-        "show": true,\r
-        "values": []\r
-      },\r
-      "yaxes": [\r
-        {\r
-          "format": "iops",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": "0",\r
-          "show": true\r
-        },\r
-        {\r
-          "format": "iops",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": null,\r
-          "show": true\r
-        }\r
-      ],\r
-      "yaxis": {\r
-        "align": true,\r
-        "alignLevel": null\r
-      }\r
-    },\r
-    {\r
-      "aliasColors": {},\r
-      "bars": false,\r
-      "dashLength": 10,\r
-      "dashes": false,\r
-      "datasource": "$Datasource",\r
-      "fill": 1,\r
-      "gridPos": {\r
-        "h": 9,\r
-        "w": 8,\r
-        "x": 8,\r
-        "y": 0\r
-      },\r
-      "id": 4,\r
-      "legend": {\r
-        "avg": false,\r
-        "current": false,\r
-        "max": false,\r
-        "min": false,\r
-        "show": true,\r
-        "total": false,\r
-        "values": false\r
-      },\r
-      "lines": true,\r
-      "linewidth": 1,\r
-      "links": [],\r
-      "nullPointMode": "null as zero",\r
-      "percentage": false,\r
-      "pointradius": 5,\r
-      "points": false,\r
-      "renderer": "flot",\r
-      "seriesOverrides": [],\r
-      "spaceLength": 10,\r
-      "stack": false,\r
-      "steppedLine": false,\r
-      "targets": [\r
-        {\r
-          "expr": "irate(ceph_rbd_write_bytes{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Write",\r
-          "refId": "A"\r
-        },\r
-        {\r
-          "expr": "irate(ceph_rbd_read_bytes{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Read",\r
-          "refId": "B"\r
-        }\r
-      ],\r
-      "thresholds": [],\r
-      "timeFrom": null,\r
-      "timeShift": null,\r
-      "title": "Throughput",\r
-      "tooltip": {\r
-        "shared": true,\r
-        "sort": 0,\r
-        "value_type": "individual"\r
-      },\r
-      "type": "graph",\r
-      "xaxis": {\r
-        "buckets": null,\r
-        "mode": "time",\r
-        "name": null,\r
-        "show": true,\r
-        "values": []\r
-      },\r
-      "yaxes": [\r
-        {\r
-          "format": "Bps",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": "0",\r
-          "show": true\r
-        },\r
-        {\r
-          "format": "Bps",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": null,\r
-          "show": true\r
-        }\r
-      ],\r
-      "yaxis": {\r
-        "align": true,\r
-        "alignLevel": null\r
-      }\r
-    },\r
-    {\r
-      "aliasColors": {},\r
-      "bars": false,\r
-      "dashLength": 10,\r
-      "dashes": false,\r
-      "datasource": "$Datasource",\r
-      "fill": 1,\r
-      "gridPos": {\r
-        "h": 9,\r
-        "w": 8,\r
-        "x": 16,\r
-        "y": 0\r
-      },\r
-      "id": 2,\r
-      "legend": {\r
-        "avg": false,\r
-        "current": false,\r
-        "max": false,\r
-        "min": false,\r
-        "show": true,\r
-        "total": false,\r
-        "values": false\r
-      },\r
-      "lines": true,\r
-      "linewidth": 1,\r
-      "links": [],\r
-      "nullPointMode": "null as zero",\r
-      "percentage": false,\r
-      "pointradius": 5,\r
-      "points": false,\r
-      "renderer": "flot",\r
-      "seriesOverrides": [],\r
-      "spaceLength": 10,\r
-      "stack": false,\r
-      "steppedLine": false,\r
-      "targets": [\r
-        {\r
-          "expr": "irate(ceph_rbd_write_latency_sum{pool=\"$Pool\", image=\"$Image\"}[30s]) / irate(ceph_rbd_write_latency_count{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Write",\r
-          "refId": "A"\r
-        },\r
-        {\r
-          "expr": "irate(ceph_rbd_read_latency_sum{pool=\"$Pool\", image=\"$Image\"}[30s]) / irate(ceph_rbd_read_latency_count{pool=\"$Pool\", image=\"$Image\"}[30s])",\r
-          "format": "time_series",\r
-          "intervalFactor": 1,\r
-          "legendFormat": "Read",\r
-          "refId": "B"\r
-        }\r
-      ],\r
-      "thresholds": [],\r
-      "timeFrom": null,\r
-      "timeShift": null,\r
-      "title": "Average Latency",\r
-      "tooltip": {\r
-        "shared": true,\r
-        "sort": 0,\r
-        "value_type": "individual"\r
-      },\r
-      "type": "graph",\r
-      "xaxis": {\r
-        "buckets": null,\r
-        "mode": "time",\r
-        "name": null,\r
-        "show": true,\r
-        "values": []\r
-      },\r
-      "yaxes": [\r
-        {\r
-          "format": "ns",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": "0",\r
-          "show": true\r
-        },\r
-        {\r
-          "format": "ns",\r
-          "label": null,\r
-          "logBase": 1,\r
-          "max": null,\r
-          "min": null,\r
-          "show": true\r
-        }\r
-      ],\r
-      "yaxis": {\r
-        "align": true,\r
-        "alignLevel": null\r
-      }\r
-    }\r
-  ],\r
-  "refresh": false,\r
-  "schemaVersion": 16,\r
-  "style": "dark",\r
-  "tags": [],\r
-  "templating": {\r
-    "list": [\r
-      {\r
-        "current": {},\r
-        "hide": 0,\r
-        "label": null,\r
-        "name": "Datasource",\r
-        "options": [],\r
-        "query": "prometheus",\r
-        "refresh": 1,\r
-        "regex": "",\r
-        "skipUrlSync": false,\r
-        "type": "datasource"\r
-      },\r
-      {\r
-        "allValue": null,\r
-        "current": {},\r
-        "datasource": "$Datasource",\r
-        "hide": 0,\r
-        "includeAll": false,\r
-        "label": null,\r
-        "multi": false,\r
-        "name": "Pool",\r
-        "options": [],\r
-        "query": "label_values(pool)",\r
-        "refresh": 1,\r
-        "regex": "",\r
-        "skipUrlSync": false,\r
-        "sort": 0,\r
-        "tagValuesQuery": "",\r
-        "tags": [],\r
-        "tagsQuery": "",\r
-        "type": "query",\r
-        "useTags": false\r
-      },\r
-      {\r
-        "allValue": null,\r
-        "current": {},\r
-        "datasource": "$Datasource",\r
-        "hide": 0,\r
-        "includeAll": false,\r
-        "label": null,\r
-        "multi": false,\r
-        "name": "Image",\r
-        "options": [],\r
-        "query": "label_values(image)",\r
-        "refresh": 1,\r
-        "regex": "",\r
-        "skipUrlSync": false,\r
-        "sort": 0,\r
-        "tagValuesQuery": "",\r
-        "tags": [],\r
-        "tagsQuery": "",\r
-        "type": "query",\r
-        "useTags": false\r
-      }\r
-    ]\r
-  },\r
-  "time": {\r
-    "from": "now-1h",\r
-    "to": "now"\r
-  },\r
-  "timepicker": {\r
-    "refresh_intervals": [\r
-      "5s",\r
-      "10s",\r
-      "30s",\r
-      "1m",\r
-      "5m",\r
-      "15m",\r
-      "30m",\r
-      "1h",\r
-      "2h",\r
-      "1d"\r
-    ],\r
-    "time_options": [\r
-      "5m",\r
-      "15m",\r
-      "1h",\r
-      "6h",\r
-      "12h",\r
-      "24h",\r
-      "2d",\r
-      "7d",\r
-      "30d"\r
-    ]\r
-  },\r
-  "timezone": "",\r
-  "title": "RBD Details",\r
-  "uid": "YhCYGcuZz",\r
-  "version": 7\r
-}
\ No newline at end of file
+{
+  "__inputs": [],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "5.3.3"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": "5.0.0"
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Detailed Performance of RBD Images (IOPS/Throughput/Latency)",
+  "editable": false,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "iteration": 1584428820779,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "$Datasource",
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null as zero",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "irate(ceph_rbd_write_ops{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Write",
+          "refId": "A"
+        },
+        {
+          "expr": "irate(ceph_rbd_read_ops{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Read",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "IOPS",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "iops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "iops",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": true,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "$Datasource",
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null as zero",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "irate(ceph_rbd_write_bytes{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Write",
+          "refId": "A"
+        },
+        {
+          "expr": "irate(ceph_rbd_read_bytes{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Read",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Throughput",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "Bps",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": true,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "$Datasource",
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null as zero",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "irate(ceph_rbd_write_latency_sum{pool=\"$Pool\", image=\"$Image\"}[30s]) / irate(ceph_rbd_write_latency_count{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Write",
+          "refId": "A"
+        },
+        {
+          "expr": "irate(ceph_rbd_read_latency_sum{pool=\"$Pool\", image=\"$Image\"}[30s]) / irate(ceph_rbd_read_latency_count{pool=\"$Pool\", image=\"$Image\"}[30s])",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Read",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Average Latency",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ns",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "ns",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": true,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 16,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "label": null,
+        "name": "Datasource",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "allValue": null,
+        "current": {},
+        "datasource": "$Datasource",
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "Pool",
+        "options": [],
+        "query": "label_values(pool)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": null,
+        "current": {},
+        "datasource": "$Datasource",
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "Image",
+        "options": [],
+        "query": "label_values(image)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "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": "RBD Details",
+  "uid": "YhCYGcuZz",
+  "version": 7
+}