Updates grafana/loki/production/loki-mixins jsonnet package

With this update we get: - Reworked retention dashboards done in grafana#11263 as a follow-up to grafana#9884 - New write dashboards for structured metadata done in grafana#11087
JoaoBraveCoding · Nov 28, 2023 · 98ec454 · 98ec454
1 parent bd505f8
commit 98ec454
Show file tree

Hide file tree

Showing 7 changed files with 594 additions and 54 deletions.
diff --git a/...al/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-chunks.json b/...al/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-chunks.json
@@ -598,7 +598,7 @@
                "steppedLine": false,
                "targets": [
                   {
-                     "expr": "cortex_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"}",
+                     "expr": "loki_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"} or cortex_ingester_flush_queue_length{namespace=\"$namespace\", job=~\".+-ingester-http\"}",
                      "format": "time_series",
                      "intervalFactor": 2,
                      "legendFormat": "{{pod}}",

diff --git a/...nal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-reads.json b/...nal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-reads.json
@@ -209,14 +209,17 @@
                "dashes": false,
                "datasource": "$datasource",
                "fieldConfig": {
-                  "custom": {
-                     "fillOpacity": 50,
-                     "showPoints": "never",
-                     "stacking": {
-                        "group": "A",
-                        "mode": "normal"
+                  "defaults": {
+                     "custom": {
+                        "fillOpacity": 50,
+                        "showPoints": "never",
+                        "stacking": {
+                           "group": "A",
+                           "mode": "normal"
+                        }
                      }
-                  }
+                  },
+                  "unit": "s"
                },
                "fill": 1,
                "id": 3,
@@ -482,14 +485,17 @@
                "dashes": false,
                "datasource": "$datasource",
                "fieldConfig": {
-                  "custom": {
-                     "fillOpacity": 50,
-                     "showPoints": "never",
-                     "stacking": {
-                        "group": "A",
-                        "mode": "normal"
+                  "defaults": {
+                     "custom": {
+                        "fillOpacity": 50,
+                        "showPoints": "never",
+                        "stacking": {
+                           "group": "A",
+                           "mode": "normal"
+                        }
                      }
-                  }
+                  },
+                  "unit": "s"
                },
                "fill": 1,
                "id": 6,
@@ -755,14 +761,17 @@
                "dashes": false,
                "datasource": "$datasource",
                "fieldConfig": {
-                  "custom": {
-                     "fillOpacity": 50,
-                     "showPoints": "never",
-                     "stacking": {
-                        "group": "A",
-                        "mode": "normal"
+                  "defaults": {
+                     "custom": {
+                        "fillOpacity": 50,
+                        "showPoints": "never",
+                        "stacking": {
+                           "group": "A",
+                           "mode": "normal"
+                        }
                      }
-                  }
+                  },
+                  "unit": "s"
                },
                "fill": 1,
                "id": 9,
@@ -1028,14 +1037,17 @@
                "dashes": false,
                "datasource": "$datasource",
                "fieldConfig": {
-                  "custom": {
-                     "fillOpacity": 50,
-                     "showPoints": "never",
-                     "stacking": {
-                        "group": "A",
-                        "mode": "normal"
+                  "defaults": {
+                     "custom": {
+                        "fillOpacity": 50,
+                        "showPoints": "never",
+                        "stacking": {
+                           "group": "A",
+                           "mode": "normal"
+                        }
                      }
-                  }
+                  },
+                  "unit": "s"
                },
                "fill": 1,
                "id": 15,