Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

by Sebastian Herbord

Module: check_mk Branch: master Commit: bd940c8f3324db55bfc5187fe4c037492758adc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd940c8f3324db… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 23 08:42:55 2016 +0200 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 23d7fdb..ba837bf 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3673 +3683

8 years

Better error handling in forms.edit_dictionary

by Mathias Kettner

Module: check_mk Branch: master Commit: 82dd86fc378a4598aaf5e8cc6ca2367f513eee8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82dd86fc378a45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 22 16:33:54 2016 +0200 Better error handling in forms.edit_dictionary --- web/htdocs/forms.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index c14cb19..3a1e26b 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -109,10 +109,11 @@ def edit_dictionaries(dictionaries, value, focus=None, hover_help=True, html.add_user_error(e.varname, e) if messages: + messages_joined = "".join(["%s \n" % m for m in messages]) if not preview: - html.show_error("".join(["%s \n" % m for m in messages])) + html.show_error(messages_joined) else: - return None + raise MKUserError(None, messages_joined) else: return new_value

8 years

3146 FIX notification scripts will now also timeout when sending a bulk notification

by Sebastian Herbord

Module: check_mk Branch: master Commit: 179b01b69be7b15d283f23de78ab027facd17faf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=179b01b69be7b1… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 22 15:00:32 2016 +0200 3146 FIX notification scripts will now also timeout when sending a bulk notification Werk #2843 introduced a timeout for notification scripts, as a single long-running notification could stall the whole notification system. That werk only affected regular notifications, not bulk notifications. This is now rectified --- .werks/3146 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 29 ++++++++++++++++++++++------- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.werks/3146 b/.werks/3146 new file mode 100644 index 0000000..8a73254 --- /dev/null +++ b/.werks/3146 @@ -0,0 +1,12 @@ +Title: notification scripts will now also timeout when sending a bulk notification +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466600205 + +Werk #2843 introduced a timeout for notification scripts, as a single long-running notification +could stall the whole notification system. +That werk only affected regular notifications, not bulk notifications. This is now rectified diff --git a/ChangeLog b/ChangeLog index 94947ab..78a8e79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -458,6 +458,7 @@ NOTE: Please refer to the migration notes! * 3426 FIX: sms: fixed wrong message handling after message was quoted and therefore too long * 3139 FIX: fixed a couple of minor issues in call to notification scripts... + * 3146 FIX: notification scripts will now also timeout when sending a bulk notification... BI: * 3271 New option in aggregation for tuning aggregation of downtimes... diff --git a/modules/notify.py b/modules/notify.py index fbe7ffc..5407020 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1528,13 +1528,28 @@ def call_bulk_notification_script(plugin, context_text): if not path: raise MKGeneralException("Notification plugin %s not found" % plugin) - # Protocol: The script gets the context on standard input and - # read until that is closed. It is being called with the parameter - # --bulk. - p = subprocess.Popen([path, "--bulk"], shell=False, - stdout = subprocess.PIPE, stderr = subprocess.PIPE, stdin = subprocess.PIPE) - stdout_txt, stderr_txt = p.communicate(context_text.encode("utf-8")) - exitcode = p.returncode + stdout_txt = stderr_txt = "" + try: + set_notification_timeout() + + # Protocol: The script gets the context on standard input and + # read until that is closed. It is being called with the parameter + # --bulk. + p = subprocess.Popen([path, "--bulk"], shell=False, + stdout = subprocess.PIPE, stderr = subprocess.PIPE, + stdin = subprocess.PIPE) + + stdout_txt, stderr_txt = p.communicate(context_text.encode("utf-8")) + exitcode = p.returncode + + clear_notification_timeout() + except NotificationTimeout: + notify_log("Notification plugin did not finish within %d seconds. Terminating." % + notification_plugin_timeout) + # p.kill() requires python 2.6! + os.kill(p.pid, signal.SIGTERM) + exitcode = 1 + if exitcode: notify_log("ERROR: script %s --bulk returned with exit code %s" % (path, exitcode)) for line in (stdout_txt + stderr_txt).splitlines():

8 years

fixed missing section header in inotify plugin

by Andreas Boesl

Module: check_mk Branch: master Commit: 30d1a58630ff9a01c17b3431e0c9e75c98ed2b27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d1a58630ff9a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 21 14:11:25 2016 +0200 fixed missing section header in inotify plugin --- agents/plugins/mk_inotify | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify index fcc07bf..8e1e330 100755 --- a/agents/plugins/mk_inotify +++ b/agents/plugins/mk_inotify @@ -68,6 +68,7 @@ stats_retention = config.getint("global", "stats_retention") config.remove_section("global") def output_data(): + sys.stdout.write("<<<inotify:sep(9)>>>\n") if os.path.exists(configured_paths): sys.stdout.write(file(configured_paths).read())

8 years

3145 FIX solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory

by Sebastian Herbord

Module: check_mk Branch: master Commit: d0ccf09e5eeeabb39827cad7747cd69e48192fa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0ccf09e5eeeab… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jun 21 13:32:11 2016 +0200 3145 FIX solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory Please note that this behaviour was not intended and differed from other agents. The created items are also incorrectly formatted so we assume no one used/wanted this. --- .werks/3145 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 15 ++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/3145 b/.werks/3145 new file mode 100644 index 0000000..303f215 --- /dev/null +++ b/.werks/3145 @@ -0,0 +1,11 @@ +Title: solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466508571 + +Please note that this behaviour was not intended and differed from other agents. The created items +are also incorrectly formatted so we assume no one used/wanted this. diff --git a/ChangeLog b/ChangeLog index deeb95e..94947ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -277,6 +277,7 @@ * 3638 FIX: cisco_qos: fixed wrong unit handling * 3548 FIX: agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation... * 3549 FIX: netapp_api_snapshots: now correctly processes offline volumes... + * 3145 FIX: solaris agent: fileinfo patterns that match a directory will no longer output items for the files in that directory... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index cf1d3ca..839432e 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -353,17 +353,18 @@ if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' + # note: patterns in the fileinfo.cfg are resolved inside this loop for file in $(cat "$MK_CONFDIR/fileinfo.cfg") do ls $file > /dev/null 2>&1 if [ $? -eq 0 ]; then - ls $file | sort -u | \ - /usr/bin/perl -e ' - while(my $file = <>) { - $file =~ s/\n$//; - ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); - print("$file|$size|$mtime\n"); - }' + echo $file | \ + /usr/bin/perl -e ' + while(my $file = <>) { + $file =~ s/\n$//; + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + print("$file|$size|$mtime\n"); + }' else echo "$file|missing|$(/usr/bin/perl -e 'print time')" fi

8 years

added additional fixes for zfs_arc_cache

by Simon Betz

Module: check_mk Branch: master Commit: bf657f6fa92ece65647ed74911c974ac330a1a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf657f6fa92ece… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 21 10:13:39 2016 +0200 added additional fixes for zfs_arc_cache --- agents/check_mk_agent.solaris | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index d370448..cf1d3ca 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -193,7 +193,8 @@ fi # ZFS arc cache # newer Solaris (>=11.3) do not provide hits and misses via mdb -k function get_zfs_arc_cache_data () { - if [ ! -z `echo "::arc" | mdb -k | grep -q "hits"` ] + out=$(echo "::arc" | mdb -k | grep "hits") + if [ ! -z "$out" ] then echo "::arc" | mdb -k else

8 years

3548 FIX agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/ clustermode differentation

by Andreas Boesl

Module: check_mk Branch: master Commit: 41b34efc597b626a17667c48a34da3ca41e69761 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41b34efc597b62… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 21 09:36:43 2016 +0200 3548 FIX agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation An exception has been fixed when a channel has 0 shelfes configured. Furthermore, the agent has now a slightly more reliable 7mode/clustermode detection mechanism. The 7mode/clustermode detection will be revised in an upcoming agent version. --- .werks/3548 | 13 +++++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 27 ++++++++++++++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.werks/3548 b/.werks/3548 new file mode 100644 index 0000000..c2c360c --- /dev/null +++ b/.werks/3548 @@ -0,0 +1,13 @@ +Title: agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1466494329 +Class: fix + +An exception has been fixed when a channel has 0 shelfes configured. + + +Furthermore, the agent has now a slightly more reliable 7mode/clustermode detection mechanism. +The 7mode/clustermode detection will be revised in an upcoming agent version. diff --git a/ChangeLog b/ChangeLog index aae9674..ed3be01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -275,6 +275,7 @@ * 3143 FIX: windows agent: fixed some minor memory and handle leaks * 3144 FIX: bugfix: replacing pipe symbol in plugin output was broken * 3638 FIX: cisco_qos: fixed wrong unit handling + * 3548 FIX: agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index d7e81c6..149ac69 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -409,7 +409,14 @@ if clustered_info: netapp_mode = clustered_info.lower() == "false" and "7mode" or "clustermode" else: # Looks like the is-clustered attribute is not set, e.g. NetApp 7-Mode Version 8.0 - netapp_mode = "7-mode" in version_info.child_get_string("version").lower() and "7mode" or "clustermode" + version_string = version_info.child_get_string("version").lower() + # TODO: Needs improvement. Unfortunately the version info string does not provide + # exact info whether its a 7mode or a clustermode system + # Possible approach: Query a class which does not exist in 7-mode and evaluate response + if "NetApp Release 7.3.5.1".lower() in version_string: + netapp_mode = "7mode" + else: + netapp_mode = "7-mode" in version_string and "7mode" or "clustermode" #. @@ -812,14 +819,16 @@ else: environ_info = query("storage-shelf-environment-list-info") if environ_info: for channel in environ_info.children_get(): - for shelf in channel.child_get("shelf-environ-shelf-list").children_get(): - shelf_id = shelf.child_get_string("shelf-id") - for what, section in [ ("power-supply-list", "netapp_api_psu"), - ("cooling-element-list", "netapp_api_fan"), - ("temp-sensor-list", "netapp_api_temp") ]: - print "<<<%s:sep(9)>>>" % section - node = shelf.child_get(what) - print format_config(node, what, shelf_id) + shelf_list = channel.child_get("shelf-environ-shelf-list") + if shelf_list: + for shelf in shelf_list.children_get(): + shelf_id = shelf.child_get_string("shelf-id") + for what, section in [ ("power-supply-list", "netapp_api_psu"), + ("cooling-element-list", "netapp_api_fan"), + ("temp-sensor-list", "netapp_api_temp") ]: + print "<<<%s:sep(9)>>>" % section + node = shelf.child_get(what) + print format_config(node, what, shelf_id) # License information print "<<<netapp_api_licenses:sep(9)>>>"

8 years

3549 FIX netapp_api_snapshots: now correctly processes offline volumes

by Andreas Boesl

Module: check_mk Branch: master Commit: 63b526f83ebfd8df7a25b9a064e228fbeb4577ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63b526f83ebfd8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 21 09:42:57 2016 +0200 3549 FIX netapp_api_snapshots: now correctly processes offline volumes Offline volumes do not provide the information the netapp_api_snapshots check requires. The check now reports an UNKNOWN state whenever the volume state differs from online. --- .werks/3549 | 11 +++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 2 +- checks/netapp_api_snapshots | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3549 b/.werks/3549 new file mode 100644 index 0000000..99e55a4 --- /dev/null +++ b/.werks/3549 @@ -0,0 +1,11 @@ +Title: netapp_api_snapshots: now correctly processes offline volumes +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466494794 + +Offline volumes do not provide the information the netapp_api_snapshots check requires. +The check now reports an UNKNOWN state whenever the volume state differs from online. diff --git a/ChangeLog b/ChangeLog index ed3be01..deeb95e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -276,6 +276,7 @@ * 3144 FIX: bugfix: replacing pipe symbol in plugin output was broken * 3638 FIX: cisco_qos: fixed wrong unit handling * 3548 FIX: agent_netapp: fixed agent exception for channels without shelfes. improved 7mode/clustermode differentation... + * 3549 FIX: netapp_api_snapshots: now correctly processes offline volumes... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 149ac69..618ef6d 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -731,7 +731,7 @@ else: container = NaElement("container") container.child_add(volume) print format_config(container, "volume_snapshot", "name", - config_report = ["name", "size-total", "snapshot-percent-reserved", + config_report = ["name", "size-total", "snapshot-percent-reserved", "state", "snapshot-blocks-reserved", "reserve-used-actual"]) # Protocols diff --git a/checks/netapp_api_snapshots b/checks/netapp_api_snapshots index a300ef4..8265b4b 100644 --- a/checks/netapp_api_snapshots +++ b/checks/netapp_api_snapshots @@ -43,6 +43,10 @@ def check_netapp_api_snapshots(item, params, parsed): if not data: return + if data[0].get("state") != "online": + yield 3, "No snapshot information available. Volume is %s" % data[0].get("state") + return + snapshot_total = int(data[0]["reserve-used-actual"]) * 1024.0 size_total = int(data[0]["size-total"]) reserved_bytes = int(data[0]["snapshot-blocks-reserved"]) * 1024.0

8 years

logwatch.ec: fix exception in case of empty logfile output

by Mathias Kettner

Module: check_mk Branch: master Commit: f209c50420b44104f9d7cc5fd1c7a88ba5143941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f209c50420b441… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 20 18:05:29 2016 +0200 logwatch.ec: fix exception in case of empty logfile output --- checks/logwatch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 943bbfc..4e4021e 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -657,9 +657,9 @@ def inventory_logwatch_ec(info, one_svc_per_log): def check_logwatch_ec(item, params, info): if len(info) == 1: - line = " ".join(info[0]) + line = " ".join(info[0][1:]) if line.startswith("CANNOT READ CONFIG FILE"): - return 3, "Error in agent configuration: %s" % " ".join(info[0][4:]) + return 3, "Error in agent configuration: %s" % " ".join(info[0][5:]) # 1. Parse lines in info and separate by logfile logs = {}

8 years

3547 FIX Deleting a subfolder now generates a correct audit message

by Andreas Boesl

Module: check_mk Branch: master Commit: c44b32c68482a75651c1aa1ba8efd486bf6d2a9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44b32c68482a7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 20 13:56:10 2016 +0200 3547 FIX Deleting a subfolder now generates a correct audit message The subfolders name was skipped in the audit message. Instead of Deleted folder Main directory/myfolder/otherfolder it showed Deleted folder Main direcotry/myfolder. --- .werks/3547 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3547 b/.werks/3547 new file mode 100644 index 0000000..257dcb3 --- /dev/null +++ b/.werks/3547 @@ -0,0 +1,12 @@ +Title: Deleting a subfolder now generates a correct audit message +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1466423596 + +The subfolders name was skipped in the audit message. +Instead of Deleted folder Main directory/myfolder/otherfolder it +showed Deleted folder Main direcotry/myfolder. diff --git a/ChangeLog b/ChangeLog index 7d18f3c..aae9674 100644 --- a/ChangeLog +++ b/ChangeLog @@ -442,6 +442,7 @@ * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... + * 3547 FIX: Deleting a subfolder now generates a correct audit message... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 64ecd27..ca916f8 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1499,7 +1499,7 @@ class Folder(BaseFolder): subfolder = self.subfolder(name) subfolder.mark_hosts_dirty() call_hook_folder_deleted(subfolder) - log_pending(AFFECTED, self, "delete-folder", _("Deleted folder %s") % self.alias_path()) + log_pending(AFFECTED, self, "delete-folder", _("Deleted folder %s") % subfolder.alias_path()) self._remove_subfolder(name) shutil.rmtree(subfolder.filesystem_path()) Folder.invalidate_caches()

8 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016