From cc64726ff4acb9bcfdd411960bf0926d12591519 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Sun, 16 Jun 2024 17:12:20 +0200
Subject: [PATCH] update project
---
README.md | 2 +-
mkp/vzlogger-0.0.2-20240616.mkp | Bin 0 -> 4940 bytes
.../cmk/special_agents/agent_vzlogger.py | 256 ++++++++----------
source/packages/vzlogger | 6 +-
4 files changed, 123 insertions(+), 141 deletions(-)
create mode 100644 mkp/vzlogger-0.0.2-20240616.mkp
diff --git a/README.md b/README.md
index 2cb9089..0d05877 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
GIT binary patch
literal 4940
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
literal 0
HcmV?d00001
diff --git a/source/lib/python3/cmk/special_agents/agent_vzlogger.py b/source/lib/python3/cmk/special_agents/agent_vzlogger.py
index 385c686..f7a47b6 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 30e2cc5..ffa937e 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'}
--
GitLab