diff --git a/README.md b/README.md index 2cb9089334692b3b47902779d0e2a16888cf893b..0d058773318db73519bfd55d3410e3056fe4f88f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[PACKAGE]: ../../raw/master/mkp/vzlogger-0.0.1-20230806.mkp "vzlogger-0.0.1-20230806.mkp" +[PACKAGE]: ../../raw/master/mkp/vzlogger-0.0.2-20240616.mkp "vzlogger-0.0.2-20240616.mkp" # Monitors values form the vzlogger middleware see https://wiki.volkszaehler.org/software/controller/vzlogger diff --git a/mkp/vzlogger-0.0.2-20240616.mkp b/mkp/vzlogger-0.0.2-20240616.mkp new file mode 100644 index 0000000000000000000000000000000000000000..c32e14be3325f7dce26dc3ee7128735744eb9edc Binary files /dev/null and b/mkp/vzlogger-0.0.2-20240616.mkp differ diff --git a/source/lib/python3/cmk/special_agents/agent_vzlogger.py b/source/lib/python3/cmk/special_agents/agent_vzlogger.py index 385c686913fa4ab945e01693612c7c50d3806d92..f7a47b643982ba107b0a3957f806232613086762 100644 --- a/source/lib/python3/cmk/special_agents/agent_vzlogger.py +++ b/source/lib/python3/cmk/special_agents/agent_vzlogger.py @@ -8,141 +8,132 @@ # Date : 2023-08-05 # File : vzlogger.py # -# vzlogger -# -# # https://wiki.volkszaehler.org/software/controller/vzlogger -# -# 2023-08-05: initial release -# from __future__ import annotations +# 2023-08-05: initial release +# 2024-06-16: modified imports for CMK 2.3 -import requests -import json -import argparse -from os import environ -# import logging from collections.abc import Sequence +import argparse +import json +import requests - -from cmk.special_agents.utils.agent_common import ( - special_agent_main, -) -from cmk.special_agents.utils.argument_parsing import Args, create_default_argument_parser +from cmk.special_agents.v0_unstable.agent_common import special_agent_main +from cmk.special_agents.v0_unstable.argument_parsing import Args, create_default_argument_parser _data = { - "version": "0.8.1", - "generator": "vzlogger", - "data": [ - { - "uuid": "101670", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 273.31 - ] - ] - }, - { - "uuid": "103670", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 144.36 - ] - ] - }, - { - "uuid": "105670", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 11.1 - ] - ] - }, - { - "uuid": "107670", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 117.84 - ] - ] - }, - { - "uuid": "10180", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 17199974.934100002 - ] - ] - }, - { - "uuid": "10280", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 88550.9837 - ] - ] - }, - { - "uuid": "103270", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 235.20000000000002 - ] - ] - }, - { - "uuid": "105270", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 235 - ] - ] - }, - { - "uuid": "107270", - "last": 1690921720649, - "interval": -1, - "protocol": "sml", - "tuples": [ - [ - 1690921720649, - 235.20000000000002 - ] - ] - } - ] + "version": "0.8.1", + "generator": "vzlogger", + "data": [ + { + "uuid": "101670", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 273.31 + ] + ] + }, + { + "uuid": "103670", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 144.36 + ] + ] + }, + { + "uuid": "105670", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 11.1 + ] + ] + }, + { + "uuid": "107670", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 117.84 + ] + ] + }, + { + "uuid": "10180", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 17199974.934100002 + ] + ] + }, + { + "uuid": "10280", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 88550.9837 + ] + ] + }, + { + "uuid": "103270", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 235.20000000000002 + ] + ] + }, + { + "uuid": "105270", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 235 + ] + ] + }, + { + "uuid": "107270", + "last": 1690921720649, + "interval": -1, + "protocol": "sml", + "tuples": [ + [ + 1690921720649, + 235.20000000000002 + ] + ] + } + ] } @@ -161,15 +152,6 @@ def agent_vzlogger_main(args: Args) -> int: # , retrurn=None if _vars['testing']: data = _data - # _base_dir = environ['OMD_ROOT'] - # vzlogger_file = f'{_base_dir}/vzlogger.json' - # try: - # with open(vzlogger_file, 'r') as file: - # data = json.load(file) - # - # except (FileNotFoundError, json.decoder.JSONDecodeError) as e: - # print('Error retrieving data:', e) - # exit() else: try: response = requests.get(f'http://{_vars["hostname"]}:{_vars["port"]}/', timeout=_vars['timeout']) diff --git a/source/packages/vzlogger b/source/packages/vzlogger index 30e2cc5a2e095c3c34ce9fe4f4034d462356f05d..ffa937e79f418393864dbc04762e07afddbdd1b4 100644 --- a/source/packages/vzlogger +++ b/source/packages/vzlogger @@ -12,7 +12,7 @@ 'lib': ['python3/cmk/special_agents/agent_vzlogger.py']}, 'name': 'vzlogger', 'title': 'vzlogger', - 'version': '0.0.1-20230806', - 'version.min_required': '2.2.0b1', + 'version': '0.0.2-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'}