Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: FIX windows agent: now able to execute python scripts again

by Andreas Boesl

Module: check_mk Branch: master Commit: 8d7fa42ad2a66916eec2576324827c9cb2f37469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d7fa42ad2a669… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 23 17:09:28 2014 +0200 FIX windows agent: now able to execute python scripts again --- .werks/924 | 8 ++++++++ ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 204800 -> 204800 bytes agents/windows/check_mk_agent.cc | 5 +++++ agents/windows/check_mk_agent.exe | Bin 175104 -> 175104 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 158175 -> 158244 bytes agents/windows/install_agent.exe | Bin 155326 -> 155364 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 9 files changed, 14 insertions(+) diff --git a/.werks/924 b/.werks/924 new file mode 100644 index 0000000..6763425 --- /dev/null +++ b/.werks/924 @@ -0,0 +1,8 @@ +Title: windows agent: now able to execute python scripts again +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1400857728 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9ec0dda..ff51c64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 0611 FIX: nfsexports.solaris: fix in determination of path prefix * 0953 FIX: brocade_mlx_temp: special treatment for devices sometimes not delivering temperature by SNMP * 0958 FIX: df.include: failed for checks with grouping patterns... + * 0924 FIX: windows agent: now able to execute python scripts again Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f54c406..e17986b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 615a546..e7fa13b 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2466,6 +2466,11 @@ char *add_interpreter(char *path, char *newpath) snprintf(newpath, 256, "perl.exe \"%s\"", path); return newpath; } + else if (!strcmp(path + strlen(path) - 3, ".py")) { + // Python scripts get python interpreter + snprintf(newpath, 256, "python.exe \"%s\"", path); + return newpath; + } else { snprintf(newpath, 256, "\"%s\"", path); return newpath; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 75ecbc5..3a353d7 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 952e63a..eeca449 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 783a9a1..559d7ed 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index a0acc6c..3ddaee1 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 492340b..f86b848 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years, 1 month

Check_MK Git: check_mk: FIX json export: fixed bug not stripping html tags from output

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a950db30e4edd26786a8fe50810bff3a6ee35f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a950db30e4edd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 23 16:30:16 2014 +0200 FIX json export: fixed bug not stripping html tags from output --- .werks/923 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/webservice.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/923 b/.werks/923 new file mode 100644 index 0000000..2035111 --- /dev/null +++ b/.werks/923 @@ -0,0 +1,9 @@ +Title: json export: fixed bug not stripping html tags from output +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400855385 + + diff --git a/ChangeLog b/ChangeLog index 0c9d45e..9ec0dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 0811 FIX: Fixed handling of exceptions occuring before login in debug mode * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted * 0921 FIX: dashboards: fixed bug not updating header timestamp... + * 0923 FIX: json export: fixed bug not stripping html tags from output WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index c32e88b..35681b3 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -101,7 +101,7 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox content = str(content) content = content.replace("<br>","\n") stripped = html.strip_tags(content) - html.write(encode_string_json(content)) + html.write(encode_string_json(stripped)) html.write("]") html.write("\n]\n")

10 years, 1 month

Check_MK Git: check_mk: Add options -I and -T to check_traceroute

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c06a837b89dcf9d45ca952e3deeae1c4eacdfca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c06a837b89dcf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 23 15:48:53 2014 +0200 Add options -I and -T to check_traceroute --- checks/check_traceroute | 7 +++++++ doc/treasures/active_checks/check_traceroute | 15 +++++++++++---- web/plugins/wato/active_checks.py | 12 +++++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/checks/check_traceroute b/checks/check_traceroute index ff26112..6a48f4f 100644 --- a/checks/check_traceroute +++ b/checks/check_traceroute @@ -28,6 +28,13 @@ def check_traceroute_arguments(params): args = "" if params["dns"]: args += "-n " + method = params["method"] + if method == "icmp": + args += "-I " + elif method == "tcp": + args += "-T " + # else: None -> default method + for router, state in params["routers"]: args += "-%s %s " % (state, quote_shell_string(router)) args += '"$HOSTADDRESS$"' diff --git a/doc/treasures/active_checks/check_traceroute b/doc/treasures/active_checks/check_traceroute index 6b6f8f9..6f57927 100755 --- a/doc/treasures/active_checks/check_traceroute +++ b/doc/treasures/active_checks/check_traceroute @@ -63,15 +63,17 @@ import os, sys, getopt, subprocess def option_to_state(c): return { "w" : 1, "c" : 2 }[c.lower()] -def check_traceroute(target, routes, nodns): +def check_traceroute(target, routes, nodns, method): args = ["traceroute"] if nodns: args.append("-n") + if method: + args.append(method) args.append(target) p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False) sto, ste = p.communicate() if p.returncode: - return 3, "UNKNOWN - " + ste.replace("\n", " ") + return 3, "UNKNOWN - " + ste.replace("\n", " "), "" # find all visited routers routers = set([]) @@ -123,6 +125,8 @@ Other options: -h, --help show this help and exit --debug show Python exceptions verbosely -n disable reverse DNS lookups + -I Use ICMP ECHO for probes + -T Use TCP SYN for probes """ @@ -131,8 +135,9 @@ os.unsetenv("LANG") opt_verbose = 0 opt_debug = False opt_nodns = False +opt_method = None -short_options = "hw:W:c:C:n" +short_options = "hw:W:c:C:nTI" long_options = [ "verbose", "help", "debug", ] routes = [] @@ -150,6 +155,8 @@ try: routes.append((o[1], a)) elif o == '-n': opt_nodns = True + elif o in [ '-T', '-I' ]: + opt_method = o # now handle action options for o, a in opts: @@ -162,7 +169,7 @@ try: target = args[0] - status, output, long_output = check_traceroute(target, routes, opt_nodns) + status, output, long_output = check_traceroute(target, routes, opt_nodns, opt_method) sys.stdout.write(output.strip() + "\n" + long_output) sys.exit(status) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 24eeb5d..1ad90b7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1353,8 +1353,18 @@ register_rule(group, add_label = _("Add Condition"), ) ), + ( "method", + DropdownChoice( + title = _("Method or probing"), + choices = [ + ( None, _("UDP (default behaviour of tcpdump)") ), + ( "icmp", _("ICMP Echo Request") ), + ( "tcp", _("TCP SYN") ), + ] + ) + ), ], - required_keys = [ "dns", "routers" ], + optional_keys = False, ), match = 'all' )

10 years, 1 month

Check_MK Git: check_mk: check_traceroute: new active check for checking presence and absence of routes

by Mathias Kettner

Module: check_mk Branch: master Commit: 2675e259efe8299442937a8fb5a2c31649a94937 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2675e259efe829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 23 15:39:09 2014 +0200 check_traceroute: new active check for checking presence and absence of routes This check does a traceroute to the target host and checks which route(s) are being taken. You can check both for missing and present routes and attach WARN or CRIT state to them. traceroute is expected to be in the search path and installed with SUID root bit. --- .werks/977 | 11 ++ ChangeLog | 1 + checkman/check_traceroute | 10 ++ checks/check_traceroute | 43 +++++++ doc/treasures/active_checks/check_traceroute | 174 ++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 47 +++++++ 6 files changed, 286 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2675e259ef…

10 years, 1 month

Check_MK Git: check_mk: Minor layout fix for state markers in Multisite

by Mathias Kettner

Module: check_mk Branch: master Commit: 4334e4c0064d901ec3350f7f42a704559e365f2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4334e4c0064d90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 23 15:35:55 2014 +0200 Minor layout fix for state markers in Multisite --- web/htdocs/status.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index bd3099a..d47f987 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -96,6 +96,8 @@ b.stmark { border-radius: 4px; font-size: 7pt; border: 1px solid #666; + position: relative; + top: -1px; } /* inline icon in plugin output for URLs */

10 years, 1 month

Check_MK Git: check_mk: Fix layout of multiline long plugin output of active checks

by Mathias Kettner

Module: check_mk Branch: master Commit: a0efe2320781ebfe71204a854de672f6debb32e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0efe2320781eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 23 15:36:23 2014 +0200 Fix layout of multiline long plugin output of active checks --- web/plugins/views/painters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 3d601df..b05e5e6 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -354,7 +354,7 @@ multisite_painters["svc_long_plugin_output"] = { "title" : _("Long output of check plugin (multiline)"), "short" : _("Status detail"), "columns" : ["service_long_plugin_output"], - "paint" : lambda row: paint_stalified(row, row["service_long_plugin_output"].replace('\\n', '<br>')), + "paint" : lambda row: paint_stalified(row, row["service_long_plugin_output"].replace('\\n', '<br>').replace('\n', '<br>')), } multisite_painters["svc_perf_data"] = { "title" : _("Service performance data"),

10 years, 1 month

Check_MK Git: check_mk: Fixed .f12 helper file

by Mathias Kettner

Module: check_mk Branch: master Commit: 59d77fe5eb143fb439a2c11f4da5e2752d7c396e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59d77fe5eb143f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 23 14:37:25 2014 +0200 Fixed .f12 helper file --- doc/treasures/active_checks/.f12 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/treasures/active_checks/.f12 b/doc/treasures/active_checks/.f12 index 30897fc..9f39ab6 100755 --- a/doc/treasures/active_checks/.f12 +++ b/doc/treasures/active_checks/.f12 @@ -1,2 +1,4 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../../../.site 2>/dev/null)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync -va ./ /omd/sites/$SITE/lib/nagios/plugins

10 years, 1 month

Check_MK Git: check_mk: Fixed function name conflict

by Mathias Kettner

Module: check_mk Branch: master Commit: c1dfa988fb98b25c6ae41bd9c1bf87811d35ff04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1dfa988fb98b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 22 17:39:07 2014 +0200 Fixed function name conflict --- modules/automation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 4244828..baa99cc 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -1329,7 +1329,7 @@ def automation_active_check(args): return execute_check_plugin(command_line) -def load_resource_cfg(macros): +def load_resource_file(macros): try: for line in file(omd_root + "/etc/nagios/resource.cfg"): line = line.strip() @@ -1351,7 +1351,7 @@ def replace_core_macros(hostname, commandline): "$HOSTNAME$" : hostname, "$HOSTADDRESS$" : lookup_ipaddress(hostname), } - load_resource_cfg(macros) + load_resource_file(macros) for varname, value in macros.items(): commandline = commandline.replace(varname, value) return commandline

10 years, 1 month

Check_MK Git: check_mk: FIX dmidecode: fixed exceptions on missing/ unknown data

by Andreas Boesl

Module: check_mk Branch: master Commit: 87a8544b0cdaef3db4604c0bb74e1c019bc99207 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87a8544b0cdaef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 22 15:48:22 2014 +0200 FIX dmidecode: fixed exceptions on missing/unknown data --- .werks/922 | 8 ++++++++ ChangeLog | 1 + inventory/dmidecode | 6 ++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/922 b/.werks/922 new file mode 100644 index 0000000..8f278cf --- /dev/null +++ b/.werks/922 @@ -0,0 +1,8 @@ +Title: dmidecode: fixed exceptions on missing/unknown data +Level: 1 +Component: inv +Version: 1.2.5i3 +Date: 1400766476 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9da13c1..f89e994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,7 @@ * 0913 lnx_distro: Now able to detect SuSE distributions... * 0610 mk_inventory: windows inventory check now included, install date added to data * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list + * 0922 FIX: dmidecode: fixed exceptions on missing/unknown data 1.2.5i2: diff --git a/inventory/dmidecode b/inventory/dmidecode index d29ded9..c654aeb 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -217,8 +217,8 @@ def inv_dmidecode_parse_mem_device(lines): if device["size"] != "No Module Installed": # Convert speed and size into numbers - device["speed"] = dmidecode_parse_speed(device["speed"]) - device["size"] = dmidecode_parse_size(device["size"]) + device["speed"] = dmidecode_parse_speed(device.get("speed", "Unknown")) + device["size"] = dmidecode_parse_size(device.get("size", "Unknown")) array["devices"].append(device) @@ -262,6 +262,8 @@ def dmidecode_parse_speed(v): # into Hz (float) return float(parts[0]) def dmidecode_parse_voltage(v): + if v == "Unknown": + return None return float(v.split()[0]) def dmidecode_parse_time(v): # 155 ns

10 years, 1 month

Check_MK Git: check_mk: FIX Fix HTML encoding of tootip in inline timeline of availability

by Mathias Kettner

Module: check_mk Branch: master Commit: c9d23b21b8b5e35beb8a45f67640a44d4bef8553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d23b21b8b5e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 22 10:40:25 2014 +0200 FIX Fix HTML encoding of tootip in inline timeline of availability --- .werks/891 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/891 b/.werks/891 new file mode 100644 index 0000000..9ce16c1 --- /dev/null +++ b/.werks/891 @@ -0,0 +1,9 @@ +Title: Fix HTML encoding of tootip in inline timeline of availability +Level: 1 +Component: reporting +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400748002 + + diff --git a/ChangeLog b/ChangeLog index d92c7c1..a2cae0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ * 0967 BI Availability timewarp: new buttons for moving back and forth * 0962 FIX: Fix CSV-Export in availability table * 0890 FIX: Fix availability computation for hosts... + * 0891 FIX: Fix HTML encoding of tootip in inline timeline of availability Event Console: * 0885 New option for writing all messages into a syslog-like logfile...

10 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014