Update sensors and tests for fiberhome OS (#8549)

* Moved temperature sensor to yaml

* Enabled sensors , it's working now

* Enable mempools and disable unused wireless discovery.

* Tests for fiberhome OS, variants can be merged on future
This commit is contained in:
Alan Gregory
2018-04-12 00:29:51 -03:00
committed by Tony Murray
parent d841625f12
commit 5d708e53b4
5 changed files with 271 additions and 9 deletions

View File

@@ -13,3 +13,14 @@ modules:
oid: mgrCardWorkStatus
op: '!='
value: 1
sensors:
temperature:
data:
-
oid: sysTemperature
num_oid: .1.3.6.1.4.1.5875.800.3.9.4.5.
descr: 'Internal Temperature {{ $index }}'
low_limit: 0
high_limit: 100
low_warn_limit: 15
warn_limit: 55

View File

@@ -11,7 +11,7 @@ discovery_modules:
entity-physical: 0
ports: 0
ports-stack: 0
mempools: 0
wireless: 0
discovery-protocols: 0
storage: 0
ucd-diskio: 0
@@ -25,7 +25,6 @@ poller_modules:
ntp: 0
ospf: 0
ports: 0
sensors: 0
services: 0
storage: 0
stp: 0

View File

@@ -1,7 +0,0 @@
<?php
$temperature = snmp_get($device, 'sysTemperature.0', '-Oqv', 'GEPON-OLT-COMMON-MIB');
if (is_numeric($temperature)) {
$oid = '.1.3.6.1.4.1.5875.800.3.9.4.5.0';
discover_sensor($valid['sensor'], 'temperature', $device, $oid, '0', 'fiberhome', 'Internal Temperature', '1', '1', '20', null, null, '50', $temperature);
}

174
tests/data/fiberhome.json Normal file
View File

@@ -0,0 +1,174 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.5875.800.1001.11",
"sysDescr": "AN5516-01",
"sysContact": null,
"version": null,
"hardware": "",
"features": null,
"location": null,
"os": "fiberhome",
"type": "network",
"serial": null,
"icon": "fiberhome.png"
}
]
},
"poller": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.5875.800.1001.11",
"sysDescr": "AN5516-01",
"sysContact": "<private>",
"version": "WKE2.115.331R1A - RP0700",
"hardware": "Fiberhome AN5516-01",
"features": "Olt AN5516-01",
"location": "<private>",
"os": "fiberhome",
"type": "network",
"serial": null,
"icon": "fiberhome.png"
}
]
}
},
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": "0",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.5875.800.3.9.8.1.1.5.9",
"processor_index": "9",
"processor_type": "fiberhome",
"processor_usage": "5",
"processor_descr": "Hswa 9 Processor",
"processor_precision": "100",
"processor_perc_warn": "75"
},
{
"entPhysicalIndex": "0",
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.5875.800.3.9.8.1.1.5.10",
"processor_index": "10",
"processor_type": "fiberhome",
"processor_usage": "1",
"processor_descr": "Hswa 10 Processor",
"processor_precision": "100",
"processor_perc_warn": "75"
}
]
},
"poller": "matches discovery"
},
"mempools": {
"discovery": {
"mempools": [
{
"mempool_index": "9",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "fiberhome",
"mempool_precision": "100",
"mempool_descr": "Hswa 9 Memory",
"mempool_perc": "0",
"mempool_used": "0",
"mempool_free": "0",
"mempool_total": "0",
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": "0",
"mempool_perc_warn": "75"
},
{
"mempool_index": "10",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "fiberhome",
"mempool_precision": "100",
"mempool_descr": "Hswa 10 Memory",
"mempool_perc": "0",
"mempool_used": "0",
"mempool_free": "0",
"mempool_total": "0",
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": "0",
"mempool_perc_warn": "75"
}
]
},
"poller": {
"mempools": [
{
"mempool_index": "9",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "fiberhome",
"mempool_precision": "100",
"mempool_descr": "Hswa 9 Memory",
"mempool_perc": "59",
"mempool_used": "158376919",
"mempool_free": "110058537",
"mempool_total": "268435456",
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": "0",
"mempool_perc_warn": "75"
},
{
"mempool_index": "10",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "fiberhome",
"mempool_precision": "100",
"mempool_descr": "Hswa 10 Memory",
"mempool_perc": "59",
"mempool_used": "158376919",
"mempool_free": "110058537",
"mempool_total": "268435456",
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": "0",
"mempool_perc_warn": "75"
}
]
}
},
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": "0",
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.5875.800.3.9.4.5.0",
"sensor_index": "0",
"sensor_type": "fiberhome",
"sensor_descr": "Internal Temperature 0",
"sensor_divisor": "1",
"sensor_multiplier": "1",
"sensor_current": "45",
"sensor_limit": "100",
"sensor_limit_warn": "55",
"sensor_limit_low": "0",
"sensor_limit_low_warn": "15",
"sensor_alert": "1",
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
}
],
"state_indexes": []
},
"poller": "matches discovery"
}
}

View File

@@ -0,0 +1,85 @@
1.3.6.1.2.1.1.1.0|4|AN5516-01
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.5875.800.1001.11
1.3.6.1.2.1.1.3.0|67|72420617
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.2.1.4.3.0|65|2166093
1.3.6.1.2.1.4.4.0|65|0
1.3.6.1.2.1.4.5.0|65|0
1.3.6.1.2.1.4.6.0|65|0
1.3.6.1.2.1.4.7.0|65|29266
1.3.6.1.2.1.4.8.0|65|0
1.3.6.1.2.1.4.9.0|65|2136823
1.3.6.1.2.1.4.10.0|65|2158741
1.3.6.1.2.1.4.11.0|65|0
1.3.6.1.2.1.4.12.0|65|0
1.3.6.1.2.1.4.14.0|65|6
1.3.6.1.2.1.4.15.0|65|3
1.3.6.1.2.1.4.16.0|65|0
1.3.6.1.2.1.4.17.0|65|13
1.3.6.1.2.1.4.18.0|65|0
1.3.6.1.2.1.4.19.0|65|19
1.3.6.1.2.1.4.20.1.2.10.25.100.17|2|32
1.3.6.1.2.1.4.20.1.2.10.25.100.253|2|34
1.3.6.1.2.1.4.20.1.2.127.0.0.1|2|30
1.3.6.1.2.1.4.20.1.2.192.168.79.162|2|33
1.3.6.1.2.1.4.20.1.3.10.25.100.17|64|255.255.255.224
1.3.6.1.2.1.4.20.1.3.10.25.100.253|64|255.255.255.224
1.3.6.1.2.1.4.20.1.3.127.0.0.1|64|255.0.0.0
1.3.6.1.2.1.4.20.1.3.192.168.79.162|64|255.255.255.252
1.3.6.1.2.1.5.1.0|65|67293
1.3.6.1.2.1.5.2.0|65|0
1.3.6.1.2.1.5.3.0|65|29266
1.3.6.1.2.1.5.4.0|65|0
1.3.6.1.2.1.5.5.0|65|0
1.3.6.1.2.1.5.6.0|65|0
1.3.6.1.2.1.5.7.0|65|0
1.3.6.1.2.1.5.8.0|65|38027
1.3.6.1.2.1.5.9.0|65|0
1.3.6.1.2.1.5.10.0|65|0
1.3.6.1.2.1.5.11.0|65|0
1.3.6.1.2.1.5.12.0|65|0
1.3.6.1.2.1.5.13.0|65|0
1.3.6.1.2.1.5.14.0|65|38034
1.3.6.1.2.1.5.15.0|65|7
1.3.6.1.2.1.5.16.0|65|7
1.3.6.1.2.1.5.17.0|65|0
1.3.6.1.2.1.5.18.0|65|0
1.3.6.1.2.1.5.19.0|65|0
1.3.6.1.2.1.5.20.0|65|0
1.3.6.1.2.1.5.21.0|65|0
1.3.6.1.2.1.5.22.0|65|38027
1.3.6.1.2.1.5.23.0|65|0
1.3.6.1.2.1.5.24.0|65|0
1.3.6.1.2.1.5.25.0|65|0
1.3.6.1.2.1.5.26.0|65|0
1.3.6.1.2.1.6.5.0|65|19
1.3.6.1.2.1.6.6.0|65|10
1.3.6.1.2.1.6.7.0|65|0
1.3.6.1.2.1.6.8.0|65|9
1.3.6.1.2.1.6.9.0|66|4
1.3.6.1.2.1.6.10.0|65|1959145
1.3.6.1.2.1.6.11.0|65|1974463
1.3.6.1.2.1.6.12.0|65|0
1.3.6.1.2.1.6.14.0|65|0
1.3.6.1.2.1.6.15.0|65|23
1.3.6.1.2.1.7.1.0|65|139678
1.3.6.1.2.1.7.2.0|65|7
1.3.6.1.2.1.7.3.0|65|0
1.3.6.1.2.1.7.4.0|65|146247
1.3.6.1.4.1.5875.800.3.9.4.3.0|4|RP0700
1.3.6.1.4.1.5875.800.3.9.4.4.0|4|WKE2.115.331R1A
1.3.6.1.4.1.5875.800.3.9.4.5.0|2|45
1.3.6.1.4.1.5875.800.3.9.8.1.1.1.9|2|355
1.3.6.1.4.1.5875.800.3.9.8.1.1.1.10|2|355
1.3.6.1.4.1.5875.800.3.9.8.1.1.2.9|4|WKE2.115.331R1A
1.3.6.1.4.1.5875.800.3.9.8.1.1.2.10|4|WKE2.115.334R1A
1.3.6.1.4.1.5875.800.3.9.8.1.1.3.9|4|RP0700
1.3.6.1.4.1.5875.800.3.9.8.1.1.3.10|4|RP0700
1.3.6.1.4.1.5875.800.3.9.8.1.1.4.9|2|1
1.3.6.1.4.1.5875.800.3.9.8.1.1.4.10|2|1
1.3.6.1.4.1.5875.800.3.9.8.1.1.5.9|2|458
1.3.6.1.4.1.5875.800.3.9.8.1.1.5.10|2|104
1.3.6.1.4.1.5875.800.3.9.8.1.1.6.9|2|5945
1.3.6.1.4.1.5875.800.3.9.8.1.1.6.10|2|5907