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

More Replacement Capabilities for sensor index computation (#14522)

Browse Source 
* More Replacement Cap.

style

* more compact

* fix mni.yaml

* too compact, revert

* quantastor

* str_replace was never matched
This commit is contained in:
PipoCanaja
2022-11-02 22:54:40 +01:00
committed by GitHub
parent 51fcd8f6a0
commit ce6eaadc2a
4 changed files with 718 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
includes/definitions/discovery/mni.yaml
View File

@@ -7,8 +7,8 @@ modules:
oid: mnPrPerfBaseTable
value: mnPrPerfBaseRFUTemp
num_oid: '.1.3.6.1.4.1.3323.13.1.4.1.1.20.{{ $index }}'
descr: 'RFU Temp'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
descr: 'RFU Temp {{ $index }}'
index: '{{ $index }}'
high_limit: '50'
low_limit: '-20'
state:
@@ -16,104 +16,104 @@ modules:
-
oid: mnPrLinkStatLinkUp
num_oid: '.1.3.6.1.4.1.3323.13.1.1.1.1.{{ $index }}'
descr: 'Link Up'
descr: 'Link Up {{ $index }}'
index: '0'
states:
- { value: 0, generic: 2, graph: 0, descr: Down }
- { value: 1, generic: 0, graph: 0, descr: Up }
-
oid: mnPrRadStatControlOn
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.5.{{ $index }}'
descr: 'Link Control'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
states:
- { value: 0, generic: 1, graph: 0, descr: Off }
- { value: 1, generic: 0, graph: 0, descr: On }
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.5.{{ $index }}'
descr: 'Link Control {{ $index }}'
index: 'StatControlOn{{ $index }}'
states:
- { value: 0, generic: 1, graph: 0, descr: Off }
- { value: 1, generic: 0, graph: 0, descr: On }
-
oid: mnPrRadStatCurSeverity
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.2.{{ $index }}'
descr: 'Current Alarm Severity'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.2.{{ $index }}'
descr: 'Current Alarm Severity {{ $index }}'
index: 'CurSeverity{{ $index }}'
states:
- { value: 1, generic: 0, graph: 0, descr: Cleared }
- { value: 1, generic: 0, graph: 0, descr: Cleared }
- { value: 2, generic: 3, graph: 0, descr: Indeterminate }
- { value: 3, generic: 2, graph: 0, descr: Critical }
- { value: 3, generic: 2, graph: 0, descr: Critical }
- { value: 4, generic: 2, graph: 0, descr: Major }
- { value: 5, generic: 1, graph: 0, descr: Minor }
- { value: 5, generic: 1, graph: 0, descr: Minor }
- { value: 6, generic: 1, graph: 0, descr: Warning }
-
oid: mnPrRadStatLatchSeverity
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.3.{{ $index }}'
descr: 'Current Latched Alarm Severity'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.3.{{ $index }}'
descr: 'Current Latched Alarm Severity {{ $index }}'
index: 'LatchSeverity{{ $index }}'
states:
- { value: 1, generic: 0, graph: 0, descr: Cleared }
- { value: 1, generic: 0, graph: 0, descr: Cleared }
- { value: 2, generic: 3, graph: 0, descr: Indeterminate }
- { value: 3, generic: 2, graph: 0, descr: Critical }
- { value: 3, generic: 2, graph: 0, descr: Critical }
- { value: 4, generic: 2, graph: 0, descr: Major }
- { value: 5, generic: 1, graph: 0, descr: Minor }
- { value: 5, generic: 1, graph: 0, descr: Minor }
- { value: 6, generic: 1, graph: 0, descr: Warning }
-
oid: mnPrRadStatProtManualMode
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.26.{{ $index }}'
descr: 'Manual Protection Mode'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
states:
- { value: 2, generic: 0, graph: 0, descr: Off }
- { value: 1, generic: 1, graph: 0, descr: On }
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.26.{{ $index }}'
descr: 'Manual Protection Mode{{ $index }} '
index: 'ManualMode{{ $index }}'
states:
- { value: 2, generic: 0, graph: 0, descr: Off }
- { value: 1, generic: 1, graph: 0, descr: On }
-
oid: mnPrRadStatModulation
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.36.{{ $index }}'
descr: 'Current Modulation'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.36.{{ $index }}'
descr: 'Current Modulation {{ $index }}'
index: 'Modulation{{ $index }}'
states:
- { value: 2, generic: 1, graph: 0, descr: QPSK }
- { value: 3, generic: 0, graph: 0, descr: 8PSK }
- { value: 4, generic: 0, graph: 0, descr: 16QAM }
- { value: 5, generic: 0, graph: 0, descr: 32QAM }
- { value: 6, generic: 0, graph: 0, descr: 64QAM }
- { value: 2, generic: 1, graph: 0, descr: QPSK }
- { value: 3, generic: 0, graph: 0, descr: 8PSK }
- { value: 4, generic: 0, graph: 0, descr: 16QAM }
- { value: 5, generic: 0, graph: 0, descr: 32QAM }
- { value: 6, generic: 0, graph: 0, descr: 64QAM }
- { value: 7, generic: 0, graph: 0, descr: 128QAM }
- { value: 8, generic: 0, graph: 0, descr: 256QAM }
- { value: 18, generic: 1, graph: 0, descr: QPSK12 }
- { value: 20, generic: 0, graph: 0, descr: 16TCM34 }
- { value: 22, generic: 0, graph: 0, descr: 64TCM56 }
- { value: 23, generic: 0, graph: 0, descr: 128TCM67 }
- { value: 8, generic: 0, graph: 0, descr: 256QAM }
- { value: 18, generic: 1, graph: 0, descr: QPSK12 }
- { value: 20, generic: 0, graph: 0, descr: 16TCM34 }
- { value: 22, generic: 0, graph: 0, descr: 64TCM56 }
- { value: 23, generic: 0, graph: 0, descr: 128TCM67 }
- { value: 24, generic: 0, graph: 0, descr: 256TCM78 }
- { value: 34, generic: 1, graph: 0, descr: QPSK34 }
- { value: 36, generic: 0, graph: 0, descr: 16TCM78 }
- { value: 37, generic: 0, graph: 0, descr: 32TCM910 }
- { value: 34, generic: 1, graph: 0, descr: QPSK34 }
- { value: 36, generic: 0, graph: 0, descr: 16TCM78 }
- { value: 37, generic: 0, graph: 0, descr: 32TCM910 }
- { value: 38, generic: 0, graph: 0, descr: 64TCM1112 }
- { value: 39, generic: 0, graph: 0, descr: 128TCM1314 }
- { value: 39, generic: 0, graph: 0, descr: 128TCM1314 }
- { value: 99, generic: 3, graph: 0, descr: Other }
frequency:
data:
-
oid: mnPrRadStatODUFreqBand
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.17.{{ $index }}'
descr: 'ODU Frequency Band'
multiplier: 1000000000
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
num_oid: '.1.3.6.1.4.1.3323.13.1.1.2.1.17.{{ $index }}'
descr: 'ODU Frequency Band {{ $index }}'
multiplier: 1000000000
index: 'StatODUFreqBand{{ $index }}'
signal:
data:
data:
-
oid: mnPrPerfBaseFadeMargin
num_oid: '.1.3.6.1.4.1.3323.13.1.4.1.1.4.{{ $index }}'
descr: 'Fade Margin'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
oid: mnPrPerfBaseFadeMargin
num_oid: '.1.3.6.1.4.1.3323.13.1.4.1.1.4.{{ $index }}'
descr: 'Fade Margin {{ $index }}'
index: 'FadeMargin{{ $index }}'
low_limit: '6'
low_warn: '12'
high_limit: '50'
bps:
bps:
data:
-
oid: mnPrPerfBaseLinkCapMbps
num_oid: '.1.3.6.1.4.1.3323.13.1.4.1.1.17.{{ $index }}'
descr: 'Rx Capacity'
index: '{{ $mnPrLinkStatLocalRadioIndex }}'
oid: mnPrPerfBaseLinkCapMbps
num_oid: '.1.3.6.1.4.1.3323.13.1.4.1.1.17.{{ $index }}'
descr: 'Rx Capacity {{ $index }}'
index: 'BaseLinkCap{{ $index }}'
multiplier: 1000000

10
includes/discovery/functions.inc.php
View File

@@ -968,7 +968,15 @@ function discovery_process(&$valid, $os, $sensor_class, $pre_cache)
$value = $user_function($value);
}
$uindex = str_replace('{{ $index }}', $index, isset($data['index']) ? $data['index'] : $index);
$uindex = $index;
if (isset($data['index'])) {
if (Str::contains($data['index'], '{{')) {
$uindex = trim(YamlDiscovery::replaceValues('index', $index, null, $data, $pre_cache));
} else {
$uindex = $data['index'];
}
}
discover_sensor($valid['sensor'], $sensor_class, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group, $data['rrd_type']);
if ($sensor_class === 'state') {

1134
tests/data/mni_mx-d.json
View File

File diff suppressed because it is too large Load Diff

50
tests/data/quantastor.json
View File

@@ -3195,7 +3195,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.0",
"sensor_index": "{{ $hwDisk-Index }}.0",
"sensor_index": "0.0",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:01)",
"group": "HDD",
@@ -3220,7 +3220,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.1",
"sensor_index": "{{ $hwDisk-Index }}.1",
"sensor_index": "0.1",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:02)",
"group": "HDD",
@@ -3245,7 +3245,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.10",
"sensor_index": "{{ $hwDisk-Index }}.10",
"sensor_index": "0.10",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:11)",
"group": "HDD",
@@ -3270,7 +3270,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.11",
"sensor_index": "{{ $hwDisk-Index }}.11",
"sensor_index": "0.11",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:12)",
"group": "HDD",
@@ -3295,7 +3295,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.12",
"sensor_index": "{{ $hwDisk-Index }}.12",
"sensor_index": "0.12",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:13)",
"group": "HDD",
@@ -3320,7 +3320,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.13",
"sensor_index": "{{ $hwDisk-Index }}.13",
"sensor_index": "0.13",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:14)",
"group": "HDD",
@@ -3345,7 +3345,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.14",
"sensor_index": "{{ $hwDisk-Index }}.14",
"sensor_index": "0.14",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:15)",
"group": "HDD",
@@ -3370,7 +3370,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.15",
"sensor_index": "{{ $hwDisk-Index }}.15",
"sensor_index": "0.15",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:16)",
"group": "HDD",
@@ -3395,7 +3395,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.16",
"sensor_index": "{{ $hwDisk-Index }}.16",
"sensor_index": "0.16",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:17)",
"group": "HDD",
@@ -3420,7 +3420,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.17",
"sensor_index": "{{ $hwDisk-Index }}.17",
"sensor_index": "0.17",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:18)",
"group": "HDD",
@@ -3445,7 +3445,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.18",
"sensor_index": "{{ $hwDisk-Index }}.18",
"sensor_index": "0.18",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:19)",
"group": "HDD",
@@ -3470,7 +3470,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.19",
"sensor_index": "{{ $hwDisk-Index }}.19",
"sensor_index": "0.19",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:20)",
"group": "HDD",
@@ -3495,7 +3495,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.2",
"sensor_index": "{{ $hwDisk-Index }}.2",
"sensor_index": "0.2",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:03)",
"group": "HDD",
@@ -3520,7 +3520,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.20",
"sensor_index": "{{ $hwDisk-Index }}.20",
"sensor_index": "0.20",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:21)",
"group": "HDD",
@@ -3545,7 +3545,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.21",
"sensor_index": "{{ $hwDisk-Index }}.21",
"sensor_index": "0.21",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:22)",
"group": "HDD",
@@ -3570,7 +3570,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.22",
"sensor_index": "{{ $hwDisk-Index }}.22",
"sensor_index": "0.22",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:23)",
"group": "HDD",
@@ -3595,7 +3595,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.23",
"sensor_index": "{{ $hwDisk-Index }}.23",
"sensor_index": "0.23",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:24)",
"group": "HDD",
@@ -3620,7 +3620,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.24",
"sensor_index": "{{ $hwDisk-Index }}.24",
"sensor_index": "0.24",
"sensor_type": "quantastor",
"sensor_descr": "Disk (2I:1:25)",
"group": "HDD",
@@ -3645,7 +3645,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.3",
"sensor_index": "{{ $hwDisk-Index }}.3",
"sensor_index": "0.3",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:04)",
"group": "HDD",
@@ -3670,7 +3670,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.4",
"sensor_index": "{{ $hwDisk-Index }}.4",
"sensor_index": "0.4",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:05)",
"group": "HDD",
@@ -3695,7 +3695,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.5",
"sensor_index": "{{ $hwDisk-Index }}.5",
"sensor_index": "0.5",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:06)",
"group": "HDD",
@@ -3720,7 +3720,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.6",
"sensor_index": "{{ $hwDisk-Index }}.6",
"sensor_index": "0.6",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:07)",
"group": "HDD",
@@ -3745,7 +3745,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.7",
"sensor_index": "{{ $hwDisk-Index }}.7",
"sensor_index": "0.7",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:08)",
"group": "HDD",
@@ -3770,7 +3770,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.8",
"sensor_index": "{{ $hwDisk-Index }}.8",
"sensor_index": "0.8",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:09)",
"group": "HDD",
@@ -3795,7 +3795,7 @@
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.39324.1.1.48.1.1.30.9",
"sensor_index": "{{ $hwDisk-Index }}.9",
"sensor_index": "0.9",
"sensor_type": "quantastor",
"sensor_descr": "Disk (1I:1:10)",
"group": "HDD",