Jsonnet: fix config drift w/ Grafana Labs

Signed-off-by: Marco Pracucci <[email protected]>
grafana · May 27, 2024 · 1c87174 · 1c87174
1 parent 04df05d
commit 1c87174
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml b/operations/mimir-tests/test-autoscaling-custom-target-utilization-generated.yaml
@@ -1998,11 +1998,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="alertmanager", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="alertmanager", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="alertmanager", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="alertmanager", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="alertmanager", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="alertmanager", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2076,11 +2076,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="distributor", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="distributor", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="distributor", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2207,11 +2207,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="query-frontend", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="query-frontend", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="query-frontend", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="query-frontend", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="query-frontend", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="query-frontend", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2285,11 +2285,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2363,11 +2363,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler-querier", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler-querier", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler-querier", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler-querier", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler-querier", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler-querier", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2449,11 +2449,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler-query-frontend", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler-query-frontend", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler-query-frontend", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler-query-frontend", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler-query-frontend", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler-query-frontend", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -1998,11 +1998,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="alertmanager", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="alertmanager", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="alertmanager", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="alertmanager", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="alertmanager", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="alertmanager", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2076,11 +2076,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="distributor", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="distributor", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="distributor", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="distributor", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="distributor", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="distributor", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2207,11 +2207,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="query-frontend", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="query-frontend", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="query-frontend", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="query-frontend", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="query-frontend", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="query-frontend", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2285,11 +2285,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2363,11 +2363,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler-querier", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler-querier", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler-querier", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler-querier", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler-querier", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler-querier", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and
@@ -2449,11 +2449,11 @@ spec:
         )
         +
         sum(
-          sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="ruler-query-frontend", namespace="default", resource="memory"}[15m]))
+          sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="ruler-query-frontend", namespace="default", resource="memory"}[15m]))
           and
-          max by (pod) (changes(kube_pod_container_status_restarts_total{container="ruler-query-frontend", namespace="default"}[15m]) > 0)
+          max by (pod)(changes(kube_pod_container_status_restarts_total{container="ruler-query-frontend", namespace="default"}[15m]) > 0)
           and
-          max by (pod) (kube_pod_container_status_last_terminated_reason{container="ruler-query-frontend", namespace="default", reason="OOMKilled"})
+          max by (pod)(kube_pod_container_status_last_terminated_reason{container="ruler-query-frontend", namespace="default", reason="OOMKilled"})
           or vector(0)
         )
         and

diff --git a/operations/mimir/autoscaling.libsonnet b/operations/mimir/autoscaling.libsonnet
@@ -315,11 +315,11 @@
     )
     +
     sum(
-      sum by (pod) (max_over_time(kube_pod_container_resource_requests{container="%(container)s", namespace="%(namespace)s", resource="memory"}[15m]))
+      sum by (pod)(max_over_time(kube_pod_container_resource_requests{container="%(container)s", namespace="%(namespace)s", resource="memory"}[15m]))
       and
-      max by (pod) (changes(kube_pod_container_status_restarts_total{container="%(container)s", namespace="%(namespace)s"}[15m]) > 0)
+      max by (pod)(changes(kube_pod_container_status_restarts_total{container="%(container)s", namespace="%(namespace)s"}[15m]) > 0)
       and
-      max by (pod) (kube_pod_container_status_last_terminated_reason{container="%(container)s", namespace="%(namespace)s", reason="OOMKilled"})
+      max by (pod)(kube_pod_container_status_last_terminated_reason{container="%(container)s", namespace="%(namespace)s", reason="OOMKilled"})
       or vector(0)
     )
     and