fix(rules): fix templates in rules

intergral · Nov 30, 2023 · 93859d0 · 93859d0
1 parent e411d32
commit 93859d0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/charts/deep-distributed/Chart.yaml b/charts/deep-distributed/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2
+version: 1.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/deep-distributed/values.yaml b/charts/deep-distributed/values.yaml
@@ -1032,47 +1032,47 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/unhealthy_ring_node/
           summary: One or more ring members are unhealthy
       - alert: Required Ring Member Missing
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name=~"ingester|tracepoint"} == 0
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name=~"ingester|tracepoint"} == 0
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Tracepoint ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Ingester ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="ingester"} != {{ .Values.ingester.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="ingester"} != {{ .Values.ingester.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Compactor ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="compactor"} != {{ .Values.compactor.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="compactor"} != {{ .Values.compactor.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Metrics Generator ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Rapid increase in blocks
-        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" (dict "ctx" $)}}"}[24h]) > 30
+        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" .}}"}[24h]) > 30
         for: 48h
         labels:
           severity: warning

diff --git a/charts/deep/Chart.yaml b/charts/deep/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.16
+version: 1.0.17
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/deep/values.yaml b/charts/deep/values.yaml
@@ -477,47 +477,47 @@ monitoring:
           runbook_url: https://intergral.github.io/deep/runbooks/unhealthy_ring_node/
           summary: One or more ring members are unhealthy
       - alert: Required Ring Member Missing
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name=~"ingester|tracepoint"} == 0
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name=~"ingester|tracepoint"} == 0
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Tracepoint ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="tracepoint"} != {{ .Values.tracepoint.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="tracepoint"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Ingester ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="ingester"} != {{ .Values.ingester.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="ingester"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Compactor ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="compactor"} != {{ .Values.compactor.replicas }}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="compactor"} != {{ .Values.deep.replicas }}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Metrics Generator ring missing member
-        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" (dict "ctx" $)}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.distributor.replicas }} {{else}}0{{end}}
+        expr: deep_ring_members{state="ACTIVE", cluster="{{ include "deep.clusterName" .}}", name="metrics-generator"} != {{ if .Values.metricsGenerator.enabled }} {{.Values.deep.replicas }} {{else}}0{{end}}
         labels:
           severity: critical
         annotations:
           description: "{{ $labels.service }} has {{ $value }} active nodes in ring {{ $labels.name }}."
           runbook_url: https://intergral.github.io/deep/runbooks/missing_ring_node/
           summary: One or more ring has missing required nodes
       - alert: Rapid increase in blocks
-        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" (dict "ctx" $)}}"}[24h]) > 30
+        expr: delta(deep_db_blocklist_length{cluster="{{ include "deep.clusterName" .}}"}[24h]) > 30
         for: 48h
         labels:
           severity: warning