Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6773 FIX Fixed URL redirect from /[site]/ when using custom ports

by Lars Michelsen

Module: check_mk Branch: master Commit: ab2212af950b967bb34c48aeca5490e0ca717326 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab2212af950b96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:26:15 2018 +0200 6773 FIX Fixed URL redirect from /[site]/ when using custom ports Requests to the GUI were not done correctly when a non standard port is used for accessing the GUI. The redirect from <tt>/[site]/</tt> or <tt>/[site]</tt> to <tt>/[site]/check_mk/</tt> was setting the URL back to standard ports. Change-Id: I905b696c5d28dcd4b3cefe36d2560d83ea18ae9c --- .werks/6773 | 13 +++++++++++++ omd/packages/omd/skel/etc/apache/conf.d/omd.conf | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6773 b/.werks/6773 new file mode 100644 index 0000000..c9cfeca --- /dev/null +++ b/.werks/6773 @@ -0,0 +1,13 @@ +Title: Fixed URL redirect from /[site]/ when using custom ports +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538113544 + +Requests to the GUI were not done correctly when a non standard port is used +for accessing the GUI. The redirect from <tt>/[site]/</tt> or <tt>/[site]</tt> +to <tt>/[site]/check_mk/</tt> was setting the URL back to standard ports. diff --git a/omd/packages/omd/skel/etc/apache/conf.d/omd.conf b/omd/packages/omd/skel/etc/apache/conf.d/omd.conf index 49949c0..607f56d 100644 --- a/omd/packages/omd/skel/etc/apache/conf.d/omd.conf +++ b/omd/packages/omd/skel/etc/apache/conf.d/omd.conf @@ -9,7 +9,7 @@ RewriteCond %{HTTP:X-Forwarded-Proto} =https [OR] RewriteCond %{HTTPS} =on RewriteRule ^/###SITE###(/?|/check_mk)$ - [env=proto:https] -RewriteRule ^/###SITE###(/?|/check_mk)$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/check_mk/ [R=302] +RewriteRule ^/###SITE###(/?|/check_mk)$ %{ENV:proto}://%{HTTP_HOST}/###SITE###/check_mk/ [R=302,L] Alias /###SITE###/omd "###ROOT###/share/omd/htdocs"

6 years, 2 months

6771 FIX Fixed minor graph rendering issues when using the modern theme

by Lars Michelsen

Module: check_mk Branch: master Commit: 6f384ade9e63c69b11272d59c7b1ac9ab72fd110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f384ade9e63c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 16:10:22 2018 +0200 6771 FIX Fixed minor graph rendering issues when using the modern theme The graph time axis labels had a slightly wrong background color. And the graph hover indicator line had a wrong position in relation to the mouse pointer. Change-Id: Ic9101460775ed49d2a610515368250765f338308 --- .werks/6771 | 12 ++++++++++++ web/htdocs/themes/facelift/theme.css | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6771 b/.werks/6771 new file mode 100644 index 0000000..4ae7d4e --- /dev/null +++ b/.werks/6771 @@ -0,0 +1,12 @@ +Title: Fixed minor graph rendering issues when using the modern theme +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1538057332 +Class: fix + +The graph time axis labels had a slightly wrong background color. And +the graph hover indicator line had a wrong position in relation to the +mouse pointer. diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index dedd152..fef0d1c 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -644,7 +644,6 @@ tr.groupheader a, tr.groupheader body.main .popup_menu span, body.main .popup_me div.graph_with_timeranges { margin-bottom: 32px; } div.graph_with_timeranges div.graph { - padding: 8px !important; box-shadow: none !important; border: 1px solid #cccfdb !important; background-color: transparent !important;

6 years, 2 months

Tiny simplification

by Lars Michelsen

Module: check_mk Branch: master Commit: 890ae748f886c58926ef3db5d171f9572e370d92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=890ae748f886c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:27:40 2018 +0200 Tiny simplification Change-Id: I36928a4aeb13d6c9ece48aba5c9d14e48f03a2b1 --- cmk/gui/plugins/userdb/ldap_connector.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 32f8846..bdf1cdf 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1018,8 +1018,7 @@ class LDAPUserConnector(UserConnector): user_connection_id = userdb.cleanup_connection_id(user.get('connector')) if user_connection_id == connection_id and self._strip_suffix(user_id) not in ldap_users: del users[user_id] # remove the user - if config.wato_enabled: - changes.append(_("LDAP [%s]: Removed user %s") % (connection_id, user_id)) + changes.append(_("LDAP [%s]: Removed user %s") % (connection_id, user_id)) for user_id, ldap_user in ldap_users.items(): mode_create, user = load_user(user_id) @@ -1066,7 +1065,7 @@ class LDAPUserConnector(UserConnector): changed = self._find_changed_user_keys(intersect, users[user_id], user) # returns a dict users[user_id] = user # Update the user record - if mode_create and config.wato_enabled: + if mode_create: changes.append(_("LDAP [%s]: Created user %s") % (connection_id, user_id)) else: details = [] @@ -1094,14 +1093,14 @@ class LDAPUserConnector(UserConnector): for key, (old_value, new_value) in sorted(changed.items()): details.append(('Changed %s from %s to %s' % (key, old_value, new_value))) - if details and config.wato_enabled: + if details: changes.append(_("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details))) duration = time.time() - start_time self._logger.info('SYNC FINISHED - Duration: %0.3f sec', duration) import cmk.gui.watolib as watolib # TODO: Cleanup - if changes and not config.is_wato_slave_site(): + if changes and config.wato_enabled and not config.is_wato_slave_site(): watolib.add_change("edit-users", "<br>\n".join(changes), add_user=False) userdb.save_users(users)

6 years, 2 months

6772 FIX LDAP: Only save users on changed configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: fb1644cd1ce0a06c97cc554dc02841ce1407c10f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb1644cd1ce0a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 28 10:29:06 2018 +0200 6772 FIX LDAP: Only save users on changed configuration The LDAP synchronization was rewriting the user configuration during every synchronization, even when no change has been made to the user configuration. This needless operation resulted in subsequent load because some processes, like the Check_MK alert and notify helper were reloading their configuration in case of a changed Check_MK config file. Change-Id: I331028d50d7ea99b5f6c18ecdc555cbb437156ac --- .werks/6772 | 17 +++++++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 5 ++++- cmk/gui/userdb.py | 6 +++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.werks/6772 b/.werks/6772 new file mode 100644 index 0000000..af71d52 --- /dev/null +++ b/.werks/6772 @@ -0,0 +1,17 @@ +Title: LDAP: Only save users on changed configuration +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538063535 + +The LDAP synchronization was rewriting the user configuration during +every synchronization, even when no change has been made to the user +configuration. + +This needless operation resulted in subsequent load because some +processes, like the Check_MK alert and notify helper were reloading +their configuration in case of a changed Check_MK config file. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index bdf1cdf..8af2b1a 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -1103,7 +1103,10 @@ class LDAPUserConnector(UserConnector): if changes and config.wato_enabled and not config.is_wato_slave_site(): watolib.add_change("edit-users", "<br>\n".join(changes), add_user=False) - userdb.save_users(users) + if changes: + userdb.save_users(users) + else: + userdb.release_users_lock() self._set_last_sync_time() diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 8d226ee..920382a 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -754,7 +754,7 @@ def save_users(profiles): # Release the lock to make other threads access possible again asap # This lock is set by load_users() only in the case something is expected # to be written (like during user syncs, wato, ...) - store.release_lock(root_dir + "contacts.mk") + release_users_lock() # populate the users cache # TODO: Can we clean this up? @@ -764,6 +764,10 @@ def save_users(profiles): hooks.call("users-saved", updated_profiles) +def release_users_lock(): + store.release_lock(root_dir + "contacts.mk") + + # TODO: Isn't this needed only while generating the contacts.mk? # Check this and move it to the right place def _add_custom_macro_attributes(profiles):

6 years, 2 months

6735 FIX cpu_util_unix: Fixed calculation of CPU usage on UNIX

by Simon Betz

Module: check_mk Branch: master Commit: 79e551186b02cfbdbc1a9f681a6c07ac231984a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e551186b02cf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 27 16:47:59 2018 +0200 6735 FIX cpu_util_unix: Fixed calculation of CPU usage on UNIX Thanks to Juergen Raschke for his patch! The result of the cpu_usage is wrong. The cpu_time_guest is included in cpu_time_user: See https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/kerne… for more information: <code> /* * Account guest CPU time to a process. * @p: the process that the CPU time gets accounted to * @cputime: the CPU time spent in virtual machine since the last update */ void account_guest_time(struct task_struct *p, u64 cputime) { u64 *cpustat = kcpustat_this_cpu->cpustat; /* Add guest time to process. */ p->utime += cputime; account_group_user_time(p, cputime); p->gtime += cputime; /* Add guest time to cpustat. */ if (task_nice(p) > 0) { cpustat[CPUTIME_NICE] += cputime; cpustat[CPUTIME_GUEST_NICE] += cputime; } else { cpustat[CPUTIME_USER] += cputime; cpustat[CPUTIME_GUEST] += cputime; } } </code> FEED-935 Change-Id: Ic26ae1d06da1284b61649831e4967776f0a89684 --- .werks/6735 | 40 ++++++++++++++++++++++++++++++++++++++++ checks/cpu_util.include | 16 +++++++++++++--- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/.werks/6735 b/.werks/6735 new file mode 100644 index 0000000..4b5ed95 --- /dev/null +++ b/.werks/6735 @@ -0,0 +1,40 @@ +Title: cpu_util_unix: Fixed calculation of CPU usage on UNIX +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1538059527 + +The result of the cpu_usage is wrong. The cpu_time_guest is included in +cpu_time_user: See +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/kernel/sched/cputime.c +for more information: + +<code> +/* + * Account guest CPU time to a process. + * @p: the process that the CPU time gets accounted to + * @cputime: the CPU time spent in virtual machine since the last update + */ +void account_guest_time(struct task_struct *p, u64 cputime) +{ + u64 *cpustat = kcpustat_this_cpu->cpustat; + + /* Add guest time to process. */ + p->utime += cputime; + account_group_user_time(p, cputime); + p->gtime += cputime; + + /* Add guest time to cpustat. */ + if (task_nice(p) > 0) { + cpustat[CPUTIME_NICE] += cputime; + cpustat[CPUTIME_GUEST_NICE] += cputime; + } else { + cpustat[CPUTIME_USER] += cputime; + cpustat[CPUTIME_GUEST] += cputime; + } +} +</code> diff --git a/checks/cpu_util.include b/checks/cpu_util.include index c5557cc..eb429af 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -132,8 +132,8 @@ def check_cpu_util(util, params, this_time=None, cores=None): # - 5 - irq: servicing interrupts # - 6 - softirq: servicing softirqs # - 7 - steal: involuntary wait -# - 8 - guest: time spent in guest OK -# - 9 - guest_nice: time spent in niced guest OK +# - 8 - guest: time spent in guest OK, also counted in 0 (user) +# - 9 - guest_nice: time spent in niced guest OK, also counted in 1 (nice) def check_cpu_util_unix(values, params, cores = None): this_time = time.time() # Compute jiffi-differences of all relevant counters @@ -150,7 +150,17 @@ def check_cpu_util_unix(values, params, cores = None): if sum_jiffies == 0: raise MKCounterWrapped("Too short time difference since last check") - user = diff_values[0] + diff_values[1] # add user + nice + user = diff_values[0] + diff_values[1] # add user + nice + if len(values) >= 10: # and (values[8] or values[9]): + # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/kerne… + # see 'account_guest_time' + # if task_nice(p) <= 0: + # cpustat[CPUTIME_USER] += cputime; + # cpustat[CPUTIME_GUEST] += cputime; + subtrahend = diff_values[8] + diff_values[9] + user -= subtrahend + sum_jiffies -= subtrahend + system = diff_values[2] + diff_values[5] + diff_values[6] wait = diff_values[4] user_perc = 100.0 * float(user) / float(sum_jiffies)

6 years, 2 months

Pylint no-else-return refactoring: fourth set of files

by Kenneth Okoh

Module: check_mk Branch: master Commit: cc8541d9ee0378140537a211776747d29302eb33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8541d9ee0378… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Sep 28 06:50:27 2018 +0200 Pylint no-else-return refactoring: fourth set of files Change-Id: I5ed6944f94346e79e730dfe4b06a3f3b4aaa3b0e --- cmk/gui/plugins/metrics/utils.py | 12 +-- cmk/gui/plugins/visuals/filters.py | 54 ++++------ cmk/gui/plugins/visuals/inventory.py | 24 ++--- cmk/gui/plugins/visuals/utils.py | 6 +- cmk/gui/plugins/wato/active_checks.py | 3 +- cmk/gui/plugins/wato/bi.py | 24 ++--- cmk/gui/plugins/wato/builtin_attributes.py | 3 +- cmk/gui/plugins/wato/utils/__init__.py | 24 ++--- cmk/gui/plugins/wato/utils/main_menu.py | 3 +- cmk/gui/wato/pages/audit_log.py | 6 +- cmk/gui/wato/pages/groups.py | 9 +- cmk/gui/wato/pages/sites.py | 6 +- cmk/gui/wato/pages/timeperiods.py | 3 +- cmk/gui/watolib.py | 154 ++++++++++++----------------- 14 files changed, 127 insertions(+), 204 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc8541d9ee…

6 years, 2 months

Pylint no-else-return refactoring: third set of files

by Kenneth Okoh

Module: check_mk Branch: master Commit: 2f2592aaa0beb7a9b6140f5e50c19bf386f906ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f2592aaa0beb7… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Sep 28 06:31:59 2018 +0200 Pylint no-else-return refactoring: third set of files Change-Id: Ib50ed7461f4471355ea2c95b07a8eb210637ea50 --- cmk/gui/plugins/sidebar/bookmarks.py | 3 +- cmk/gui/plugins/sidebar/quicksearch.py | 33 ++--- cmk/gui/plugins/sidebar/virtual_host_tree.py | 25 ++-- cmk/gui/plugins/userdb/htpasswd.py | 6 +- cmk/gui/plugins/userdb/ldap_connector.py | 15 +-- cmk/gui/plugins/userdb/user_attributes.py | 3 +- cmk/gui/plugins/views/icons/builtin.py | 9 +- cmk/gui/plugins/views/inventory.py | 54 +++----- cmk/gui/plugins/views/painters.py | 58 +++------ cmk/gui/plugins/views/perfometers/__init__.py | 3 +- cmk/gui/plugins/views/perfometers/check_mk.py | 42 +++--- cmk/gui/plugins/views/sorters.py | 9 +- cmk/gui/plugins/views/utils.py | 60 +++------ cmk/gui/valuespec.py | 176 ++++++++++---------------- 14 files changed, 189 insertions(+), 307 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2f2592aaa0…

6 years, 2 months

cisco_stack: Make scan function less restrictive

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0bc633780add4cb46d1c465b1f9660419a89ad03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bc633780add4c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Sep 28 11:34:43 2018 +0200 cisco_stack: Make scan function less restrictive Change-Id: I97ae862a4867f81612f199626bef3a1621c9c9ec --- checks/cisco_stack | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/cisco_stack b/checks/cisco_stack index 319de05..9e1ba04 100644 --- a/checks/cisco_stack +++ b/checks/cisco_stack @@ -116,6 +116,7 @@ check_info['cisco_stack'] = { "3", # cswSwitchRole "6", # cswSwitchState ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.1208"), + 'snmp_scan_function' : lambda oid: (oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.1208") or + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.1745")), 'group' : 'cisco_stack', }

6 years, 2 months

5511 FIX cmk-update-agent: Improve prelink handling

by Andreas Umbreit

Module: check_mk Branch: master Commit: 6b2ede752bb46a76aed48a4cdbc4bbd2b6144a1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b2ede752bb46a… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Sep 28 09:49:41 2018 +0200 5511 FIX cmk-update-agent: Improve prelink handling With werk #5507, we tried to mitigate the impact of prelink on the agent updater binary. However, it turned out that the corresponding files did not survive every Check_MK Agent update scenarios. First of all, please note that we do not recommend the usage of prelink at all, as its benefit is questionable and there are some issues (not limited the the cmk-update-agent binary) that may occur by applying it to a system. Now, with this werk, the prelink exception for the cmk-update-agent is placed on the target system in a more robust way. A blacklist-file at <pre>/etc/prelink.conf.d/cmk-update-agent.conf</pre> is now placed on the target system regardless of an existing prelink-installation. If prelink is installed on the target system (i.e. the file /etc/prelink.conf exists), our blacklist-file will be referenced as an additional prelink configuration file. If prelink gets installed on the system after the Check_MK Agent, you have to reference the blacklist-file by yourself. You can do this by adding a line <pre> -c /etc/prelink.conf.d/cmk-update-agent.conf </pre> to <pre>/etc/prelink.conf</pre>. However, this mechanism is only available for .rpm and .deb Check_MK Agent pakages. (Jira Issue: CMK-1056) Change-Id: Ia65d9dbdc214c405dbe04aa991e43c48c5fa7ab8 --- .werks/5511 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.werks/5511 b/.werks/5511 new file mode 100644 index 0000000..c970407 --- /dev/null +++ b/.werks/5511 @@ -0,0 +1,32 @@ +Title: cmk-update-agent: Improve prelink handling +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1538119495 + + +With werk #5507, we tried to mitigate the impact of prelink on the agent updater binary. +However, it turned out that the corresponding files did not survive every Check_MK Agent +update scenarios. + +First of all, please note that we do not recommend the usage of prelink at all, +as its benefit is questionable and there are some issues +(not limited the the cmk-update-agent binary) that may occur by applying it to a system. + +Now, with this werk, the prelink exception for the cmk-update-agent is placed on the target +system in a more robust way. +A blacklist-file at <tt>/etc/prelink.conf.d/cmk-update-agent.conf</tt> is +now placed on the target system regardless of an existing prelink-installation. +If prelink is installed on the target system (i.e. the file <tt>/etc/prelink.conf</tt> exists), +our blacklist-file will be referenced as an additional prelink configuration file. +If prelink gets installed on the system after the Check_MK Agent, you have to reference +the blacklist-file by yourself. You can do this by adding a line +<pre>-c /etc/prelink.conf.d/cmk-update-agent.conf</pre> +to <tt>/etc/prelink.conf</tt>. + +However, this mechanism is only available for .rpm and .deb Check_MK Agent pakages. +

6 years, 2 months

Reserved 10 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: 09ed927ae5c99249d654655d007290c6e907902a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09ed927ae5c992… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Sep 28 11:25:54 2018 +0200 Reserved 10 Werk IDS Change-Id: I70d89026ce6deb7780094733f8091ca60fa9b1c8 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d403938..ed90fa0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6789 +6799

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018