Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64557 discussions

Check_MK Git: check_mk: FIX df*: Negative filesystem space levels get a more clear text in check output

by Lars Michelsen

Module: check_mk Branch: master Commit: 4913ec566a415d1d73beb0b0b25eb81fb086a8f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4913ec566a415d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:59:56 2013 +0100 FIX df*: Negative filesystem space levels get a more clear text in check output Instead of just displaying negative values, the text "levels at free space below XX.XX/YY.YY) is displayed in plugin output. --- .bugs/1083 | 7 +++++-- .werks/387 | 11 +++++++++++ ChangeLog | 1 + checks/df.include | 16 ++++++++++++++-- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.bugs/1083 b/.bugs/1083 index 8017ae1..99a68c0 100644 --- a/.bugs/1083 +++ b/.bugs/1083 @@ -1,10 +1,13 @@ Title: df: do not display negative levels Component: checks -State: open +Class: nastiness +State: done Date: 2013-11-13 15:20:04 Targetversion: future -Class: nastiness The df check can now use negative levels. This means *free* spac. But in the check output this should be made clear and not just printed negative values. + +2013-12-17 18:58:31: changed state open -> done +Added some text instead of the negative values. diff --git a/.werks/387 b/.werks/387 new file mode 100644 index 0000000..d4712c5 --- /dev/null +++ b/.werks/387 @@ -0,0 +1,11 @@ +Title: df*: Negative filesystem space levels get a more clear text in check output +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387303116 +Targetversion: future + +Instead of just displaying negative values, the text "levels at free space below XX.XX/YY.YY) +is displayed in plugin output. diff --git a/ChangeLog b/ChangeLog index 10f03c4..56b1574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 0109 FIX: cisco_fantray: Prevent inventory for not available fans * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs * 0350 FIX: nfsmounts: correctly handle mount points with spaces... + * 0387 FIX: df*: Negative filesystem space levels get a more clear text in check output... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/df.include b/checks/df.include index 7c4290c..d39ac93 100644 --- a/checks/df.include +++ b/checks/df.include @@ -197,11 +197,23 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): crit_mb = savefloat(size_mb * crit_scaled / 100) levels["levels_mb"] = (warn_mb, crit_mb) if type(warn) == float: - levels["levels_text"] = "(levels at %.2f/%.2f%%)" % (warn_scaled, crit_scaled) + if warn_scaled < 0 and crit_scaled < 0: + label = 'levels at free space below' + warn_scaled *= -1 + crit_scaled *= -1 + else: + label = 'levels at' + levels["levels_text"] = "(%s %.2f/%.2f%%)" % (label, warn_scaled, crit_scaled) else: + if warn * mega < 0 and crit * mega < 0: + label = 'levels at free space below' + warn *= -1 + crit *= -1 + else: + label = 'levels at' warn_hr = get_bytes_human_readable(warn * mega) crit_hr = get_bytes_human_readable(crit * mega) - levels["levels_text"] = "(levels at %s/%s)" % ( warn_hr, crit_hr ) + levels["levels_text"] = "(%s %s/%s)" % (label, warn_hr, crit_hr) return levels

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0899

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ba26e0896efeebf9f1f7da7f09a6323eb688da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ba26e0896efee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:52:03 2013 +0100 Updated bug entries #0899 --- .bugs/899 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/899 b/.bugs/899 index 1081fd5..d7dd493 100644 --- a/.bugs/899 +++ b/.bugs/899 @@ -1,12 +1,15 @@ Title: LDAP - removing users.mk and keeping contacts.mk switches all users to htpasswd related Component: multisite -State: open +Class: nastiness +State: wontfix Date: 2013-02-08 09:26:24 Targetversion: 1.2.2 -Class: nastiness The fact that a user belongs to the ldap connector is stored in the users.mk. When one deletes the users.mk and leaves the roles.mk untouched all users are converted to "htpasswd" users. This might be ok, since the removal of files is a inner modification, but we could easily add a field to the contacts.mk which also marks the users as ldap users. + +2013-12-17 18:52:00: changed state open -> wontfix +Is ok.

10 years, 9 months

Check_MK Git: check_mk: Added all active checks to check_mk -L output

by Lars Michelsen

Module: check_mk Branch: master Commit: c461f250254c303059febda45ef4e419e5f184dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c461f250254c30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:40:37 2013 +0100 Added all active checks to check_mk -L output check_mk -L did list all tcp and snmp based check, but the active checks were missing. They have been added now. --- .bugs/1084 | 7 +++++-- .bugs/827 | 7 +++++-- .bugs/920 | 7 +++++-- .werks/386 | 12 ++++++++++++ ChangeLog | 1 + modules/check_mk.py | 33 ++++++++++++++++++++++++--------- 6 files changed, 52 insertions(+), 15 deletions(-) diff --git a/.bugs/1084 b/.bugs/1084 index 8a0f62f..e2e8e69 100644 --- a/.bugs/1084 +++ b/.bugs/1084 @@ -1,9 +1,12 @@ Title: cmk -L should also list active checks Component: checks -State: open +Class: nastiness +State: done Date: 2013-11-15 08:23:05 Targetversion: future -Class: nastiness cmk -L should not only list Check_MK based checks but also active checks that can be configured via Check_MK, like check_http. + +2013-12-17 18:39:29: changed state open -> done +Added active checks to -L output and improved formating of that table diff --git a/.bugs/827 b/.bugs/827 index ea9f8d9..3ccb785 100644 --- a/.bugs/827 +++ b/.bugs/827 @@ -1,9 +1,9 @@ Title: Wato Folder creation from non admins Component: wato -State: open +Class: nastiness +State: done Date: 2013-04-08 14:53:45 Targetversion: 1.2.3 -Class: nastiness Ich/mein User ist nicht admin, hat aber Rechte im WATO-Ordner Ich lege einen neuen WATO-Unterordner an, ohne dass ich spezielle @@ -13,3 +13,6 @@ keine Rechte darauf. Dies ist aber lediglich ein Anzeigefehler... ein Page-Reload reicht schon... das Schloss verschwindet und die Vererbten Permissions werden angezeigt - alles paletti! + +2013-12-17 18:17:46: changed state open -> done +This should have been solved today. diff --git a/.bugs/920 b/.bugs/920 index 59f474c..4a2b825 100644 --- a/.bugs/920 +++ b/.bugs/920 @@ -1,9 +1,9 @@ Title: Implement paged ldap search to fix problems with response size limits Component: multisite -State: open +Class: nastiness +State: done Date: 2013-04-29 10:22:57 Targetversion: 1.2.3 -Class: nastiness At the moment we have only implemented a simple ldap search. In some directories, like active directory it leads into a SIZE_LIMIT_EXCEEDED exception when @@ -11,3 +11,6 @@ a query results in more than 1000 response objects. The solution here is to implement a paged ldap search. An example can be seen here: http://www.novell.com/coolsolutions/tip/18274.html + +2013-12-17 18:15:52: changed state open -> done +This has already been implemented a long time ago. diff --git a/.werks/386 b/.werks/386 new file mode 100644 index 0000000..1808b98 --- /dev/null +++ b/.werks/386 @@ -0,0 +1,12 @@ +Title: Added all active checks to check_mk -L output +Level: 1 +Component: core +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387301984 +Targetversion: future + +check_mk -L did list all tcp and snmp based check, but the +active checks were missing. They have been added now. + diff --git a/ChangeLog b/ChangeLog index b3e0cb5..10f03c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i1: Core & Setup: + * 0386 Added all active checks to check_mk -L output... * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory diff --git a/modules/check_mk.py b/modules/check_mk.py index 5156294..0db56b6 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -450,30 +450,45 @@ if __name__ == "__main__": def output_check_info(): print "Available check types:" print - print " plugin perf- in- " - print "Name type data vent. service description" + print " plugin perf- in- " + print "Name type data vent. service description" print "-------------------------------------------------------------------------" - checks_sorted = check_info.items() + checks_sorted = check_info.items() + active_check_info.items() checks_sorted.sort() for check_type, check in checks_sorted: try: + if 'command_line' in check: + what = 'active' + ty_color = tty_blue + elif check_uses_snmp(check_type): + what = 'snmp' + ty_color = tty_magenta + else: + what = 'tcp' + ty_color = tty_yellow + if check.get("has_perfdata", False): p = tty_green + tty_bold + "yes" + tty_normal else: p = "no" - if check["inventory_function"] == None: + + if what == 'active': + i = '-' + elif check["inventory_function"] == None: i = "no" else: i = tty_blue + tty_bold + "yes" + tty_normal - if check_uses_snmp(check_type): - typename = tty_magenta + "snmp" + tty_normal + if what == 'active': + descr = '-' else: - typename = tty_yellow + "tcp " + tty_normal + descr = check["service_description"] - print (tty_bold + "%-19s" + tty_normal + " %s %-3s %-3s %s") % \ - (check_type, typename, p, i, check["service_description"]) + print (tty_bold + "%-32s" + tty_normal + + ty_color + " %-6s " + tty_normal + + " %-3s %-3s %s") % \ + (check_type, what, p, i, descr) except Exception, e: sys.stderr.write("ERROR in check_type %s: %s\n" % (check_type, e))

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2101

by Lars Michelsen

Module: check_mk Branch: master Commit: a552864db3cbd7a2b1138f5955474ace7fecbaa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a552864db3cbd7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:14:55 2013 +0100 Updated bug entries #2101 --- .bugs/2101 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2101 b/.bugs/2101 new file mode 100644 index 0000000..45e4203 --- /dev/null +++ b/.bugs/2101 @@ -0,0 +1,9 @@ +Title: sidebar content is missing space at bottom +Component: multisite +State: open +Date: 2013-12-17 18:13:50 +Targetversion: future +Class: nastiness + +The sidebar height is set too low. There should really be a space below +the last snapin to have some small border like 5px.

10 years, 9 months

Check_MK Git: check_mk: Fixed last change

by Lars Michelsen

Module: check_mk Branch: master Commit: 10930e899cb0978a261734284f44b5a6c4c5caee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10930e899cb097… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:04:54 2013 +0100 Fixed last change --- web/htdocs/wato.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3c22d8c..527e4d0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11654,9 +11654,7 @@ def get_rule_conditions(ruleset): itemspec = ListChoice(choices = itemenum, columns = 3) item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] else: - vs = ListOfStrings(valuespec = RegExpUnicode( - title = ruleset["itemspec"].title(), - )) + vs = ListOfStrings(valuespec = RegExpUnicode()) item_list = vs.from_html_vars("itemlist") vs.validate_value(item_list, "itemlist")

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0665, #0897

by Lars Michelsen

Module: check_mk Branch: master Commit: dc420d2063664a53ba87d2cb44a7863cb75a6e65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc420d2063664a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 17:37:53 2013 +0100 Updated bug entries #0665, #0897 --- .bugs/665 | 7 +++++-- .bugs/897 | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bugs/665 b/.bugs/665 index 5b2ce95..1512d1d 100644 --- a/.bugs/665 +++ b/.bugs/665 @@ -1,9 +1,9 @@ Title: Makefiles von REDHAT/CENTOS 6.4 - Missing packages Component: core -State: open +Class: nastiness +State: works4me Date: 2013-03-19 11:28:02 Targetversion: 1.2.3 -Class: nastiness The following packages need to be installed manually after ./configure has been called xorg-x11-server-Xvfb @@ -12,3 +12,6 @@ They are only set in OS_PACKAGES, but probably needed in BUILD_PACKAGES But what happens if they are missing? Are they needed during compilation? + +2013-12-17 17:31:47: changed state open -> works4me +I see no reason why this should result in a problem. Please provide error output if this is really a problem. diff --git a/.bugs/897 b/.bugs/897 index 90cd42e..66bda6d 100644 --- a/.bugs/897 +++ b/.bugs/897 @@ -1,12 +1,16 @@ Title: Add some security mechanism to prevent accidential removal of ldap users profile Component: multisite -State: open +Class: nastiness +State: done Date: 2013-02-07 16:13:52 Targetversion: 1.2.2 -Class: nastiness It might happen that users are not visible to the ldap sync (maybe by temporary misconfiguration). When a sync detects that one user is suddenly missing, it removes the user from the configuration as also the htpasswd mechanism does. This could lead in bad situations where customized things in multisite get lost, maybe we find a way to prevent this somehow...? + +2013-12-17 17:33:05: changed state open -> done +The profile folder deletion has been commented out a longer time ago. The problem should +be solved for the moment.

10 years, 9 months

Check_MK Git: check_mk: FIX Better error handling for invalid service regex in rule conditions

by Lars Michelsen

Module: check_mk Branch: master Commit: 72997abe02dd19214bb5db20c5d99c0e71671751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72997abe02dd19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 18:01:06 2013 +0100 FIX Better error handling for invalid service regex in rule conditions Previous versions of the rule editor in WATO did not check whether or not the regular expressions provided for matching services are valid. This change adds a regular expression validation. --- .bugs/890 | 7 +++++-- .werks/385 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 6 ++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.bugs/890 b/.bugs/890 index 30f064f..c0dafa6 100644 --- a/.bugs/890 +++ b/.bugs/890 @@ -1,11 +1,14 @@ Title: Better error handling for invalid regex in rule Component: core -State: open +Class: nastiness +State: done Date: 2013-06-03 14:18:36 Targetversion: 1.2.3 -Class: nastiness If you enter e.g. H:\ into the "Mount Point" of the df-Rule then cmk -C crashes with an exception. Can we make a validator here? + +2013-12-17 17:58:48: changed state open -> done +Added RegExp validation to all service related fields in rule conditions. diff --git a/.werks/385 b/.werks/385 new file mode 100644 index 0000000..ddded24 --- /dev/null +++ b/.werks/385 @@ -0,0 +1,10 @@ +Title: Better error handling for invalid service regex in rule conditions +Level: 2 +Component: wato +Version: 1.2.5i1 +Date: 1387299554 +Class: fix + +Previous versions of the rule editor in WATO did not check whether or not +the regular expressions provided for matching services are valid. This +change adds a regular expression validation. diff --git a/ChangeLog b/ChangeLog index f541473..b3e0cb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 0341 FIX: Avoid rare exception in WATO when deleting a host... * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now * 0346 FIX: Fix folder visibility in WATO for unpriviledged users... + * 0385 FIX: Better error handling for invalid service regex in rule conditions... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4518ff6..3c22d8c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11654,7 +11654,9 @@ def get_rule_conditions(ruleset): itemspec = ListChoice(choices = itemenum, columns = 3) item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] else: - vs = ListOfStrings(valuespec = ruleset["itemspec"]) + vs = ListOfStrings(valuespec = RegExpUnicode( + title = ruleset["itemspec"].title(), + )) item_list = vs.from_html_vars("itemlist") vs.validate_value(item_list, "itemlist") @@ -11892,7 +11894,7 @@ def mode_edit_rule(phase, new = False): else: ListOfStrings( orientation = "horizontal", - valuespec = TextAscii(size = 30)).render_input("itemlist", item_list) + valuespec = RegExpUnicode(size = 30)).render_input("itemlist", item_list) html.write("<br><br>") html.help(_("The entries here are regular expressions to match the beginning. "

10 years, 9 months

Check_MK Git: check_mk: FIX Trying to prevent problem when restarting mkeventd

by Lars Michelsen

Module: check_mk Branch: master Commit: 25fb5bf35a8ccb62039eea129f828c6279502587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25fb5bf35a8ccb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 17:27:05 2013 +0100 FIX Trying to prevent problem when restarting mkeventd In some situation, when restarting the mkeventd, the old process has been stopped, but when the new process comes up, the builtin syslog server can not open the port, because it is somehow still opened. The error message is: Cannot bind TCP socket for syslog-tcp to port: Address already in use This change tries to prevent the problem. --- .werks/384 | 17 +++++++++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 8 +++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/384 b/.werks/384 new file mode 100644 index 0000000..1827a4a --- /dev/null +++ b/.werks/384 @@ -0,0 +1,17 @@ +Title: Trying to prevent problem when restarting mkeventd +Level: 1 +Component: ec +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387297403 +Targetversion: future + +In some situation, when restarting the mkeventd, the old process has +been stopped, but when the new process comes up, the builtin syslog +server can not open the port, because it is somehow still opened. +The error message is: + +Cannot bind TCP socket for syslog-tcp to port: Address already in use + +This change tries to prevent the problem. diff --git a/ChangeLog b/ChangeLog index a50f947..3ab8733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ * 0304 FIX: Escaping several unwanted chars from incoming log messages... * 0089 FIX: CSV export of event console was broken... * 0359 FIX: Fixed exception in event simulator when one match group did not match + * 0384 FIX: Trying to prevent problem when restarting mkeventd... Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 940f2b6..1f11de9 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2366,7 +2366,6 @@ def run_eventd(): time.sleep(1) - #. # .--EventStatus---------------------------------------------------------. # | _____ _ ____ _ _ | @@ -3266,6 +3265,13 @@ try: g_event_server.output_hash_stats() + # Closing fds which might be still open + for fd in [ opt_syslog_fd, opt_syslog_tcp_fd, opt_snmptrap_fd ]: + try: + os.close(fd) + except: + pass + log("Successfully shut down.") os.remove(g_pid_file) sys.exit(0)

10 years, 9 months

Check_MK Git: check_mk: fixed typo in werk 245

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 44250960c0db8dd171bc18d30e312d20a4c6bb67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44250960c0db8d… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:53:45 2013 +0100 fixed typo in werk 245 --- .werks/245 | 2 +- ChangeLog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/245 b/.werks/245 index beabc34..d8a5c33 100644 --- a/.werks/245 +++ b/.werks/245 @@ -1,4 +1,4 @@ -Title: Inline SNMP now longer throws an exception when using SNMPv3 credentials +Title: Inline SNMP no longer throws an exception when using SNMPv3 credentials Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 13ba59a..9ab4e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,14 +48,14 @@ * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts - * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... + * 0245 FIX: Inline SNMP no longer throws an exception when using SNMPv3 credentials... * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... * 0347 FIX: smart.stats: Remove duplicate disks... - * 0109 FIX: cisco_fantray: Prevent inventory for not available fans - * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs * 0349 FIX: winperf.cpuusage: update man page: this check is deprecated * 0383 FIX: solaris_mem: Is now compatible to more systems... + * 0109 FIX: cisco_fantray: Prevent inventory for not available fans + * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs Multisite: * 0371 Added log class filter to hostsvcevents view

10 years, 9 months

Check_MK Git: check_mk: fixed merge conflict in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 21d9d53ce0a139f0ae367e96ee2e248dc3463137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d9d53ce0a139… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Dec 17 16:54:43 2013 +0100 fixed merge conflict in ChangeLog ---

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits