Merge branch 'main' into add-unnecessary-disk-panels-for-ssd-read-path

Signed-off-by: QuentinBisson <[email protected]>
grafana · May 22, 2024 · 82fd704 · 82fd704
2 parents 4ccb8f4 + 1948899
commit 82fd704
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/production/loki-mixin-compiled-ssd/dashboards/loki-deletion.json b/production/loki-mixin-compiled-ssd/dashboards/loki-deletion.json
@@ -701,6 +701,16 @@
                "tagsQuery": "",
                "type": "query",
                "useTags": false
+            },
+            {
+               "hide": 0,
+               "label": null,
+               "name": "loki_datasource",
+               "options": [ ],
+               "query": "loki",
+               "refresh": 1,
+               "regex": "",
+               "type": "datasource"
             }
          ]
       },

diff --git a/production/loki-mixin-compiled/dashboards/loki-deletion.json b/production/loki-mixin-compiled/dashboards/loki-deletion.json
@@ -701,6 +701,16 @@
                "tagsQuery": "",
                "type": "query",
                "useTags": false
+            },
+            {
+               "hide": 0,
+               "label": null,
+               "name": "loki_datasource",
+               "options": [ ],
+               "query": "loki",
+               "refresh": 1,
+               "regex": "",
+               "type": "datasource"
             }
          ]
       },

diff --git a/production/loki-mixin/dashboards/loki-deletion.libsonnet b/production/loki-mixin/dashboards/loki-deletion.libsonnet
@@ -12,6 +12,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
         .addCluster()
         .addNamespace()
         .addTag()
+        .addLog()
         .addRow(
           ($.row('Headlines') +
            {

diff --git a/production/loki-mixin/dashboards/loki-reads-resources.libsonnet b/production/loki-mixin/dashboards/loki-reads-resources.libsonnet
@@ -94,7 +94,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
             $.containerDiskSpaceUtilizationPanel('Disk Space Utilization', 'querier'),
           )
         )
-        # Add the read path for single scalable deployment only. The read path should not display disk utilization as the index gateway is present in the backend pods.
+        // Add the read path for single scalable deployment only. The read path should not display disk utilization as the index gateway is present in the backend pods.
         .addRowIf(
           $._config.ssd.enabled,
           grafana.row.new('Read path')
@@ -108,7 +108,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
             $.goHeapInUsePanel('Memory (go heap inuse)', index_gateway_job_matcher),
           )
         )
-        # Otherwise we add the index gateway information
+        // Otherwise we add the index gateway information
         .addRowIf(
           !$._config.ssd.enabled,
           grafana.row.new('Index Gateway')