Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: adapted juniper_alarm check: do not discover if alarm is unavailable

by Simon Betz

Module: check_mk Branch: master Commit: 77d58122ce9426a6aa3756867ca34020bf230269 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77d58122ce9426… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 16 10:34:30 2015 +0200 adapted juniper_alarm check: do not discover if alarm is unavailable --- checks/juniper_alarm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/juniper_alarm b/checks/juniper_alarm index c5aaf8f..7f1d098 100644 --- a/checks/juniper_alarm +++ b/checks/juniper_alarm @@ -28,7 +28,8 @@ def inventory_juniper_alarm(info): - return [ (None, None) ] + if info[0][0] != "1": + return [ (None, None) ] def check_juniper_alarm(item, params, info):

9 years

Check_MK Git: check_mk: Fixed exception when sending GUI messages to users with special characters in names

by Lars Michelsen

Module: check_mk Branch: master Commit: 23020c7e977c3fdd7ca88bd76e1e9964f83049c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23020c7e977c3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 16 10:22:36 2015 +0200 Fixed exception when sending GUI messages to users with special characters in names --- web/htdocs/notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index 4d9f88f..588c43e 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -30,7 +30,7 @@ from valuespec import * def get_gui_messages(user_id = None): if user_id is None: user_id = config.user_id - path = config.config_dir + "/" + user_id + '/messages.mk' + path = config.config_dir + "/" + user_id.encode("utf-8") + '/messages.mk' try: messages = eval(file(path).read()) @@ -61,7 +61,7 @@ def delete_gui_message(msg_id): def save_gui_messages(messages, user_id = None): if user_id is None: user_id = config.user_id - path = config.config_dir + "/" + user_id + '/messages.mk' + path = config.config_dir + "/" + user_id.encode("utf-8") + '/messages.mk' make_nagios_directory(os.path.dirname(path)) file(path, 'w').write(repr(messages) + "\n")

9 years

Check_MK Git: check_mk: Event Console: Fixed MIB upload with Python<2.7

by Lars Michelsen

Module: check_mk Branch: master Commit: 8616eb5e9f5b224fb95518664ead1b029202beda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8616eb5e9f5b22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 16 10:18:21 2015 +0200 Event Console: Fixed MIB upload with Python<2.7 --- mkeventd/web/plugins/wato/mkeventd.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 22e6ab6..1a94b35 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2021,7 +2021,7 @@ def validate_and_compile_mib(mibname, content): def upload_mib(filename, mimetype, content): validate_mib_file_name(filename) - if zipfile.is_zipfile(cStringIO.StringIO(content)): + if is_zipfile(cStringIO.StringIO(content)): msg = process_uploaded_zip_file(filename, content) else: if mimetype == "application/tar" or filename.lower().endswith(".gz") or filename.lower().endswith(".tgz"): @@ -2055,6 +2055,17 @@ def process_uploaded_zip_file(filename, content): "<br><br>\nProcessed %d MIB files, skipped %d MIB files" % (success, fail) +# Used zipfile.is_zipfile(cStringIO.StringIO(content)) before, but this only +# possible with python 2.7. zipfile is only supporting checking of files by +# their path. +def is_zipfile(fo): + try: + zipfile.ZipFile(fo) + return True + except zipfile.BadZipfile: + return False + + def validate_mib_file_name(filename): if filename.startswith(".") or "/" in filename: raise Exception(_("Invalid filename"))

9 years

Check_MK Git: check_mk: headrify: small update

by Mathias Kettner

Module: check_mk Branch: master Commit: 1068ed2656417ec63d08adae33c60dd5fa38fc89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1068ed2656417e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 15 17:44:05 2015 +0200 headrify: small update --- doc/helpers/headrify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index 910fbfa..e24c094 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -97,7 +97,7 @@ headrify () secondline="$(sed -n 2p < $file)" thirdline="$(sed -n 3p < $file)" shouldbe="$comment+---------------------------------------------------" - endline='.*Boston, MA 02110-1301 USA.' + endline='.*(Boston, MA 02110-1301 USA.|address provided at www.mathias-kettner.de)' if [ -n "$lastline" ] ; then endline="${lastline//\//\/}" ; fi if [ "${firstline:0:20}" = "${shouldbe:0:20}" \

9 years

Check_MK Git: check_mk: Fix make headers

by Mathias Kettner

Module: check_mk Branch: master Commit: 51d63748aecb58ea140f557279a2e1588b6c19c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51d63748aecb58… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 15 17:45:57 2015 +0200 Fix make headers --- doc/helpers/headrify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index e24c094..a5438c9 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -103,7 +103,7 @@ headrify () if [ "${firstline:0:20}" = "${shouldbe:0:20}" \ -o "${secondline:0:20}" = "${shouldbe:0:20}" \ -o "${thirdline:0:20}" = "${shouldbe:0:20}" ] ; then - sed '0,/^'"$endline"'$/d' $file | sed 1d >> $TMP + sed -r '0,/^'"$endline"'$/d' $file | sed 1d >> $TMP else cat $file >> $TMP fi

9 years

Check_MK Git: check_mk: New version of fileheader script

by Mathias Kettner

Module: check_mk Branch: master Commit: cba9aeee15ebc2e5654a0a5acdd17b19b5e84a08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cba9aeee15ebc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 15 17:42:07 2015 +0200 New version of fileheader script --- doc/helpers/headrify | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/helpers/headrify b/doc/helpers/headrify index a8c74a0..910fbfa 100755 --- a/doc/helpers/headrify +++ b/doc/helpers/headrify @@ -18,18 +18,20 @@ header () cat <<EOF This file is part of Check_MK. -The official homepage is at http://mathias-kettner.de/check_mk. +Copyright by Mathias Kettner and Mathias Kettner GmbH. All rights reserved. -check_mk is free software; you can redistribute it and/or modify it +Check_MK is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation in version 2. check_mk is distributed -in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more de- -ails. You should have received a copy of the GNU General Public -License along with GNU Make; see the file COPYING. If not, write -to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -Boston, MA 02110-1301 USA. +the Free Software Foundation in version 2. + +Check_MK is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public +License along with Check_MK. If not, email to mk(a)mathias-kettner.de +or write to the postal address provided at www.mathias-kettner.de EOF if [ -n "$lastline" ] ; then echo

9 years

Check_MK Git: check_mk: #2606 FIX cisco_temperature: Reduced SNMP overhead for large devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 7df3feb508bdf2f21de728e55296b47fee9e4ac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7df3feb508bdf2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 15 14:28:34 2015 +0200 #2606 FIX cisco_temperature: Reduced SNMP overhead for large devices The cisco_temperature check makes use of the SNMP table .1.3.6.1.2.1.47.1.1.1.1.2 to gather the description of the sensors. This table can be very large on some devices. Check_MK normally needs to fetch the whole table because of it's architecture e.g. to make the service discovery possible. But since this table is normally static, it is not needed to fetch this large table during every check. Check_MK is now caching this table during checking. The cache is renewed when performing service discovery (either manually or automatically via the discovery service). --- .werks/2606 | 21 +++++++ ChangeLog | 1 + checks/cisco_temperature | 2 +- modules/automation.py | 3 +- modules/check_mk_base.py | 6 +- modules/discovery.py | 8 ++- modules/snmp.py | 152 +++++++++++++++++++++++++++++++++------------- 7 files changed, 144 insertions(+), 49 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7df3feb508…

9 years

Check_MK Git: check_mk: icom_repeater.ps_volt: Added missing manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0af237ed3338b157417256b9ed3b5dda3fc17117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0af237ed3338b1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 15 14:00:26 2015 +0200 icom_repeater.ps_volt: Added missing manpage --- checkman/icom_repeater.ps_volt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/checkman/icom_repeater.ps_volt b/checkman/icom_repeater.ps_volt new file mode 100644 index 0000000..dbe809a --- /dev/null +++ b/checkman/icom_repeater.ps_volt @@ -0,0 +1,11 @@ +title: ICOM Repeater: Power Supply Voltage +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the power supply voltage of ICOM repeaters. The service + goes WARN or CRIT when the voltage is outside a defined interval. + +inventory: + One check per device is created.

9 years

Check_MK Git: check_mk: #2624 FIX fixed vbscript based inventory script ( windows) only sending updated data every 39 years

by Sebastian Herbord

Module: check_mk Branch: master Commit: f688e87a6366b4c23b9aafcbfe52f207d64b8444 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f688e87a6366b4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 15 13:57:44 2015 +0200 #2624 FIX fixed vbscript based inventory script (windows) only sending updated data every 39 years --- .werks/2624 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.vbs | 5 ++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/2624 b/.werks/2624 new file mode 100644 index 0000000..aebfa85 --- /dev/null +++ b/.werks/2624 @@ -0,0 +1,9 @@ +Title: fixed vbscript based inventory script (windows) only sending updated data every 39 years +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i3 +Date: 1442318089 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 68a2268..63ebbf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -293,6 +293,7 @@ * 2454 FIX: lnx_distro: Fixed inventory for SuSE installations with patchlevel 0 * 2541 FIX: Round last state change of network interfaces to one day, avoid history spam... * 2553 FIX: solaris_prtdiag: Can now handle Supermicro servers using Solaris 10 + * 2624 FIX: fixed vbscript based inventory script (windows) only sending updated data every 39 years 1.2.7i2: diff --git a/agents/windows/plugins/mk_inventory.vbs b/agents/windows/plugins/mk_inventory.vbs index 4b590df..8e480ea 100644 --- a/agents/windows/plugins/mk_inventory.vbs +++ b/agents/windows/plugins/mk_inventory.vbs @@ -37,9 +37,8 @@ timestamp = state_dir & "\mk_inventory." & remote_host If (fso.FileExists(timestamp)) Then Set objTimestamp = fso.GetFile(timestamp) fileDate = objTimestamp.DateLastModified - earlier = Now - delay - ' exit if timestamp to young - If filedate > earlier Then + ' exit if timestamp is too young + If DateAdd("s", delay, filedate) >= Now Then WScript.Quit End If End If

9 years

Check_MK Git: check_mk: Fixed manpage name

by Lars Michelsen

Module: check_mk Branch: master Commit: bb9a55601fb12e8ea61d1e3dab531d2d226c7861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb9a55601fb12e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 15 13:50:15 2015 +0200 Fixed manpage name --- checkman/{siemens_plc_cpu => siemens_plc_cpu_state} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/siemens_plc_cpu b/checkman/siemens_plc_cpu_state similarity index 100% rename from checkman/siemens_plc_cpu rename to checkman/siemens_plc_cpu_state

9 years

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015