From e37c6e6c5e458b3633cee8f2ce21d6804977ef0a Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Sun, 16 Jun 2024 20:14:50 +0200 Subject: [PATCH] update project --- README.md | 2 +- mkp/snmp_uptime-0.0.3-20240616.mkp | Bin 0 -> 2022 bytes source/agent_based/snmp_uptime.py | 4 ++-- source/packages/snmp_uptime | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 mkp/snmp_uptime-0.0.3-20240616.mkp diff --git a/README.md b/README.md index 57b800f..226970b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/snmp_uptime-0.0.2-20230805.mkp "snmp_uptime-0.0.2-20230805.mkp" +[PACKAGE]: ../../raw/master/mkp/snmp_uptime-0.0.3-20240616.mkp "snmp_uptime-0.0.3-20240616.mkp" # SNMP uptime This check is based on the snmp_uptime check form CMK. It adds the SNMP-FRAMEWORK-MIB::snmpEngineTime OID to the check. Its value is in seconds not ticks and therefore the Uptime can now be around 68 years before a rollover of the counter :-) diff --git a/mkp/snmp_uptime-0.0.3-20240616.mkp b/mkp/snmp_uptime-0.0.3-20240616.mkp new file mode 100644 index 0000000000000000000000000000000000000000..f0b7350646f2016bd987f249e768475bae18c64f GIT binary patch literal 2022 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 E0B+UOPXGV_ literal 0 HcmV?d00001 diff --git a/source/agent_based/snmp_uptime.py b/source/agent_based/snmp_uptime.py index 10ded8f..7b5a25a 100644 --- a/source/agent_based/snmp_uptime.py +++ b/source/agent_based/snmp_uptime.py @@ -15,12 +15,13 @@ # 2022-03-07: fixed if snmpEngineTime == 0 # 2022-03-08: renamed to snmp_uptime_extended to avoid caching issues with the original check # 2023-08-05: made parse function more stable (try/except/else) +# 2024-06-16: modified imports for CMK 2.3 from typing import Optional from cmk.base.plugins.agent_based.agent_based_api.v1 import exists, register, SNMPTree from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import StringTable -from cmk.base.plugins.agent_based.utils import uptime +from cmk.plugins.lib import uptime def parse_snmp_uptime_extended(string_table: StringTable) -> Optional[uptime.Section]: @@ -33,7 +34,6 @@ def parse_snmp_uptime_extended(string_table: StringTable) -> Optional[uptime.Sec True >>> parse_snmp_uptime_extended([['2297331594', '', '313671']]) Section(uptime_sec=313671, message=None) - """ try: sysUpTime, hrSystemUptime, snmpEngineTime = string_table[0] diff --git a/source/packages/snmp_uptime b/source/packages/snmp_uptime index 26800f8..bfeee6a 100644 --- a/source/packages/snmp_uptime +++ b/source/packages/snmp_uptime @@ -8,7 +8,7 @@ 'files': {'agent_based': ['snmp_uptime.py']}, 'name': 'snmp_uptime', 'title': 'SNMP Uptime', - 'version': '0.0.2-20230805', - 'version.min_required': '2.0.0b1', + 'version': '0.0.3-20240616', + 'version.min_required': '2.3.0b1', 'version.packaged': 'cmk-mkp-tool 0.2.0', - 'version.usable_until': '2.3.0b1'} + 'version.usable_until': '2.4.0b1'} -- GitLab