Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: ba749fecf8a2f965c4a642bb7479cd0829533b0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba749fecf8a2f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:48:01 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0898

by Lars Michelsen

Module: check_mk Branch: master Commit: 10c9da078fe8a3c1fe49df01ec4dea9e6138a5c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10c9da078fe8a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:28:51 2013 +0100 Updated bug entries #0898 --- .bugs/898 | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.bugs/898 b/.bugs/898 index 434e964..4fecb31 100644 --- a/.bugs/898 +++ b/.bugs/898 @@ -1,16 +1,9 @@ -Title: Unresolvable host prevents loading configuration (bad behaviour) -Component: core +Title: Make "site" infos available e.g. as group header in "Events ..." views +Component: ec State: open -Date: 2013-01-22 09:44:36 -Targetversion: 1.4.0 -Class: nastiness +Date: 2013-02-07 16:27:32 +Targetversion: 1.2.2 +Class: cleanup -It seems strange, I am able to add a host to Check_MK by the host name and -while the name can be resolved everything is OK. But once the name is not -resolvable anymore (for whatever reason), the monitoring still works but -if I want to rewrite the config and restart nagios, the process is blocked -by that unresolvable host. - -This seems a bit nasty. It would be better to have a warning message or just -no message while applying the config. The monitoring will show me the fact -that the host is not resolvable. +The hostname and so on are available and filled, the "site" info can be selected +for the view, but there is no data rendered for the site. Should be added.

11 years, 7 months

Check_MK Git: check_mk: FIX: Do not execute ldap sync while performing actions on users page

by Lars Michelsen

Module: check_mk Branch: master Commit: 5af5486d51cc6760ef092c8946a5fc9aa0a02199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af5486d51cc67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 14:09:43 2013 +0100 FIX: Do not execute ldap sync while performing actions on users page --- ChangeLog | 1 + web/htdocs/wato.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 533974d..9bfbe10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups * FIX: "Sync & Restart" did not perform restart in distributed WATO setups * FIX: Fixed exception in editing code of ldap group to rule plugin + * FIX: Don't execute ldap sync while performing actions on users page Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 491a1a2..91d46d3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7714,8 +7714,10 @@ def mode_users(phase): return # Execute all connectors synchronisations of users. This must be done before - # loading the users, because it might modify the users list - userdb.hook_sync(add_to_changelog = True) + # loading the users, because it might modify the users list. But don't execute + # it during actions, this should save some time. + if phase != "action": + userdb.hook_sync(add_to_changelog = True) roles = userdb.load_roles() users = filter_hidden_users(userdb.load_users())

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0897

by Lars Michelsen

Module: check_mk Branch: master Commit: 09bb3c49cc45060db9da2bef16635c70362d0fa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09bb3c49cc4506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 16:16:06 2013 +0100 Updated bug entries #0897 --- .bugs/897 | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.bugs/897 b/.bugs/897 index 494729c..90cd42e 100644 --- a/.bugs/897 +++ b/.bugs/897 @@ -1,9 +1,12 @@ -Title: Add Windows-Agent as Zip-File to Download page -Component: core +Title: Add some security mechanism to prevent accidential removal of ldap users profile +Component: multisite State: open -Date: 2013-01-21 16:46:19 -Targetversion: future -Class: todo +Date: 2013-02-07 16:13:52 +Targetversion: 1.2.2 +Class: nastiness -It is bad for windows users that there is no zip-download of the agent. There is the installer -but someone might not want to use it. +It might happen that users are not visible to the ldap sync (maybe by temporary +misconfiguration). When a sync detects that one user is suddenly missing, it +removes the user from the configuration as also the htpasswd mechanism does. +This could lead in bad situations where customized things in multisite get lost, +maybe we find a way to prevent this somehow...?

11 years, 7 months

Check_MK Git: check_mk: Added option to enforce lower User-IDs during LDAP sync

by Lars Michelsen

Module: check_mk Branch: master Commit: b239f0c835093a7fcdec5a74f54d8234cc757830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b239f0c835093a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 14:33:19 2013 +0100 Added option to enforce lower User-IDs during LDAP sync --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 6 +++++- web/plugins/wato/check_mk_configuration.py | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bfbe10..f136a48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * Added host filter for "last host state change" and "last host check" * FIX: Preventing autocomplete in password fields of "edit profile" dialog * The ldap member attribute of groups is now configruable via WATO + * Added option to enforce lower User-IDs during LDAP sync BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 2755f9a..bb8f4cc 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -84,7 +84,7 @@ ldap_filter_map = { def ldap_log(s): if config.ldap_debug_log is not None: - file(config.ldap_debug_log, "a").write('%s\n' % s) + file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s\n' % s) class MKLDAPException(MKGeneralException): pass @@ -289,6 +289,10 @@ def ldap_get_users(add_filter = None): raise MKLDAPException(_('The configured User-ID attribute "%s" does not ' 'exist for the user "%s"') % (ldap_user_id_attr(), dn)) user_id = ldap_user[ldap_user_id_attr()][0] + + if config.ldap_userspec.get('lower_user_ids', False): + user_id = user_id.lower() + result[user_id] = ldap_user return result diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 59a773d..4f99b10 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -430,8 +430,14 @@ register_configvar(group, "attribute."), default_value = lambda: userdb.ldap_attr('user_id'), )), + ("lower_user_ids", FixedValue( + title = _("Lower Case User-IDs"), + help = _("Convert imported User-IDs to lower case during synchronisation."), + value = True, + totext = _("Enforce lower case User-IDs."), + )), ], - optional_keys = ['scope', 'filter', 'user_id'], + optional_keys = ['scope', 'filter', 'user_id', 'lower_user_ids'], ), domain = "multisite", )

11 years, 7 months

Check_MK Git: check_mk: FIX: "Sync & Restart" did not perform restart in distributed WATO setups

by Lars Michelsen

Module: check_mk Branch: master Commit: bf18ca026473d996c137dcf840d6add52a97bf99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf18ca026473d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 08:36:47 2013 +0100 FIX: "Sync & Restart" did not perform restart in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d66e87..968a874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ case of distributed WATO setups * Added oracle_tablespaces configuration to the application checkgroup * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups + * FIX: "Sync & Restart" did not perform restart in distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 52e5954..491a1a2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3462,7 +3462,7 @@ def mode_changelog(phase): # can be optimized in future but is the save way for now. site = config.site(site_id) if action in [ "sync", "sync_restart" ]: - response = synchronize_site(site, restart = action == "restart") + response = synchronize_site(site, restart = action == "sync_restart") else: try: restart_site(site)

11 years, 7 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: f9cef5a88b0f4d5d0ba5b8ad47f129a71d8ddcdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9cef5a88b0f4d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 13:21:11 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: fix: lnx_bonding remove extra info from primary slave entry

by Andreas Boesl

Module: check_mk Branch: master Commit: f570b4c29701f1ae970346e69b02b63a837bf56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f570b4c29701f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 13:20:57 2013 +0100 fix: lnx_bonding remove extra info from primary slave entry --- checks/lnx_bonding | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/lnx_bonding b/checks/lnx_bonding index 14106d2..4538bef 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -106,7 +106,7 @@ def parse_lnx_bonding(info): } converted[bond] = { "status" : status["main"]["MII Status"], - "primary" : status["main"].get("Primary Slave"), + "primary" : status["main"].get("Primary Slave").split()[0], "active" : status["main"].get("Currently Active Slave"), "mode" : status["main"]["Bonding Mode"].split('(')[0].strip(), "interfaces" : interfaces,

11 years, 7 months

Check_MK Git: check_mk: livestatus: new comments_with_extra_info column in

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f2e6f830115a7790e213675b526451f034d2699 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f2e6f830115a7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 7 11:05:24 2013 +0100 livestatus: new comments_with_extra_info column in hosts/services table --- ChangeLog | 4 ++++ livestatus/src/DownCommColumn.cc | 6 ++++++ livestatus/src/DownCommColumn.h | 5 +++-- livestatus/src/TableHosts.cc | 10 ++++++---- livestatus/src/TableServices.cc | 10 ++++++---- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d66e87..28c7887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,10 @@ * Add: if check now able to handle interface groups (if_groups) * Add: winperf_phydisk can now output IOPS * Add: oracle_tablespace now with flexible warn/crit levels(magic number) + + Livestatus: + * Add: new column in hosts/services table: comments_with_extra_info + Adds the entry type and entry time Multisite: * Added comment painter to notification related views diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 7b8ef34..2a42e0c 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -69,6 +69,12 @@ void DownCommColumn::output(void *data, Query *query) query->outputString(dt->_author_name); query->outputSublistSeparator(); query->outputString(dt->_comment); + query->outputSublistSeparator(); + if(_with_extra_info && !_is_downtime) { + query->outputInteger(((Comment*)dt)->_entry_type); + query->outputSublistSeparator(); + query->outputTime(dt->_entry_time); + } query->outputEndSublist(); } else diff --git a/livestatus/src/DownCommColumn.h b/livestatus/src/DownCommColumn.h index dc5cf3b..de0437c 100644 --- a/livestatus/src/DownCommColumn.h +++ b/livestatus/src/DownCommColumn.h @@ -36,9 +36,10 @@ class DownCommColumn : public ListColumn { bool _is_downtime; bool _with_info; + bool _with_extra_info; // provides date and type public: - DownCommColumn(string name, string description, int indirect_offset, bool is_downtime, bool with_info) - : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info) {} + DownCommColumn(string name, string description, int indirect_offset, bool is_downtime, bool with_info, bool with_extra_info) + : ListColumn(name, description, indirect_offset), _is_downtime(is_downtime), _with_info(with_info), _with_extra_info(with_extra_info) {} int type() { return COLTYPE_LIST; } void output(void *, Query *); void *getNagiosObject(char *name); diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 50f0876..731160b 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -241,13 +241,15 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) table->addColumn(new HostContactsColumn(prefix + "contacts", "A list of all contacts of this host, either direct or via a contact group", indirect_offset)); table->addColumn(new DownCommColumn(prefix + "downtimes", - "A list of the ids of all scheduled downtimes of this host", indirect_offset, true, false)); + "A list of the ids of all scheduled downtimes of this host", indirect_offset, true, false, false)); table->addColumn(new DownCommColumn(prefix + "downtimes_with_info", - "A list of the all scheduled downtimes of the host with id, author and comment", indirect_offset, true, true)); + "A list of the all scheduled downtimes of the host with id, author and comment", indirect_offset, true, true, false)); table->addColumn(new DownCommColumn(prefix + "comments", - "A list of the ids of all comments of this host", indirect_offset, false, false)); + "A list of the ids of all comments of this host", indirect_offset, false, false, false)); table->addColumn(new DownCommColumn(prefix + "comments_with_info", - "A list of all comments of the host with id, author and comment", indirect_offset, false, true)); + "A list of all comments of the host with id, author and comment", indirect_offset, false, true, false)); + table->addColumn(new DownCommColumn(prefix + "comments_with_extra_info", + "A list of all comments of the host with id, author, comment, entry type and entry time", indirect_offset, false, true, true)); table->addColumn(new CustomVarsColumn(prefix + "custom_variable_names", "A list of the names of all custom variables", (char *)(&hst.custom_variables) - ref, indirect_offset, CVT_VARNAMES)); diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 025cb0f..2154461 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -339,13 +339,15 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, table->addColumn(new ServiceContactsColumn(prefix + "contacts", "A list of all contacts of the service, either direct or via a contact group", indirect_offset)); table->addColumn(new DownCommColumn(prefix + "downtimes", - "A list of all downtime ids of the service", indirect_offset, true, false)); + "A list of all downtime ids of the service", indirect_offset, true, false, false)); table->addColumn(new DownCommColumn(prefix + "downtimes_with_info", - "A list of all downtimes of the service with id, author and comment", indirect_offset, true, true)); + "A list of all downtimes of the service with id, author and comment", indirect_offset, true, true, false)); table->addColumn(new DownCommColumn(prefix + "comments", - "A list of all comment ids of the service", indirect_offset, false, false)); + "A list of all comment ids of the service", indirect_offset, false, false, false)); table->addColumn(new DownCommColumn(prefix + "comments_with_info", - "A list of all comments of the service with id, author and comment", indirect_offset, false, true)); + "A list of all comments of the service with id, author and comment", indirect_offset, false, true, false)); + table->addColumn(new DownCommColumn(prefix + "comments_with_extra_info", + "A list of all comments of the service with id, author, comment, entry type and entry time", indirect_offset, false, true, true)); if (add_hosts) g_table_hosts->addColumns(this, "host_", (char *)(&svc.host_ptr) - ref);

11 years, 7 months

Check_MK Git: check_mk: oracle_tablespaces: little checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 44518f1a677bbbad9a529c9ee894847735b62e12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44518f1a677bbb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 6 18:24:41 2013 +0100 oracle_tablespaces: little checkman update --- checkman/oracle_tablespaces | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 3623754..4139c57 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -105,3 +105,5 @@ oracle_tablespaces_check_default_increment(bool): This setting does not all checks, not only newly inventorized ones. Per default it is set to {True}. That way the check will warn if the table space has its increment size set to {1} (the ORACLE default value). + +oracle_tablespaces_default_levels(dict): A dictionary with the optional keys mentioned in parameters

11 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013