diff --git a/README.md b/README.md index d27f3bc2f5bbb3228278c31e3470903207af76dd..634633b9081fcc7c503bcea51d619652453c1670 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/fritzbox_smarthome-0.9.0-20240225.mkp "fritzbox_smarthome-0.9.0-20240225.mkp" +[PACKAGE]: ../../raw/master/mkp/fritzbox_smarthome-0.9.1-20240617.mkp "fritzbox_smarthome-0.9.1-20240617.mkp" # AVM Fritz!Box Smarthome This repository contains a additional check_MK Fritz!Box Agent which can gather informations over the AVM AHA HTTP Interface about SmartHome Devices connected to an Fritz!Box. diff --git a/mkp/fritzbox_smarthome-0.9.1-20240617.mkp b/mkp/fritzbox_smarthome-0.9.1-20240617.mkp new file mode 100644 index 0000000000000000000000000000000000000000..f4e7d2332dec4938b6e3d7b9aa3aaf068fc7a15f Binary files /dev/null and b/mkp/fritzbox_smarthome-0.9.1-20240617.mkp differ diff --git a/source/agent_based/fritzbox_smarthome_temperature.py b/source/agent_based/fritzbox_smarthome_temperature.py index ac7923142d5770a692a90d2653074d6aed82145a..025ead5b010c37dfb1bdce1048fc70688cae0a32 100644 --- a/source/agent_based/fritzbox_smarthome_temperature.py +++ b/source/agent_based/fritzbox_smarthome_temperature.py @@ -8,14 +8,16 @@ # Date : 2023-12-28 # File : fritzbox_smarthome_temperature.py (check plugin) # -# + +# 2024-06-17: modified import for CMK 2.3 from typing import Dict from cmk.base.plugins.agent_based.agent_based_api.v1 import Result, Service, State, register from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import CheckResult, DiscoveryResult -from cmk.base.plugins.agent_based.utils.temperature import check_temperature, _render_temp_with_unit from cmk.base.plugins.agent_based.utils.fritzbox_smarthome import AvmSmartHomeDevice +from cmk.base.plugins.agent_based.utils.temperature import check_temperature +from cmk.plugins.lib.temperature import _render_temp_with_unit def discovery_fritzbox_smarthome_temperature_single( diff --git a/source/agent_based/utils/fritzbox_smarthome.py b/source/agent_based/utils/fritzbox_smarthome.py index c886fa148d48b913018b3b4fb7021e5a80f6dffe..d51c45c6ca215832f6c8569ba993dacea273d043 100644 --- a/source/agent_based/utils/fritzbox_smarthome.py +++ b/source/agent_based/utils/fritzbox_smarthome.py @@ -10,7 +10,8 @@ # # Based on the work of Maximilian Clemens, see https://github.com/MaximilianClemens/checkmk_fritzbox # -# + +# 2024-06-17: modified import for CMK 2.3 from dataclasses import dataclass from typing import Any, Dict, Final, List @@ -18,7 +19,7 @@ from os import environ from pathlib import Path from json import loads, dumps -from cmk.checkers import plugin_contexts +from cmk.base.checkers import plugin_contexts @dataclass(frozen=True) diff --git a/source/packages/fritzbox_smarthome b/source/packages/fritzbox_smarthome index 2618ec19aaa6eb693174a9df3e2cba5a2871e224..58a8936ddd1870cae3ca98021a0a8bf3e3c6a770 100644 --- a/source/packages/fritzbox_smarthome +++ b/source/packages/fritzbox_smarthome @@ -55,7 +55,7 @@ 'plugins/views/fritzbox_smarthome.py']}, 'name': 'fritzbox_smarthome', 'title': 'Fritz!Box SmartHome', - 'version': '0.9.0-20240225', - 'version.min_required': '2.2.0b1', - 'version.packaged': '2.2.0p24', - 'version.usable_until': '2.3.0b1'} + 'version': '0.9.1-20240617', + 'version.min_required': '2.3.0b1', + 'version.packaged': 'cmk-mkp-tool 0.2.0', + 'version.usable_until': '2.4.0b1'}