From de45ca12f379da60a02dfa11897f6a822e9794e3 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Tue, 14 May 2024 20:24:23 +0200
Subject: [PATCH] update project
---
README.md | 2 +-
mkp/squid-2.1.1-20240514.mkp | Bin 0 -> 5730 bytes
.../gui/wato/{ => check_parameters}/squid.py | 46 ++----------
.../gui/wato/check_parameters/squid_bakery.py | 67 ++++++++++++++++++
source/packages/squid | 8 ++-
5 files changed, 79 insertions(+), 44 deletions(-)
create mode 100644 mkp/squid-2.1.1-20240514.mkp
rename source/gui/wato/{ => check_parameters}/squid.py (73%)
create mode 100644 source/gui/wato/check_parameters/squid_bakery.py
diff --git a/README.md b/README.md
index 7feadfb..8ae4af0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[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.
diff --git a/mkp/squid-2.1.1-20240514.mkp b/mkp/squid-2.1.1-20240514.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..00959a093125a037d3348604740b6d8d8112d0d3
GIT binary patch
literal 5730
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
literal 0
HcmV?d00001
diff --git a/source/gui/wato/squid.py b/source/gui/wato/check_parameters/squid.py
similarity index 73%
rename from source/gui/wato/squid.py
rename to source/gui/wato/check_parameters/squid.py
index 2ef9d72..8dbcdb1 100644
--- a/source/gui/wato/squid.py
+++ b/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,
- )
-)
diff --git a/source/gui/wato/check_parameters/squid_bakery.py b/source/gui/wato/check_parameters/squid_bakery.py
new file mode 100644
index 0000000..a028355
--- /dev/null
+++ b/source/gui/wato/check_parameters/squid_bakery.py
@@ -0,0 +1,67 @@
+#!/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,
+ )
+)
diff --git a/source/packages/squid b/source/packages/squid
index 603c7f9..197e194 100644
--- a/source/packages/squid
+++ b/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}
--
GitLab