Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 47cc934224fc220bcf7d6bbfe8552e7e16f6c9c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47cc934224fc22… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 15:42:50 2017 +0100 Healed spaces. Change-Id: I24b9802b5d7435462d6a23f55e0b767d30d22c8a --- agents/plugins/mk_mysql | 2 +- web/plugins/config/builtin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index 7e2a04e..72593da 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -73,7 +73,7 @@ then if [ -z "$mysql_sockets" ] ; then do_query "" else - for socket in $mysql_sockets ; do + for socket in $mysql_sockets ; do do_query "--socket="$socket done fi diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index b35cfc9..9f2e6c9 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -152,7 +152,7 @@ custom_links['guest'] = [ custom_links['user'] = custom_links['guest'] + [ ( "Open Source Components", False, [ ( "Check_MK", "http://mathias-kettner.com/check_mk.html", None, "_blank"), - ( "Nagios", "http://www.nagios.org/", None, "_blank"), + ( "Nagios", "http://www.nagios.org/", None, "_blank"), ( "PNP4Nagios", "http://pnp4nagios.org/", None, "_blank"), ( "NagVis", "http://nagvis.org/", None, "_blank"), ( "RRDTool", "http://oss.oetiker.ch/rrdtool/", None, "_blank"),

7 years, 7 months

Make titles of F5-Manpages coherent

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d8c7cffb341cf2dc542c92c5b99376b1e9bc495 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d8c7cffb341cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 14:38:22 2017 +0100 Make titles of F5-Manpages coherent Change-Id: Ia14929aca23178745e3511b60b0d0cdfdbbd1976 --- checkman/f5_bigip_chassis_temp | 2 +- checkman/f5_bigip_cpu_temp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/f5_bigip_chassis_temp b/checkman/f5_bigip_chassis_temp index 0142860..9ea2099 100644 --- a/checkman/f5_bigip_chassis_temp +++ b/checkman/f5_bigip_chassis_temp @@ -1,4 +1,4 @@ -title: F5 BIG-IP load balancer: Chassis temperature +title: F5 Big-IP: Chassis temperature agents: snmp catalog: hw/network/f5 license: GPL diff --git a/checkman/f5_bigip_cpu_temp b/checkman/f5_bigip_cpu_temp index 202135a..9b159b9 100644 --- a/checkman/f5_bigip_cpu_temp +++ b/checkman/f5_bigip_cpu_temp @@ -1,4 +1,4 @@ -title: F5 BIG-IP load balancer: CPU temperature +title: F5 Big-IP: CPU temperature agents: snmp catalog: hw/network/f5 license: GPL

7 years, 7 months

4295 solaris_addresses, solaris_routes, statgrab_net: new solaris inventory plugins

by Simon Betz

Module: check_mk Branch: master Commit: 30c7addbd4549a77ece78662db4a145b94c8de72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c7addbd4549a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 20 12:36:15 2017 +0100 4295 solaris_addresses, solaris_routes, statgrab_net: new solaris inventory plugins Change-Id: I87e3d0f8310bfa19859b7ef9f481a1876780b1bb --- .werks/4295 | 10 ++++ ChangeLog | 1 + agents/plugins/mk_inventory.solaris | 7 +++ inventory/solaris_addresses | 94 +++++++++++++++++++++++++++++++++++++ inventory/solaris_routes | 57 ++++++++++++++++++++++ inventory/statgrab_net | 75 +++++++++++++++++++++++++++++ 6 files changed, 244 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=30c7addbd4…

7 years, 7 months

4322 FIX Activate changes: Fixed exception when having EC changes and core changes while core produces a warning

by Lars Michelsen

Module: check_mk Branch: master Commit: c48868d74aff52806d330cdc719a8d038222131e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c48868d74aff52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 13:30:43 2017 +0100 4322 FIX Activate changes: Fixed exception when having EC changes and core changes while core produces a warning Change-Id: I08c730fdc683e28ce6a15bec8f878fb19bd79b2d --- .werks/4322 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4322 b/.werks/4322 new file mode 100644 index 0000000..f4c107d --- /dev/null +++ b/.werks/4322 @@ -0,0 +1,9 @@ +Title: Activate changes: Fixed exception when having EC changes and core changes while core produces a warning +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i4 +Date: 1486384214 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f4aec0e..387c119 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ NOTE: Please refer to the migration notes! * 4312 FIX: Counting events are now also respecting the EC limits * 4314 FIX: Quick event delete icon works with checkboxes enabled now + * 4322 FIX: Activate changes: Fixed exception when having EC changes and core changes while core produces a warning HW/SW-Inventory: * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e483708..ff53d57 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4731,7 +4731,8 @@ def execute_activate_changes(domains): results = {} for domain in domains: domain_class = ConfigDomain.get_class(domain) - results[domain] = domain_class().activate() + warnings = domain_class().activate() + results[domain] = warnings or [] return results

7 years, 7 months

LDAP sync: Create only a single WATO change entry per LDAP sync run

by Lars Michelsen

Module: check_mk Branch: master Commit: abfe2257fb9ed6c220501810fbe3999f5ad39169 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abfe2257fb9ed6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 08:51:54 2017 +0100 LDAP sync: Create only a single WATO change entry per LDAP sync run Change-Id: I48220c027a47d37b142c74250638ada075ae62be --- web/plugins/userdb/ldap.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ea6b2d0..5c10d00 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -928,6 +928,8 @@ class LDAPUserConnector(UserConnector): import wato users = load_users(lock = True) + changes = [] + def load_user(user_id): if user_id in users: user = copy.deepcopy(users[user_id]) @@ -944,8 +946,7 @@ class LDAPUserConnector(UserConnector): 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: - wato.add_change("edit-users", - _("LDAP [%s]: Removed user %s") % (connection_id, user_id), add_user=False) + 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) @@ -986,10 +987,8 @@ 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: - if config.wato_enabled: - wato.add_change("edit-users", - _("LDAP [%s]: Created user %s") % (connection_id, user_id), add_user=False) + if mode_create and config.wato_enabled: + changes.append(_("LDAP [%s]: Created user %s") % (connection_id, user_id)) else: details = [] if added: @@ -1017,13 +1016,13 @@ class LDAPUserConnector(UserConnector): details.append(('Changed %s from %s to %s' % (key, old_value, new_value))) if details and config.wato_enabled: - wato.add_change("edit-users", - _("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details)), - add_user=False) + changes.append(_("LDAP [%s]: Modified user %s (%s)") % (connection_id, user_id, ', '.join(details))) duration = time.time() - start_time self.log('SYNC FINISHED - Duration: %0.3f sec' % duration) + wato.add_change("edit-users", "\n".join(changes), add_user=False) + # delete the fail flag file after successful sync try: os.unlink(self._sync_fail_file)

7 years, 7 months

Site specific global settings: First small cleanups and made edit dialog available for master site

by Lars Michelsen

Module: check_mk Branch: master Commit: d21aa938431d00e66c65de7c7d205fd7c6028eba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d21aa938431d00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 30 16:36:29 2017 +0100 Site specific global settings: First small cleanups and made edit dialog available for master site Change-Id: Idcf4740543d3b9f9190a809688db788009120353 --- web/htdocs/wato.py | 57 ++++++++++++++++++++++++++++++--------------------- web/htdocs/watolib.py | 2 +- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 03926c1..8c746d6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9140,24 +9140,24 @@ def mode_sites(phase): "sites, please do not forget to add your local monitoring site also, if " "you want to display its data.")) - entries = configured_sites.items() - sort_sites(entries) - for id, site in entries: + sites = sort_sites(configured_sites.items()) + for site_id, site in sites: table.row() + # Buttons - edit_url = folder_preserving_link([("mode", "edit_site"), ("edit", id)]) - clone_url = folder_preserving_link([("mode", "edit_site"), ("clone", id)]) - delete_url = html.makeactionuri([("_delete", id)]) + edit_url = folder_preserving_link([("mode", "edit_site"), ("edit", site_id)]) + clone_url = folder_preserving_link([("mode", "edit_site"), ("clone", site_id)]) + delete_url = html.makeactionuri([("_delete", site_id)]) table.cell(_("Actions"), css="buttons") html.icon_button(edit_url, _("Properties"), "edit") html.icon_button(clone_url, _("Clone this connection in order to create a new one"), "clone") html.icon_button(delete_url, _("Delete"), "delete") - if site.get("replication"): - globals_url = folder_preserving_link([("mode", "edit_site_globals"), ("site", id)]) - html.icon_button(globals_url, _("Site-specific global configuration"), "configuration") + if has_wato_slave_sites() and (site.get("replication") or config.site_is_local(site_id)): + globals_url = folder_preserving_link([("mode", "edit_site_globals"), ("site", site_id)]) + html.icon_button(globals_url, _("Site specific global configuration"), "configuration") # Site-ID - table.cell(_("ID"), id) + table.cell(_("ID"), site_id) # Alias table.cell(_("Alias"), site.get("alias", "")) @@ -9212,28 +9212,34 @@ def mode_sites(phase): table.cell(_("Login")) if repl: if site.get("secret"): - logout_url = make_action_link([("mode", "sites"), ("_logout", id)]) + logout_url = make_action_link([("mode", "sites"), ("_logout", site_id)]) html.buttonlink(logout_url, _("Logout")) else: - login_url = make_action_link([("mode", "sites"), ("_login", id)]) + login_url = make_action_link([("mode", "sites"), ("_login", site_id)]) html.buttonlink(login_url, _("Login")) table.end() + def mode_edit_site_globals(phase): configured_sites = load_sites() - siteid = html.var("site") - site = configured_sites[siteid] + site_id = html.var("site") + + try: + site = configured_sites[site_id] + except KeyError: + raise MKUserError("site", _("This site does not exist.")) search = get_search_expression() if phase == "title": - return _("Edit site-specific global settings of %s") % siteid + return _("Edit site specific global settings of %s") % site_id elif phase == "buttons": + global_buttons() html.context_button(_("All Sites"), folder_preserving_link([("mode", "sites")]), "back") html.context_button(_("Connection"), folder_preserving_link([("mode", "edit_site"), - ("edit", siteid)]), "sites") + ("edit", site_id)]), "sites") return # The site's default values are the current global settings @@ -9250,7 +9256,7 @@ def mode_edit_site_globals(phase): if action == "reset" and not is_a_checkbox(valuespec): c = wato_confirm( - _("Removing site-specific configuration variable"), + _("Removing site specific configuration variable"), _("Do you really want to remove the configuration variable %s " "of the specific configuration of this site and that way use the global value " "of <tt>%s</tt>?") % @@ -9265,12 +9271,12 @@ def mode_edit_site_globals(phase): current_settings[varname] = not current_settings[varname] else: current_settings[varname] = not def_value - msg = _("Changed site-specific configuration variable %s to %s.") % (varname, + msg = _("Changed site specific configuration variable %s to %s.") % (varname, current_settings[varname] and _("on") or _("off")) site.setdefault("globals", {})[varname] = current_settings[varname] save_sites(configured_sites, activate=False) - add_change("edit-configvar", msg, sites=[siteid], need_restart=need_restart) + add_change("edit-configvar", msg, sites=[site_id], need_restart=need_restart) if action == "_reset": return "edit_site_globals", msg else: @@ -9284,11 +9290,16 @@ def mode_edit_site_globals(phase): return html.help(_("Here you can configure global settings, that should just be applied " - "on that remote site. Note: this only makes sense if the site " - "is a configuration slave.")) + "on that site. Note: this only makes sense if the site " + "is part of a distributed setup.")) + + if not has_wato_slave_sites(): + html.show_error(_("You can not configure site specific global settings " + "in non distributed setups.")) + return - if site.get("replication") != "slave": - html.show_error(_("This site is not a replication slave. " + if not site.get("replication") and not config.site_is_local(site_id): + html.show_error(_("This site is not the master site nor a replication slave. " "You cannot configure specific settings for it.")) return diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 1d96bfe..86d5d86 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4207,7 +4207,7 @@ class ActivateChangesManager(ActivateChanges): "userdb_automatic_sync" : site.get("user_sync", userdb.user_sync_default_config(site_id)), }) - file(tmp_dir + "/sitespecific.mk", "w").write("%r\n" % config) + store.save_data_to_file(tmp_dir + "/sitespecific.mk", config)

7 years, 7 months

4321 FIX LDAP: Improved validation of groups to attributes sync plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: 45d942cf33bd4f787e7c85ae91eb7ef7f2b56666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45d942cf33bd4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 13:01:05 2017 +0100 4321 FIX LDAP: Improved validation of groups to attributes sync plugin Change-Id: I70db5dbfef6014cc51537569eb25e2d68a52d227 --- .werks/4321 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 11 +++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/4321 b/.werks/4321 new file mode 100644 index 0000000..e3d3063 --- /dev/null +++ b/.werks/4321 @@ -0,0 +1,10 @@ +Title: LDAP: Improved validation of groups to attributes sync plugin +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486382449 + + diff --git a/ChangeLog b/ChangeLog index 4a8e9fc..f4aec0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 4015 FIX: Multisite events page: Fixed slow page generation caused by the event delete icon... * 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles * 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show context button" options + * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 5c10d00..842b886 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1193,9 +1193,10 @@ def ldap_attribute_plugins_elements(connection_id): ))) else: elements.append((key, Dictionary( - title = plugin['title'], - help = plugin['help'], - elements = plugin['parameters'], + title = plugin['title'], + help = plugin['help'], + elements = plugin['parameters'], + required_keys = plugin.get('required_parameters', []), ))) return elements @@ -1648,8 +1649,10 @@ ldap_attribute_plugins['groups_to_attributes'] = { "not a member of a group, the attribute will be left at it's default value. When " "a single attribute is set by multiple groups and a user is member of multiple " "of these groups, the later plugin in the list will override the others."), + allow_empty=False, )), - ] + ], + 'required_parameters': ["groups"], } #.

7 years, 7 months

4320 Distributed: Master site has now also site specific global settings

by Lars Michelsen

Module: check_mk Branch: master Commit: df0dfe030899852bd3cc32c0495df80f66294cfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df0dfe03089985… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 6 11:03:44 2017 +0100 4320 Distributed: Master site has now also site specific global settings It is now possible to configure site specific global settings for the central master site in distributed setups. In previous versions it was difficult to set a configuration setting (like the number of check helpers) for the master site and another value for the remote sites. You had to set the configuration setting for each site individually which could be a problem when having a lot of remote sites. With this change the "Global settings" can now be handled as default configuration settings for all sites while the site specific settings can be configured on the site specific globals page which can be opened from the distributed configuration page. So you can now easily set a individual setting for the master site and leave the configuration for the slave sites at the global defaults. Change-Id: Iec7d943263bd6b800f5f31c27232894f4fc7043a --- .werks/4320 | 22 ++++++++++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 28 +++++++++++++++----- web/htdocs/wato.py | 12 +++++---- web/htdocs/watolib.py | 71 +++++++++++++++++++++++++++++++++----------------- 5 files changed, 99 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=df0dfe0308…

7 years, 7 months

4338 FIX aix_hacmp_resources: fixed state handling

by Simon Betz

Module: check_mk Branch: master Commit: 0db62899932d2a1863c6819997fcb89f4de3d82e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0db62899932d2a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 6 12:19:37 2017 +0100 4338 FIX aix_hacmp_resources: fixed state handling Change-Id: Ie938545a4ce7ccd55e6cfcc365b9824fe2097edf --- .werks/4338 | 10 ++++++++++ ChangeLog | 1 + checks/aix_hacmp_resources | 17 +++++++++-------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/4338 b/.werks/4338 new file mode 100644 index 0000000..810e50d --- /dev/null +++ b/.werks/4338 @@ -0,0 +1,10 @@ +Title: aix_hacmp_resources: fixed state handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486379960 + + diff --git a/ChangeLog b/ChangeLog index 2bc468f..4fd4b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * 4335 FIX: perle check and inventory plugins: some updates and improvements... NOTE: Please refer to the migration notes! * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... + * 4338 FIX: aix_hacmp_resources: fixed state handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index f91495a..34fc1d4 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -56,18 +56,19 @@ def inventory_aix_hacmp_resources(parsed): def check_aix_hacmp_resources(item, params, parsed): if item in parsed: resource_stats = [] - infotext = "" + infotexts = [] for node_name, resource_status in parsed[item]: resource_stats.append(resource_status) - infotext += "%s on node %s, " % (resource_status, node_name) - - # The first node is always online in an OK scenario - # Something is wrong if an other node is online - state = 0 - if resource_stats[0] != "online": + infotexts.append("%s on node %s" % \ + (resource_status, node_name)) + if "online" in resource_stats: + state = 0 + elif "error" in resource_stats: state = 2 + else: + state = 1 - return state, infotext[:-2] + return state, "Status: %s" % ", ".join(infotexts) check_info['aix_hacmp_resources'] = {

7 years, 7 months

Unversione cmc tar, please...

by Sven Panne

Module: check_mk Branch: master Commit: 3244e1c2c7b4b6e1f141fdeb6c29fe3d330d9b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3244e1c2c7b4b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 6 10:52:21 2017 +0100 Unversione cmc tar, please... Change-Id: I678ce9886224d0c8cfedd86e6a9c548de28b6642 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e58f9ab..1e94149 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ dist: mk-livestatus precompile-werks --exclude "openhardwaremonitor" \ --exclude .f12 $$(cd agents ; ls) - test -d enterprise && tar czf $(DISTNAME)/cmc-$(VERSION).tar.gz $(TAROPTS) -C enterprise $$(cd enterprise && echo .bugs *) + test -d enterprise && tar czf $(DISTNAME)/cmc.tar.gz $(TAROPTS) -C enterprise $$(cd enterprise && echo .bugs *) cd $(DISTNAME) ; ../scripts/make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME)

7 years, 7 months

← Newer
1
...
32
33
34
35
36
37
38
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017