Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64554 discussions

Check_MK Git: check_mk: FIX Fixed too long page title during performing several actions

by Lars Michelsen

Module: check_mk Branch: master Commit: afa0d7c737cc44985458060103649b738b39d46f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa0d7c737cc44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 13:16:13 2013 +0100 FIX Fixed too long page title during performing several actions The page title reflects the current page. A bug caused this page title to be appended to the current title instead of being replaced. This resulted in too long page titles when performing e.g. actions in WATO --- .werks/333 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 9 ++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/333 b/.werks/333 new file mode 100644 index 0000000..ac66414 --- /dev/null +++ b/.werks/333 @@ -0,0 +1,12 @@ +Title: Fixed too long page title during performing several actions +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387196080 +Targetversion: future + +The page title reflects the current page. A bug caused this page title +to be appended to the current title instead of being replaced. This resulted +in too long page titles when performing e.g. actions in WATO diff --git a/ChangeLog b/ChangeLog index 4b837b9..62a1ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 0312 FIX: Hiding views related to not existing datasources, like the EC now... * 0325 FIX: Removed CSV export icon from availability views... * 0327 FIX: Most forms did now work with "Profile Requests" enabled... + * 0333 FIX: Fixed too long page title during performing several actions... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 67940f6..19b8c57 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -26,7 +26,6 @@ var browser = navigator.userAgent.toLowerCase(); var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); var weAreOpera = browser.indexOf("opera") != -1; var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; -var g_orig_title = null; var g_content_loc = null; var sidebar_folded = false; @@ -363,8 +362,8 @@ function contentFrameAccessible() { function update_content_location() { // init the original frameset title - if (g_orig_title == null) { - g_orig_title = window.parent.document.title; + if (typeof(window.parent.orig_title) == 'undefined') { + window.parent.orig_title = window.parent.document.title; } var content_frame = window.parent.frames[1]; @@ -372,9 +371,9 @@ function update_content_location() { // Change the title to add the right frame title to reflect the // title of the content URL in the framesets title (window title or tab title) if (content_frame.document.title != '') { - var page_title = g_orig_title + ' - ' + content_frame.document.title; + var page_title = window.parent.orig_title + ' - ' + content_frame.document.title; } else { - var page_title = g_orig_title; + var page_title = window.parent.orig_title; } window.parent.document.title = page_title;

10 years, 9 months

Check_MK Git: check_mk: FIX Own host tag groups without topics resulted in two groups "Host tags" in the rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: e0512251d29e7ef3afa657b5e151baad41c8b677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0512251d29e7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 12:39:41 2013 +0100 FIX Own host tag groups without topics resulted in two groups "Host tags" in the rule editor Conflicts: .werks/332 --- .werks/332 | 1 - 1 file changed, 1 deletion(-) diff --git a/.werks/332 b/.werks/332 index 2a6acea..115d8c3 100644 --- a/.werks/332 +++ b/.werks/332 @@ -6,4 +6,3 @@ State: unknown Version: 1.2.5i1 Date: 1387193799 Targetversion: future -

10 years, 9 months

Check_MK Git: check_mk: FIX Own host tag groups without topics resulted in two groups "Host tags" in the rule editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 975679128a452448a3d2bd60c8badfd53b122749 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=975679128a4524… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 12:37:37 2013 +0100 FIX Own host tag groups without topics resulted in two groups "Host tags" in the rule editor Conflicts: .bugs/1081 --- .bugs/1081 | 13 +++++++++++++ .werks/332 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 +++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.bugs/1081 b/.bugs/1081 new file mode 100644 index 0000000..f451a2f --- /dev/null +++ b/.bugs/1081 @@ -0,0 +1,13 @@ +Title: Own host tag groups without topics are sorted in own group +Component: wato +Class: bug +State: done +Date: 2013-12-16 11:33:59 +Targetversion: 1.2.4 + +Create a tag group. Do not set a topic. That tag group will be +displayed in an own folder with the title "Host Tags". That folder +is thus duplicate. + +2013-12-16 12:36:31: changed state open -> done +This occured in the rule editor. has been fixed now diff --git a/.werks/332 b/.werks/332 new file mode 100644 index 0000000..2a6acea --- /dev/null +++ b/.werks/332 @@ -0,0 +1,9 @@ +Title: Own host tag groups without topics resulted in two groups "Host tags" in the rule editor +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387193799 +Targetversion: future + diff --git a/ChangeLog b/ChangeLog index 7a17c48..10bd873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... * 0330 FIX: Improved performance of WATO slave push with a large user base... * 0331 FIX: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO... + * 0332 FIX: Own host tag groups without topics resulted in two groups "Host tags" in the rule editor Notifications: * 0108 FIX: Prevent service notification on host alerts... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02c2f40..8e2f0be 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9577,6 +9577,8 @@ def group_hosttags_by_topic(hosttags): tags = {} for entry in hosttags: topic, title = parse_hosttag_title(entry[1]) + if not topic: + topic = _('Host tags') tags.setdefault(topic, []) tags[topic].append((entry[0], title) + entry[2:]) return sorted(tags.items(), key = lambda x: x[0]) @@ -11745,7 +11747,7 @@ def render_condition_editor(tag_specs, varprefix=""): make_foldable = len(hosttags) > 1 for topic, grouped_tags in hosttags: if make_foldable: - html.begin_foldable_container("topic", topic, True, "%s" % (topic or _('Host tags'))) + html.begin_foldable_container("topic", topic, True, "%s" % (topic)) html.write("<table class=\"hosttags\">") # Show main tags

10 years, 9 months

Check_MK Git: check_mk: FIX Parse state of downtime notification log entries correctly

by Mathias Kettner

Module: check_mk Branch: master Commit: dc8445afe08d1a35a233f0d1f313f3588fda9dc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc8445afe08d1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 12:37:55 2013 +0100 FIX Parse state of downtime notification log entries correctly The state information of log messages of notifications that are triggered by downtimes was not correctly parsed. This has been fixed. --- .bugs/952 | 7 +++++-- .werks/335 | 12 ++++++++++++ ChangeLog | 3 +++ livestatus/src/LogEntry.cc | 36 +++++++++++++++++++++++++++--------- 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/.bugs/952 b/.bugs/952 index 45a0fb5..5db7895 100644 --- a/.bugs/952 +++ b/.bugs/952 @@ -1,9 +1,9 @@ Title: Livestatus: parse DOWNTIMESTOPPED (UP) into correct state UP Component: livestatus -State: open +Class: bug +State: done Date: 2013-09-16 11:34:56 Targetversion: 1.4.0 -Class: bug When parsing lines like: @@ -12,3 +12,6 @@ When parsing lines like: Livestatus sets 3 as the state (meaning invalid). It should extract the (UP) however and set the state 0. + +2013-12-16 12:35:09: changed state open -> done +Fixed. Nagios uses log enries with varying order. diff --git a/.werks/335 b/.werks/335 new file mode 100644 index 0000000..0a77090 --- /dev/null +++ b/.werks/335 @@ -0,0 +1,12 @@ +Title: Parse state of downtime notification log entries correctly +Level: 1 +Component: livestatus +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387193798 +Targetversion: future + +The state information of log messages of notifications that are +triggered by downtimes was not correctly parsed. This has been +fixed. diff --git a/ChangeLog b/ChangeLog index 7a17c48..01bca7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,9 @@ * 0304 FIX: Escaping several unwanted chars from incoming log messages... * 0089 FIX: CSV export of event console was broken... + Livestatus: + * 0335 FIX: Parse state of downtime notification log entries correctly... + 1.2.3i7: Core & Setup: diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 86b6482..5d4783b 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -240,8 +240,12 @@ inline bool LogEntry::handleStatusEntry() return false; } - - +// Examples of host notifications. Beware CUSTOM and DOWNTIME notifications +// have a different column order. This can be considered as a bug. But we +// need to parse that anyway. +// HOST NOTIFICATION: omdadmin;localhost;check-mk-notify;DOWNTIMESTOPPED (UP);mk +// HOST NOTIFICATION: omdadmin;localhost;CUSTOM (UP);check-mk-notify;OK - 127.0.0.1: rta 0.055ms, lost 0%;omdadmin;TEST +// HOST NOTIFICATION: omdadmin;localhost;DOWN;check-mk-notify;Manually set to Down by omdadmin inline bool LogEntry::handleNotificationEntry() { if (!strncmp(_text, "HOST NOTIFICATION: ", 19) @@ -255,17 +259,31 @@ inline bool LogEntry::handleNotificationEntry() _contact_name = next_token(&scan, ';'); _host_name = next_token(&scan, ';'); - if (svc) { + if (svc) _svc_desc = next_token(&scan, ';'); - _state_type = save_next_token(&scan, ';'); + + _state_type = save_next_token(&scan, ';'); + _command_name = next_token(&scan, ';'); + + if (svc) _state = serviceStateToInt(_state_type); - } - else { - _state_type = save_next_token(&scan, ';'); + else _state = hostStateToInt(_state_type); + + // If that state is not parsable then we assume that the order + // is swapped + if ((svc && _state == 4) || + (!svc && _state == 3)) + { + char *swap = _state_type; + _state_type = _command_name; + _command_name = swap; + if (svc) + _state = serviceStateToInt(_state_type); + else + _state = hostStateToInt(_state_type); } - _command_name = next_token(&scan, ';'); _check_output = next_token(&scan, ';'); return true; } @@ -370,7 +388,7 @@ inline int LogEntry::serviceStateToInt(char *s) inline int LogEntry::hostStateToInt(char *s) { char *last = s + strlen(s) - 1; - if (*last == ')') + if (*last == ')') // handle CUSTOM (UP) and DOWNTIMESTOPPED (DOWN) last--; // UP, DOWN, UNREACHABLE, RECOVERY

10 years, 9 months

Check_MK Git: check_mk: Fixed .f12 file of livestatus

by Mathias Kettner

Module: check_mk Branch: master Commit: 2589d3f01d206b4047e38cbde749c9a4b9e67175 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2589d3f01d206b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 12:35:27 2013 +0100 Fixed .f12 file of livestatus --- livestatus/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index cb74775..7f15020 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -14,7 +14,7 @@ fi make CFLAGS=-g -j 8 -sudo install src/livestatus.o /omd/versions/default/lib/mk-livestatus/livestatus.o +sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o echo "$C files copied" echo "Restarting site $SITE" sudo omd restart $SITE nagios

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 140bf77da7e01d2e35e68c12b042552d46776619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=140bf77da7e01d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 12:36:07 2013 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3d9988a..8941db5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -335 +355

10 years, 9 months

Check_MK Git: check_mk: FIX LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 8484cc34550c5187a94b16ac5d428463b72d3388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8484cc34550c51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 12:15:49 2013 +0100 FIX LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO The macro was configurable via plain config files for a long time, but it could not be configured via WATO. This is now possible. --- .werks/331 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 10 ++++++++++ web/plugins/wato/check_mk_configuration.py | 1 + 4 files changed, 23 insertions(+) diff --git a/.werks/331 b/.werks/331 new file mode 100644 index 0000000..a6a1278 --- /dev/null +++ b/.werks/331 @@ -0,0 +1,11 @@ +Title: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387192477 +Targetversion: future + +The macro was configurable via plain config files for a long time, but it +could not be configured via WATO. This is now possible. diff --git a/ChangeLog b/ChangeLog index 16082fb..7a17c48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0309 FIX: Trying to prevent read/write conflicts with a large user base... * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... * 0330 FIX: Improved performance of WATO slave push with a large user base... + * 0331 FIX: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO... Notifications: * 0108 FIX: Prevent service notification on host alerts... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 08c7348..fa02b21 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -598,11 +598,21 @@ class Filename(TextAscii): self._default_path = kwargs["default"] else: self._default_path = "/tmp/foo" + if "trans_func" in kwargs: + self._trans_func = kwargs["trans_func"] + else: + self._trans_func = None def canonical_value(self): return self._default_path def validate_value(self, value, varprefix): + # The transformation function only changes the value for validation. This is + # usually a function which is later also used within the code which uses + # this variable to e.g. replace macros + if self._trans_func: + value = self._trans_func(value) + if len(value) == 0: raise MKUserError(varprefix, _("Please enter a filename.")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 60d64f0..2a25018 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -791,6 +791,7 @@ register_configvar(group, Filename( label = _("Absolute path to log file"), default = defaults.var_dir + '/web/ldap-debug.log', + trans_func = userdb.ldap_replace_macros, ), title = _("LDAP connection diagnostics"), label = _("Activate logging of LDAP transactions into a logfile"),

10 years, 9 months

Check_MK Git: check_mk: FIX Improved performance of WATO slave push with a large user base

by Lars Michelsen

Module: check_mk Branch: master Commit: 52c448c91a6d5d743026f7ed38e425ef6d33334b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52c448c91a6d5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 12:09:06 2013 +0100 FIX Improved performance of WATO slave push with a large user base When having a large number of users (several thousands) and pushing them to a slave site, the user database hook was executed twice, which resulted in a senseless duplicate calculation of things. This has been resolved now. Conflicts: .bugs/1018 ChangeLog --- .bugs/980 | 7 +++++-- .werks/330 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/userdb.py | 1 + web/plugins/wato/userdb.py | 5 ----- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.bugs/980 b/.bugs/980 index 303d566..d285c64 100644 --- a/.bugs/980 +++ b/.bugs/980 @@ -1,9 +1,9 @@ Title: Hooks users-saved called duplicate when doing WATO sync Component: wato -State: open +Class: nastiness +State: done Date: 2013-10-08 18:24:47 Targetversion: 1.2.3i3 -Class: nastiness When doing a replicated WATO sync, then the hook users-saved is being called twice. We should elimiate that. Especially because @@ -28,3 +28,6 @@ there might be involved lengthy LDAP syncs [Tue Oct 08 09:23:31 2013] [warn] [client 127.0.0.1] CALLING HOOK activate-changes [Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] FINISHED HOOK activate-changes [Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] RESTARTED + +2013-12-16 12:06:40: changed state open -> done +Removed the snapshot-pushed hook. diff --git a/.werks/330 b/.werks/330 new file mode 100644 index 0000000..47eb7ae --- /dev/null +++ b/.werks/330 @@ -0,0 +1,12 @@ +Title: Improved performance of WATO slave push with a large user base +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387192025 +Targetversion: future + +When having a large number of users (several thousands) and pushing them to a +slave site, the user database hook was executed twice, which resulted in a +senseless duplicate calculation of things. This has been resolved now. diff --git a/ChangeLog b/ChangeLog index b5d9350..5bacde5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 0242 FIX: Parameters for clustered services can now be configured on the cluster host... * 0309 FIX: Trying to prevent read/write conflicts with a large user base... * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... + * 0330 FIX: Improved performance of WATO slave push with a large user base... Notifications: * 0108 FIX: Prevent service notification on host alerts... diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 55905d1..6e23468 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -664,6 +664,7 @@ def hook_login(username, password): # Is called on: # a) before rendering the user management page in WATO # b) a user is created during login (only for this user) +# c) Before activating the changes in WATO def hook_sync(connector_id = None, add_to_changelog = False, only_username = None, raise_exc = False): if connector_id: connectors = [ get_connector(connector_id) ] diff --git a/web/plugins/wato/userdb.py b/web/plugins/wato/userdb.py index 0d5663e..43608fd 100644 --- a/web/plugins/wato/userdb.py +++ b/web/plugins/wato/userdb.py @@ -30,8 +30,3 @@ def sync_pre_activate_changes(_unused): if 'wato_pre_activate_changes' in config.userdb_automatic_sync: userdb.hook_sync() api.register_hook('pre-activate-changes', sync_pre_activate_changes) - -def sync_snapshot_pushed(): - if 'wato_snapshot_pushed' in config.userdb_automatic_sync: - userdb.hook_sync() -api.register_hook('snapshot-pushed', sync_snapshot_pushed)

10 years, 9 months

Check_MK Git: check_mk: Removed Distributed WATO peer mode

by Lars Michelsen

Module: check_mk Branch: master Commit: 4155ba1ccbb1e0a9761b2e45076c2c6b565f16e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4155ba1ccbb1e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 11:45:27 2013 +0100 Removed Distributed WATO peer mode This mode did not really work and was not used by any known installation. This confused users and hand no relevance. Dropped that feature. --- .bugs/1018 | 7 ++- .werks/329 | 9 ++++ ChangeLog | 3 +- web/htdocs/wato.py | 138 ++++------------------------------------------------ 4 files changed, 26 insertions(+), 131 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4155ba1ccb…

10 years, 9 months

Check_MK Git: check_mk: FIX agent_vpshere: new option for supporting ESX 4. 1

by Mathias Kettner

Module: check_mk Branch: master Commit: 77bd890e111b21b7545bacb3f6788d1cae400343 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77bd890e111b21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 12:03:46 2013 +0100 FIX agent_vpshere: new option for supporting ESX 4.1 The current fast implementation of the ESX vSphere agent for Check_MK does not yet support ESX versions older than 5.0. The most promiment such version is ESX 4.1. There is now a new option Support ESX 4.1 (using slower PySphere implementation) in the WATO rule for the ESX agent that forces using the old pysphere-based agent. --- .bugs/943 | 8 +- .werks/59 | 14 +++ ChangeLog | 2 +- agents/special/agent_vsphere | 14 ++- agents/special/agent_vsphere.pysphere | 5 +- checks/agent_vsphere | 4 +- web/plugins/wato/datasource_programs.py | 159 +++++++++++++++++-------------- 7 files changed, 126 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=77bd890e11…

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