enhancement: merge resource dashboards for ssd into resources-overvie…

…w dashboard Signed-off-by: QuentinBisson <[email protected]>
grafana · Jul 10, 2024 · 1f3afb0 · 1f3afb0
1 parent 6ea83b4
commit 1f3afb0
Show file tree

Hide file tree

Showing 10 changed files with 1,652 additions and 1,569 deletions.
diff --git a/production/loki-mixin-compiled-ssd/dashboards/loki-reads-resources.json b/production/loki-mixin-compiled-ssd/dashboards/loki-reads-resources.json
diff --git a/production/loki-mixin-compiled-ssd/dashboards/loki-resources-overview.json b/production/loki-mixin-compiled-ssd/dashboards/loki-resources-overview.json
diff --git a/production/loki-mixin-compiled-ssd/dashboards/loki-writes-resources.json b/production/loki-mixin-compiled-ssd/dashboards/loki-writes-resources.json
diff --git a/production/loki-mixin-compiled/dashboards/loki-reads-resources.json b/production/loki-mixin-compiled/dashboards/loki-reads-resources.json
diff --git a/production/loki-mixin-compiled/dashboards/loki-writes-resources.json b/production/loki-mixin-compiled/dashboards/loki-writes-resources.json
@@ -288,7 +288,7 @@
          },
          {
             "collapse": false,
-            "collapsed": false,
+            "height": "250px",
             "panels": [
                {
                   "datasource": "$datasource",
@@ -314,7 +314,6 @@
                      },
                      "overrides": [ ]
                   },
-                  "gridPos": { },
                   "id": 4,
                   "links": [ ],
                   "options": {
@@ -326,6 +325,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "sum by(pod) (loki_ingester_memory_streams{cluster=~\"$cluster\", job=~\"($namespace)/ingester.*\"})",
@@ -403,7 +403,6 @@
                         }
                      ]
                   },
-                  "gridPos": { },
                   "id": 5,
                   "links": [ ],
                   "options": {
@@ -415,6 +414,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "sum by(pod) (rate(container_cpu_usage_seconds_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=\"ingester\"}[$__rate_interval]))",
@@ -504,7 +504,6 @@
                         }
                      ]
                   },
-                  "gridPos": { },
                   "id": 6,
                   "links": [ ],
                   "options": {
@@ -516,6 +515,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "max by(pod) (container_memory_working_set_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\", container=\"ingester\"})",
@@ -566,7 +566,6 @@
                      },
                      "overrides": [ ]
                   },
-                  "gridPos": { },
                   "id": 7,
                   "links": [ ],
                   "options": {
@@ -578,6 +577,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "sum by(pod) (go_memstats_heap_inuse_bytes{cluster=~\"$cluster\", job=~\"($namespace)/ingester.*\"})",
@@ -616,7 +616,6 @@
                      },
                      "overrides": [ ]
                   },
-                  "gridPos": { },
                   "id": 8,
                   "links": [ ],
                   "options": {
@@ -628,6 +627,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "sum by(instance, pod, device) (rate(node_disk_written_bytes_total[$__rate_interval])) + ignoring(pod) group_right() (label_replace(count by(instance, pod, device) (container_fs_writes_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=\"ingester\", device!~\".*sda.*\"}), \"device\", \"$1\", \"device\", \"/dev/(.*)\") * 0)\n",
@@ -663,7 +663,6 @@
                      },
                      "overrides": [ ]
                   },
-                  "gridPos": { },
                   "id": 9,
                   "links": [ ],
                   "options": {
@@ -675,6 +674,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "sum by(instance, pod, device) (rate(node_disk_read_bytes_total[$__rate_interval])) + ignoring(pod) group_right() (label_replace(count by(instance, pod, device) (container_fs_writes_bytes_total{cluster=~\"$cluster\", namespace=~\"$namespace\", container=\"ingester\", device!~\".*sda.*\"}), \"device\", \"$1\", \"device\", \"/dev/(.*)\") * 0)\n",
@@ -710,7 +710,6 @@
                      },
                      "overrides": [ ]
                   },
-                  "gridPos": { },
                   "id": 10,
                   "links": [ ],
                   "options": {
@@ -722,6 +721,7 @@
                         "sort": "none"
                      }
                   },
+                  "span": 1,
                   "targets": [
                      {
                         "expr": "max by(persistentvolumeclaim) (kubelet_volume_stats_used_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\"} / kubelet_volume_stats_capacity_bytes{cluster=~\"$cluster\", namespace=~\"$namespace\"}) and count by(persistentvolumeclaim) (kube_persistentvolumeclaim_labels{cluster=~\"$cluster\", namespace=~\"$namespace\",label_name=~\"ingester.*.*\"})",
@@ -739,8 +739,7 @@
             "repeatRowId": null,
             "showTitle": true,
             "title": "Ingester",
-            "titleSize": "h6",
-            "type": "row"
+            "titleSize": "h6"
          }
       ],
       "schemaVersion": 14,

diff --git a/production/loki-mixin/dashboards.libsonnet b/production/loki-mixin/dashboards.libsonnet
@@ -3,10 +3,11 @@
 (import 'dashboards/loki-chunks.libsonnet') +
 (import 'dashboards/loki-logs.libsonnet') +
 (import 'dashboards/loki-operational.libsonnet') +
+(import 'dashboards/loki-resources-overview.libsonnet') +
 (import 'dashboards/loki-reads.libsonnet') +
+(import 'dashboards/loki-reads-resources.libsonnet') +
 (import 'dashboards/loki-writes.libsonnet') +
 (import 'dashboards/loki-writes-resources.libsonnet') +
-(import 'dashboards/loki-reads-resources.libsonnet') +
 (import 'dashboards/loki-deletion.libsonnet') +
 (import 'dashboards/loki-canary-dashboard.libsonnet') +
 (import 'dashboards/recording-rules.libsonnet') +