From b433b234fabb57e1bc139422ccf478f10dc42c35 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 1 Sep 2023 22:12:03 +0200
Subject: [PATCH] update project
---
README.md | 1 +
agent_based/juniper_craft_alarm.py | 118 ++++++++++++------
.../check_parameters/juniper_craft_alarm.py | 73 +++++++++++
juniper_craft_alarm-0.0.2-20230901.mkp | Bin 0 -> 2619 bytes
packages/juniper_craft_alarm | 17 +--
5 files changed, 164 insertions(+), 45 deletions(-)
create mode 100644 gui/wato/check_parameters/juniper_craft_alarm.py
create mode 100644 juniper_craft_alarm-0.0.2-20230901.mkp
diff --git a/README.md b/README.md
index d724da6..e744c03 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/juniper_craft_alarm-0.0.2-20230901.mkp "juniper_craft_alarm-0.0.2-20230901.mkp"
# Juniper Chassis Alarm
Monitors the status of the Juniper Chassis alarm using the JUNIPER-ALARM-MIB.
diff --git a/agent_based/juniper_craft_alarm.py b/agent_based/juniper_craft_alarm.py
index a096c90..36dc752 100644
--- a/agent_based/juniper_craft_alarm.py
+++ b/agent_based/juniper_craft_alarm.py
@@ -5,10 +5,15 @@
#
# Author: thl-cmk[at]outlook[dot]com
# URL : https://thl-cmk.hopto.org
-# Date : 2016-08-01
+# Date : 2022-06-07
#
# monitor Juniper Networks craft alarms
#
+# 2023-09-01: fixed empty string_table
+# added WATO rule
+# added alarm state
+# added last change (notice only)
+#
# sample snmpwalk
# .1.3.6.1.4.1.2636.3.4.2.1.0 = INTEGER: 2
# .1.3.6.1.4.1.2636.3.4.2.2.1.0 = INTEGER: 2
@@ -19,7 +24,7 @@
# .1.3.6.1.4.1.2636.3.4.2.3.3.0 = 0
#
# sample string_table
-# [[['2']], [['2', '0', '0', '2', '0', '0']]]
+# [[['2']], [['2', '0', '0']], [['2', '0', '0']]]
#
# sample section
# JuniperAlarms(
@@ -28,8 +33,6 @@
# red_alarm=JuniperAlarm(state=2, count=0, last_change=0)
# )
#
-# ToDo: create WATO for params
-#
from dataclasses import dataclass
from typing import Optional, List
@@ -41,6 +44,7 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import (
State,
SNMPTree,
startswith,
+ check_levels,
)
from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
DiscoveryResult,
@@ -51,9 +55,9 @@ from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
@dataclass
class JuniperAlarm:
- # state: int
+ state: int
count: int
- # last_change: int
+ last_change: int
@dataclass
@@ -77,20 +81,37 @@ _juniper_alarm_state = {
def parse_juniper_craft_alarms(string_table: List[StringTable]) -> Optional[JuniperAlarms]:
- alarm_relay_mode, alarms = string_table
- yellow_count, red_count = alarms[0]
+ try:
+ alarm_relay_mode, yellow_alarm, red_alarm = string_table
+ except IndexError:
+ return
+
+ try:
+ alarm_relay_mode = alarm_relay_mode[0][0]
+ except IndexError:
+ return
+
+ try:
+ yellow_state, yellow_count, yellow_last_change = yellow_alarm[0]
+ except IndexError:
+ return
+
+ try:
+ red_state, red_count, red_last_change = red_alarm[0]
+ except IndexError:
+ return
return JuniperAlarms(
- alarm_relay_mode=int(alarm_relay_mode[0][0]),
+ alarm_relay_mode=int(alarm_relay_mode),
yellow_alarm=JuniperAlarm(
- # state=int(yellow_state),
+ state=int(yellow_state),
count=int(yellow_count),
- # last_change=int(yellow_last_change)
+ last_change=int(yellow_last_change)
),
red_alarm=JuniperAlarm(
- # state=int(red_state),
+ state=int(red_state),
count=int(red_count),
- # last_change=int(red_last_change)
+ last_change=int(red_last_change)
)
)
@@ -100,24 +121,42 @@ def discovery_juniper_craft_alarms(section: JuniperAlarms) -> DiscoveryResult:
def check_juniper_craft_alarms(params, section: JuniperAlarms) -> CheckResult:
- if section.alarm_relay_mode != 2 and params['warn_not_pass_om']:
- yield Result(
- state=State.WARN,
- summary=f'Alarm relay mode: {_juniper_alarm_relay_mode.get(section.alarm_relay_mode)}')
+ message = f'Alarm relay mode: {_juniper_alarm_relay_mode.get(section.alarm_relay_mode, section.alarm_relay_mode )}'
+ if section.alarm_relay_mode != 2: # pass on
+ yield Result(state=State(params['state_not_pass_om']), summary=message)
else:
- yield Result(
- state=State.OK,
- summary=f'Alarm relay mode: {_juniper_alarm_relay_mode.get(section.alarm_relay_mode)}')
+ yield Result(state=State.OK, summary=message)
- if section.yellow_alarm.count > params['count_yellow']:
- yield Result(state=State.WARN, notice=f'Yellow alarm count: {section.yellow_alarm.count}')
+ message = f'Yellow alarm state: {_juniper_alarm_state.get(section.yellow_alarm.state, section.yellow_alarm.state)}'
+ if section.yellow_alarm.state != 2: # off
+ yield Result(state=State(params['state_yellow_not_off']), summary=message)
else:
- yield Result(state=State.OK, summary=f'Yellow alarm count: {section.yellow_alarm.count}')
+ yield Result(state=State.OK, summary=message)
- if section.red_alarm.count > params['count_red']:
- yield Result(state=State.CRIT, notice=f'Red alarm count: {section.red_alarm.count}')
+ message = f'Red alarm state: {_juniper_alarm_state.get(section.red_alarm.state, section.red_alarm.state)}'
+ if section.red_alarm.state != 2: # off
+ yield Result(state=State(params['state_red_not_off']), summary=message)
else:
- yield Result(state=State.OK, summary=f'Red alarm count: {section.red_alarm.count}')
+ yield Result(state=State.OK, summary=message)
+
+ yield from check_levels(
+ value=section.yellow_alarm.count,
+ label='Yellow alarm count',
+ levels_upper=params.get('count_yellow'),
+ render_func=lambda v: f'{v:.0f}',
+ notice_only=True,
+ )
+
+ yield from check_levels(
+ value=section.red_alarm.count,
+ label='Red alarm count',
+ levels_upper=params.get('count_red'),
+ render_func=lambda v: f'{v:.0f}',
+ notice_only=True,
+ )
+
+ yield Result(state=State.OK, notice=f'Yellow alarm last change: {section.yellow_alarm.last_change}')
+ yield Result(state=State.OK, notice=f'Red alarm last change: {section.red_alarm.last_change}')
register.snmp_section(
@@ -131,16 +170,21 @@ register.snmp_section(
]
),
SNMPTree(
- base='.1.3.6.1.4.1.2636.3.4.2', # JUNIPER-ALARM-MIB::jnxCraftAlarms
+ base='.1.3.6.1.4.1.2636.3.4.2.2', # JUNIPER-ALARM-MIB::jnxCraftAlarms
oids=[
- # '2.1', # jnxYellowAlarmState
- '2.2', # jnxYellowAlarmCount
- # '2.3', # jnxYellowAlarmLastChange
- # '3.1', # jnxRedAlarmState
- '3.2', # jnxRedAlarmCount
- # '3.3', # jnxRedAlarmLastChange
+ '1', # jnxYellowAlarmState
+ '2', # jnxYellowAlarmCount
+ '3', # jnxYellowAlarmLastChange
]
- )
+ ),
+ SNMPTree(
+ base='.1.3.6.1.4.1.2636.3.4.2.3', # JUNIPER-ALARM-MIB::jnxCraftAlarms
+ oids=[
+ '1', # jnxRedAlarmState
+ '2', # jnxRedAlarmCount
+ '3', # jnxRedAlarmLastChange
+ ]
+ ),
],
detect=startswith('.1.3.6.1.2.1.1.2.0', '.1.3.6.1.4.1.2636.1.1.1'),
)
@@ -152,8 +196,8 @@ register.check_plugin(
check_function=check_juniper_craft_alarms,
check_ruleset_name='juniper_craft_alarms',
check_default_parameters={
- 'count_yellow': 0,
- 'count_red': 0,
- 'warn_not_pass_om': True,
+ 'state_not_pass_om': 1,
+ 'state_yellow_not_off': 1,
+ 'state_red_not_off': 2,
}
)
diff --git a/gui/wato/check_parameters/juniper_craft_alarm.py b/gui/wato/check_parameters/juniper_craft_alarm.py
new file mode 100644
index 0000000..6c84e1a
--- /dev/null
+++ b/gui/wato/check_parameters/juniper_craft_alarm.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# License: GNU General Public License v2
+
+# Author: thl-cmk[at]outlook[dot]com
+# URL : https://thl-cmk.hopto.org
+# Date : 2023-09-01
+# File : juniper_craft_alarm.py
+#
+# 2023-09-01: initial release
+
+from cmk.gui.i18n import _
+from cmk.gui.valuespec import (
+ Dictionary,
+ MonitoringState,
+ Tuple,
+ Integer,
+)
+
+from cmk.gui.plugins.wato.utils import (
+ rulespec_registry,
+ CheckParameterRulespecWithoutItem,
+ RulespecGroupCheckParametersHardware,
+)
+
+
+def _parameter_valuespec_vzlogger():
+ return Dictionary(
+ title=_('Juniper Chassis Alarm'),
+ elements=[
+ ('state_not_pass_om',
+ MonitoringState(
+ title=_('State if Alarm relay mode not "pass on"'),
+ default_value=1,
+ )),
+ ('state_yellow_not_off',
+ MonitoringState(
+ title=_('State if Yellow alarm is not "off"'),
+ default_value=1,
+ )),
+ ('state_red_not_off',
+ MonitoringState(
+ title=_('State if Red alarm is not "off"'),
+ default_value=2,
+ )),
+ ('count_yellow',
+ Tuple(
+ title=_('Levels Yellow Alarm'),
+ help=_(''),
+ elements=[
+ Integer(title=_('Warning at'), minvalue=0, unit=_('')),
+ Integer(title=_('Critical at'), minvalue=0, unit=_('')),
+ ])),
+ ('count_red',
+ Tuple(
+ title=_('Levels Red Alarm'),
+ help=_(''),
+ elements=[
+ Integer(title=_('Warning at'), minvalue=0, unit=_('')),
+ Integer(title=_('Critical at'), minvalue=0, unit=_('')),
+ ]))
+
+ ],
+ )
+
+
+rulespec_registry.register(
+ CheckParameterRulespecWithoutItem(
+ check_group_name="juniper_craft_alarms",
+ group=RulespecGroupCheckParametersHardware,
+ parameter_valuespec=_parameter_valuespec_vzlogger,
+ ))
diff --git a/juniper_craft_alarm-0.0.2-20230901.mkp b/juniper_craft_alarm-0.0.2-20230901.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..63d047f86c5edf76174671d72400ec4ff75d6839
GIT binary patch
literal 2619
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
P3l6^rOJ|otE?xQ$rxqZ`
literal 0
HcmV?d00001
diff --git a/packages/juniper_craft_alarm b/packages/juniper_craft_alarm
index 431abd9..0092ba1 100644
--- a/packages/juniper_craft_alarm
+++ b/packages/juniper_craft_alarm
@@ -3,14 +3,15 @@
'\n'
'The check is based on the JUNIPER-ALARM-MIB\n'
'\n'
- 'WARN: if # of yellow alerts > 0\n'
- 'CRIT: if # of red alerts > 0\n'
- 'WARN: if alarm relay mode not pass om\n',
+ 'WARN: if alarm relay mode not pass om\n'
+ 'WARN if Yellow Alarm is not off\n'
+ 'CRIT if Red Alarm is not off\n',
'download_url': 'https://thl-cmk.hopto.org',
- 'files': {'agent_based': ['juniper_craft_alarm.py']},
+ 'files': {'agent_based': ['juniper_craft_alarm.py'],
+ 'gui': ['wato/check_parameters/juniper_craft_alarm.py']},
'name': 'juniper_craft_alarm',
'title': 'Juniper (Craft) alarm',
- 'version': '0.0.1-20230603',
- 'version.min_required': '2.0.0b1',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': None}
\ No newline at end of file
+ 'version': '0.0.2-20230901',
+ 'version.min_required': '2.2.0b1',
+ 'version.packaged': '2.2.0p7',
+ 'version.usable_until': None}
--
GitLab