feat(mon-services): add mode indicator filter (downtime/ack/notifications/flapping)

alecmkandro · alecmkandro · commit dfbe1c236ede · 2026-08-11T11:12:18.000+02:00
Adds a tri-state boolean-group filter to the modes column of the Host
Services table, mirroring the All Hosts page. Extends the Service
domain model with notifications_enabled and is_flapping (only
acknowledged/in_downtime were fetched before), adds a
ServiceBooleanCondition to the services filter schema, and wires up
the corresponding icons in both service mode builders.

Also fixes a pre-existing bug in build_service_modes/
build_service_modes_by_id: the notifications-disabled icon was named
"notif_disabled" (underscore), but the actual registered icon is
"notif-disabled" (hyphen), so it likely never rendered.

CMK-37406

Change-Id: I61d264b58767b40353f4a84c864fe2dbd00c911f
diff --git a/cmk/gui/monitor/services/_api/_filters.py b/cmk/gui/monitor/services/_api/_filters.py
@@ -54,7 +54,21 @@ class ServiceStateChoiceCondition:
     )
 
 
-type ServiceConditionNode = ServiceStateChoiceCondition | ServiceStringCondition
+@api_model
+class ServiceBooleanCondition:
+    type: Literal["condition"] = api_field(
+        description="Node type discriminator", example="condition"
+    )
+    field: Literal["acknowledged", "in_downtime", "notifications_enabled", "is_flapping"] = (
+        api_field(description="Boolean service field to filter on", example="acknowledged")
+    )
+    op: Literal["eq"] = api_field(description="Equality operation", example="eq")
+    value: bool = api_field(description="Boolean value to compare against", example=False)
+
+
+type ServiceConditionNode = (
+    ServiceStateChoiceCondition | ServiceStringCondition | ServiceBooleanCondition
+)
 
 
 @api_model(slots=False)
@@ -116,6 +130,16 @@ def _accumulate_filters(node: ServiceFilterNode, filters: list[str]) -> None:
                 case "one_of" if len(node.value) > 1:
                     filters.append(f"Or: {len(node.value)}")
 
+        case ServiceBooleanCondition():
+            match node.field:
+                case "in_downtime":
+                    # Livestatus has no boolean downtime column; a service is in a scheduled
+                    # downtime when scheduled_downtime_depth is greater than zero.
+                    op = ">" if node.value else "="
+                    filters.append(f"Filter: scheduled_downtime_depth {op} 0")
+                case _:
+                    filters.append(f"Filter: {node.field} = {int(node.value)}")
+
         case ServiceAndNode() | ServiceOrNode():
             for child in node.children:
                 _accumulate_filters(child, filters)
diff --git a/cmk/gui/monitor/services/_api/_modes.py b/cmk/gui/monitor/services/_api/_modes.py
@@ -46,11 +46,19 @@ def build_service_modes(service: ServiceOverview) -> list[ServiceModeInfo]:
     if not service.notifications_enabled:
         modes.append(
             ServiceModeInfo(
-                icon_name="notif_disabled",
+                icon_name="notif-disabled",
                 link=service_view_link("service", service),
                 title=_("Notifications are disabled for this service"),
             )
         )
+    if service.is_flapping:
+        modes.append(
+            ServiceModeInfo(
+                icon_name="flapping",
+                link=service_view_link("service", service),
+                title=_("This service is flapping"),
+            )
+        )
     return modes
 
 
@@ -81,6 +89,26 @@ def build_service_modes_by_id(
                 title=_("Problem acknowledged"),
             )
         )
+    if not service.notifications_enabled:
+        modes.append(
+            ServiceModeInfo(
+                icon_name="notif-disabled",
+                link=service_view_link_by_id(
+                    "service", site_id=site_id, hostname=hostname, service_name=service.name
+                ),
+                title=_("Notifications are disabled for this service"),
+            )
+        )
+    if service.is_flapping:
+        modes.append(
+            ServiceModeInfo(
+                icon_name="flapping",
+                link=service_view_link_by_id(
+                    "service", site_id=site_id, hostname=hostname, service_name=service.name
+                ),
+                title=_("This service is flapping"),
+            )
+        )
     return modes
 
 
diff --git a/cmk/gui/monitor/services/_impl.py b/cmk/gui/monitor/services/_impl.py
@@ -69,6 +69,8 @@ def fetch(
                 Services.plugin_output,
                 Services.acknowledged,
                 Services.scheduled_downtime_depth,
+                Services.notifications_enabled,
+                Services.is_flapping,
                 Services.last_check,
                 Services.last_state_change,
             ],
@@ -84,6 +86,8 @@ def fetch(
                         state=ServiceState(row["state"]),
                         acknowledged=bool(row["acknowledged"]),
                         in_downtime=row["scheduled_downtime_depth"] > 0,
+                        notifications_enabled=bool(row["notifications_enabled"]),
+                        is_flapping=bool(row["is_flapping"]),
                         summary=row["plugin_output"],
                         last_check=(
                             dt.datetime.fromtimestamp(row["last_check"], tz=dt.UTC)
@@ -111,6 +115,7 @@ def get_overview(self, *, hostname: str, service_name: str, site_id: str) -> Ser
                 Services.acknowledged,
                 Services.scheduled_downtime_depth,
                 Services.notifications_enabled,
+                Services.is_flapping,
                 Services.host_alias,
                 Services.host_state,
                 Services.host_acknowledged,
@@ -148,6 +153,7 @@ def get_overview(self, *, hostname: str, service_name: str, site_id: str) -> Ser
             acknowledged=bool(row["acknowledged"]),
             in_downtime=row["scheduled_downtime_depth"] > 0,
             notifications_enabled=bool(row["notifications_enabled"]),
+            is_flapping=bool(row["is_flapping"]),
             host_alias=row["host_alias"],
             host_state=HostState(row["host_state"]),
             host_acknowledged=bool(row["host_acknowledged"]),
diff --git a/cmk/gui/monitor/services/_models.py b/cmk/gui/monitor/services/_models.py
@@ -42,6 +42,8 @@ class Service:
     state: ServiceState
     acknowledged: bool
     in_downtime: bool
+    notifications_enabled: bool
+    is_flapping: bool
     summary: str
     last_check: dt.datetime | None
     last_state_change: dt.datetime
@@ -78,6 +80,7 @@ class ServiceOverview(Service):
     acknowledged: bool
     in_downtime: bool
     notifications_enabled: bool
+    is_flapping: bool
     contact_groups: list[str]
     long_output: str
     current_attempt: int
diff --git a/packages/cmk-frontend-vue/src/monitoring/host-services/columns.ts b/packages/cmk-frontend-vue/src/monitoring/host-services/columns.ts
@@ -8,6 +8,7 @@ import usei18n from 'cmk-ui-library/lib/i18n'
 
 import type { HostServiceEntry, ServiceState } from '@/monitoring/shared/api/types'
 import type {
+  BooleanGroupFilter,
   CheckboxListFilter,
   StringInputFilter
 } from '@/monitoring/shared/components/filter/types'
@@ -44,6 +45,18 @@ export function useHostServicesColumns(): ColumnDef<HostServiceEntry>[] {
     field: 'summary'
   }
 
+  const modesFilter: BooleanGroupFilter<
+    'in_downtime' | 'acknowledged' | 'notifications_enabled' | 'is_flapping'
+  > = {
+    type: 'boolean-group',
+    groups: [
+      { field: 'in_downtime', title: _t('In downtime') },
+      { field: 'acknowledged', title: _t('Acknowledged') },
+      { field: 'notifications_enabled', title: _t('Notifications enabled') },
+      { field: 'is_flapping', title: _t('Flapping') }
+    ]
+  }
+
   return [
     {
       id: 'select',
@@ -69,7 +82,7 @@ export function useHostServicesColumns(): ColumnDef<HostServiceEntry>[] {
       enableSorting: false,
       minSize: 80,
       maxSize: 80,
-      meta: { justify: 'left' }
+      meta: { justify: 'left', filter: modesFilter }
     },
     {
       accessorKey: 'name',
diff --git a/packages/cmk-frontend-vue/tests/monitoring/host-services/HostServicesApp.test.ts b/packages/cmk-frontend-vue/tests/monitoring/host-services/HostServicesApp.test.ts
@@ -228,6 +228,53 @@ test('clearing the summary filter restores the full, unfiltered list', async ()
   )
 })
 
+test('requests services that are not acknowledged and not in downtime', async () => {
+  mockServices([makeApiEntry()])
+  renderApp()
+
+  await userEvent.click(await screen.findByRole('button', { name: 'Filter Mode' }))
+  const panel = screen.getByRole('group', { name: 'Filter Mode' })
+  await userEvent.click(within(panel).getByLabelText('NOT Acknowledged'))
+  await userEvent.click(within(panel).getByLabelText('NOT In downtime'))
+  await userEvent.click(within(panel).getByRole('button', { name: 'Apply' }))
+
+  expect(postSpy).toHaveBeenLastCalledWith(
+    '/monitor/hosts/{hostname}/services',
+    expect.objectContaining({
+      body: {
+        limit: 1000,
+        filter: {
+          type: 'and',
+          children: [
+            { type: 'condition', field: 'in_downtime', op: 'eq', value: false },
+            { type: 'condition', field: 'acknowledged', op: 'eq', value: false }
+          ]
+        }
+      }
+    })
+  )
+})
+
+test('clearing the mode filter restores the full, unfiltered list', async () => {
+  mockServices([makeApiEntry()])
+  renderApp()
+
+  await userEvent.click(await screen.findByRole('button', { name: 'Filter Mode' }))
+  let panel = screen.getByRole('group', { name: 'Filter Mode' })
+  await userEvent.click(within(panel).getByLabelText('Flapping'))
+  await userEvent.click(within(panel).getByRole('button', { name: 'Apply' }))
+
+  await userEvent.click(screen.getByRole('button', { name: 'Filter Mode' }))
+  panel = screen.getByRole('group', { name: 'Filter Mode' })
+  await userEvent.click(within(panel).getByRole('button', { name: 'Clear' }))
+  await userEvent.click(within(panel).getByRole('button', { name: 'Apply' }))
+
+  expect(postSpy).toHaveBeenLastCalledWith(
+    '/monitor/hosts/{hostname}/services',
+    expect.objectContaining({ body: { limit: 1000 } })
+  )
+})
+
 test('resetting all filters restores the full, unfiltered list', async () => {
   mockServices([makeApiEntry()])
   renderApp()
diff --git a/tests/openapi/test_openapi_monitor_host_services.py b/tests/openapi/test_openapi_monitor_host_services.py
@@ -134,6 +134,8 @@ def test_single_filter(
                     "plugin_output": "WARN - load average: 3.10, 2.05, 1.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time(),
                     "last_state_change": time.time(),
                 }
@@ -219,6 +221,8 @@ def test_with_multiple_conditions(
                     "plugin_output": "WARN - load average: 3.10, 2.05, 1.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time(),
                     "last_state_change": time.time(),
                 }
@@ -330,6 +334,8 @@ def test_services(
                     "plugin_output": "OK - load average: 0.10, 0.05, 0.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time() - 30,
                     "last_state_change": time.time(),
                 }
@@ -403,6 +409,8 @@ def test_pending_service_has_no_last_check(
                     "plugin_output": "",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": 0,
                     "last_state_change": time.time(),
                 }
@@ -522,6 +530,8 @@ def test_services_without_limit(
                     "plugin_output": "OK - load average: 0.10, 0.05, 0.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time(),
                     "last_state_change": time.time(),
                 }
@@ -584,6 +594,8 @@ def test_limit_removal_clamped_without_permission(
                     "plugin_output": "OK - load average: 0.10, 0.05, 0.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time(),
                     "last_state_change": time.time(),
                 }
@@ -646,6 +658,8 @@ def test_limit_removal_honored_with_permission(
                     "plugin_output": "OK - load average: 0.10, 0.05, 0.01",
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
+                    "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "last_check": time.time(),
                     "last_state_change": time.time(),
                 }
@@ -707,6 +721,7 @@ def test_returns_the_requested_service(
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
                     "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "host_alias": _HOST_ALIAS,
                     "host_state": 0,
                     "host_acknowledged": 0,
@@ -775,12 +790,12 @@ def test_returns_the_requested_service(
             pytest.param({"acknowledged": 1}, ["ack"], id="problem acknowledged"),
             pytest.param(
                 {"notifications_enabled": 0},
-                ["notif_disabled"],
+                ["notif-disabled"],
                 id="notifications disabled",
             ),
             pytest.param(
                 {"scheduled_downtime_depth": 2, "acknowledged": 1, "notifications_enabled": 0},
-                ["downtime", "ack", "notif_disabled"],
+                ["downtime", "ack", "notif-disabled"],
                 id="all modes at once",
             ),
         ],
@@ -806,6 +821,7 @@ def test_modes_reflect_the_service_state(
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
                     "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "host_alias": _HOST_ALIAS,
                     "host_state": 0,
                     "host_acknowledged": 0,
@@ -859,6 +875,7 @@ def test_passive_service_has_no_next_check(
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
                     "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "host_alias": _HOST_ALIAS,
                     "host_state": 0,
                     "host_acknowledged": 0,
@@ -911,6 +928,7 @@ def test_pending_service_has_no_last_check(
                     "acknowledged": 0,
                     "scheduled_downtime_depth": 0,
                     "notifications_enabled": 1,
+                    "is_flapping": 0,
                     "host_alias": _HOST_ALIAS,
                     "host_state": 0,
                     "host_acknowledged": 0,
@@ -1086,13 +1104,13 @@ def test_invalid_credentials(self, clients: ClientRegistry) -> None:
 _HOST_ALIAS = "Web Server"
 _SERVICE_OVERVIEW_COLUMNS = (
     "description host_name state plugin_output last_check last_state_change acknowledged "
-    "scheduled_downtime_depth notifications_enabled host_alias host_state host_acknowledged "
-    "host_scheduled_downtime_depth contact_groups long_plugin_output current_attempt "
-    "max_check_attempts next_check tags labels label_sources"
+    "scheduled_downtime_depth notifications_enabled is_flapping host_alias host_state "
+    "host_acknowledged host_scheduled_downtime_depth contact_groups long_plugin_output "
+    "current_attempt max_check_attempts next_check tags labels label_sources"
 )
 _LIMIT = 1000
 _SERVICES_COLUMNS = (
     "description host_name state plugin_output acknowledged scheduled_downtime_depth "
-    "last_check last_state_change"
+    "notifications_enabled is_flapping last_check last_state_change"
 )
 _DEFAULT_ORDER_BY = "OrderBy: description asc natural"
diff --git a/tests/unit/cmk/gui/monitor/services/test_filters.py b/tests/unit/cmk/gui/monitor/services/test_filters.py
diff --git a/tests/unit/cmk/gui/monitor/services/test_impl.py b/tests/unit/cmk/gui/monitor/services/test_impl.py
diff --git a/tests/unit/cmk/gui/monitor/services/test_modes.py b/tests/unit/cmk/gui/monitor/services/test_modes.py
