Merge pull request grafana#84 from grafana/main

Update from upstream repository
periklis · Nov 29, 2022 · f822feb · f822feb
2 parents df27689 + 4bcecef
commit f822feb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Main
 
+- [7809](https://github.com/grafana/loki/pull/7809) **xperimental**: Fix histogram-based alerting rules
 - [7808](https://github.com/grafana/loki/pull/7808) **xperimental**: Replace fifocache usage by embedded_cache
 - [7753](https://github.com/grafana/loki/pull/7753) **periklis**: Check for mandatory CA configmap name in ObjectStorageTLS spec
 - [7744](https://github.com/grafana/loki/pull/7744) **periklis**: Fix object storage TLS spec CAKey descriptor

diff --git a/operator/internal/manifests/internal/alerts/prometheus-alerts.yaml b/operator/internal/manifests/internal/alerts/prometheus-alerts.yaml
@@ -88,7 +88,6 @@ groups:
           )
         ) by (job, le, namespace, route)
       )
-      * 100
       > 1
     for: 15m
     labels:
@@ -124,7 +123,6 @@ groups:
           job_le_namespace_operation:loki_boltdb_shipper_request_duration_seconds_bucket:rate5m{operation="WRITE"}
         ) by (job, le, namespace)
       )
-      * 100
       > 1
     for: 15m
     labels:
@@ -141,7 +139,6 @@ groups:
           job_le_namespace_operation:loki_boltdb_shipper_request_duration_seconds_bucket:rate5m{operation="Shipper.Query"}
         ) by (job, le, namespace)
       )
-      * 100
       > 5
     for: 15m
     labels:
@@ -174,7 +171,6 @@ groups:
           )
         ) by (job, le, namespace)
       )
-      * 100
       > 30
     for: 15m
     labels: