Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: #2199 livestatus_status: now in addition check master settings of monitoring core

by Mathias Kettner

Module: check_mk Branch: master Commit: ebe5fa2860e6bd629a3be2957b404fbe16d3ed4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebe5fa2860e6bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 13 09:57:34 2015 +0200 #2199 livestatus_status: now in addition check master settings of monitoring core For example the check will no go critical if notifications are disabled. The exact states for each situation can be configured via a new WATO rule set. --- .werks/2199 | 10 ++++ ChangeLog | 1 + checkman/livestatus_status | 14 +++--- checks/livestatus_status | 88 ++++++++++++++++++++++++---------- web/plugins/wato/check_parameters.py | 27 ++++++++++- 5 files changed, 106 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ebe5fa2860…

9 years, 5 months

Check_MK Git: check_mk: Fix match_type setting of many check parameters

by Mathias Kettner

Module: check_mk Branch: master Commit: 27f3cf27ba041eaadaf29d72e8c5d4b16bf0fbf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27f3cf27ba041e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 13 09:21:17 2015 +0200 Fix match_type setting of many check parameters --- web/htdocs/wato.py | 5 + web/plugins/wato/check_parameters.py | 222 +++++++++++++++++++--------------- 2 files changed, 127 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=27f3cf27ba…

9 years, 5 months

Check_MK Git: check_mk: Code cleanup in WATO rules, set correct match_type everywhere

by Mathias Kettner

Module: check_mk Branch: master Commit: 6b4f4b8c31731c87a39758555b3d9ef2bae26d4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b4f4b8c31731c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 13 09:06:07 2015 +0200 Code cleanup in WATO rules, set correct match_type everywhere --- web/htdocs/wato.py | 6 +- web/plugins/wato/check_parameters.py | 527 +++++++++++++++++++--------------- 2 files changed, 298 insertions(+), 235 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6b4f4b8c31…

9 years, 5 months

Check_MK Git: check_mk: Fixed title of werk #1955

by Sven Rueß

Module: check_mk Branch: master Commit: aa2ea70aeeb4b08192d51b47d00e00c92ec2e522 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa2ea70aeeb4b0… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 13 08:43:00 2015 +0200 Fixed title of werk #1955 --- .werks/1955 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1955 b/.werks/1955 index 8722f0a..e6a4b5a 100644 --- a/.werks/1955 +++ b/.werks/1955 @@ -1,4 +1,4 @@ -Title: Fixed status message to show the correct values of limits +Title: lnx_quota: Fixed status message to show the correct values of limits Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 5091e76..cd3df67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -317,7 +317,7 @@ * 2172 FIX: Allowing OIDs in checks not starting with a dot again... * 2173 FIX: mk-job: Fixed quoting of command line arguments * 2198 FIX: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past... - * 1955 FIX: Fixed status message to show the correct values of limits... + * 1955 FIX: lnx_quota: Fixed status message to show the correct values of limits... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 5 months

Check_MK Git: check_mk: #1955 FIX Fixed status message to show the correct values of limits

by Sven Rueß

Module: check_mk Branch: master Commit: a8bc79f5fa9576357ba1934764f2c8a76ce40f32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8bc79f5fa9576… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 13 08:06:23 2015 +0200 #1955 FIX Fixed status message to show the correct values of limits Fixed status message to show the correct values of hard and file limits if the user exceeded it. --- .werks/1955 | 11 +++++++++++ ChangeLog | 1 + checks/lnx_quota | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1955 b/.werks/1955 new file mode 100644 index 0000000..8722f0a --- /dev/null +++ b/.werks/1955 @@ -0,0 +1,11 @@ +Title: Fixed status message to show the correct values of limits +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428904937 + +Fixed status message to show the correct values of hard and file limits if +the user exceeded it. diff --git a/ChangeLog b/ChangeLog index bcef5c2..5091e76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -317,6 +317,7 @@ * 2172 FIX: Allowing OIDs in checks not starting with a dot again... * 2173 FIX: mk-job: Fixed quoting of command line arguments * 2198 FIX: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past... + * 1955 FIX: Fixed status message to show the correct values of limits... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/lnx_quota b/checks/lnx_quota index 8250412..751df78 100644 --- a/checks/lnx_quota +++ b/checks/lnx_quota @@ -52,7 +52,7 @@ def check_lnx_quota(item, params, info): output = [] perfdata = [] - fmt = lambda v, w: w == 'files' and '%d files' % v or get_bytes_human_readable(used*1000, 1000) + fmt = lambda v, w: w == 'files' and '%d files' % v or get_bytes_human_readable(v*1000, 1000) for user, values in parsed[item].items(): for what, (used, soft, hard, grace) in [

9 years, 5 months

Check_MK Git: check_mk: diskstat: fix exception in case IOs/sec is zero

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e75ca6505ba70b859805ebe095ac2d0e39d799b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e75ca6505ba70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 12 20:42:44 2015 +0200 diskstat: fix exception in case IOs/sec is zero --- checks/diskstat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index c6f3b7d..35d220f 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -148,14 +148,14 @@ def parse_diskstat(info): # Average read and write rate, from end to end, including queuing, etc. # and average size of one request - if read_ticks_rate: + if read_ticks_rate and read_ios_rate > 0: average_read_wait = read_ticks_rate / read_ios_rate / 1000.0 average_read_size = read_bytes_rate / read_ios_rate else: average_read_wait = 0.0 average_read_size = 0.0 - if write_ticks_rate: + if write_ticks_rate and write_ios_rate > 0: average_write_wait = write_ticks_rate / write_ios_rate / 1000.0 average_write_size = write_bytes_rate / write_ios_rate else:

9 years, 5 months

Check_MK Git: check_mk: #2198 FIX windows_updates: Fix missing warning if reboot required in case forced reboot is in the past

by Mathias Kettner

Module: check_mk Branch: master Commit: 5aca793ef9a0a3bbdc970f248c2ac44b344089ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aca793ef9a0a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 16:58:26 2015 +0200 #2198 FIX windows_updates: Fix missing warning if reboot required in case forced reboot is in the past If the plugin reports the next forced reboot to lie in the past then the check did not warn anymore about a neccessary reboot for applying the installed patches. Also the code was cleaned up on the dependency to the Python module <tt>datetime</tt> has been removed. --- .werks/2198 | 13 +++++++++++++ ChangeLog | 1 + checks/windows_updates | 48 +++++++++++++++++------------------------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.werks/2198 b/.werks/2198 new file mode 100644 index 0000000..c425f3d --- /dev/null +++ b/.werks/2198 @@ -0,0 +1,13 @@ +Title: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428677837 + +If the plugin reports the next forced reboot to lie in the past then +the check did not warn anymore about a neccessary reboot for applying +the installed patches. Also the code was cleaned up on the dependency +to the Python module <tt>datetime</tt> has been removed. diff --git a/ChangeLog b/ChangeLog index 7738037..bcef5c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -316,6 +316,7 @@ * 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit email addresses... * 2172 FIX: Allowing OIDs in checks not starting with a dot again... * 2173 FIX: mk-job: Fixed quoting of command line arguments + * 2198 FIX: windows_updates: Fix missing warning if reboot required in case forced reboot is in the past... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/windows_updates b/checks/windows_updates index 717ff52..9c49864 100644 --- a/checks/windows_updates +++ b/checks/windows_updates @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - # <<<windows_updates>>> # 0 2 5 # Windows XP Service Pack 3 (KB936929); Windows-Tool zum Entfernen sch�dlicher Software - M�rz 2011 (KB890830) @@ -36,15 +34,13 @@ # Third row: List of all optional updates (optional) # Last row: Date and time of forced update (optional) -import datetime - windows_updates_default_params = (0, 0, 0, 0, 604800, 172800, True) def inventory_windows_updates(info): if info and len(info[0]) == 3: return [(None, "windows_updates_default_params")] -def check_windows_updates(_unused, params, info): +def check_windows_updates(_no_item, params, info): if info and len(info[0]) == 3: status = 0 # Workarround to return errors from the plugin @@ -95,38 +91,28 @@ def check_windows_updates(_unused, params, info): txt.append(this_txt) perfdata.append((label, cur, warn, crit)) + if reboot_required == 1: + if status < 1: + status = 1 + txt.append('Reboot required to finish updates(!)') + if forced_reboot != "": - date, time = forced_reboot - year, month, day = map(int, date.split("-")) - hour, minute, second = map(int, time.split(":")) - force_date = datetime.datetime(year, month, day, hour, minute, second) - now = datetime.datetime.now() - nix = datetime.timedelta(seconds=0) + parsed = time.strptime(" ".join(forced_reboot), "%Y-%m-%d %H:%M:%S") + now = int(time.time()) + delta = time.mktime(parsed) - now + # check if force_date is in the future - if force_date - now > nix: - if force_crit: - diff_crit = datetime.timedelta(seconds=force_crit) - else: - diff_crit = None - if force_warn: - diff_warn = datetime.timedelta(seconds=force_warn) - else: - diff_warn = None + if delta >= 0: sym = "" - if diff_crit and diff_crit > force_date - now: - status = 2 + if force_crit and delta <= force_crit: sym = "(!!)" - elif diff_warn and diff_warn > force_date - now: - if status < 1: - status = 1 + status = 2 + elif force_warn and delta <= force_warn: sym = "(!)" - boot_txt = ('Reboot enforced on %s to finish updates %s') \ - % ( " ".join(forced_reboot), sym ) + status = max(status, 1) + + boot_txt = 'Reboot enforced in %s to finish updates%s' % (get_age_human_readable(delta), sym) txt.append(boot_txt) - elif reboot_required == 1: - if status < 1: - status = 1 - txt.append('Reboot required to finish updates (!)') return (status, ', '.join(txt), perfdata)

9 years, 5 months

Check_MK Git: check_mk: Reserved 15 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 70ff279f234eea0244b909a89f523b4e6ef6bd7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ff279f234eea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 16:57:10 2015 +0200 Reserved 15 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 978a548..e22951f 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2198 +2213

9 years, 5 months

Check_MK Git: check_mk: Fixed downtime script in treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 5cc0a0389f99b4c6e1413bccd9db5d217f4dfed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc0a0389f99b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 16:30:23 2015 +0200 Fixed downtime script in treasures --- .werks/1945 | 6 ++-- ChangeLog | 2 +- doc/treasures/downtime | 82 +++++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/.werks/1945 b/.werks/1945 index 278a1f7..613208c 100644 --- a/.werks/1945 +++ b/.werks/1945 @@ -1,4 +1,4 @@ -Title: doc/treasures/downtime script: was no longer working because of latest changes in the GUI +Title: doc/treasures/downtime: Fix setting and removing of downtimes Level: 1 Component: multisite Compatible: compat @@ -6,5 +6,5 @@ Version: 1.2.7i1 Date: 1424337912 Class: fix -This little helper script used the wrong multisite filter elements. -Some of them have been renamed, e.g. from host to host_regex. +The downtime helper script has been fixed to work with the new +filter semantics of the host and service views. diff --git a/ChangeLog b/ChangeLog index a2308b4..7738037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -362,7 +362,7 @@ * 1983 FIX: Fixed special case in language configuration via user profile... * 1984 FIX: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload... * 1985 FIX: PNP graph dashlet handles graphs in distributed setups correctly... - * 1945 FIX: doc/treasures/downtime script: was no longer working because of latest changes in the GUI... + * 1945 FIX: doc/treasures/downtime: Fix setting and removing of downtimes... * 2008 FIX: Users created during basic auth login get the role assigned configured in "default user profile"... * 2011 FIX: "Service Group" view sorts/groups the services now correctly by host * 2024 FIX: Views: Fixed problem when filtering views by strings containing umlauts... diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 416e4e9..06a0d82 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -67,14 +67,14 @@ long_options = [ "help", "set", "remove", "comment=", "url=", opt_all = False opt_verbose = 0 opt_mode = 'set' -opt_comment = "Automatic_downtime" +opt_comment = "Automatic downtime" opt_user = "automation" opt_secret = None opt_url = None opt_duration = 120 if omd_site: - opt_url = "http://localhost/" + omd_site + "/check_mk/" + opt_url = "http://localhost/" + omd_site + "/check_mk/" try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, err: @@ -110,10 +110,10 @@ for o,a in opts: if omd_site and not opt_secret: try: - opt_secret = file(omd_root + "/var/check_mk/web/" + opt_user + opt_secret = file(omd_root + "/var/check_mk/web/" + opt_user + "/automation.secret").read().strip() except Exception, e: - bail_out("Cannot read automation secret from user %s: %s" % + bail_out("Cannot read automation secret from user %s: %s" % (opt_user, e)) elif not omd_site and not opt_secret: @@ -145,62 +145,64 @@ verbose("User: " + opt_user) verbose("Secret: " + (opt_secret or "(none specified)")) def make_url(base, variables): - vartext = "&".join([ "%s=%s" % e for e in variables ]) + vartext = "&".join([ "%s=%s" % (varname, urllib.quote(value)) for (varname, value) in variables ]) return base + "?" + vartext +def set_downtime(variables, add_vars): + url = make_url(opt_url + "view.py", variables + add_vars) + verbose("URL: " + url) + try: + pipe = urllib.urlopen(url) + lines = pipe.readlines() + verbose(" --> Got %d lines of response" % len(lines)) + if opt_verbose > 1: + for line in lines: + verbose("OUTPUT: %s" % line.rstrip()) + for line in lines: + if line.startswith('<div class=error>'): + bail_out(line[17:].split('<')[0]) + except Exception, e: + bail_out("Cannot call Multisite URL: %s" % e) + + +# We have 6 different modes: +# Only the host | 1: set | 4: remove +# Only specific services | 2: set | 5: remove +# Host and all services | 3: set | 6: remove + +# Authentication and host selection variables = [ ( "_username", opt_user ), ( "_secret", opt_secret ), ( "_transid", "-1" ), ( "_do_confirm", "yes" ), ( "_do_actions", "yes" ), + ("host", arg_host ), ] -if opt_mode == 'remove': +# Action variables for setting or removing (works in all views) +if opt_mode == "remove": variables += [ - ("view_name", "downtimes"), ("_remove_downtimes", "Remove"), - ("host_regex", arg_host + "$" ), + ("_down_remove", "Remove"), ] else: variables += [ ( "_down_from_now", "yes" ), - ( "_down_minutes", opt_duration ), + ( "_down_minutes", str(opt_duration) ), ( "_down_comment", opt_comment ), - ("host", arg_host ), ] - if arg_services: - variables.append(("view_name", "service")) - else: - variables.append(("view_name", "hoststatus")) -def set_downtime(variables, add_vars): - url = make_url(opt_url + "view.py", variables + add_vars) - verbose("URL: " + url) - try: - pipe = urllib.urlopen(url) - lines = pipe.readlines() - verbose(" --> Got %d lines of response" % len(lines)) - if opt_verbose > 1: - for line in lines: - verbose("OUTPUT: %s" % line.rstrip()) - for line in lines: - if line.startswith('<div class=error>'): - bail_out(line[17:].split('<')[0]) - except Exception, e: - bail_out("Cannot call Multisite URL: %s" % e) +# Downtime on host (handles 1 & 4, needed for 3 & 6) +if not arg_services: + set_downtime(variables, [("view_name", "hoststatus")]) -if arg_services: - for service in arg_services: - if opt_mode == "remove": - set_downtime(variables, [("service", service )]) - else: - set_downtime(variables, [("service", service )]) +# Downtime on specific services (handles 2 & 5) else: - set_downtime(variables, []) - if opt_all: - if opt_mode == 'set': - set_downtime(variables, [("view_name", "service")]) - + for service in arg_services: + set_downtime(variables, [("view_name", "service"), ("service", service)]) +# Handle services for option --all (3 & 6) +if opt_all: + set_downtime(variables, [("view_name", "host")])

9 years, 5 months

Check_MK Git: check_mk: #2197 FIX win_reg_uninstall: Fix exception in case of invalid output line

by Mathias Kettner

Module: check_mk Branch: master Commit: 028b46e11a846c1b05d00652c35fe31cf3428527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=028b46e11a846c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 10 15:09:39 2015 +0200 #2197 FIX win_reg_uninstall: Fix exception in case of invalid output line Might be cased by a software with vertical bars in the name. This happended for <tt>Symantec Backup Exec Remote Agent for Windows</tt>. The reason is unclear. --- .werks/2197 | 12 ++++++++++++ ChangeLog | 1 + inventory/win_reg_uninstall | 3 +++ 3 files changed, 16 insertions(+) diff --git a/.werks/2197 b/.werks/2197 new file mode 100644 index 0000000..610ca76 --- /dev/null +++ b/.werks/2197 @@ -0,0 +1,12 @@ +Title: win_reg_uninstall: Fix exception in case of invalid output line +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428671316 + +Might be cased by a software with vertical bars in the name. This happended +for <tt>Symantec Backup Exec Remote Agent for Windows</tt>. The reason is +unclear. diff --git a/ChangeLog b/ChangeLog index bc3240a..a2308b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -480,6 +480,7 @@ * 2147 FIX: Fixed exception in HW-/SW-Inventory GUI with special characters in inventorized data... * 2148 FIX: win_os: Fixed inventory of OS with older powershell versions * 2108 FIX: win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output + * 2197 FIX: win_reg_uninstall: Fix exception in case of invalid output line... 1.2.6b1: diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 1cd4525..63c3581 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -31,6 +31,9 @@ def inv_win_reg_uninstall(info): paclist = inv_tree("software.packages:") for line in info: + if len(line) != 7: + continue + display_name, publisher, path, pacname, version, estimated_size, date = line install_date = "" if re.match("^20\d{6}", date):

9 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015