Revert "18264 netapp_ontap_status: respect alert's suppression and acknowledgement"

This reverts commit 05ce889.

Reason for revert: plugin tests failing

Change-Id: I8ac633e9806370072d9efd21c0bf2bcd183b633d

Author: DavidGerva

.werks/18264.md

@@ -29,15 +29,6 @@
 # }
 
 
-def format_alert(alert):
-    s = alert.name
-    if alert.acknowledge:
-        s += f", acknowledged by {alert.acknowledger}"
-    if alert.suppress:
-        s += f", suppressed by {alert.suppressor}"
-    return s
-
-
 def parse_netapp_api_status(string_table: StringTable) -> Section:
     return [
         alert for line in string_table for alert in [models.AlertModel.model_validate_json(line[0])]
@@ -55,25 +46,14 @@ def discovery_netapp_ontap_status(section: Section) -> DiscoveryResult:
 
 
 def check_netapp_ontap_status(section: Section) -> CheckResult:
+    """
+    Status is considered OK if there are no alerts
+    """
+
     if not section:
-        yield Result(state=State.OK, summary="No alerts present")
-        return
-
-    handled_alerts = [alert for alert in section if alert.acknowledge or alert.suppress]
-    unhandled_alerts = [alert for alert in section if alert not in handled_alerts]
-    # show the unhandled alerts first
-    details = "\n".join(format_alert(alert) for alert in unhandled_alerts + handled_alerts)
-
-    if unhandled_alerts:
-        yield Result(
-            state=State.CRIT, summary="Unhandled alerts present, see details", details=details
-        )
+        yield Result(state=State.OK, summary="Status: OK")
     else:
-        yield Result(
-            state=State.OK,
-            summary="Alerts present, but all acknowledged or suppressed, see details",
-            details=details,
-        )
+        yield Result(state=State.CRIT, summary="Status: Alerts present")
 
 
 check_plugin_netapp_ontap_status = CheckPlugin(

cmk/plugins/netapp/agent_based/netapp_ontap_status.py

@@ -577,10 +577,6 @@ class AlertModel(BaseModel):
     """
 
     name: str
-    acknowledge: bool
-    acknowledger: str = ""
-    suppress: bool
-    suppressor: str = ""
 
 
 class SvmTrafficCountersModel(BaseModel):

cmk/plugins/netapp/models.py

@@ -21,60 +21,15 @@ class AlertModelFactory(ModelFactory):
     "alerts_models, expected_result",
     [
         pytest.param(
-            [
-                AlertModelFactory.build(name="alert1", acknowledge=False, suppress=False),
-                AlertModelFactory.build(name="alert2", acknowledge=False, suppress=False),
-            ],
-            [
-                Result(
-                    state=State.CRIT,
-                    summary="Unhandled alerts present, see details",
-                    details="alert1\nalert2",
-                )
-            ],
+            [AlertModelFactory.build(name="alert1"), AlertModelFactory.build(name="alert2")],
+            [Result(state=State.CRIT, summary="Status: Alerts present")],
             id="alerts present",
         ),
         pytest.param(
             [],
-            [Result(state=State.OK, summary="No alerts present")],
+            [Result(state=State.OK, summary="Status: OK")],
             id="no alerts present",
         ),
-        pytest.param(
-            [
-                AlertModelFactory.build(
-                    name="alert1", acknowledge=True, acknowledger="hhirsch", suppress=False
-                ),
-                AlertModelFactory.build(
-                    name="alert2", acknowledge=False, suppress=True, suppressor="hhirsch"
-                ),
-            ],
-            [
-                Result(
-                    state=State.OK,
-                    summary="Alerts present, but all acknowledged or suppressed, see details",
-                    details="alert1, acknowledged by hhirsch\nalert2, suppressed by hhirsch",
-                )
-            ],
-            id="alerts suppressed",
-        ),
-        pytest.param(
-            [
-                AlertModelFactory.build(
-                    name="alert2", acknowledge=False, suppress=True, suppressor="hhirsch"
-                ),
-                AlertModelFactory.build(
-                    name="alert1", acknowledge=False, acknowledger="hhirsch", suppress=False
-                ),
-            ],
-            [
-                Result(
-                    state=State.CRIT,
-                    summary="Unhandled alerts present, see details",
-                    details="alert1\nalert2, suppressed by hhirsch",
-                )
-            ],
-            id="one alert not suppressed (show it first)",
-        ),
     ],
 )
 def test_check_netapp_ontap_status(