mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-fix bug in Graphite (#15394)

Browse Source 
preg_replace can handle arrays of subjects :D
This commit is contained in:
Tony Murray
2023-10-05 17:11:33 -05:00
committed by GitHub
parent affb68e2bc
commit 366be4cd49
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
LibreNMS/Data/Store/Graphite.php
View File

@@ -104,13 +104,8 @@ class Graphite extends BaseDatastore
$measurement = preg_replace(['/\./', '/\//'], '_', $measurement);
$measurement = preg_replace('/\|/', '.', $measurement);
$ms_name = $tags['rrd_name'] ?? '';
if (is_array($ms_name)) {
$ms_name = implode('.', $ms_name);
} else {
$ms_name = preg_replace('/\./', '_', $ms_name);
}
$measurement_name = preg_replace('/\./', '_', $tags['rrd_name'] ?? '');
$ms_name = is_array($measurement_name) ? implode('.', $measurement_name) : $measurement_name;
// remove the port-id tags from the metric
if (preg_match('/^port-id\d+/', $ms_name)) {
$ms_name = '';