From e046ccde2d4e6fd181c6622fd1d348def1413aab Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 11 Oct 2019 04:10:50 +0000 Subject: [PATCH] Rename RutOS 2xx pinState state sensor to avoid conflict (#10675) with rutos PinState state sensor --- includes/definitions/discovery/rutos-2xx.yaml | 20 +++++++++---------- misc/notifications.rss | 11 +++++++--- tests/data/rutos-2xx.json | 12 +++++------ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/includes/definitions/discovery/rutos-2xx.yaml b/includes/definitions/discovery/rutos-2xx.yaml index 1adaae26a8..3042910c9a 100644 --- a/includes/definitions/discovery/rutos-2xx.yaml +++ b/includes/definitions/discovery/rutos-2xx.yaml @@ -7,7 +7,7 @@ modules: - Operator temperature: data: - - + - oid: Temperature num_oid: ".1.3.6.1.4.1.48690.2.9.{{ $index }}" descr: Module Temp @@ -16,7 +16,7 @@ modules: divisor: 10 state: data: - - + - oid: SimState num_oid: ".1.3.6.1.4.1.48690.2.1.{{ $index }}" descr: SIM State @@ -26,18 +26,18 @@ modules: - { descr: inserted, graph: 1, value: 0, generic: 0 } - { descr: not inserted, graph: 1, value: 1, generic: 2 } - { descr: unknown, graph: 1, value: 2, generic: 3 } - - + - oid: PinState num_oid: ".1.3.6.1.4.1.48690.2.2.{{ $index }}" descr: Pin State group: Mobile - state_name: pinState + state_name: rutos2xx_pinState states: - { descr: PIN REQUIRED, graph: 1, value: 0, generic: 2 } - { descr: NOT READY, graph: 1, value: 1, generic: 1 } - { descr: READY, graph: 1, value: 2, generic: 0 } - { descr: unknown, graph: 1, value: 3, generic: 3 } - - + - oid: NetState num_oid: ".1.3.6.1.4.1.48690.2.3.{{ $index }}" descr: Mobile Net State @@ -49,7 +49,7 @@ modules: - { descr: registered (roaming), graph: 1, value: 2, generic: 1 } - { descr: unknown, graph: 1, value: 3, generic: 3 } - { descr: unregistered, graph: 1, value: 4, generic: 2 } - - + - oid: ConnectionState num_oid: ".1.3.6.1.4.1.48690.2.7.{{ $index }}" descr: "Connection State ({{ $Operator }})" @@ -60,7 +60,7 @@ modules: - { descr: connected, graph: 1, value: 0, generic: 0 } - { descr: not connected, graph: 1, value: 1, generic: 2 } - { descr: disconnected, graph: 1, value: 2, generic: 2 } - - + - oid: ConnectionType num_oid: ".1.3.6.1.4.1.48690.2.8.{{ $index }}" descr: "Connection Type ({{ $Operator }})" @@ -76,7 +76,7 @@ modules: - { descr: unknown, graph: 1, value: 5, generic: 3 } signal: data: - - + - oid: Signal num_oid: ".1.3.6.1.4.1.48690.2.4.{{ $index }}" entPhysicalIndex: "{{ $index }}" @@ -86,7 +86,7 @@ modules: index: "Signal.{{ $index }}" count: data: - - + - oid: SimSlot num_oid: ".1.3.6.1.4.1.48690.2.15.{{ $index }}" descr: "Number of SIM Slots" @@ -94,7 +94,7 @@ modules: index: "simSlot.{{ $index }}" runtime: data: - - + - oid: ConnectionUptime num_oid: ".1.3.6.1.4.1.48690.2.17.{{ $index }}" descr: "Connection Uptime " diff --git a/misc/notifications.rss b/misc/notifications.rss index 2e4b05ad56..fe8a6a579a 100644 --- a/misc/notifications.rss +++ b/misc/notifications.rss @@ -19,14 +19,14 @@ Billing Data Changes - We have updated the method for storing billing data, removing a lot of information stored in - the database which was not used. Please check that your billing data is updating as expected, and + We have updated the method for storing billing data, removing a lot of information stored in + the database which was not used. Please check that your billing data is updating as expected, and if you notice any problems open an issue on GitHub. Mon, 07 Mar 2016 12:00:00 +0000 Introduction of default purge interval or alert history - We have introduced a purge setting for alert history which is set to 365 days as default. If you would like to update this then please + We have introduced a purge setting for alert history which is set to 365 days as default. If you would like to update this then please set $config['alert_log_purge'] to a custom value (set in days). Mon, 02 May 2016 20:00:00 +0000 @@ -63,5 +63,10 @@ Version two of the LibreNMS python dispatcher service is merged. This code now requires Redis 5.x and redis-py 3.x to operate (if using distributed polling). If you are using the dispatcher service with Redis and have not updated, polling will stop functioning. Mon, 20 May 2019 00:00:00 +0000 + + RutOS 2xx pinState renamed + RutOS 2xx pinState renamed to rutos2xx_pinState. Update any alert rules you may have. + Thu, 10 Oct 2019 00:00:00 +0000 + diff --git a/tests/data/rutos-2xx.json b/tests/data/rutos-2xx.json index b9c623873b..ae44a58bbc 100644 --- a/tests/data/rutos-2xx.json +++ b/tests/data/rutos-2xx.json @@ -3054,7 +3054,7 @@ "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.48690.2.2.0", "sensor_index": "0", - "sensor_type": "pinState", + "sensor_type": "rutos2xx_pinState", "sensor_descr": "Pin State", "group": "Mobile", "sensor_divisor": 1, @@ -3070,7 +3070,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "pinState" + "state_name": "rutos2xx_pinState" }, { "sensor_deleted": 0, @@ -3221,28 +3221,28 @@ "state_generic_value": 2 }, { - "state_name": "pinState", + "state_name": "rutos2xx_pinState", "state_descr": "PIN REQUIRED", "state_draw_graph": 1, "state_value": 0, "state_generic_value": 2 }, { - "state_name": "pinState", + "state_name": "rutos2xx_pinState", "state_descr": "NOT READY", "state_draw_graph": 1, "state_value": 1, "state_generic_value": 1 }, { - "state_name": "pinState", + "state_name": "rutos2xx_pinState", "state_descr": "READY", "state_draw_graph": 1, "state_value": 2, "state_generic_value": 0 }, { - "state_name": "pinState", + "state_name": "rutos2xx_pinState", "state_descr": "unknown", "state_draw_graph": 1, "state_value": 3,