Merge branch 'master' into feat-add-alert-template-api

Author: Yoyasp

.github/workflows/test.yml

@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - 8.2
           - 8.4
         arguments:
           - --os a
@@ -31,10 +30,6 @@ jobs:
           - --os t
           - --os u,v,w,x,y,z,0,1,2,3,4,5,6,7,8,9
         include:
-          -
-            name: PHP 8.2
-            php-version: 8.2
-            database: mysql:8.0
           -
             name: PHP 8.4
             php-version: 8.4
@@ -44,6 +39,11 @@ jobs:
             php-version: 8.4
             database: mariadb:11.7
             arguments: --full --exclude-phpunit-group=browser,mibs,external-dependencies,os
+          -
+            name: Other
+            php-version: 8.2
+            database: mysql:8.0
+            arguments: --full --exclude-phpunit-group=browser,mibs,external-dependencies,os
 
     services:
       database:

LibreNMS/Alert/AlertUtil.php

@@ -28,6 +28,7 @@
 
 use App\Facades\LibrenmsConfig;
 use App\Models\Device;
+use App\Models\DeviceGroup;
 use App\Models\User;
 use DeviceCache;
 use Illuminate\Database\Eloquent\Builder;
@@ -173,6 +174,8 @@ public static function findContactsOwners(array $results): array
         return User::whereNot('email', '')->where(function (Builder $query) use ($results): void {
             if ($device_ids = array_filter(Arr::pluck($results, 'device_id'))) {
                 $query->orWhereHas('devicesOwned', fn ($q) => $q->whereIn('devices_perms.device_id', $device_ids));
+                // Find all device groups that users have been granted access to where the device group also contains at least one device that we are looking for
+                $query->orWhereHas('deviceGroups', fn ($q) => $q->whereIn('device_groups.id', DeviceGroup::WhereHas('devices', fn ($dq) => $dq->whereIn('devices.device_id', $device_ids))->pluck('device_groups.id')));
             }
             if ($port_ids = array_filter(Arr::pluck($results, 'port_id'))) {
                 $query->orWhereHas('portsOwned', fn ($q) => $q->whereIn('ports_perms.port_id', $port_ids));

LibreNMS/Alert/RunAlerts.php

@@ -34,9 +34,12 @@
 use App\Facades\DeviceCache;
 use App\Facades\LibrenmsConfig;
 use App\Facades\Rrd;
+use App\Models\Alert;
 use App\Models\AlertTransport;
 use App\Models\ApplicationMetric;
 use App\Models\Eventlog;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use LibreNMS\Alerting\QueryBuilderParser;
 use LibreNMS\Enum\AlertState;
 use LibreNMS\Enum\MaintenanceStatus;
@@ -509,9 +512,18 @@ public function runAlerts()
                 $alert['details']['count'] = 0;
             }
 
-            $chk = dbFetchRow('SELECT alerts.alerted,devices.ignore,devices.disabled FROM alerts,devices WHERE alerts.device_id = ? && devices.device_id = alerts.device_id && alerts.rule_id = ?', [$alert['device_id'], $alert['rule_id']]);
+            $status_check = DB::table('devices')
+                ->where('device_id', $alert['device_id'])
+                ->first(['ignore', 'disabled']);
 
-            if ($chk['alerted'] == $alert['state']) {
+            if ($status_check === null) {
+                Log::warning("Alert #{$alert['id']} references non-existent device {$alert['device_id']}, cleaning up");
+                Alert::query()->where('id', $alert['id'])->delete();
+
+                continue;
+            }
+
+            if ($alert['alerted'] == $alert['state']) {
                 $noiss = true;
             }
 
@@ -561,7 +573,7 @@ public function runAlerts()
                     $noiss = false;
                 }
             }
-            if ($chk['ignore'] == 1 || $chk['disabled'] == 1) {
+            if ($status_check->ignore || $status_check->disabled) {
                 $noiss = true;
                 $updet = false;
                 $noacc = false;

LibreNMS/Alert/Transport/Alertmanager.php

@@ -23,6 +23,8 @@
 
 namespace LibreNMS\Alert\Transport;
 
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\Pool;
 use LibreNMS\Alert\Transport;
 use LibreNMS\Enum\AlertState;
 use LibreNMS\Exceptions\AlertTransportDeliveryException;
@@ -59,36 +61,59 @@ public function deliverAlert(array $alert_data): bool
         $alertmanager_opts = $this->parseUserOptions($this->config['alertmanager-options']);
         foreach ($alertmanager_opts as $label => $value) {
             if (str_starts_with((string) $label, 'stc_')) {
-                $data[0]['labels'][$label] = strip_tags((string) $value);
+                // Static label: strip the stc_ prefix and use the value as-is
+                $cleanLabel = substr((string) $label, 4);
+                $data[0]['labels'][$cleanLabel] = strip_tags((string) $value);
             } else {
-                $data[0]['labels'][$label] = strip_tags(
-                    (string) ($alert_data[$value] ?? current(array_filter(
-                        array_column($alert_data['faults'] ?? [], $value),
-                        fn ($v) => ! empty($v)
-                    )) ?? $value)
-                );
+                // Dynamic label: try to resolve value from alert data, faults, or fall back to literal
+                $resolved = $alert_data[$value] ?? current(array_filter(
+                    array_column($alert_data['faults'] ?? [], $value),
+                    fn ($v) => ! empty($v)
+                )) ?: $value;
+
+                $data[0]['labels'][$label] = strip_tags((string) $resolved);
+
                 if (str_starts_with((string) $label, 'dyn_') && $data[0]['labels'][$label] == $value) {
                     unset($data[0]['labels'][$label]);
                 }
             }
         }
 
-        $client = Http::client()->timeout(5);
+        $urls = array_values(array_filter(array_map(trim(...), explode(',', (string) $url))));
 
-        if ($username != '' && $password != '') {
-            $client->withBasicAuth($username, $password);
-        }
+        $client = Http::client()->timeout(2);
 
-        foreach (explode(',', (string) $url) as $am) {
-            $post_url = ($am . '/api/v2/alerts');
-            $res = $client->post($post_url, $data);
+        $responses = $client->pool(fn (Pool $pool) => array_map(function (string $baseUrl) use ($pool, $username, $password, $data) {
+            $req = $pool;
+            if ($username !== '' && $password !== '') {
+                $req = $req->withBasicAuth($username, $password);
+            }
 
-            if ($res->successful()) {
-                return true;
+            return $req->post(rtrim($baseUrl, '/') . '/api/v2/alerts', $data);
+        }, $urls));
+
+        foreach ($responses as $res) {
+            if ($res instanceof ConnectionException) {
+                throw new AlertTransportDeliveryException(
+                    $alert_data,
+                    0,
+                    $res->getMessage(),
+                    $alertmanager_msg,
+                    $data
+                );
+            }
+            if (! $res->successful()) {
+                throw new AlertTransportDeliveryException(
+                    $alert_data,
+                    $res->status(),
+                    $res->body(),
+                    $alertmanager_msg,
+                    $data
+                );
             }
         }
 
-        throw new AlertTransportDeliveryException($alert_data, $res->status(), $res->body(), $alertmanager_msg, $data);
+        return true;
     }
 
     public static function configTemplate(): array

LibreNMS/Alert/Transport/Mail.php

@@ -24,11 +24,14 @@
 
 namespace LibreNMS\Alert\Transport;
 
+use App\Facades\DeviceCache;
 use App\Facades\LibrenmsConfig;
+use App\Models\Eventlog;
 use Exception;
 use Illuminate\Support\Str;
 use LibreNMS\Alert\AlertUtil;
 use LibreNMS\Alert\Transport;
+use LibreNMS\Enum\Severity;
 use LibreNMS\Exceptions\AlertTransportDeliveryException;
 use Spatie\Permission\Models\Role;
 
@@ -43,6 +46,13 @@ public function deliverAlert(array $alert_data): bool
             default => $this->config['email'] ?? $alert_data['contacts'] ?? [], // contacts is only used by legacy synthetic transport
         };
 
+        if (is_array($emails) && count($emails) == 0) {
+            $device = DeviceCache::get($alert_data['device_id']);
+            Eventlog::log('No e-mail recipients found for transport ' . $alert_data['transport_name'], $device, 'alert', Severity::Notice);
+
+            return true;
+        }
+
         $html = LibrenmsConfig::get('email_html');
 
         if ($html && ! $this->isHtmlContent($alert_data['msg'])) {

LibreNMS/Alert/Transport/Pagerduty.php

@@ -49,7 +49,7 @@ public function deliverAlert(array $alert_data): bool
         } else {
             // Legacy behaviour: strip tags and split into non-empty lines
             $safe_message = strip_tags($msg_raw) ?: 'Test';
-            $message = array_filter(explode("\n", $safe_message), fn ($value): bool => strlen($value) > 0);
+            $message = array_filter(explode("\n", $safe_message), fn ($value): bool => strlen((string) $value) > 0);
             $custom_details = ['message' => $message];
         }
         $data = [

LibreNMS/Authentication/ActiveDirectoryAuthorizer.php

@@ -76,6 +76,11 @@ protected function userInGroup($username, $groupname)
             $search_filter,
             ['cn']
         );
+
+        if ($search === false) {
+            throw new AuthenticationException('LDAP search failed: ' . ldap_error($connection));
+        }
+
         $result = ldap_get_entries($connection, $search);
 
         if ($result == false || $result['count'] !== 1) {

LibreNMS/Billing.php

@@ -127,47 +127,26 @@ public static function getLastMeasurement($bill_id): array
 
     private static function get95thagg($bill_id, $datefrom, $dateto): float
     {
-        $mq_sql = 'SELECT count(delta) FROM bill_data WHERE bill_id = ?';
-        $mq_sql .= ' AND timestamp > ? AND timestamp <= ?';
-        $measurements = dbFetchCell($mq_sql, [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round($measurements / 100 * 95) - 1);
+        $sum_data = dbFetchRows('SELECT (SUM(delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
 
-        $q_95_sql = 'SELECT (delta / period * 8) AS rate FROM bill_data  WHERE bill_id = ?';
-        $q_95_sql .= ' AND timestamp > ? AND timestamp <= ? ORDER BY rate ASC';
-        $a_95th = dbFetchColumn($q_95_sql, [$bill_id, $datefrom, $dateto]);
-        $m_95th = $a_95th[$measurement_95th];
-
-        return round($m_95th, 2);
+        return round($sum_data[$measurement_95th]['rate'], 2);
     }
 
     private static function get95thIn($bill_id, $datefrom, $dateto): float
     {
-        $mq_sql = 'SELECT count(delta) FROM bill_data WHERE bill_id = ?';
-        $mq_sql .= ' AND timestamp > ? AND timestamp <= ?';
-        $measurements = dbFetchCell($mq_sql, [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round($measurements / 100 * 95) - 1);
-
-        $q_95_sql = 'SELECT (in_delta / period * 8) AS rate FROM bill_data  WHERE bill_id = ?';
-        $q_95_sql .= ' AND timestamp > ? AND timestamp <= ? ORDER BY rate ASC';
-        $a_95th = dbFetchColumn($q_95_sql, [$bill_id, $datefrom, $dateto]);
-        $m_95th = $a_95th[$measurement_95th] ?? 0;
+        $sum_data = dbFetchRows('SELECT (SUM(in_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(in_delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
 
-        return round($m_95th, 2);
+        return round($sum_data[$measurement_95th]['rate'], 2);
     }
 
     private static function get95thout($bill_id, $datefrom, $dateto): float
     {
-        $mq_sql = 'SELECT count(delta) FROM bill_data WHERE bill_id = ?';
-        $mq_sql .= ' AND timestamp > ? AND timestamp <= ?';
-        $measurements = dbFetchCell($mq_sql, [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round($measurements / 100 * 95) - 1);
-
-        $q_95_sql = 'SELECT (out_delta / period * 8) AS rate FROM bill_data  WHERE bill_id = ?';
-        $q_95_sql .= ' AND timestamp > ? AND timestamp <= ? ORDER BY rate ASC';
-        $a_95th = dbFetchColumn($q_95_sql, [$bill_id, $datefrom, $dateto]);
-        $m_95th = $a_95th[$measurement_95th] ?? 0;
+        $sum_data = dbFetchRows('SELECT (SUM(out_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(out_delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
 
-        return round($m_95th, 2);
+        return round($sum_data[$measurement_95th]['rate'], 2);
     }
 
     public static function getRates($bill_id, $datefrom, $dateto, $dir_95th): array

LibreNMS/ComposerHelper.php

@@ -134,7 +134,6 @@ private static function populateEnv()
         ];
 
         if (file_exists('config.php')) {
-            /** @phpstan-ignore include.fileNotFound */
             @include 'config.php';
         }
 

LibreNMS/DB/Eloquent.php

@@ -27,6 +27,7 @@
 namespace LibreNMS\DB;
 
 use Illuminate\Database\Connection;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use LibreNMS\Util\Laravel;
 use PDOException;
@@ -102,7 +103,7 @@ public static function getDriver(): ?string
      */
     public static function setConnection($name, $db_host = null, $db_user = '', $db_pass = '', $db_name = '', $db_port = null, $db_socket = null): void
     {
-        \Config::set("database.connections.$name", [
+        Config::set("database.connections.$name", [
             'driver' => 'mysql',
             'host' => $db_host,
             'port' => $db_port,
@@ -116,6 +117,6 @@ public static function setConnection($name, $db_host = null, $db_user = '', $db_
             'strict' => true,
             'engine' => null,
         ]);
-        \Config::set('database.default', $name);
+        Config::set('database.default', $name);
     }
 }