From 7226096b201d750ef4658af54382906d15970262 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Tue, 14 May 2024 20:23:55 +0200
Subject: [PATCH] update project
---
README.md | 2 +-
mkp/unbound-1.2.1-20240514.mkp | Bin 0 -> 4936 bytes
source/gui/wato/check_parameters/unbound.py | 46 ++++---------
.../wato/check_parameters/unbound_bakery.py | 65 ++++++++++++++++++
source/packages/unbound | 6 +-
5 files changed, 82 insertions(+), 37 deletions(-)
create mode 100644 mkp/unbound-1.2.1-20240514.mkp
create mode 100644 source/gui/wato/check_parameters/unbound_bakery.py
diff --git a/README.md b/README.md
index 9f2f972..4bf67e2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/mkp/unbound-1.2.0-20240421.mkp "unbound-1.2.0-20240421.mkp"
+[PACKAGE]: ../../raw/master/mkp/unbound-1.2.1-20240514.mkp "unbound-1.2.1-20240514.mkp"
# unbound
This agent plugin cheks the state of the unbound dns daemon. For more information about unbound see: https://nlnetlabs.nl/projects/unbound/about/
diff --git a/mkp/unbound-1.2.1-20240514.mkp b/mkp/unbound-1.2.1-20240514.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..0e5b612ea06b6266c4ca3f242a288c62c471d306
GIT binary patch
literal 4936
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
literal 0
HcmV?d00001
diff --git a/source/gui/wato/check_parameters/unbound.py b/source/gui/wato/check_parameters/unbound.py
index 5e52a07..6e01e01 100644
--- a/source/gui/wato/check_parameters/unbound.py
+++ b/source/gui/wato/check_parameters/unbound.py
@@ -24,20 +24,25 @@
# added ruleset for bakery
# renamed to unbound.py (from unbound_parameters.py)
# moved to ~/local/lib/check_mk/gui/plugins/wato/check_parameters (from local/share/check_mk/web/plugins/wato)
-#
+# 2024-05-14: separated WATO for bakery and check in two files
+
from cmk.gui.i18n import _
from cmk.gui.plugins.wato.utils import (
CheckParameterRulespecWithoutItem,
- rulespec_registry,
RulespecGroupCheckParametersApplications,
- HostRulespec,
-)
-from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import (
- RulespecGroupMonitoringAgentsAgentPlugins,
+ rulespec_registry,
)
-from cmk.gui.valuespec import Dictionary, Float, Percentage, Tuple, Alternative, FixedValue
+
+from cmk.gui.valuespec import (
+ Alternative,
+ Dictionary,
+ FixedValue,
+ Float,
+ Percentage,
+ Tuple,
+)
def _parameter_valuespec_unbound_cache():
@@ -136,30 +141,3 @@ rulespec_registry.register(
title=lambda: _("Unbound Answers"),
)
)
-
-
-def _parameter_valuespec_unbound_bakery():
- return Alternative(
- title=_('unbound'),
- elements=[
- FixedValue(
- True,
- title=_('Deploy the unbound agent plugin'),
- totext=_('The unbound agent plugin will be deployed')
- ),
- FixedValue(
- None,
- title=_('Do not deploy the unbound agent plugin'),
- totext=_('The unbound agent plugin will not be deployed')
- ),
- ],
- )
-
-
-rulespec_registry.register(
- HostRulespec(
- group=RulespecGroupMonitoringAgentsAgentPlugins,
- name='agent_config:unbound',
- valuespec=_parameter_valuespec_unbound_bakery,
- )
-)
diff --git a/source/gui/wato/check_parameters/unbound_bakery.py b/source/gui/wato/check_parameters/unbound_bakery.py
new file mode 100644
index 0000000..525038d
--- /dev/null
+++ b/source/gui/wato/check_parameters/unbound_bakery.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2022, Jan-Philipp Litza (PLUTEX) <jpl@plutex.de>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# modifications by thl-cmk[at]outlook[dot]com
+# 2024-04-21: fixed missing FixedValue in import
+# changed Alternative titles to "Upper levels in qps"/"Upper levels in %" to better differentiate between them
+# added explicit unit "%2
+# added ruleset for bakery
+# renamed to unbound.py (from unbound_parameters.py)
+# moved to ~/local/lib/check_mk/gui/plugins/wato/check_parameters (from local/share/check_mk/web/plugins/wato)
+# 2024-05-14: separated WATO for bakery and check in two files
+
+from cmk.gui.i18n import _
+from cmk.gui.plugins.wato.utils import (
+ HostRulespec,
+ rulespec_registry,
+)
+from cmk.gui.cee.plugins.wato.agent_bakery.rulespecs.utils import (
+ RulespecGroupMonitoringAgentsAgentPlugins,
+)
+
+from cmk.gui.valuespec import Alternative, FixedValue
+
+
+def _parameter_valuespec_unbound_bakery():
+ return Alternative(
+ title=_('unbound'),
+ elements=[
+ FixedValue(
+ True,
+ title=_('Deploy the unbound agent plugin'),
+ totext=_('The unbound agent plugin will be deployed')
+ ),
+ FixedValue(
+ None,
+ title=_('Do not deploy the unbound agent plugin'),
+ totext=_('The unbound agent plugin will not be deployed')
+ ),
+ ],
+ )
+
+
+rulespec_registry.register(
+ HostRulespec(
+ group=RulespecGroupMonitoringAgentsAgentPlugins,
+ name='agent_config:unbound',
+ valuespec=_parameter_valuespec_unbound_bakery,
+ )
+)
diff --git a/source/packages/unbound b/source/packages/unbound
index 5741833..517e045 100644
--- a/source/packages/unbound
+++ b/source/packages/unbound
@@ -9,11 +9,13 @@
'download_url': 'https://github.com/PLUTEX/checkmk-unbound/',
'files': {'agent_based': ['unbound.py'],
'agents': ['plugins/unbound'],
- 'gui': ['metrics/unbound.py', 'wato/check_parameters/unbound.py'],
+ 'gui': ['metrics/unbound.py',
+ 'wato/check_parameters/unbound.py',
+ 'wato/check_parameters/unbound_bakery.py'],
'lib': ['python3/cmk/base/cee/plugins/bakery/unbound.py']},
'name': 'unbound',
'title': 'Unbound',
- 'version': '1.2.0-20240421',
+ 'version': '1.2.1-20240514',
'version.min_required': '2.2.0b1',
'version.packaged': '2.2.0p24',
'version.usable_until': None}
--
GitLab