Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: bf6ba804d1bf4cc6d2501862612a70885af7b69c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6ba804d1bf4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 14:16:50 2015 +0100 Add comment --- checks/elphase.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/elphase.include b/checks/elphase.include index e3c9093..b0424e3 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -32,8 +32,8 @@ def inventory_elphase(parsed): # Parsed has the following form: # parsed = { # "Phase 1" : { -# "voltage" : (220.17, (1, "Voltage is too low")), -# "current" : 12.0, +# "voltage" : (220.17, (1, "Voltage is too low")), # with device state +# "current" : 12.0, # without device state # } # } def check_elphase(item, params, parsed):

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2305

by Mathias Kettner

Module: check_mk Branch: master Commit: f7bc03f7accfc7662f8f103c91547ed85f8dc222 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7bc03f7accfc7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 11:45:29 2015 +0100 Updated bug entries #2305 --- .bugs/2305 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.bugs/2305 b/.bugs/2305 new file mode 100644 index 0000000..aefec22 --- /dev/null +++ b/.bugs/2305 @@ -0,0 +1,21 @@ +Title: User setting Disable Notifications vanishes also for admin for permission is missing +Component: wato +State: open +Date: 2015-02-24 11:43:13 +Targetversion: 1.2.6 +Class: bug + +If a user does not have the permission general.disable_notifications, then the checkbox +in his personal settings for this option is not visible. Even if the user settings are edited +by the admin! + +Solution: + +1. The admin must have the permission to change this flag - regardless of the permission of + the user + +2. If the permission is missing for the user then the actual setting must be displayed + read-only nevertheless! + +In our case the notifications were disabled but this was completely hidden and only +visible in users.mk.

9 years, 7 months

Check_MK Git: check_mk: Fixed path in check catalogue for f5 temperature checks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3426e2935666d4a53781b19adcf4dd67bea8077c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3426e2935666d4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 24 11:08:44 2015 +0100 Fixed path in check catalogue for f5 temperature checks --- checkman/f5_bigip_chassis_temp | 2 +- checkman/f5_bigip_cpu_temp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/f5_bigip_chassis_temp b/checkman/f5_bigip_chassis_temp index e47c292..b710649 100644 --- a/checkman/f5_bigip_chassis_temp +++ b/checkman/f5_bigip_chassis_temp @@ -1,6 +1,6 @@ title: F5 BIG-IP load balancer: Chassis temperature agents: snmp -catalog: hw/environment/hwg +catalog: hw/network/f5 license: GPL distribution: check_mk description: diff --git a/checkman/f5_bigip_cpu_temp b/checkman/f5_bigip_cpu_temp index a9f7962b..d13cac9 100644 --- a/checkman/f5_bigip_cpu_temp +++ b/checkman/f5_bigip_cpu_temp @@ -1,6 +1,6 @@ title: F5 BIG-IP load balancer: CPU temperature agents: snmp -catalog: hw/environment/hwg +catalog: hw/network/f5 license: GPL distribution: check_mk description:

9 years, 7 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: a15d17a7aa6753c4e6700183bd0795b15b191dd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a15d17a7aa6753… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 10:20:58 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b29009a..c873496 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2038 +2048

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2304

by Mathias Kettner

Module: check_mk Branch: master Commit: 745dd56f57c846f663932671c5b109bd8e85cfe4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=745dd56f57c846… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 10:20:51 2015 +0100 Updated bug entries #2304 --- .bugs/2304 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2304 b/.bugs/2304 new file mode 100644 index 0000000..bac8b78 --- /dev/null +++ b/.bugs/2304 @@ -0,0 +1,9 @@ +Title: Process piggyback data even if "no agent" is selected +Component: core +State: open +Date: 2015-02-24 10:18:14 +Targetversion: 1.2.6 +Class: bug + +If you just get Piggy data for a host you must be able to select 'no agent'. But +in that case the piggy data is not being processed - at least not by the inventory.

9 years, 7 months

Check_MK Git: check_mk: win_dmidecode.bat: make output parsable by MK inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 50f085ba4831f6879c65e1e26027a87617ae6164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50f085ba4831f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 10:17:49 2015 +0100 win_dmidecode.bat: make output parsable by MK inventory --- agents/windows/plugins/win_dmidecode.bat | 4 ++-- inventory/dmidecode | 8 +++++++- modules/check_mk_base.py | 20 ++++++++++++-------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/agents/windows/plugins/win_dmidecode.bat b/agents/windows/plugins/win_dmidecode.bat index e0bfb9f..5d60a83 100644 --- a/agents/windows/plugins/win_dmidecode.bat +++ b/agents/windows/plugins/win_dmidecode.bat @@ -11,5 +11,5 @@ REM * This plugin should work out of the box if you install dmidecode REM * to the default location. REM *** -echo ^<^<^<dmidecode^>^>^> -C:\Programme\GnuWin32\sbin\dmidecode.exe -t 1 -q +echo ^<^<^<dmidecode:sep(0):nostrip^>^>^> +C:\Programme\GnuWin32\sbin\dmidecode.exe -q diff --git a/inventory/dmidecode b/inventory/dmidecode index 382875e..4feeb3c 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -62,11 +62,17 @@ # # ... any many other sections... - +# Note: on Linux \t is replaced by : and then the split +# is done by :. On Windows the \t comes 1:1 and no splitting +# is being done. So we need to split manually here def inv_dmidecode(info): section_name = None section_lines = [] for line in info: + # Windows plugin keeps tabs and has no separator + if len(line) == 1: + parts = line[0].replace("\t", ":").split(":") + line = [ x.strip() for x in parts ] if len(line) == 1: if section_name: inv_dmidecode_parse_section(section_name, section_lines) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f97061e..50d471f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -475,8 +475,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, ignore_che elif len(output) < 16: raise MKAgentError("Too short output from agent: '%s'" % output) - lines = [ l.strip() for l in output.split('\n') ] - info, piggybacked, persisted = parse_info(lines, hostname) + info, piggybacked, persisted = parse_info(output.split("\n"), hostname) store_piggyback_info(hostname, piggybacked) store_persisted_info(hostname, persisted) store_cached_hostinfo(hostname, info) @@ -794,7 +793,6 @@ def store_cached_checkinfo(hostname, checkname, table): # 2. piggy-backed data for other hosts # 3. Sections to be persisted for later usage def parse_info(lines, hostname): - info = {} piggybacked = {} # unparsed info for other hosts persist = {} # handle sections with option persist(...) @@ -804,8 +802,10 @@ def parse_info(lines, hostname): separator = None encoding = None for line in lines: - if line[:4] == '<<<<' and line[-4:] == '>>>>': - host = line[4:-4] + line = line.rstrip("\r") + stripped_line = line.strip() + if stripped_line[:4] == '<<<<' and stripped_line[-4:] == '>>>>': + host = stripped_line[4:-4] if not host: host = None else: @@ -817,8 +817,8 @@ def parse_info(lines, hostname): # Found normal section header # section header has format <<<name:opt1(args):opt2:opt3(args)>>> - elif line[:3] == '<<<' and line[-3:] == '>>>': - section_header = line[3:-3] + elif stripped_line[:3] == '<<<' and stripped_line[-3:] == '>>>': + section_header = stripped_line[3:-3] headerparts = section_header.split(":") section_name = headerparts[0] section_options = {} @@ -848,7 +848,10 @@ def parse_info(lines, hostname): # The section data might have a different encoding encoding = section_options.get("encoding") - elif line != '': + elif stripped_line != '': + if "nostrip" not in section_options: + line = stripped_line + if encoding: try: decoded_line = line.decode(encoding) @@ -856,6 +859,7 @@ def parse_info(lines, hostname): except: pass section.append(line.split(separator)) + return info, piggybacked, persist

9 years, 7 months

Check_MK Git: check_mk: #2037 FIX Inventorize piggy back data even if access to normal agent fails

by Mathias Kettner

Module: check_mk Branch: master Commit: 4afc6d3bbb800058b2ebfdad2892cdf71d480b2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4afc6d3bbb8000… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 24 10:16:41 2015 +0100 #2037 FIX Inventorize piggy back data even if access to normal agent fails --- .werks/2037 | 10 ++++++++++ ChangeLog | 1 + modules/discovery.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2037 b/.werks/2037 new file mode 100644 index 0000000..9bcf3de --- /dev/null +++ b/.werks/2037 @@ -0,0 +1,10 @@ +Title: Inventorize piggy back data even if access to normal agent fails +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424769389 + + diff --git a/ChangeLog b/ChangeLog index e7cd726..33f3b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function * 2012 FIX: Piggyback hostname translation can now deal correctly with umlauts * 2014 FIX: Fixed different issues running Check_MK on CentOS 5.x + * 2037 FIX: Inventorize piggy back data even if access to normal agent fails Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/discovery.py b/modules/discovery.py index b6bb015..2b1f6dd 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -377,7 +377,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): info = None # default in case of exception info = get_info_for_discovery(hostname, ipaddress, section_name, use_caches) except MKAgentError, e: - if str(e): + if str(e) and str(e) != "Cannot get information from agent, processing only piggyback data.": raise except MKSNMPError, e: if str(e):

9 years, 7 months

Check_MK Git: check_mk: Fixed snapshot creation with CentOS <2.5

by Lars Michelsen

Module: check_mk Branch: master Commit: 73b5e8afa1c4029a33552306a166c66986bb6dd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73b5e8afa1c402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 21:16:25 2015 +0100 Fixed snapshot creation with CentOS <2.5 --- modules/automation.py | 55 +++++++++++++++++++++++++++++++------------------ web/htdocs/wato.py | 2 -- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 96217f2..6d20c45 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -867,23 +867,37 @@ def automation_create_snapshot(args): statusinfo[name] = "TODO:0" update_status_file() - if not data.get("wait"): - try: - pid = os.fork() - if pid > 0: - # Exit parent process - return - # Decouple from parent environment - os.chdir("/") - os.umask(0) - os.setsid() - for fd in range(0, 256): - try: - os.close(fd) - except OSError: - pass - except OSError, e: - raise MKAutomationError(str(e)) + # Now fork into our own process to have an asynchronous backup creation + try: + pid = os.fork() + if pid > 0: + # Exit parent process + return + # Decouple from parent environment + os.chdir("/") + os.umask(0) + os.setsid() + + # Close all fd except stdin,out,err + for fd in range(3, 256): + try: + os.close(fd) + except OSError: + pass + + sys.stdout.flush() + sys.stderr.flush() + + si = os.open("/dev/null", os.O_RDONLY) + so = os.open("/dev/null", os.O_WRONLY) + os.dup2(si, 0) + os.dup2(so, 1) + os.dup2(so, 2) + os.close(si) + os.close(so) + + except OSError, e: + raise MKAutomationError(str(e)) # Save pid of working process. file(filename_pid, "w").write("%d" % os.getpid()) @@ -987,13 +1001,14 @@ def automation_create_snapshot(args): command = "tar czf %s --ignore-failed-read --force-local %s -C %s %s" % \ (path_subtar, exclude_options, prefix, " ".join(paths)) - proc = subprocess.Popen(command, shell=True, stdin = None, - stdout = subprocess.PIPE, stderr = subprocess.PIPE, cwd = prefix) + proc = subprocess.Popen(command, shell=True, stdin=None, close_fds=True, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=prefix) stdout, stderr = proc.communicate() exit_code = proc.wait() # Allow exit codes 0 and 1 (files changed during backup) if exit_code not in [0, 1]: - raise MKAutomationError("Error while creating backup of %s (Exit Code %d) - %s.\n%s" % (current_domain, exit_code, stderr, command)) + raise MKAutomationError("Error while creating backup of %s (Exit Code %d) - %s.\n%s" % + (current_domain, exit_code, stderr, command)) subtar_size = os.stat(path_subtar).st_size subtar_hash = sha256(file(path_subtar).read()).hexdigest() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index afbc4d5..bb84f59 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6819,7 +6819,6 @@ def mode_snapshot(phase): snapshot_data["type"] = "manual" snapshot_data["snapshot_name"] = snapshot_name snapshot_data["domains"] = store_domains - snapshot_data["wait"] = False return None, _("Created snapshot <tt>%s</tt>.") % create_snapshot(snapshot_data) @@ -7036,7 +7035,6 @@ def create_snapshot(data = {}): snapshot_data["type"] = data.get("type", "automatic") snapshot_data["snapshot_name"] = snapshot_name snapshot_data["domains"] = remove_functions(data.get("domains", get_backup_domains(["default"]))) - snapshot_data["wait"] = data.get("wait", False) check_mk_local_automation("create-snapshot", [], snapshot_data)

9 years, 7 months

Check_MK Git: check_mk: made liveproxyd python <2.5 compatible ( For CentOS 5.x) support

by Lars Michelsen

Module: check_mk Branch: master Commit: 77b9d172685c0b491016d0daa3620be8f4ea6fd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b9d172685c0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 19:01:52 2015 +0100 made liveproxyd python <2.5 compatible (For CentOS 5.x) support --- doc/treasures/liveproxy/liveproxyd | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index da3ef48..165bca2 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -95,6 +95,9 @@ def liveproxyd_run(): dump_state() last_dump = now + except SystemExit: + # Python <2.5 compat: Simply let exit go through this level + raise except Exception, e: if opt_debug: raise @@ -926,7 +929,7 @@ def usage(): -v, --verbose Enable verbose output -g, --foreground Do not daemonize, run in foreground - -c, --conifg CONFIG Read configuration from file CONFIG + -c, --config CONFIG Read configuration from file CONFIG --debug Enable debug mode (let exceptions through) -h, --help Show this help and exit -V, --version Print version and exit @@ -1084,7 +1087,7 @@ try: opt_debug = True elif o in [ '-g', '--foreground' ]: opt_foreground = True - elif o in [ '-c', '--conifg' ]: + elif o in [ '-c', '--config' ]: opt_config = a # now handle action options @@ -1127,6 +1130,9 @@ try: os.remove(opt_pid_file) sys.exit(0) +except SystemExit: + # Python <2.5 compat: Simply let exit go through this level + raise except Exception, e: if opt_debug: raise

9 years, 7 months

Check_MK Git: check_mk: Rename dmi_sysinfo.bat to win_dmidecode.bat

by Mathias Kettner

Module: check_mk Branch: master Commit: 96d5b44e760431d7b3a5a525956eeddbc678015a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d5b44e760431… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 23 18:06:38 2015 +0100 Rename dmi_sysinfo.bat to win_dmidecode.bat Inventory expects the section <<<dmidecode>>> --- agents/windows/plugins/{ => deprecated}/dmi_sysinfo.bat | 0 agents/windows/plugins/win_dmidecode.bat | 15 +++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/agents/windows/plugins/dmi_sysinfo.bat b/agents/windows/plugins/deprecated/dmi_sysinfo.bat similarity index 100% rename from agents/windows/plugins/dmi_sysinfo.bat rename to agents/windows/plugins/deprecated/dmi_sysinfo.bat diff --git a/agents/windows/plugins/win_dmidecode.bat b/agents/windows/plugins/win_dmidecode.bat new file mode 100644 index 0000000..e0bfb9f --- /dev/null +++ b/agents/windows/plugins/win_dmidecode.bat @@ -0,0 +1,15 @@ +@echo off + +REM *** +REM * To be able to run this plugin you need to install dmidecode +REM * on your windows client. +REM * +REM * You can download dmidecode for windows from +REM * <http://gnuwin32.sourceforge.net/packages/dmidecode.htm> +REM * +REM * This plugin should work out of the box if you install dmidecode +REM * to the default location. +REM *** + +echo ^<^<^<dmidecode^>^>^> +C:\Programme\GnuWin32\sbin\dmidecode.exe -t 1 -q

9 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015