diff --git a/agent_based/squid.py b/agent_based/squid.py
index 2bf9847e055fb2070d89f57876f666ba9fb10bf2..2fdd9c3d4d27c47253275b8bc5df1da92249d021 100644
--- a/agent_based/squid.py
+++ b/agent_based/squid.py
@@ -56,14 +56,14 @@ def parse_squid(string_table) -> Dict[str, float]:
except ValueError:
continue
if 'kbytes' in entry:
- value = value * 1024 + 8 # change kbytes to bits
+ value = value * 1024 + 8 # change kbytes to bits
section[entry] = value
return section
register.agent_section(
- name="squid",
+ name='squid',
parse_function=parse_squid,
)
@@ -164,7 +164,7 @@ def check_squid(item, params, section: Dict[str, float]) -> CheckResult:
for value in squid_map[item].keys():
entry = squid_map[item][value]
levels_upper = params.get(entry['levels_upper'], None)
- yield from check_levels_predictive(
+ yield from check_levels_predictive(
label=entry['label'],
value=section[value],
levels=levels_upper,
diff --git a/agents/bakery/squid.py b/agents/bakery/squid.py
index 25a01918671e236880819a4364f158035636e470..dbaa8956ac24a76ae6d91325ec646f47c11edb14 100755
--- a/agents/bakery/squid.py
+++ b/agents/bakery/squid.py
@@ -29,8 +29,6 @@ def get_squid_files(conf) -> FileGenerator:
yield Plugin(
base_os=OS.LINUX,
source=Path('squid'),
- # interval=interval,
- # timeout=timeout
)
yield PluginConfig(
diff --git a/agents/plugins/squid b/agents/plugins/squid
index 03aa18458e86c568a5bd31abb1041657aed4ac72..d88aaf6bcd80929610765801849e729b913f3557 100755
--- a/agents/plugins/squid
+++ b/agents/plugins/squid
@@ -2,13 +2,14 @@
# based on https://github.com/allangood/check_mk/tree/master/plugins/squid by Allan GooD: allan.cassaro@gmail.com
#
-# 2023-05-20: changed separator to :sep(0)
-# changed section from check_squid to squid
-#
# https://etutorials.org/Server+Administration/Squid.+The+definitive+guide/Chapter+14.+Monitoring+Squid/14.2+The+Cache+Manager/
#
# Table 14-1. Cache manager pages for squidclient mgr:<page>
#
+# 2023-05-20: changed separator to :sep(0)
+# changed section from check_squid to squid
+# 2023-05-22: fixed missing "<" in section name
+#
MK_CONFDIR="/etc/check_mk"
@@ -22,7 +23,7 @@ fi
if type squidclient > /dev/null 2>&1 ; then
- echo "<<squid:sep(0)>>>"
+ echo "<<<squid:sep(0)>>>"
# one squid instance
squidclient -p "$port" -T2 mgr:5min | grep =
diff --git a/gui/metrics/squid.py b/gui/metrics/squid.py
index a6bd6576bd2d46be0038e4888fa5cefe8241684a..41df441db452795685dcc32f1397997897f34a1e 100644
--- a/gui/metrics/squid.py
+++ b/gui/metrics/squid.py
@@ -27,14 +27,13 @@ check_metrics['check_mk-squid'] = {
'predict_util': {'auto_graph': False},
}
-
metric_info['client_hits_per_second'] = {'title': _('Cache hits'), 'unit': '1/s', 'color': '11/a', }
metric_info['client_requests_per_second'] = {'title': _('Requests'), 'unit': '1/s', 'color': '31/a', }
metric_info['client_errors_per_second'] = {'title': _('Errors'), 'unit': '1/s', 'color': '21/a', }
metric_info['predict_client_hits_per_second'] = {'title': _('Cache hits (Predicted)'), 'unit': '1/s', 'color': '52/a', }
-metric_info['predict_client_requests_per_second'] = {'title': _('Requests (Predicted)'), 'unit': '1/s', 'color': '51/a', }
-
+metric_info['predict_client_requests_per_second'] = {'title': _('Requests (Predicted)'), 'unit': '1/s',
+ 'color': '51/a', }
graph_info['squid_client'] = {
'title': _('Squid Client statistics'),
diff --git a/gui/wato/squid.py b/gui/wato/squid.py
index 50bc02aef334c28cacd8f925d0e0134c12dce73e..f94de2189ac6372a1c6c9fa4ea8a1a1d2e1359d2 100644
--- a/gui/wato/squid.py
+++ b/gui/wato/squid.py
@@ -42,35 +42,6 @@ def _valuespec_squid():
return Dictionary(
title=_('Squid Web Proxy (Linux)'),
elements=[
- # ('client_requests',
- # Tuple(
- # title=_('Set levels for Client Requests'),
- # elements=[
- # Integer(title=_('Warning at'), default_value=600, unit='/s'),
- # Integer(title=_('Critical at'), default_value=800, unit='/s'),
- # ])),
- # not sure if client hits as upper levels are use full
- # ('client_hits',
- # Tuple(
- # title=_('Set levels for Client Hits'),
- # elements=[
- # Integer(title=_('Warning at'), default_value=600, unit='/s'),
- # Integer(title=_('Critical at'), default_value=800, unit='/s'),
- # ])),
- # ('server_requests',
- # Tuple(
- # title=_('Set levels for Server Requests'),
- # elements=[
- # Integer(title=_('Warning at'), default_value=600, unit='/s'),
- # Integer(title=_('Critical at'), default_value=800, unit='/s'),
- # ])),
- # ('cpu_usage',
- # Tuple(
- # title=_('Set levels for Squid CPU usage'),
- # elements=[
- # Float(title=_('Warning at'), default_value=60.0, unit='%'),
- # Float(title=_('Critical at'), default_value=80.0, unit='%')
- # ])),
('client_requests',
Levels(
title=_('Set levels for Client Requests'),
diff --git a/packages/squid b/packages/squid
index f23833319948466762f0de096ffd882e5f9f3b62..96c84765a2f68a7400e7c3e3d13dc1cda54b7abb 100644
--- a/packages/squid
+++ b/packages/squid
@@ -12,7 +12,7 @@
'gui': ['wato/squid.py', 'metrics/squid.py']},
'name': 'squid',
'title': 'Squid3 Health Check',
- 'version': '2.0.2-2023-05-21',
+ 'version': '2.0.3-2023-05-22',
'version.min_required': '2.1.0b1',
'version.packaged': '2.1.0p21',
'version.usable_until': None}
\ No newline at end of file
diff --git a/squid-2.0.3-2023-05-22.mkp b/squid-2.0.3-2023-05-22.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..fb912a247b4de607eef751901df98259ae2a2751
Binary files /dev/null and b/squid-2.0.3-2023-05-22.mkp differ
diff --git a/squid.mkp b/squid.mkp
index ab2975478a692f0d9de368cfaa175e1679c7626e..fb912a247b4de607eef751901df98259ae2a2751 100644
Binary files a/squid.mkp and b/squid.mkp differ