Services in Device Groups not displayed correctly in availability map and widget

[ajsiersema]

The problem

Both Maps -> Availability and the Availability Map Widget for dashboards fail to filter the device group for devices on which these services are running.

Maps -> Availability misses the option to filter on device group for all options/modes (only devices, only services, devices and services). And if a device group is selected, no filtering is applied on the device group for the devices on which these services are running.

The Availability Map Widget uses different code, but has the same issue: services aren't filtered by device group.

Output of ./validate.php

===========================================
Component | Version
--------- | -------
LibreNMS  | 23.4.0 (2023-04-07T01:52:52+02:00)
DB Schema | 2023_03_14_130653_migrate_empty_user_funcs_to_null (249)
PHP       | 8.2.5
Python    | 3.9.14
Database  | MariaDB 10.5.16-MariaDB
RRDTool   | 1.7.2
SNMP      | 5.9.1
===========================================

[OK]    Composer Version: 2.5.4
[OK]    Dependencies up-to-date.
[OK]    Database connection successful
[OK]    Database Schema is current
[OK]    SQL Server meets minimum requirements
[OK]    lower_case_table_names is enabled
[OK]    MySQL engine is optimal
[OK]    Database and column collations are correct
[OK]    Database schema correct
[OK]    MySQl and PHP time match
[OK]    Distributed Polling setting is enabled globally
[OK]    Connected to rrdcached
[OK]    Active pollers found
[OK]    Dispatcher Service is enabled
[OK]    Locks are functional
[OK]    No python wrapper pollers found
[OK]    Redis is functional
[OK]    rrdtool version ok
[OK]    Connected to rrdcached

What was the last working version of LibreNMS?

No response

Anything in the logs that might be useful for us?

No response