regen

Signed-off-by: QuentinBisson <[email protected]>

helm/dashboards/charts/private_dashboards_al/dashboards/shared/private/loki-cost-estimation.json

@@ -1139,8 +1139,8 @@
     ]
   },
   "timezone": "utc",
-  "title": "Loki Cost Estimation",
-  "uid": "lokicost",
+  "title": "Loki / Cost Estimation",
+  "uid": "loki-cost-estimation",
   "version": 1,
   "weekStart": ""
 }

loki/mixin.libsonnet

@@ -8,10 +8,15 @@ loki{
       "component:loki"
     ],
 
+    per_node_label: 'node',
     per_cluster_label: 'cluster_id',
 
     canary+: {
       enabled: true,
     },
+
+    promtail+: {
+      enabled: true,
+    },
   },
 }

loki/update.sh

@@ -10,9 +10,7 @@
 set -e
 
 BRANCH="main"
-BRANCH="fix-cluster-id-label-in-mixins"
 MIXIN_URL=https://github.com/grafana/loki/production/loki-mixin@$BRANCH
-MIXIN_URL=https://github.com/QuentinBisson/loki-upstream/production/loki-mixin@$BRANCH
 helmDir="$(pwd)/helm/dashboards/charts/private_dashboards_al/dashboards/shared/private"
 
 cd loki
@@ -26,8 +24,6 @@ for file in dashboards_out/*; do
   # Process each file here
   echo "$file"
 
-
-
   if [[ $(basename "$file") == "loki-canary.json" ]]; then
     # adds missing uid
     jq '.uid = "loki-canary"' "$file" > "$file.out" && mv "$file.out" "$file"
@@ -36,6 +32,11 @@ for file in dashboards_out/*; do
     jq '.uid = "loki-" + .uid' "$file" > "$file.out" && mv "$file.out" "$file"
   fi
 
+  ## Needed until this is fixed https://github.com/grafana/loki/pull/12846
+  if [[ $(basename "$file") == "loki-deletion.json" ]]; then
+    sed -i 's/container=\\"compactor\\"/container=\\"loki\\", pod=~\\"(loki.*|enterprise-logs)-backend.*\\"/g' "$file"
+  fi
+
   echo "Copying dashboard to $helmDir"
   cp "$file" "$helmDir"
 done