From 3a602fcb4571c3902c4f190ee66e4aa31554a750 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 17 Jan 2025 20:37:27 +0100
Subject: [PATCH] removed unused ruleset definition and default parameters
---
README.md | 2 +-
mkp/juniper_led-0.0.3-20250117.mkp | Bin 0 -> 2127 bytes
source/agent_based/juniper_led.py | 27 ++++++++++++++-------------
source/packages/juniper_led | 4 ++--
4 files changed, 17 insertions(+), 16 deletions(-)
create mode 100644 mkp/juniper_led-0.0.3-20250117.mkp
diff --git a/README.md b/README.md
index 5e52450..ab6ec8b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/juniper_led-0.0.2-20230603.mkp "juniper_led-0.0.2-20230603.mkp"
+[PACKAGE]: ../../raw/master/mkp/juniper_led-0.0.3-20250117.mkp "juniper_led-0.0.3-20250117.mkp"
# Juniper LED state
Monitors the state of the Juniper LEDs using the JUNIPER-MIB.
diff --git a/mkp/juniper_led-0.0.3-20250117.mkp b/mkp/juniper_led-0.0.3-20250117.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..98d8c1f2ef9e96ecb49d419187e06be927aedb7f
GIT binary patch
literal 2127
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
F008L#H2wep
literal 0
HcmV?d00001
diff --git a/source/agent_based/juniper_led.py b/source/agent_based/juniper_led.py
index 17ac79b..f7212e2 100644
--- a/source/agent_based/juniper_led.py
+++ b/source/agent_based/juniper_led.py
@@ -8,6 +8,9 @@
# Date : 2016-08-01
#
# monitor Juniper Networks led state
+#
+# 2025-01-17: removed unused ruleset definition and default parameters (ThX to nick[at]fisk[dot]me[dot]uk)
+
#
# sample snmpwalk
# .1.3.6.1.4.1.2636.3.1.10.1.7.3.1.1.0.0 = STRING: " chassis alarm LED"
@@ -25,19 +28,19 @@
#
# ToDo: create WATO for monitoring levels for each LED state
#
-from typing import Optional, Dict
+from typing import Dict, Optional
from cmk.base.plugins.agent_based.agent_based_api.v1 import (
- register,
- Service,
Result,
- State,
SNMPTree,
+ Service,
+ State,
+ register,
startswith,
)
from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
- DiscoveryResult,
CheckResult,
+ DiscoveryResult,
StringTable,
)
@@ -58,12 +61,13 @@ _juniper_led_alarm_ordered = {
def parse_juniper_led(string_table: StringTable) -> Optional[Dict[str, str]]:
- juniper_leds = {}
+ juniper_leds: Dict[str, str] = {}
for led_description, led_state in string_table:
# remove "LED" from description
- led_description = led_description.replace('LED', '').strip(' ')
- # changing the first letter into upper case
+ led_description: str = led_description.replace('LED', '').strip(' ')
+ # changing only the first letter into upper case (title() will change every first char,
+ # capitalize() will lower case inheriting except the first char)
led_description = led_description[0].upper() + led_description[1:]
juniper_leds[led_description] = led_state
@@ -76,8 +80,8 @@ def discovery_juniper_led(section: Dict[str, str]) -> DiscoveryResult:
yield Service(item=led)
-def check_juniper_led(item, params, section: Dict[str, str]) -> CheckResult:
- led_state = section.get(item)
+def check_juniper_led(item, section: Dict[str, str]) -> CheckResult:
+ led_state: str = section.get(item)
if led_state:
state, state_readable = _juniper_led_alarm_ordered.get(led_state, (3, f'unhandled alarm type {led_state}'))
yield Result(state=State(state), summary=state_readable)
@@ -103,7 +107,4 @@ register.check_plugin(
service_name='Alarm LED %s',
discovery_function=discovery_juniper_led,
check_function=check_juniper_led,
- check_ruleset_name='juniper_led',
- check_default_parameters={
- }
)
diff --git a/source/packages/juniper_led b/source/packages/juniper_led
index ca20019..70fab59 100644
--- a/source/packages/juniper_led
+++ b/source/packages/juniper_led
@@ -12,7 +12,7 @@
'files': {'agent_based': ['juniper_led.py']},
'name': 'juniper_led',
'title': 'Juniper Alarm LEDs',
- 'version': '0.0.2-20230603',
+ 'version': '0.0.3-20250117',
'version.min_required': '2.0.0b1',
- 'version.packaged': '2.2.0p24',
+ 'version.packaged': 'cmk-mkp-tool 0.2.0',
'version.usable_until': None}
--
GitLab