Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Sven Panne

Module: check_mk Branch: master Commit: a36261f80cbdd2aeedb45acc186be1f026b868df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a36261f80cbdd2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 16 14:42:25 2018 +0100 Reserved 10 Werk IDS Change-Id: Ia55260bf6d62b2087aa1d74f6dbaa2c2cbdebf10 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 07e12df..46829db 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5828 +5838

6 years, 7 months

5828 FIX Handle case-insensitive equality correctly in Livestatus.

by Sven Panne

Module: check_mk Branch: master Commit: 1c6f164c249de7d2e7e9d2e10c6a581f04acbff4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c6f164c249de7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 16 14:47:35 2018 +0100 5828 FIX Handle case-insensitive equality correctly in Livestatus. Equality-based Livestatus filters did not handle case-insensitivity correctly for non-ASCII characters. This has been fixed. The affected operators are =~ and !=~ for string-valued columns plus > and <= for list-valued columns. Note that regular expressions already handle case-(in)sensitivity correctly since werk 5672 ("Use RE2 regular expression engine for Livestatus queries"). Change-Id: I936fd5bdfe1b4a48354919f9705cbeabbebcbe09 --- .werks/5828 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.werks/5828 b/.werks/5828 new file mode 100644 index 0000000..24829c5 --- /dev/null +++ b/.werks/5828 @@ -0,0 +1,18 @@ +Title: Handle case-insensitive equality correctly in Livestatus. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518788550 +Class: fix + +Equality-based Livestatus filters did not handle case-insensitivity +correctly for non-ASCII characters. This has been fixed. + +The affected operators are =~ and !=~ for string-valued columns plus > and +<= for list-valued columns. + +Note that regular expressions already handle case-(in)sensitivity correctly +since werk 5672 ("Use RE2 regular expression engine for Livestatus +queries").

6 years, 7 months

Handle case-insensitive equality correctly in Livestatus.

by Sven Panne

Module: check_mk Branch: master Commit: d3e2201c29f6f40c9cd3835bb9856a11ddf3a674 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3e2201c29f6f4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 16 11:23:23 2018 +0100 Handle case-insensitive equality correctly in Livestatus. Finally: strcasecmp is dead! Note that we stil ignore the local for this, though... Change-Id: If2971b75ea5e6734a3c3656473c1f2f082671c0b --- configure.ac | 2 +- livestatus/src/CustomVarsDictFilter.cc | 12 ++++---- livestatus/src/ListFilter.cc | 49 +++++++++++++++++++++---------- livestatus/src/OffsetStringMacroColumn.cc | 5 ++-- livestatus/src/RegExp.cc | 24 +++++++++++---- livestatus/src/RegExp.h | 4 ++- livestatus/src/StringFilter.cc | 12 ++++---- livestatus/src/opids.cc | 17 ++++++++--- 8 files changed, 81 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d3e2201c29…

6 years, 7 months

5735 FIX Fixed PDF export of "Event Detail" page

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fb37445e40ac255b23e7088bda918bcd2d248bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fb37445e40ac2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 11:09:17 2018 +0100 5735 FIX Fixed PDF export of "Event Detail" page Change-Id: Ib7dbf2b74baa922941565eef2b2fe07af50fcd37 --- .werks/5735 | 11 +++++++++++ web/plugins/views/mkeventd.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5735 b/.werks/5735 new file mode 100644 index 0000000..2f77957 --- /dev/null +++ b/.werks/5735 @@ -0,0 +1,11 @@ +Title: Fixed PDF export of "Event Detail" page +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1518775736 + + diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index d639416..3c6175d 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -298,7 +298,7 @@ if mkeventd_enabled: "title" : _("Process ID"), "short" : _("PID"), "columns" : ["event_pid" ], - "paint" : lambda row: ("", row["event_pid"]), + "paint" : lambda row: ("", "%s" % row["event_pid"]), } multisite_painters["event_priority"] = {

6 years, 7 months

Check tests: Remove unused pprint imports

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4236d3981d8dabd37ba3180fb8d1cd83f0f4de2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4236d3981d8dab… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Feb 16 10:40:11 2018 +0100 Check tests: Remove unused pprint imports Change-Id: I2614673bc80cbcc11375d3b786657b84f610d71c --- tests/checks/test_df_check.py | 1 - tests/checks/test_if_check.py | 1 - tests/checks/test_kernel_check.py | 1 - tests/checks/test_mkbackup_check.py | 1 - tests/checks/test_statgrab_cpu_check.py | 1 - tests/checks/test_uptime_check.py | 1 - 6 files changed, 6 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index b34eee1..b336d62 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -1,5 +1,4 @@ import pytest -import pprint import checktestlib pytestmark = pytest.mark.checks diff --git a/tests/checks/test_if_check.py b/tests/checks/test_if_check.py index 4098e87..9cc5e30 100644 --- a/tests/checks/test_if_check.py +++ b/tests/checks/test_if_check.py @@ -1,5 +1,4 @@ import pytest -import pprint import ast from testlib import cmk_path diff --git a/tests/checks/test_kernel_check.py b/tests/checks/test_kernel_check.py index 6c3dd90..426b3a0 100644 --- a/tests/checks/test_kernel_check.py +++ b/tests/checks/test_kernel_check.py @@ -1,5 +1,4 @@ import pytest -import pprint from cmk_base.check_api import MKCounterWrapped import checktestlib diff --git a/tests/checks/test_mkbackup_check.py b/tests/checks/test_mkbackup_check.py index 1128973..086f025 100644 --- a/tests/checks/test_mkbackup_check.py +++ b/tests/checks/test_mkbackup_check.py @@ -1,5 +1,4 @@ import pytest -import pprint pytestmark = pytest.mark.checks diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index ffc390e..96e3d0d 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -1,5 +1,4 @@ import pytest -import pprint from cmk_base.check_api import MKCounterWrapped import checktestlib diff --git a/tests/checks/test_uptime_check.py b/tests/checks/test_uptime_check.py index d8a3ea6..1921c88 100644 --- a/tests/checks/test_uptime_check.py +++ b/tests/checks/test_uptime_check.py @@ -1,4 +1,3 @@ - import pytest # Mark all tests in this file as check related tests

6 years, 7 months

Emit C++/regex info into cmc.log.

by Sven Panne

Module: check_mk Branch: master Commit: dde26bd7be1ac179ce939dd9ffe3dcdec37ab77d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dde26bd7be1ac1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 16 10:12:07 2018 +0100 Emit C++/regex info into cmc.log. Change-Id: Icf2fd2214e97a0d7348214365dd49ebe10910447 --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 4665ff2..c406118 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([Need a C99-compliant C compiler]) fi AC_PROG_CXX([g++-7 clang++-5.0 g++ clang++]) +AC_DEFINE_UNQUOTED([BUILD_CXX], ["`$CXX --version | head -n1`"], [C++ compiler]) AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) AC_PROG_RANLIB # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it. :-P

6 years, 7 months

Fixed broken import

by Lars Michelsen

Module: check_mk Branch: master Commit: ec23a3d95da3ef34dcc0df4fc7014d7156cfb9a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec23a3d95da3ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 09:45:32 2018 +0100 Fixed broken import Change-Id: Ied18926322379316acd3d4a7b8b894ad83bc9479 --- web/plugins/wato/bi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index dc8013a..943d753 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -26,7 +26,11 @@ # WATO-Module for the rules and aggregations of Check_MK BI -import managed +if cmk.is_managed_edition(): + import managed +else: + managed = None + import table # .--Base class----------------------------------------------------------.

6 years, 7 months

5273 FIX Fix display of CustomGraphs for metrics without current performance data

by Andreas Umbreit

Module: check_mk Branch: master Commit: 6dd5a7b87e36c0b3e58cc357c5325cdfe16b131f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd5a7b87e36c0… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Feb 15 16:03:41 2018 +0100 5273 FIX Fix display of CustomGraphs for metrics without current performance data The graphing system was unable to display metrics within a custom graph if the corresponding performance-data is currently not available. This would for example be the case if a check isin a temporary "Unknown" state. The rendering now correctly relies on the corresponding historical metric data instead of discarding the metric completely. Change-Id: I245a435350d87ced7adaea6f3e9c558258817f3d --- .werks/5273 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5273 b/.werks/5273 new file mode 100644 index 0000000..ad99ec6 --- /dev/null +++ b/.werks/5273 @@ -0,0 +1,12 @@ +Title: Fix display of CustomGraphs for metrics without current performance data +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518706513 +Class: fix + +The graphing system was unable to display metrics within a custom graph if the corresponding performance-data is currently not available. This would for example be the case if a check isin a temporary "Unknown" state. + +The rendering now correctly relies on the corresponding historical metric data instead of discarding the metric completely.

6 years, 7 months

5734 LDAP: It's now possible to create user accounts only on first login

by Lars Michelsen

Module: check_mk Branch: master Commit: e29f97ae72ffc7a2a43956aed0ed30c410be24d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e29f97ae72ffc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 09:26:15 2018 +0100 5734 LDAP: It's now possible to create user accounts only on first login The LDAP connections can now be configured to create user accounts only on demand which means the accounts are created during the first login of the user. This feature can be used if you need to allow a large base of users to access Check_MK, but only want to have the accounts of users created that really work with it. Please note that you will only be able to configure the users after their first login. For example the roles / groups of a user can only be configured after account creation. It can be enabled using the option Create users only on login in the Users options of your LDAP connection. Change-Id: I9cdc7303a59efa5db9998534fd4d75ff36b9248e --- .werks/5734 | 23 +++++++++++++++++++++++ web/htdocs/wato.py | 8 +++++++- web/plugins/userdb/ldap.py | 11 +++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.werks/5734 b/.werks/5734 new file mode 100644 index 0000000..ed67179 --- /dev/null +++ b/.werks/5734 @@ -0,0 +1,23 @@ +Title: LDAP: It's now possible to create user accounts only on first login +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518769402 +Class: feature + +The LDAP connections can now be configured to create user accounts only on +demand which means the accounts are created during the first login of the +user. + +This feature can be used if you need to allow a large base of users to access +Check_MK, but only want to have the accounts of users created that really work +with it. + +Please note that you will only be able to configure the users after their +first login. For example the roles / groups of a user can only be configured +after account creation. + +It can be enabled using the option Create users only on login in +the Users options of your LDAP connection. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 433ff5d..ee98de1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6728,6 +6728,12 @@ class ModeEditLDAPConnection(LDAPMode): ), forth = lambda x: "keep" if (x == "skip") else x )), + ("create_only_on_login", FixedValue( + title = _("Create users only on login"), + value = True, + totext = _("Instead of creating the user accounts during the regular sync, create " + "the user on the first login."), + )), ] group_elements = [ @@ -6813,7 +6819,7 @@ class ModeEditLDAPConnection(LDAPMode): optional_keys = [ 'port', 'use_ssl', 'bind', 'page_size', 'response_timeout', 'failover_servers', 'user_filter', 'user_filter_group', 'user_id', 'lower_user_ids', 'connect_timeout', 'version', - 'group_filter', 'group_member', 'suffix', + 'group_filter', 'group_member', 'suffix', 'create_only_on_login', ], validate = self._validate_ldap_connection, ), diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index c0d4238..b1d616b 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -42,6 +42,7 @@ # | Some basic declarations and module loading etc. | # '----------------------------------------------------------------------' +import os import time import copy @@ -393,6 +394,10 @@ class LDAPUserConnector(UserConnector): return self._config['user_dn'] != '' + def create_users_only_on_login(self): + return self._config.get('create_only_on_login', False) + + def user_id_attr(self): return self._config.get('user_id', self.ldap_attr('user_id')) @@ -1038,6 +1043,12 @@ class LDAPUserConnector(UserConnector): mode_create, user = load_user(user_id) user_connection_id = cleanup_connection_id(user.get('connector')) + if self.create_users_only_on_login() and mode_create: + self._logger.debug(' SKIP SYNC "%s" (Only create user of "%s" connector on login)' % + (user_id, user_connection_id)) + continue + + if only_username and user_id != only_username: continue # Only one user should be synced, skip others.

6 years, 7 months

5733 FIX Fixed bulk deletion of users with special characters in their ID

by Lars Michelsen

Module: check_mk Branch: master Commit: e6ae3df527c2a27a9774cc6e7be9a2a10f9ce73e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ae3df527c2a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 09:16:02 2018 +0100 5733 FIX Fixed bulk deletion of users with special characters in their ID Change-Id: I948f763495d7efd8de223a006d5bb98945eadb85 --- .werks/5733 | 10 ++++++++++ web/htdocs/wato.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/5733 b/.werks/5733 new file mode 100644 index 0000000..102150e --- /dev/null +++ b/.werks/5733 @@ -0,0 +1,10 @@ +Title: Fixed bulk deletion of users with special characters in their ID +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518768939 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b20622b..433ff5d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10617,7 +10617,7 @@ class ModeUsers(WatoMode): users = userdb.load_users() for varname in html.all_varnames_with_prefix("_c_user_"): if html.get_checkbox(varname): - user = varname.split("_c_user_")[-1] + user = base64.b64decode(varname.split("_c_user_")[-1]).decode("utf-8") if user in users: selected_users.append(user) @@ -10660,7 +10660,7 @@ class ModeUsers(WatoMode): value='X'), sortable=False, css="checkbox") if id != config.user.id: - html.checkbox("_c_user_%s" % id) + html.checkbox("_c_user_%s" % base64.b64encode(id.encode("utf-8"))) user_connection_id = userdb.cleanup_connection_id(user.get('connector')) connection = userdb.get_connection(user_connection_id)

6 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018