update project

README.md

-[PACKAGE]: ../../raw/master/mkp/squid-2.1.0-20231202.mkp "squid-2.1.0-20231202.mkp"
+[PACKAGE]: ../../raw/master/mkp/squid-2.1.1-20240514.mkp "squid-2.1.1-20240514.mkp"
 # Squid Web Proxy
 
 This CheckMK plugin monitors the performance of the _**Squid Web Proxy**_. This plugin is intended to use with the Agent Bakery of CheckMK.

source/gui/wato/squid.py → source/gui/wato/check_parameters/squid.py

@@ -18,25 +18,21 @@
 #             changed cpu_time to cpu_usage
 # 2023-12-02: add ip_address option for agent plugin
 #             add available_number_of_file_descriptors for check section
+# 2024-05-14: moved to check_parameters
+#             separated WATO for bakery and check in two files
 
 from cmk.gui.i18n import _
 from cmk.gui.valuespec import (
     Dictionary,
-    Integer,
-    Tuple,
-    TextInput,
     Float,
+    TextInput,
+    Tuple,
 )
 from cmk.gui.plugins.wato.utils import (
-    rulespec_registry,
-    HostRulespec,
-    RulespecGroupCheckParametersApplications,
     CheckParameterRulespecWithItem,
     Levels,
-)
-
-from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import (
-    RulespecGroupMonitoringAgentsAgentPlugins,
+    RulespecGroupCheckParametersApplications,
+    rulespec_registry,
 )
 
 
@@ -94,33 +90,3 @@ rulespec_registry.register(
             help='Service name without "Squid" i.e. "DNS response time"',
         ),
     ))
-
-
-def _valuespec_agent_squid():
-    return Dictionary(
-        help=_('The plugin <tt>squid</tt> allows monitoring of Squid Web Proxies.'),
-        title=_('Squid Web Proxy (Linux)'),
-        elements=[
-            ('ip_address',
-             TextInput(
-                 title=_('IP Address/Hostname'),
-                 help=_('The IP-Address/Hostname squidclient connects to.'),
-                 default_value='localhost',
-             )),
-            ('port',
-             Integer(
-                 title=_('Port number'),
-                 help=_('TCP port number that squidclient connects to.'),
-                 default_value=3128,
-             )),
-        ]
-    )
-
-
-rulespec_registry.register(
-    HostRulespec(
-        group=RulespecGroupMonitoringAgentsAgentPlugins,
-        name='agent_config:squid',
-        valuespec=_valuespec_agent_squid,
-    )
-)

source/gui/wato/check_parameters/squid_bakery.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# License: GNU General Public License v2
+#
+# Author: thl-cmk[at]outlook[dot]com
+# URL   : https://thl-cmk.hopto.org
+# Date  : 2023-05-20
+
+# based on https://github.com/allangood/check_mk/tree/master/plugins/squid
+#
+# rewritten for cmk 2.x
+#
+# 2023-05-20: moved to ~/local/lib/check_mk/gui/plugins/wato
+#             renamed from check_squid.py to squid.py
+#             changed client_reqps to client_requests
+#             changed server_reqps to server_requests
+#             changed cpu_time to cpu_usage
+# 2023-12-02: add ip_address option for agent plugin
+#             add available_number_of_file_descriptors for check section
+# 2024-05-14: moved to check_parameters
+#             separated WATO for bakery and check in two files
+
+from cmk.gui.i18n import _
+from cmk.gui.valuespec import (
+    Dictionary,
+    Integer,
+    TextInput,
+)
+from cmk.gui.plugins.wato.utils import (
+    HostRulespec,
+    rulespec_registry,
+)
+
+from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import (
+    RulespecGroupMonitoringAgentsAgentPlugins,
+)
+
+
+def _valuespec_agent_squid():
+    return Dictionary(
+        help=_('The plugin <tt>squid</tt> allows monitoring of Squid Web Proxies.'),
+        title=_('Squid Web Proxy (Linux)'),
+        elements=[
+            ('ip_address',
+             TextInput(
+                 title=_('IP Address/Hostname'),
+                 help=_('The IP-Address/Hostname squidclient connects to.'),
+                 default_value='localhost',
+             )),
+            ('port',
+             Integer(
+                 title=_('Port number'),
+                 help=_('TCP port number that squidclient connects to.'),
+                 default_value=3128,
+             )),
+        ]
+    )
+
+
+rulespec_registry.register(
+    HostRulespec(
+        group=RulespecGroupMonitoringAgentsAgentPlugins,
+        name='agent_config:squid',
+        valuespec=_valuespec_agent_squid,
+    )
+)

source/packages/squid

@@ -9,11 +9,13 @@
  'files': {'agent_based': ['squid.py'],
            'agents': ['plugins/squid'],
            'checkman': ['squid'],
-           'gui': ['wato/squid.py', 'metrics/squid.py'],
+           'gui': ['metrics/squid.py',
+                   'wato/check_parameters/squid.py',
+                   'wato/check_parameters/squid_bakery.py'],
            'lib': ['python3/cmk/base/cee/plugins/bakery/squid.py']},
  'name': 'squid',
  'title': 'Squid3 Health Check',
- 'version': '2.1.0-20231202',
+ 'version': '2.1.1-20240514',
  'version.min_required': '2.1.0b1',
- 'version.packaged': '2.2.0p17',
+ 'version.packaged': '2.2.0p24',
  'version.usable_until': None}