check & squashme

datastax · Feb 23, 2021 · e05973d · e05973d
1 parent 3252ad5
commit e05973d
Show file tree

Hide file tree

Showing 3 changed files with 236 additions and 6 deletions.
diff --git a/dashboards/demo/docker-compose.yml b/dashboards/demo/docker-compose.yml
@@ -89,7 +89,7 @@ services:
       - demo_net
     environment:
       - "TLP_STRESS_CASSANDRA_HOST=cassandra"
-    command: "run KeyValue --rate 25 -p 100 -d 1d -r .8"
+    command: "run KeyValue --rate 250 -p 100 -d 1d -r .8"
     depends_on:
       cassandra2:
         condition: service_healthy
@@ -102,7 +102,7 @@ services:
       - demo_net
     environment:
       - "TLP_STRESS_CASSANDRA_HOST=cassandra"
-    command: "run BasicTimeSeries --rate 200 -p 10 -d 1d -r .1 --deletes .8"
+    command: "run BasicTimeSeries --rate 200 -p 10 -d 1d -r .1 --deletes .5"
     depends_on:
       cassandra2:
         condition: service_healthy

diff --git a/dashboards/grafana/dashboards-jsonnet/read-path.jsonnet b/dashboards/grafana/dashboards-jsonnet/read-path.jsonnet
@@ -912,9 +912,64 @@ dashboard.new(
 .addRow(
   row.new(title='Disks Performances', collapse=true)
 
-  // TODO (all only one chart - per host and device - so 5 missing charts here)
-  // Disk Read Count (io.r/s)
-  // Disk Read Throughput (io.rkb/s)
+  .addPanel(
+    graphPanel.new(
+      'Disk Reads IOPS - Total per Node',
+      description='Sum of all disks hits for reads per second, for each node',
+      format='iops',
+      datasource='$PROMETHEUS_DS',
+      transparent=true,
+      fill=0,
+      legend_show=true,
+      legend_values=true,
+      legend_current=true,
+      legend_alignAsTable=true,
+      legend_sort='current',
+      legend_sortDesc=true,
+      shared_tooltip=false,
+      min=0,
+      bars=false,
+      lines=true,
+      stack=false,
+      decimals=0,
+    )
+    .addTarget(
+      prometheus.target(
+        expr='Sum by (cluster, dc, rack, instance) (rate(collectd_processes_io_ops_read_total{cluster="$cluster", dc=~"$dc", rack=~"$rack", instance=~"$node"}[1m:30s]))',
+        legendFormat='disks reads - iops: {{instance}}',
+      )
+    )
+  )
+
+  .addPanel(
+    graphPanel.new(
+      'Disk Reads Throughput - Total per Node',
+      description='Sum of all disks throughput for reads per second, for each node',
+      format='bps',
+      datasource='$PROMETHEUS_DS',
+      transparent=true,
+      fill=0,
+      legend_show=true,
+      legend_values=true,
+      legend_current=true,
+      legend_alignAsTable=true,
+      legend_sort='current',
+      legend_sortDesc=true,
+      shared_tooltip=false,
+      min=0,
+      bars=false,
+      lines=true,
+      stack=false,
+      decimals=0,
+    )
+    .addTarget(
+      prometheus.target(
+        expr='Sum by (cluster, dc, rack, instance) (rate(collectd_processes_io_octets_rx_total{cluster="$cluster", dc=~"$dc", rack=~"$rack", instance=~"$node"}[1m:30s]))',
+        legendFormat='disks reads - throughput: {{instance}}',
+      )
+    )
+  )
+
   // Disk Read Latency (io.r_await?)
   // Disk Read Queued (io.rrqm/s)
   // Disk Utilization (io.util%)

diff --git a/dashboards/grafana/generated-dashboards/read-path.json b/dashboards/grafana/generated-dashboards/read-path.json
@@ -2353,7 +2353,182 @@
       {
          "collapse": true,
          "collapsed": true,
-         "panels": [ ],
+         "panels": [
+            {
+               "aliasColors": { },
+               "bars": false,
+               "dashLength": 10,
+               "dashes": false,
+               "datasource": "$PROMETHEUS_DS",
+               "decimals": 0,
+               "description": "Sum of all disks hits for reads per second, for each node",
+               "fill": 0,
+               "fillGradient": 0,
+               "gridPos": { },
+               "id": 29,
+               "legend": {
+                  "alignAsTable": true,
+                  "avg": false,
+                  "current": true,
+                  "max": false,
+                  "min": false,
+                  "rightSide": false,
+                  "show": true,
+                  "sideWidth": null,
+                  "sort": "current",
+                  "sortDesc": true,
+                  "total": false,
+                  "values": true
+               },
+               "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": "Sum by (cluster, dc, rack, instance) (rate(collectd_processes_io_ops_read_total{cluster=\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", instance=~\"$node\"}[1m:30s]))",
+                     "format": "time_series",
+                     "intervalFactor": 2,
+                     "legendFormat": "disks reads - iops: {{instance}}",
+                     "refId": "A"
+                  }
+               ],
+               "thresholds": [ ],
+               "timeFrom": null,
+               "timeShift": null,
+               "title": "Disk Reads IOPS - Total per Node",
+               "tooltip": {
+                  "shared": false,
+                  "sort": 0,
+                  "value_type": "individual"
+               },
+               "transparent": true,
+               "type": "graph",
+               "xaxis": {
+                  "buckets": null,
+                  "mode": "time",
+                  "name": null,
+                  "show": true,
+                  "values": [ ]
+               },
+               "yaxes": [
+                  {
+                     "decimals": 0,
+                     "format": "iops",
+                     "label": null,
+                     "logBase": 1,
+                     "max": null,
+                     "min": 0,
+                     "show": true
+                  },
+                  {
+                     "decimals": 0,
+                     "format": "iops",
+                     "label": null,
+                     "logBase": 1,
+                     "max": null,
+                     "min": 0,
+                     "show": true
+                  }
+               ]
+            },
+            {
+               "aliasColors": { },
+               "bars": false,
+               "dashLength": 10,
+               "dashes": false,
+               "datasource": "$PROMETHEUS_DS",
+               "decimals": 0,
+               "description": "Sum of all disks throughput for reads per second, for each node",
+               "fill": 0,
+               "fillGradient": 0,
+               "gridPos": { },
+               "id": 30,
+               "legend": {
+                  "alignAsTable": true,
+                  "avg": false,
+                  "current": true,
+                  "max": false,
+                  "min": false,
+                  "rightSide": false,
+                  "show": true,
+                  "sideWidth": null,
+                  "sort": "current",
+                  "sortDesc": true,
+                  "total": false,
+                  "values": true
+               },
+               "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": "Sum by (cluster, dc, rack, instance) (rate(collectd_processes_io_octets_rx_total{cluster=\"$cluster\", dc=~\"$dc\", rack=~\"$rack\", instance=~\"$node\"}[1m:30s]))",
+                     "format": "time_series",
+                     "intervalFactor": 2,
+                     "legendFormat": "disks reads - throughput: {{instance}}",
+                     "refId": "A"
+                  }
+               ],
+               "thresholds": [ ],
+               "timeFrom": null,
+               "timeShift": null,
+               "title": "Disk Reads Throughput - Total per Node",
+               "tooltip": {
+                  "shared": false,
+                  "sort": 0,
+                  "value_type": "individual"
+               },
+               "transparent": true,
+               "type": "graph",
+               "xaxis": {
+                  "buckets": null,
+                  "mode": "time",
+                  "name": null,
+                  "show": true,
+                  "values": [ ]
+               },
+               "yaxes": [
+                  {
+                     "decimals": 0,
+                     "format": "bps",
+                     "label": null,
+                     "logBase": 1,
+                     "max": null,
+                     "min": 0,
+                     "show": true
+                  },
+                  {
+                     "decimals": 0,
+                     "format": "bps",
+                     "label": null,
+                     "logBase": 1,
+                     "max": null,
+                     "min": 0,
+                     "show": true
+                  }
+               ]
+            }
+         ],
          "repeat": null,
          "repeatIteration": null,
          "repeatRowId": null,