diff --git a/agent_based/curl.py b/agent_based/curl.py index 19bd5a5b65668e66a3e8ac3684446f0b0da27728..d5563422f08802adcb14eb4f091305a68f0fe4a4 100644 --- a/agent_based/curl.py +++ b/agent_based/curl.py @@ -27,6 +27,7 @@ # 2022-04-06: removed .replace('://', ': //')) from json.loads() so service name is without space # 2022-04-26: made http(s) URLs clickable # 2022-05-15: added workaround for raise ValueError("Cannot render negative timespan") +# 2022-05-17: fixed wrong import path for _TIME_UNITS and _gen_timespan_chunks # # Example output from agent: @@ -81,7 +82,7 @@ from cmk.base.plugins.agent_based.agent_based_api.v1 import ( # # start workaround for : raise ValueError("Cannot render negative timespan") # -from cmk.base.plugins.agent_based.agent_based_api.v1.render import ( +from cmk.base.api.agent_based.render import ( _TIME_UNITS, _gen_timespan_chunks, ) diff --git a/curl.mkp b/curl.mkp index 7d2cb034671bf9523285f562bea3dfa1581441a3..8a38d4db2aaadcc599b9392c916fd4727df5c172 100644 Binary files a/curl.mkp and b/curl.mkp differ diff --git a/packages/curl b/packages/curl index b8df7912d5737c199429248b7342009d4fdc4eb5..84453ca91784da2657f9a96f69432ed52986a965 100644 --- a/packages/curl +++ b/packages/curl @@ -26,7 +26,7 @@ 'name': 'curl', 'num_files': 6, 'title': 'cURL agent plugin', - 'version': '20220515.v0.1.8b', + 'version': '20220515.v0.1.8c', 'version.min_required': '2.0.0', 'version.packaged': '2021.09.20', 'version.usable_until': None} \ No newline at end of file diff --git a/web/plugins/metrics/curl.py b/web/plugins/metrics/curl.py index e453b53ed7d0181d4a35c8b461af5237ea683df0..2ce2a0b3f89a1ad980054e9802df84b34361f808 100644 --- a/web/plugins/metrics/curl.py +++ b/web/plugins/metrics/curl.py @@ -12,6 +12,7 @@ # 2022-02-15: rewritten form cmk 2.0, based on the work by doc[at]snowheaven[dot]de # 2022-02-20: added num_connects, num_redirects, size_download, size_header and speed_download # 2022-03-13: moved cert time left graph to the end of graphs +# 2022-05-17: added scalars to cert_time_left from cmk.gui.i18n import _ @@ -193,6 +194,10 @@ graph_info['curl_cert_time'] = { 'metrics': [ ('cert_time_left', 'area'), ], + 'scalars': [ + ('cert_time_left:crit', _('crit')), + ('cert_time_left:warn', _('warn')), + ], } perfometer_info.append(