From 88eb3837d97e4de34d61812a698ab400ff8f4342 Mon Sep 17 00:00:00 2001
From: Said Sef <saidsef@gmail.com>
Date: Mon, 18 Nov 2024 19:05:48 +0000
Subject: [PATCH] fix: Prometheus v3.0.0 removed unsupported features

---
 deployment/prometheus/cm.yml         | 14 +++++---------
 deployment/prometheus/deployment.yml |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/deployment/prometheus/cm.yml b/deployment/prometheus/cm.yml
index 25c3ecc..c2ccf40 100644
--- a/deployment/prometheus/cm.yml
+++ b/deployment/prometheus/cm.yml
@@ -10,16 +10,12 @@ data:
     groups:
     - name: http_request_duration
       rules:
-      - record: job:request_duration_seconds:rate
+      - record: job:request_duration_seconds:sum_rate5m
         expr: |
-          sum(rate(hubble_http_request_duration_seconds_bucket{
-            cluster=~"${cluster}",
-            destination_namespace=~"${destination_namespace}",
-            destination_workload=~"${destination_workload}",
-            reporter="${reporter}",
-            source_namespace=~"${source_namespace}",
-            source_workload=~"${source_workload}"
-          }[5m])) by (cluster, destination_namespace, destination_workload, le)
+          sum(rate(hubble_http_request_duration_seconds_bucket{}[5m])) by (cluster, destination_namespace, destination_workload, le)
+        annotations:
+          description: Sum of Hubble HTTP request durations by cluster and namespace
+          summary: Sum Hubble request durations by cluster and namespace
     - name: Memory
       rules:
       - alert: ContainerUsedMemoryPercent
diff --git a/deployment/prometheus/deployment.yml b/deployment/prometheus/deployment.yml
index 0c86ce2..3ffe1f9 100644
--- a/deployment/prometheus/deployment.yml
+++ b/deployment/prometheus/deployment.yml
@@ -33,7 +33,7 @@ spec:
             - '--storage.tsdb.path=/prometheus/data/'
             - '--web.console.libraries=/etc/prometheus/console_libraries'
             - '--web.console.templates=/etc/prometheus/consoles'
-            - '--enable-feature=concurrent-rule-eval,promql-experimental-functions,new-service-discovery-manager,exemplar-storage,remote-write-receiver,promql-per-step-stats'
+            - '--enable-feature=concurrent-rule-eval,promql-experimental-functions,exemplar-storage,promql-per-step-stats,native-histograms'
             - '--web.enable-remote-write-receiver'
             - '--web.enable-otlp-receiver'
             - '--web.enable-lifecycle'