Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64412 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e56c7a098cd95503c8af7ecedaaa578669e141b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e56c7a098cd95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 11 11:54:34 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0887

by Mathias Kettner

Module: check_mk Branch: master Commit: 48328413e8419888600af45c4eaa2a638250ce42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48328413e84198… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 10:52:50 2013 +0100 Updated bug entries #0887 --- .bugs/887 | 9 +++++++++ .bugs/902 | 6 +++--- .bugs/903 | 16 ++++++++++++++++ .bugs/904 | 7 +++++-- .bugs/905 | 7 +++++++ .bugs/907 | 5 +++++ 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/.bugs/887 b/.bugs/887 new file mode 100644 index 0000000..3b4b00f --- /dev/null +++ b/.bugs/887 @@ -0,0 +1,9 @@ +Title: Name regex groups in EC +Component: ec +State: open +Date: 2013-02-11 10:51:28 +Targetversion: 1.2.2 +Class: feature + +A new config field "Regex group name" as a ListOfStrings. +That way one can use \foo instead of \1 alternatively. diff --git a/.bugs/902 b/.bugs/902 index ccc22ac..f57bf87 100644 --- a/.bugs/902 +++ b/.bugs/902 @@ -1,9 +1,9 @@ -Title: execute action but directly drop message afterwards +Title: execute action but directly delete message afterwards Component: ec State: open Date: 2013-01-31 11:13:50 Targetversion: 1.2.2 Class: feature -We need to be able to execute actions but directly drop the message -afterwards without creating an event from it. +We need to be able to execute actions but directly delete the event +afterwards. diff --git a/.bugs/903 b/.bugs/903 index e0ec6ea..0016731 100644 --- a/.bugs/903 +++ b/.bugs/903 @@ -6,3 +6,19 @@ Targetversion: 1.2.2 Class: bug When adding umlauts like ä to regex patterns, they do never match. + +Was machen wir eigentlich, wenn die Enkodierung der eingehenden +Events nicht klar ist? Vorschlag: + +Wir kodieren grundsatzlich von UTF-8 nach intern Unicode. Dabei +dann aufpassen, dass auch die Konfiguration der Regeln immer +Unicode verwendet (nicht TextAscii, sondern TextUnicode()). + +Wenn beim Enkodieren ein Fehler auftritt, dann nehmen wir +latin1 an (bzw. Einstellbar als globale Option). + +try: + text = text.decode('utf-8' +except: + text = text.decode(conifg.ec_fallback_encoding) + diff --git a/.bugs/904 b/.bugs/904 index 2226d0b..5ad2898 100644 --- a/.bugs/904 +++ b/.bugs/904 @@ -1,8 +1,11 @@ Title: References like \1 \2 to regex groups do not work in "expect regular messages" mode Component: ec -State: open +Class: bug +State: wontfix Date: 2013-01-31 11:17:10 Targetversion: 1.2.2 -Class: bug In this case, e.g. when rewriting the message text, it only shows \1 \2. + +2013-02-11 10:41:13: changed state open -> wontfix +Obsolete through #905 diff --git a/.bugs/905 b/.bugs/905 index a830a7e..de05983 100644 --- a/.bugs/905 +++ b/.bugs/905 @@ -24,3 +24,10 @@ items. Once a number (subpatter) is received for the first time, the expection counter must start and raise an event for this single number if it has not been received for about a minute. + +Loesung: Dies wird ausserhalb der EC geloest durch eine EC-Aktion, die +von einer Regel aufgerufen wird, die auf obigen Text matcht. Diese fuegt +autoamtisch eine neue EC-Regel direkt vor der Generator-Regel ein, die +dann auf den speziellen Host wartet. Danach muss die EC neu geladen werden. +Frage ist, ob das aus einer Aktion heraus sauber geht. Wahrscheinlich ja. + diff --git a/.bugs/907 b/.bugs/907 index 226cc5c..38540b5 100644 --- a/.bugs/907 +++ b/.bugs/907 @@ -10,3 +10,8 @@ Create a set of default rules, at least one rule which should remain as above. When having a rule, it is possible to count the times this rule was used to maybe define better "catch & drop" rules at the beginning of the ruleset + +Solution: We create one rule with count(1) that create *one* open +counting event per host. This rule is created if the file rules.mk +does not exist when entering the event editor. This can simply be +done in WATO: EC load_rules.

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: b685d3f58fefb32aaf97c99b3d968d393ff0f8d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b685d3f58fefb3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 18:46:52 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: BI did not handle PENDING on host state

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a1097a24a9af641732e94c2a57cc7f1f4c188ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a1097a24a9af6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 9 18:37:21 2013 +0100 FIX: BI did not handle PENDING on host state --- web/htdocs/bi.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 85c5266..3fd0159 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1019,7 +1019,7 @@ def execute_leaf_node(node, status_info): return ({"state":MISSING, "output": _("This host has no such service")}, None, node) else: - aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN}[host_state] + aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN, -1:PENDING}[host_state] state = {"state":aggr_state, "output" : host_output} if state_assumption != None: assumed_state = {"state": state_assumption,

11 years, 7 months

Check_MK Git: check_mk: Fix again the toggle button visibility problem

by Mathias Kettner

Module: check_mk Branch: master Commit: be2d247275c4966c3079a09cf5588524e0619155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be2d247275c496… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 6 10:43:38 2013 +0100 Fix again the toggle button visibility problem --- web/htdocs/js/checkmk.js | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index cc329ea..0d9b91f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1437,8 +1437,7 @@ function unhide_context_buttons(oA) var oTd = oA.parentNode.parentNode; for (var i in oTd.childNodes) { oNode = oTd.childNodes[i]; - if (oNode.tagName == "DIV" && oNode.id != "toggle" - && oNode.id.substr(oNode.id.length - 4) != "_off") + if (oNode.tagName == "DIV" && !has_class(oNode, "togglebutton")) oNode.style.display = ""; } oA.parentNode.style.display = "none";

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0912, #0911

by Lars Michelsen

Module: check_mk Branch: master Commit: a6be65e476d377689aafa5bec063805a8fe6eb30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6be65e476d377… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:46:01 2013 +0100 Updated bug entries #0912, #0911 --- .bugs/911 | 10 ++++++++-- .bugs/912 | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.bugs/911 b/.bugs/911 index 695e35c..5d10d94 100644 --- a/.bugs/911 +++ b/.bugs/911 @@ -1,9 +1,15 @@ Title: Distributed WATO - activate changes not transid secured Component: wato -State: open +Class: bug +State: works4me Date: 2013-02-04 10:06:34 Targetversion: 1.2.2 -Class: bug When one hits F5 during global activate changes, the table is re-rendered and all sites do sync & restart again. This should be prevented by transids. + +--- + + Can not reproduce here. Closing... + +2013-02-08 10:25:47: changed state open -> works4me diff --git a/.bugs/912 b/.bugs/912 index f678597..6983948 100644 --- a/.bugs/912 +++ b/.bugs/912 @@ -3,7 +3,7 @@ Component: wato State: open Date: 2013-02-04 10:08:08 Targetversion: 1.2.2 -Class: bug +Class: nastiness When clicking on "restart" for a single site, no background action with a progress bar is started. Instead, the browser only shows a loading mouse pointer.

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0899

by Lars Michelsen

Module: check_mk Branch: master Commit: 09e4cc97c80bb7c68909a1450b8c07ac51921d63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09e4cc97c80bb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 09:30:20 2013 +0100 Updated bug entries #0899 --- .bugs/899 | 32 +++++++++++--------------------- 1 files changed, 11 insertions(+), 21 deletions(-) diff --git a/.bugs/899 b/.bugs/899 index d35d822..1081fd5 100644 --- a/.bugs/899 +++ b/.bugs/899 @@ -1,22 +1,12 @@ -Title: Make negated values in "sections" possible -Component: checks +Title: LDAP - removing users.mk and keeping contacts.mk switches all users to htpasswd related +Component: multisite State: open -Date: 2013-01-22 12:07:39 -Targetversion: 1.4.0 -Class: feature - -Recent windows agent ini files have a sections specification, where you can specify which sections to run. - -I would like to see the reverse of this – a sections-not – which would specify sections NOT to run. - -We have several machines that hang on once section or another for some reason. It would be nice to be able to remove just that section, without have to manually specify all the other sections that we do want to run - - -[global] - Sections-not = ps - -To not run ps, but to do run all other available sections. - -Or, modify the existing one to accept a not (!) -Global - Sections = !ps +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.

11 years, 7 months

Check_MK Git: check_mk: Displaying date/ time of comments in comment icon hover menu (Please

by Lars Michelsen

Module: check_mk Branch: master Commit: 545e7332fc8f5d267637c2413fbc1db1b91dd334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=545e7332fc8f5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 08:51:56 2013 +0100 Displaying date/time of comments in comment icon hover menu (Please note: You need to update your livestatus to current version to make this work) --- ChangeLog | 2 ++ web/plugins/icons/builtin.py | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f279f5a..5f48e00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ * The ldap member attribute of groups is now configruable via WATO * Added option to enforce lower User-IDs during LDAP sync * Improved debug logging of ldap syncs (Now writing duration of queries to log) + * Displaying date/time of comments in comment icon hover menu (Please + note: You need to update your livestatus to current version to make this work) BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index fffc014..e54d6b9 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -318,17 +318,18 @@ multisite_icons.append({ # +----------------------------------------------------------------------+ def paint_comments(what, row, tags, custom_vars): - comments = row[what+ "_comments_with_info"] + comments = row[what+ "_comments_with_extra_info"] if len(comments) > 0: text = "" - for id, author, comment in comments: - text += "%s: \"%s\" \n" % (author, comment) + for c in comments: + id, author, comment, ty, timestamp = c + text += "%s %s: \"%s\" \n" % (paint_age(timestamp, True, 0, 'abs')[1], author, comment) return link_to_view('<img class=icon title=\'%s\' ' \ 'src="images/icon_comment.gif">' % text, row, 'comments_of_' + what) multisite_icons.append({ - 'columns': [ 'comments_with_info' ], + 'columns': [ 'comments_with_extra_info' ], 'paint': paint_comments, })

11 years, 7 months

Check_MK Git: check_mk: FIX: Making "action" context link unclickable during handling actions / confirms

by Lars Michelsen

Module: check_mk Branch: master Commit: 0519760026bb09e6cd3a2017370aca73fc647dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0519760026bb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:22:00 2013 +0100 FIX: Making "action" context link unclickable during handling actions / confirms --- ChangeLog | 1 + web/htdocs/views.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f48e00..fc9d552 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * Improved debug logging of ldap syncs (Now writing duration of queries to log) * Displaying date/time of comments in comment icon hover menu (Please note: You need to update your livestatus to current version to make this work) + * FIX: Making "action" context link unclickable during handling actions / confirms BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c3c5fb1..9318519 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1429,13 +1429,17 @@ def render_view(view, rows, datasource, group_painters, painters, if show_buttons: update_context_links( # don't take display_options into account here ('c' is set during reload) - row_count > 0 and should_show_command_form('C', datasource), + row_count > 0 and should_show_command_form('C', datasource) \ + and not html.do_actions(), can_display_checkboxes ) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): play_alarm_sounds() + else: + # Always hide action related context links in this situation + update_context_links(False, False) # In multi site setups error messages of single sites do not block the # output and raise now exception. We simply print error messages here.

11 years, 7 months

Check_MK Git: check_mk: FIX: When a single rule matching raises an exception, the line is now

by Lars Michelsen

Module: check_mk Branch: master Commit: 1efb6cd92cca8932e192b208abc80a83dff84c05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1efb6cd92cca89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 10:46:06 2013 +0100 FIX: When a single rule matching raises an exception, the line is now matched agains the following rules instead of being skipped. The exception is logged to mkeventd.log --- ChangeLog | 3 +++ mkeventd/bin/mkeventd | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc9d552..95f47bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,9 @@ during "activate changes" process * Added hook mkeventd-activate-changes to add custom actions to the mkeventd "activate changes" GUI function + * FIX: When a single rule matching raises an exception, the line is now + matched agains the following rules instead of being skipped. The + exception is logged to mkeventd.log 1.2.1i5: Core: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fc05d77..fa58bff 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1218,7 +1218,11 @@ class EventServer: rule_candidates = self._rules for rule in rule_candidates: - result = self.event_rule_matches(rule, event) + try: + result = self.event_rule_matches(rule, event) + except Exception: + log(' Exception during matching:\n%s' % format_exception()) + result = False if result: g_perfcounters.count("rule_hits") cancelling, groups = result @@ -1280,7 +1284,6 @@ class EventServer: do_rule_actions(rule, event) return - # Checks if an event matches a rule. Returns either False (no match) # or a pair of matchtype, groups, where matchtype is False for a # normal match and True for a cancelling match and the groups is a tuple @@ -1307,7 +1310,7 @@ class EventServer: log(" did not match because of wrong application '%s' (need '%s')" % (event["application"], pattern(rule.get("match_application")))) return False - + if "match_facility" in rule and event["facility"] != rule["match_facility"]: if debug: log(" did not match because of wrong syslog facility")

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits