Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

5139 FIX Fixed baked agent download page when user had no global bakery permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 653d0494ee3da537edb8dc99eb6a7edf941a92fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=653d0494ee3da5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 31 15:55:41 2017 +0200 5139 FIX Fixed baked agent download page when user had no global bakery permissions A normal user also required the permission "Register all hosts & download all monitoring agents" to be able to download one of his hosts. Additionally no agent download button was shown in the edit host dialog when the permission Register Host & download monitoring agents of your hosts waas set. Change-Id: Iada3dab7d1e61a79206d12e6e922b5d819eacd77 --- .werks/5139 | 16 ++++++++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/5139 b/.werks/5139 new file mode 100644 index 0000000..e919c49 --- /dev/null +++ b/.werks/5139 @@ -0,0 +1,16 @@ +Title: Fixed baked agent download page when user had no global bakery permissions +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1504187380 + +A normal user also required the permission "Register all hosts & download all monitoring agents" +to be able to download one of his hosts. + + +Additionally no agent download button was shown in the edit host dialog when the permission +Register Host & download monitoring agents of your hosts waas set. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a2b0c91..08ffc9c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1289,7 +1289,7 @@ def mode_edit_host(phase, new, is_cluster): html.context_button(_("Services"), folder_preserving_link([("mode", "inventory"), ("host", hostname)]), "services") - if config.user.may('wato.agents'): + if config.user.may('wato.download_agents'): html.context_button(_("Monitoring Agent"), folder_preserving_link([("mode", "agent_of_host"), ("host", hostname)]), "agents") if config.user.may('wato.rulesets'):

6 years, 9 months

Fix issue with recent commit

by Konstantin Büttner

Module: check_mk Branch: master Commit: f9631452f27226748a8159a69bee97239eea97dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9631452f27226… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 31 13:45:35 2017 +0200 Fix issue with recent commit Change-Id: I78c7285d5b34185685cc9e5135d1e5b4c127e379 --- checks/df.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/df.include b/checks/df.include index 7e2e2d1..e9b05fd 100644 --- a/checks/df.include +++ b/checks/df.include @@ -80,7 +80,7 @@ def ungrouped_mountpoints_and_groups(mplist, group_patterns): in_group = True break if not in_group: - ungrouped_mountpoints.append((mp, {})) + ungrouped_mountpoints.append(mp) return ungrouped_mountpoints, groups @@ -93,7 +93,8 @@ def df_inventory(mplist): ungrouped_mountpoints, groups = ungrouped_mountpoints_and_groups(mplist, group_patterns) - return ungrouped_mountpoints + list(groups) + return [ (mp, {}) for mp in ungrouped_mountpoints ] \ + + [ (group, {"patterns" : group_patterns[group]}) for group in groups ] # Users might have set filesystem_default_levels to old format like (80, 90)

6 years, 9 months

All global setting defaults can be read from effective defaults

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a9f13b6164009e23aa897bdd9b9145a21481493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a9f13b6164009… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 31 11:05:24 2017 +0200 All global setting defaults can be read from effective defaults Rewrote global setting management to always read the default settings of all domains from the effective defaults instead of the valuespecs. We can now set defaults in a single place instead of two places. Change-Id: I53b5f64b4feec3bfb5f008a813aee918a591026f --- web/.f12 | 2 +- web/htdocs/config.py | 24 +++++++++++++++++++++++- web/htdocs/wato.py | 31 +++++++++---------------------- web/htdocs/watolib.py | 29 +++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 24 deletions(-) diff --git a/web/.f12 b/web/.f12 index b10da3e..b5405f5 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,11 +1,11 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} +echo "Update site $SITE..." echo "Copy CRE files..." sudo rsync \ --exclude "*cmc.py" \ - --exclude "*omd_configuration.py" \ -arx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ # Also deploy all other directories of same type diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 92ecb65..ad1aa67 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -24,7 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, pprint, glob +import os +import pprint +import glob +import copy + import i18n import log from lib import * @@ -54,6 +58,9 @@ config_dir = cmk.paths.var_dir + "/web" # Detect modification in configuration modification_timestamps = [] +# Stores the initial configuration values +default_config = {} + # Global table of available permissions. Plugins may add their own # permissions by calling declare_permission() permissions_by_name = {} @@ -116,6 +123,7 @@ def include(filename): except Exception, e: raise MKConfigError(_("Cannot read configuration file %s: %s:") % (filename, e)) + # Load multisite.mk and all files in multisite.d/. This will happen # for *each* HTTP request. # FIXME: Optimize this to cache the config etc. until either the config files or plugins @@ -126,8 +134,12 @@ def load_config(): global modification_timestamps, sites modification_timestamps = [] + # Set default values for all user-changable configuration settings + vars_before_plugins = all_nonfunction_vars() load_plugins(True) + vars_after_plugins = all_nonfunction_vars() + load_default_config(vars_before_plugins, vars_after_plugins) # Initialze sites with default site configuration. Need to do it here to # override possibly deleted sites @@ -156,6 +168,11 @@ def load_config(): sites = default_single_site_configuration() +def load_default_config(vars_before_plugins, vars_after_plugins): + new_vars = vars_after_plugins.difference(vars_before_plugins) + default_config.update(dict([ (k, copy.deepcopy(globals()[k])) for k in new_vars ])) + + def reporting_available(): try: # Check the existance of one arbitrary config variable from the @@ -178,6 +195,11 @@ def hide_language(lang): return lang in hide_languages +def all_nonfunction_vars(): + return set([ name for name,value in globals().items() + if name[0] != '_' and type(value) != type(lambda:0) ]) + + def get_language(default=None): if default == None: return default_language diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 233d907..a2b0c91 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6834,11 +6834,7 @@ class ModeGlobalSettings(WatoMode): super(ModeGlobalSettings, self).__init__() self._search = None - # 1. Check_MK program defaults - # Get default settings of all configuration variables of interest in the domain - # "check_mk". (this also reflects the settings done in main.mk) - self._default_values = check_mk_local_automation("get-configuration", [], get_check_mk_config_var_names()) - + self._default_values = ConfigDomain.get_all_default_globals() self._global_settings = {} self._current_settings = {} @@ -6908,7 +6904,7 @@ class ModeGlobalSettings(WatoMode): forms.header(group_name, isopen=search) header_is_painted = True - default_value = self._default_values.get(varname, valuespec.default_value()) + default_value = self._default_values[varname] edit_url = folder_preserving_link([("mode", self._edit_mode()), ("varname", varname), @@ -7001,7 +6997,7 @@ class ModeEditGlobals(ModeGlobalSettings): action = html.var("_action") domain, valuespec, need_restart, allow_reset, in_global_settings = configvars()[varname] - def_value = self._default_values.get(varname, valuespec.default_value()) + def_value = self._default_values[varname] if action == "reset" and not is_a_checkbox(valuespec): c = wato_confirm( @@ -7132,21 +7128,16 @@ def mode_edit_configvar(phase, what = 'globalvars'): else: return "globalvars" - check_mk_vars = check_mk_local_automation("get-configuration", [], [varname]) - if varname in current_settings: - value = current_settings[varname] - else: - if siteid: - globalsettings = load_configuration_settings() - check_mk_vars.update(globalsettings) - value = check_mk_vars.get(varname, valuespec.default_value()) + default_values = ConfigDomain.get_all_default_globals() if siteid: - defvalue = check_mk_vars.get(varname, valuespec.default_value()) + global_settings = load_configuration_settings() else: - defvalue = valuespec.default_value() + global_settings = {} + defvalue = default_values[varname] + value = current_settings.get(varname, global_settings.get(varname, defvalue)) html.begin_form("value_editor", method="POST") forms.header(valuespec.title()) @@ -9833,7 +9824,7 @@ class ModeEditSiteGlobals(ModeSites, ModeGlobalSettings): return domain, valuespec, need_restart, allow_reset, in_global_settings = configvars()[varname] - def_value = self._global_settings.get(varname, self._default_values.get(varname, valuespec.default_value())) + def_value = self._global_settings.get(varname, self._default_values[varname]) if action == "reset" and not is_a_checkbox(valuespec): c = wato_confirm( @@ -10268,10 +10259,6 @@ def sort_sites(sitelist): return sitelist -def get_check_mk_config_var_names(): - return [ varname for (varname, var) in configvars().items() if var[0] == ConfigDomainCore ] - - #. # .--Automation-Webservice-----------------------------------------------. # | _ _ _ _ | diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index d53d229..7799a36 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -298,6 +298,14 @@ class ConfigDomain(object): return True + @classmethod + def get_all_default_globals(cls): + settings = {} + for domain in ConfigDomain.enabled_domains(): + settings.update(domain().default_globals()) + return settings + + def config_dir(self): raise NotImplementedError() @@ -352,6 +360,19 @@ class ConfigDomain(object): self.save(settings, site_specific=True) + def default_globals(self): + settings = {} + for varname, var in configvars().items(): + domain, valuespec = var[:2] + if domain == self.__class__: + settings[varname] = valuespec.default_value() + return settings + + + def _get_global_config_var_names(self): + return [ varname for (varname, var) in configvars().items() if var[0] == self.__class__ ] + + class ConfigDomainCore(ConfigDomain): needs_sync = True @@ -366,6 +387,10 @@ class ConfigDomainCore(ConfigDomain): return check_mk_local_automation(config.wato_activation_method) + def default_globals(self): + return check_mk_local_automation("get-configuration", [], self._get_global_config_var_names()) + + class ConfigDomainGUI(ConfigDomain): needs_sync = True @@ -380,6 +405,10 @@ class ConfigDomainGUI(ConfigDomain): pass + def default_globals(self): + return config.default_config + + class ConfigDomainEventConsole(ConfigDomain): needs_sync = True

6 years, 9 months

mkeventd_notify_contactgroup: Fixed invalid default value

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ed99a34d9de374e832daa1b376c3da381fcccb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ed99a34d9de37… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 31 16:00:58 2017 +0200 mkeventd_notify_contactgroup: Fixed invalid default value Change-Id: Ibf754562ba1b9953f5bfa6df317ce22255d96caa --- web/plugins/config/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/config/mkeventd.py b/web/plugins/config/mkeventd.py index cda0c76..337a594 100644 --- a/web/plugins/config/mkeventd.py +++ b/web/plugins/config/mkeventd.py @@ -26,7 +26,7 @@ mkeventd_enabled = False mkeventd_pprint_rules = False -mkeventd_notify_contactgroup = None +mkeventd_notify_contactgroup = '' mkeventd_notify_facility = 16 mkeventd_notify_remotehost = None mkeventd_connect_timeout = 10

6 years, 9 months

omd package: Added missing .f12 file

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dfc4bd552ba768efd338081edf984e32bddc281 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dfc4bd552ba76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 1 10:30:59 2017 +0200 omd package: Added missing .f12 file Change-Id: I4c1b7dcfea23ee80d397b1cea3266b0b267e81d1 --- omd/packages/omd/.f12 | 27 +++++++++++++++++++++++++++ omd/packages/omd/.gitignore | 1 - 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 new file mode 100644 index 0000000..6b30ba7 --- /dev/null +++ b/omd/packages/omd/.f12 @@ -0,0 +1,27 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../../../.site || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} + +# Little install helper used during development and test +sudo cp -v index.py /omd/sites/$SITE/share/omd/htdocs/index.py +sudo cp -v logout.php /omd/sites/$SITE/share/omd/htdocs/logout.php +sudo cp -v img/* /omd/sites/$SITE/share/omd/htdocs/img/ +sudo rm -vf /omd/sites/$SITE/share/man/man8/omd.8.gz +sudo cp -v omd.8 /omd/sites/$SITE/share/man/man8/omd.8 +sudo gzip /omd/sites/$SITE/share/man/man8/omd.8 +for hook in *.hook; do + sudo cp -v $hook /omd/sites/$SITE/lib/omd/hooks/${hook%*.hook} + sudo chmod +x /omd/sites/$SITE/lib/omd/hooks/${hook%*.hook} +done +sudo mkdir -p /omd/sites/$SITE/lib/omd/scripts/post-create +sudo cp -v omd.service /omd/sites/$SITE/share/omd + +OLD_VERSION=$(sed -rn < /omd/sites/$SITE/bin/omd 's/^OMD_VERSION = "(.*)"$/\1/p') +echo $OLD_VERSION + + +echo "Keeping version number in 'omd' at $OLD_VERSION" +sudo cp -v omd /omd/sites/$SITE/bin/omd +sudo sed -i "s|###OMD_VERSION###|$OLD_VERSION|g" /omd/sites/$SITE/bin/omd +sudo sed -i "s|#!/omd/versions/.*/bin/python|#!/omd/versions/$OLD_VERSION/bin/python|g" /omd/sites/$SITE/bin/omd +sudo sed -i "s/OMD_VERSION =.*/OMD_VERSION = "'"'"$OLD_VERSION"'"/' /omd/sites/$SITE/bin/omd diff --git a/omd/packages/omd/.gitignore b/omd/packages/omd/.gitignore deleted file mode 100644 index c332f1d..0000000 --- a/omd/packages/omd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.f12

6 years, 9 months

Removed duplicate default setting declarations

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e1b6277cada41f4958c20fafc6e67b75db273d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e1b6277cada41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 31 16:24:47 2017 +0200 Removed duplicate default setting declarations Removed duplicated, useless and sometimes wrong default_value attributes from global setting valuespecs. This has been done for the config domains "Core" and the "GUI". Todo: Event Console. Now we only need to declare the default setting of a global setting in a single place: Core : cmk_base/default_config GUI : web/plugins/config Change-Id: Ib4e17b3d55cff9dc1a9c62ebe7dd715a15ba44c3 --- bin/mkeventd | 55 ++------------------ lib/event_console.py | 83 ++++++++++++++++++++++++++++++ web/htdocs/watolib.py | 5 ++ web/plugins/wato/check_mk_configuration.py | 70 ++++++++----------------- web/plugins/wato/globals_notification.py | 11 ---- web/plugins/wato/mkeventd.py | 43 +++------------- 6 files changed, 120 insertions(+), 147 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e1b6277ca…

6 years, 9 months

Test setup: Enforce reinstall of required modules

by Lars Michelsen

Module: check_mk Branch: master Commit: d44ef4d811735e753454f22fe307f5d5bc934834 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d44ef4d811735e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 31 13:19:48 2017 +0200 Test setup: Enforce reinstall of required modules Change-Id: Ib23ec847975b7dc673d387c3d23842db3b66bb77 --- tests/Makefile | 2 +- tests/pylint/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index b94e7cc..ae97b53 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -49,5 +49,5 @@ setup: python-pip \ chrpath sudo pip install --upgrade pip - sudo pip install --upgrade -r requirements.txt + sudo pip install --upgrade --ignore-installed -r requirements.txt $(MAKE) -C pylint setup diff --git a/tests/pylint/Makefile b/tests/pylint/Makefile index 9572d61..3c5f4bf 100644 --- a/tests/pylint/Makefile +++ b/tests/pylint/Makefile @@ -2,6 +2,6 @@ help: @echo "see make in tests/ directory" setup: - sudo pip install --upgrade -r requirements.txt + sudo pip install --upgrade --ignore-installed -r requirements.txt sudo apt-get install \ enchant

6 years, 9 months

Disable automatic module reloading feature ( which may confuse loading order) of mod_python

by Lars Michelsen

Module: check_mk Branch: master Commit: 69b7b36a90e544e1e76b6b245fba305935ffef8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69b7b36a90e544… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 21 11:21:00 2017 +0200 Disable automatic module reloading feature (which may confuse loading order) of mod_python Change-Id: I48c3fe3bc045b839651f0839868cffe11a1c77f3 --- omd/packages/check_mk/skel/etc/check_mk/apache.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/omd/packages/check_mk/skel/etc/check_mk/apache.conf b/omd/packages/check_mk/skel/etc/check_mk/apache.conf index 4e9103b..44de251 100644 --- a/omd/packages/check_mk/skel/etc/check_mk/apache.conf +++ b/omd/packages/check_mk/skel/etc/check_mk/apache.conf @@ -35,6 +35,7 @@ Alias /###SITE###/check_mk/local/agents ###ROOT###/local/share/check_mk/agents AddHandler mod_python .py PythonHandler index PythonOption mod_python.importer.path "['###ROOT###/local/share/check_mk/web/htdocs', '###ROOT###/share/check_mk/web/htdocs']" + PythonAutoReload Off DirectoryIndex index.py # Use different sub interpreters per language. Currently the multisite

6 years, 9 months

5169 FIX LDAP: Fixed syncing contact groups / roles of users with special characters in their name

by Lars Michelsen

Module: check_mk Branch: master Commit: d5bc3faa0283cd9a7597bd2eff905d44a26f6009 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5bc3faa0283cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 31 12:00:24 2017 +0200 5169 FIX LDAP: Fixed syncing contact groups / roles of users with special characters in their name Change-Id: If925e8feeaee377b4d9c9a531cb076cb3e2cae31 --- .werks/5169 | 11 +++++++++++ web/plugins/userdb/ldap.py | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5169 b/.werks/5169 new file mode 100644 index 0000000..18d400c --- /dev/null +++ b/.werks/5169 @@ -0,0 +1,11 @@ +Title: LDAP: Fixed syncing contact groups / roles of users with special characters in their name +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504173591 + + diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 6f82493..2559766 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -908,7 +908,7 @@ class LDAPUserConnector(UserConnector): self._config['group_scope']): groups[dn] = { 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8').lower() for m in obj.get(member_attr,[]) ], + 'members' : [ m.lower() for m in obj.get(member_attr,[]) ], } else: # Special handling for OpenLDAP when searching for groups by DN @@ -917,7 +917,7 @@ class LDAPUserConnector(UserConnector): ['cn', member_attr], 'base'): groups[f_dn] = { 'cn' : obj['cn'][0], - 'members' : [ m.encode('utf-8').lower() for m in obj.get(member_attr,[]) ], + 'members' : [ m.lower() for m in obj.get(member_attr,[]) ], } return groups @@ -1481,7 +1481,7 @@ def get_connection_choices(add_this=True): # This is either the user id or the user distinguished name, # depending on the LDAP server to communicate with def get_group_member_cmp_val(connection, user_id, ldap_user): - return connection.member_attr().lower() == 'memberuid' and user_id or ldap_user['dn'] + return user_id if connection.member_attr().lower() == 'memberuid' else ldap_user['dn'] def get_groups_of_user(connection, user_id, ldap_user, cg_names, nested, other_connection_ids):

6 years, 9 months

5027 FIX Made communication with alert helper more robust.

by Sven Panne

Module: check_mk Branch: master Commit: 8fe0b00123f24bc63587528e63c559b0eef08c8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe0b00123f24b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Aug 31 11:49:27 2017 +0200 5027 FIX Made communication with alert helper more robust. The Check_MK Micro Core had some trouble restarting the alert helper after a failed communication, resulting in alerts not working correctly afterwards. This has been fixed. Change-Id: I9f25d572ef4a492648163b8506efb05540762b82 --- .werks/5027 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5027 b/.werks/5027 new file mode 100644 index 0000000..a7a2cd7 --- /dev/null +++ b/.werks/5027 @@ -0,0 +1,12 @@ +Title: Made communication with alert helper more robust. +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1504172839 +Class: fix + +The Check_MK Micro Core had some trouble restarting the alert helper after a +failed communication, resulting in alerts not working correctly afterwards. +This has been fixed.

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017