Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

5135 hitachi_hnas_virtual.volume: New subcheck to monitor virtual volumes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 84d2f645b2871e146e068395fc76f39316a563be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84d2f645b2871e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Sep 21 09:50:52 2017 +0200 5135 hitachi_hnas_virtual.volume: New subcheck to monitor virtual volumes The check monitors the quota of virtual volumes on Hitachi NAS devices. If a quota is defined the output of the check is similar to the output of the volumes check of Hitachi NAS devices. If no quota is defined the check returns the status OK. Change-Id: If54a2e46b0beb2fc80585771ceaff70eed75734a --- .werks/5135 | 13 ++++++ checkman/hitachi_hnas_volume.virtual | 21 +++++++++ checks/hitachi_hnas.include | 48 +++++++++++++++++++- checks/hitachi_hnas_volume | 85 +++++++++++++++++++++++++++++++++--- web/plugins/metrics/check_mk.py | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 161 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=84d2f645b2…

6 years, 11 months

Added more detailed werk description

by Marcel Arentz

Module: check_mk Branch: master Commit: 16fc683c95fb54a5bae4b1a53c31892502d51aae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16fc683c95fb54… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 24 11:26:38 2017 +0200 Added more detailed werk description Change-Id: Ie5566ac00873d3474fac9d754a8f14a9a756619b --- .werks/5305 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.werks/5305 b/.werks/5305 index 614fc7e..1ea6dc6 100644 --- a/.werks/5305 +++ b/.werks/5305 @@ -9,3 +9,7 @@ Class: fix The original path for lib files has been hardcoded to omd version 0.45. The path now uses the regular path which is standard for linux and solaris. + +If the agent will be replaced by this new version, the lib path has to be changed also: +Old: /omd/versions/0.45.20110123/lib/check_mk_agent +New: /usr/lib/check_mk_agent

6 years, 11 months

5305 FIX check_mk_agent.hpux: Fix hardcoded version in lib path

by Marcel Arentz

Module: check_mk Branch: master Commit: a40d5d06329ea317d10e98f96a81f1bd13b58318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a40d5d06329ea3… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 23 15:39:08 2017 +0200 5305 FIX check_mk_agent.hpux: Fix hardcoded version in lib path The original path for lib files has been hardcoded to omd version 0.45. The path now uses the regular path which is standard for linux and solaris. Change-Id: I0eac120bab1a5f76cdcf1ff8306c145c40615e19 --- .werks/5305 | 11 +++++++++++ agents/check_mk_agent.hpux | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5305 b/.werks/5305 new file mode 100644 index 0000000..614fc7e --- /dev/null +++ b/.werks/5305 @@ -0,0 +1,11 @@ +Title: check_mk_agent.hpux: Fix hardcoded version in lib path +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1508765713 +Class: fix + +The original path for lib files has been hardcoded to omd version 0.45. The +path now uses the regular path which is standard for linux and solaris. diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index ea48348..6f0a53e 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -26,7 +26,7 @@ export PATH=$PATH:/usr/sbin:/usr/bin:/usr/contrib/bin -export MK_LIBDIR="/omd/versions/0.45.20110123/lib/check_mk_agent" +export MK_LIBDIR="/usr/lib/check_mk_agent" export MK_CONFDIR="/etc/check_mk" # All executables in PLUGINSDIR will simply be executed and their

6 years, 11 months

Update for werk 5348

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e804e5d3fbd28c802aa9067688cc947206c700f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e804e5d3fbd28c… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 24 10:57:25 2017 +0200 Update for werk 5348 Change-Id: I6c31d738f0673d51fe72625b1576288b0fcc00cc --- agents/check_mk_agent.openwrt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 2068499..d50b794 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -669,10 +669,10 @@ if [ -x /opt/VRTSvcs/bin/haclus ] then echo "<<<veritas_vcs>>>" vcshost=$(hostname | cut -d. -f1) - waitmax -s 9 2/opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState - waitmax -s 9 2/opt/VRTSvcs/bin/hasys -display -attribute SysState - waitmax -s 9 2/opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus - waitmax -s 9 2/opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2 /opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState + waitmax -s 9 2 /opt/VRTSvcs/bin/hasys -display -attribute SysState + waitmax -s 9 2 /opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2 /opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus fi # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg

6 years, 11 months

Added new packaging tests for source file (tar.gz)

by Lars Michelsen

Module: check_mk Branch: master Commit: a02d78354479939891abcdb2a987f7e94be2ac86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a02d7835447993… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 10:41:57 2017 +0200 Added new packaging tests for source file (tar.gz) Change-Id: I0f97e93c8ac8309a22acea542d7640099af083b8 --- tests/packaging/test_files.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index fa7cc17..955fd44 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -25,9 +25,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 210*1024*1024), - ("deb", 94*1024*1024, 195*1024*1024), - ("cma", 169*1024*1024, 215*1024*1024), + ("rpm", 119*1024*1024, 210*1024*1024), + ("deb", 94*1024*1024, 195*1024*1024), + ("cma", 169*1024*1024, 215*1024*1024), + ("tar.gz", 320*1024*1024, 400*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what): @@ -95,3 +96,11 @@ def test_cma_only_contains_version_paths(version_path): for line in subprocess.check_output(["tar", "tvf", pkg]).splitlines(): path = line.split()[5] assert not path.startswith(version + "/") + + +def test_src_only_contains_relative_version_paths(version_path): + for pkg in _get_package_paths(version_path, "tar.gz"): + prefix = pkg.replace(".tar.gz", "") + for line in subprocess.check_output(["tar", "tvf", pkg]).splitlines(): + path = line.split()[5] + assert not path.startswith(prefix + "/")

6 years, 11 months

5348 FIX veritas_vcs: add timeout in the Check_MK agent

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 60bda85f6dc8e043bd1dd3240aae27e50c125ffb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60bda85f6dc8e0… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 24 10:24:10 2017 +0200 5348 FIX veritas_vcs: add timeout in the Check_MK agent Add a timeout of 2 seconds for the check veritas_vcs in the Check_MK agent. This circumvents the problem that the agent blocks if there is a problem with a Veritas cluster. Change-Id: I44a87493e080d45fa7cdadf325f923ba21547285 --- .werks/5348 | 13 +++++++++++++ agents/check_mk_agent.linux | 8 ++++---- agents/check_mk_agent.openwrt | 8 ++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.werks/5348 b/.werks/5348 new file mode 100644 index 0000000..5b8f891 --- /dev/null +++ b/.werks/5348 @@ -0,0 +1,13 @@ +Title: veritas_vcs: add timeout in the Check_MK agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508833185 +Class: fix + +Add a timeout of 2 seconds for the check veritas_vcs +in the Check_MK agent. This circumvents the problem +that the agent blocks if there is a problem with a +Veritas cluster. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8dc40c0..61313ad 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -737,10 +737,10 @@ if [ -x /opt/VRTSvcs/bin/haclus ] then echo "<<<veritas_vcs>>>" vcshost=$(hostname | cut -d. -f1) - /opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState - /opt/VRTSvcs/bin/hasys -display -attribute SysState - /opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus - /opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2 /opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState + waitmax -s 9 2 /opt/VRTSvcs/bin/hasys -display -attribute SysState + waitmax -s 9 2 /opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2 /opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 02ae32d..2068499 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -669,10 +669,10 @@ if [ -x /opt/VRTSvcs/bin/haclus ] then echo "<<<veritas_vcs>>>" vcshost=$(hostname | cut -d. -f1) - /opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState - /opt/VRTSvcs/bin/hasys -display -attribute SysState - /opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus - /opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2/opt/VRTSvcs/bin/haclus -display -localclus | grep -e ClusterName -e ClusState + waitmax -s 9 2/opt/VRTSvcs/bin/hasys -display -attribute SysState + waitmax -s 9 2/opt/VRTSvcs/bin/hagrp -display -sys $vcshost -attribute State -localclus + waitmax -s 9 2/opt/VRTSvcs/bin/hares -display -sys $vcshost -attribute State -localclus fi # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg

6 years, 11 months

5324 FIX check_tcp: Made response time metric readable

by Simon Betz

Module: check_mk Branch: master Commit: 284bb2d53744f0c5a9e8df0d60148951b4edc89d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=284bb2d53744f0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 24 10:27:07 2017 +0200 5324 FIX check_tcp: Made response time metric readable Change-Id: I60269b4d39cc3b9863f72ea29740d239e02779ec --- .werks/5324 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/5324 b/.werks/5324 new file mode 100644 index 0000000..cdb6bcc --- /dev/null +++ b/.werks/5324 @@ -0,0 +1,11 @@ +Title: check_tcp: Made response time metric readable +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1508833565 + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 50c4804..84782b5 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4094,6 +4094,10 @@ check_metrics["check_icmp"] = { "rtmin" : { "scale" : m }, } +check_metrics["check_tcp"] = { + "time": { "name": "response_time" } +} + check_metrics["check-mk-host-ping"] = { "rta" : { "scale" : m }, "rtmax" : { "scale" : m },

6 years, 11 months

5347 agent_ucs_bladecenter: add option to disable certificate validation

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 46fcee1c06f8583d2a1aeb1410e93b1807a83014 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46fcee1c06f858… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 24 09:26:41 2017 +0200 5347 agent_ucs_bladecenter: add option to disable certificate validation The SSL certificate validation of the agent_ucs_bladecenter can now be disabled in the WATO rule "Check state of UCS Bladecenter". Change-Id: Ia0dca983965801900cc2dd37bed780c382f1cea3 --- .werks/5347 | 11 +++++++++++ agents/special/agent_ucs_bladecenter | 9 +++++++-- checks/agent_ucs_bladecenter | 3 +++ web/plugins/wato/datasource_programs.py | 9 ++++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/5347 b/.werks/5347 new file mode 100644 index 0000000..10349cc --- /dev/null +++ b/.werks/5347 @@ -0,0 +1,11 @@ +Title: agent_ucs_bladecenter: add option to disable certificate validation +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508829646 +Class: feature + +The SSL certificate validation of the agent_ucs_bladecenter can now be +disabled in the WATO rule "Check state of UCS Bladecenter". diff --git a/agents/special/agent_ucs_bladecenter b/agents/special/agent_ucs_bladecenter index 085a7a7..872b69f 100755 --- a/agents/special/agent_ucs_bladecenter +++ b/agents/special/agent_ucs_bladecenter @@ -44,12 +44,13 @@ OPTIONS: -h, --help Show this help message and exit -u, --username Sets the username -p, --password Sets the password + --no-cert-check Disables the checking of the servers ssl certificate --debug Debug mode: let Python exceptions come through """) short_options = 'hu:p:' long_options = [ - 'help', 'username=', 'password=', 'debug', 'ucssdk' + 'help', 'username=', 'password=', 'debug', 'ucssdk', 'no-cert-check' ] try: @@ -61,6 +62,7 @@ except getopt.GetoptError, err: opt_debug = False opt_username = "" opt_password = "" +opt_verify = True opt_ucssdk = False for o,a in opts: @@ -73,6 +75,8 @@ for o,a in opts: from UcsSdk import * elif o in [ '-p', '--password' ]: opt_password = a + elif o in [ '--no-cert-check' ]: + opt_verify = False elif o in [ '-h', '--help' ]: usage() sys.exit(0) @@ -119,7 +123,8 @@ class Server: "Content-Type": 'text/xml; charset="utf-8"' } - response = self.session_handle.post("https://%s/nuova" % self.netloc, headers=headers, data=payload) + response = self.session_handle.post("https://%s/nuova" % self.netloc, headers=headers, + data=payload, verify=opt_verify) data = response.text if opt_debug: sys.stderr.write("<==== %s\n" % data) diff --git a/checks/agent_ucs_bladecenter b/checks/agent_ucs_bladecenter index 74e48a1..9ba0120 100644 --- a/checks/agent_ucs_bladecenter +++ b/checks/agent_ucs_bladecenter @@ -30,6 +30,9 @@ def agent_ucsbladecenter_arguments(params, hostname, ipaddress): args += " -u " + quote_shell_string(params["username"]) args += " -p " + quote_shell_string(params["password"]) + if params.get("no_cert_check"): + args += " --no-cert-check" + args += " " + quote_shell_string(ipaddress) return args diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index da9539c..cf50e07 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -609,8 +609,15 @@ register_rule(group, allow_empty = False, ) ), + ( "no_cert_check", + FixedValue( + True, + title = _("Disable SSL certificate validation"), + totext = _("SSL certificate validation is disabled"), + ) + ), ], - optional_keys = False + optional_keys = ['no_cert_check'] ), title = _("Check state of UCS Bladecenter"), help = _("This rule selects the UCS Bladecenter agent instead of the normal Check_MK Agent "

6 years, 11 months

5404 FIX Changing "Agent encryption" ruleset now marks bakery as dirty

by Lars Michelsen

Module: check_mk Branch: master Commit: 55c4a446416be6ffee031a6c8f175a7baf049246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55c4a446416be6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 07:45:44 2017 +0200 5404 FIX Changing "Agent encryption" ruleset now marks bakery as dirty Change-Id: Ibdb129695d9e1e5d48e72065fac8ac1df8cae9d9 --- .werks/5404 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5404 b/.werks/5404 new file mode 100644 index 0000000..b04cc2f --- /dev/null +++ b/.werks/5404 @@ -0,0 +1,10 @@ +Title: Changing "Agent encryption" ruleset now marks bakery as dirty +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1508823881 +Class: fix + +

6 years, 11 months

Removed old werk directories from werk .f12

by Lars Michelsen

Module: check_mk Branch: master Commit: 219d5ef6664987b7a6dd454ac0e76479c5489c4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=219d5ef6664987… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 10:03:13 2017 +0200 Removed old werk directories from werk .f12 Change-Id: Ic794f90761e37bcbfdc12c27b949b324d2e06b01 --- .werks/.f12 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.werks/.f12 b/.werks/.f12 index 50cc21e..ed4cc9f 100755 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -8,10 +8,6 @@ ROOT=/omd/sites/$SITE sudo mkdir -p $ROOT/share/check_mk/werks/ make -C .. .werks/werks sudo install -m 644 -g $SITE -o $SITE werks $ROOT/share/check_mk/werks/werks -make -C .. enterprise/werks -sudo install -m 644 -g $SITE -o $SITE ../enterprise/werks $ROOT/share/check_mk/werks/werks-cmc -make -C .. managed/werks -sudo install -m 644 -g $SITE -o $SITE ../managed/werks $ROOT/share/check_mk/werks/werks-cme if [ -z $ONLY_COPY ]; then sudo omd restart $SITE apache

6 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017