From bf3586e64251bdef017416c99f8e8d511a45ae1c Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Tue, 28 Nov 2023 16:43:33 +0000
Subject: [PATCH] Remove bogus alert

This was removed upstream, see:

https://github.com/samber/awesome-prometheus-alerts/commit/10b810fd6e0fe92500279366dd3b6d2309be8def
(cherry picked from commit 80f7567f60cea94d440f5700541e6944cb7456bd)
---
 etc/kayobe/kolla/config/prometheus/cadvisor.rules        | 9 ---------
 ...ogus-ContainerVolumeUsage-alert-c973b61f598d85e5.yaml | 5 +++++
 2 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/removes-bogus-ContainerVolumeUsage-alert-c973b61f598d85e5.yaml

diff --git a/etc/kayobe/kolla/config/prometheus/cadvisor.rules b/etc/kayobe/kolla/config/prometheus/cadvisor.rules
index d97a3a545..726517452 100644
--- a/etc/kayobe/kolla/config/prometheus/cadvisor.rules
+++ b/etc/kayobe/kolla/config/prometheus/cadvisor.rules
@@ -33,15 +33,6 @@ groups:
       summary: "Container Volume usage (instance {{ $labels.instance }})"
       description: "Container Volume usage is above 80%"
 
-  - alert: ContainerVolumeIoUsage
-    expr: (sum(container_fs_io_current{name!=""}) BY (instance, name) * 100) > 80
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      summary: "Container Volume IO usage (instance {{ $labels.instance }})"
-      description: "Container Volume IO usage is above 80%"
-
   - alert: ContainerHighThrottleRate
     expr: rate(container_cpu_cfs_throttled_seconds_total[3m]) > 1
     for: 1m
diff --git a/releasenotes/notes/removes-bogus-ContainerVolumeUsage-alert-c973b61f598d85e5.yaml b/releasenotes/notes/removes-bogus-ContainerVolumeUsage-alert-c973b61f598d85e5.yaml
new file mode 100644
index 000000000..f1c76c545
--- /dev/null
+++ b/releasenotes/notes/removes-bogus-ContainerVolumeUsage-alert-c973b61f598d85e5.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Removes bogus ContainerVolumeUsage alert. This rule wasn't correctly measuring
+    container volume IO and could cause spurious alerts.