Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Typo in routeros YAML discovery #9903

Merged
merged 3 commits into from
Mar 27, 2019
Merged

Typo in routeros YAML discovery #9903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5a6fb2
typo in yaml
PipoCanaja Mar 5, 2019
e054de1
Notification
PipoCanaja Mar 19, 2019
f14eb71
Update notifications.rss
PipoCanaja Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/definitions/discovery/routeros.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ modules:
oid: mtxrWl60GConnected
num_oid: '.1.3.6.1.4.1.14988.1.1.1.8.1.4.{{ $index }}'
descr: Station Connected
index: 'mtxrWl60GConnected.{{ $index ]]'
index: 'mtxrWl60GConnected.{{ $index }}'
state_name: mtxrWl60GConnected
states:
- { value: 0, generic: 2, graph: 1, descr: 'disconnected' }
Expand Down
64 changes: 32 additions & 32 deletions tests/data/routeros.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"version": null,
"hardware": null,
"features": null,
"location": null,
"os": "routeros",
"type": "network",
"serial": null,
"icon": "mikrotik.svg"
"icon": "mikrotik.svg",
"location": null
}
]
},
Expand All @@ -28,11 +28,11 @@
"version": "6.40.5",
"hardware": null,
"features": "Level 1",
"location": "<private>",
"os": "routeros",
"type": "network",
"serial": "71B1060EE89D",
"icon": "mikrotik.svg"
"icon": "mikrotik.svg",
"location": "<private>"
}
]
}
Expand Down Expand Up @@ -2461,11 +2461,11 @@
"sensor_index": "mtxrOpticalTxBiasCurrent.25",
"sensor_type": "routeros",
"sensor_descr": "sfp1 Tx",
"group": null,
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 0.007,
"sensor_limit": 0.0105,
"sensor_current": 0.0070000000000000001,
"sensor_limit": 0.010500000000000001,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
Expand All @@ -2485,7 +2485,7 @@
"sensor_index": "mtxrPOECurrent.7",
"sensor_type": "routeros",
"sensor_descr": "ether5 POE",
"group": null,
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 0,
Expand All @@ -2509,13 +2509,13 @@
"sensor_index": "mtxrOpticalRxPower.25",
"sensor_type": "routeros",
"sensor_descr": "sfp1 Rx",
"group": null,
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": -5.673,
"sensor_limit": -5.38935,
"sensor_limit": -5.3893500000000003,
"sensor_limit_warn": null,
"sensor_limit_low": -5.95665,
"sensor_limit_low": -5.9566499999999998,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
Expand All @@ -2533,13 +2533,13 @@
"sensor_index": "mtxrOpticalTxPower.25",
"sensor_type": "routeros",
"sensor_descr": "sfp1 Tx",
"group": null,
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": -4.879,
"sensor_limit": -4.63505,
"sensor_current": -4.8789999999999996,
"sensor_limit": -4.6350499999999997,
"sensor_limit_warn": null,
"sensor_limit_low": -5.12295,
"sensor_limit_low": -5.1229500000000003,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
Expand All @@ -2557,7 +2557,7 @@
"sensor_index": "mtxrPOEPower.7",
"sensor_type": "routeros",
"sensor_descr": "ether5 POE",
"group": null,
"group": "",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 0,
Expand All @@ -2581,7 +2581,7 @@
"sensor_index": "mtxrOpticalRxLoss.25",
"sensor_type": "mtxrOpticalRxLoss",
"sensor_descr": "sfp1 Rx",
"group": null,
"group": "",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
Expand All @@ -2605,7 +2605,7 @@
"sensor_index": "mtxrOpticalTxFault.25",
"sensor_type": "mtxrOpticalTxFault",
"sensor_descr": "sfp1 Tx",
"group": null,
"group": "",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 0,
Expand All @@ -2626,10 +2626,10 @@
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.8.1.4.1",
"sensor_index": "mtxrWl60GConnected.{{ $index ]]",
"sensor_index": "mtxrWl60GConnected.1",
"sensor_type": "mtxrWl60GConnected",
"sensor_descr": "Station Connected",
"group": null,
"group": "",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
Expand All @@ -2653,7 +2653,7 @@
"sensor_index": "mtxrWl60GMode.1",
"sensor_type": "mtxrWl60GMode",
"sensor_descr": "Mode",
"group": null,
"group": "",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
Expand All @@ -2677,7 +2677,7 @@
"sensor_index": "0",
"sensor_type": "routeros",
"sensor_descr": "Temperature 0",
"group": null,
"group": "",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 33,
Expand All @@ -2701,7 +2701,7 @@
"sensor_index": "mtxrOpticalTemperature.25",
"sensor_type": "routeros",
"sensor_descr": "sfp1",
"group": null,
"group": "",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 40,
Expand All @@ -2725,11 +2725,11 @@
"sensor_index": "0",
"sensor_type": "routeros",
"sensor_descr": "Voltage 0",
"group": null,
"group": "",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 15.4,
"sensor_limit": 17.71,
"sensor_limit": 17.710000000000001,
"sensor_limit_warn": null,
"sensor_limit_low": 13.09,
"sensor_limit_low_warn": null,
Expand All @@ -2749,13 +2749,13 @@
"sensor_index": "mtxrOpticalSupplyVoltage.25",
"sensor_type": "routeros",
"sensor_descr": "sfp1",
"group": null,
"group": "",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 3.302,
"sensor_limit": 3.7973,
"sensor_limit": 3.7972999999999999,
"sensor_limit_warn": null,
"sensor_limit_low": 2.8067,
"sensor_limit_low": 2.8067000000000002,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
Expand All @@ -2773,7 +2773,7 @@
"sensor_index": "mtxrPOEVoltage.7",
"sensor_type": "routeros",
"sensor_descr": "ether5 POE",
"group": null,
"group": "",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 0,
Expand Down Expand Up @@ -3389,7 +3389,7 @@
"sensor_divisor": 100000,
"sensor_multiplier": 0,
"sensor_aggregator": "sum",
"sensor_current": 0.0231,
"sensor_current": 0.023099999999999999,
"sensor_prev": null,
"sensor_limit": null,
"sensor_limit_warn": null,
Expand Down Expand Up @@ -3876,8 +3876,8 @@
"sensor_divisor": 100000,
"sensor_multiplier": 0,
"sensor_aggregator": "sum",
"sensor_current": 0.0231,
"sensor_prev": 0.0231,
"sensor_current": 0.023099999999999999,
"sensor_prev": 0.023099999999999999,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
Expand Down