Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Pass a MonitoringCore down to is_authorized_for.

by Sven Panne

Module: check_mk Branch: master Commit: 399310392b7c71fe3dcd870e31f853d75fc87892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=399310392b7c71… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 13:52:50 2017 +0200 Pass a MonitoringCore down to is_authorized_for. Currently unused, but this will be changed later. This refactoring is already big enough in itself... Change-Id: Ib1daa3829d2d63621f6881aacbc1a6aed8a68551 --- livestatus/src/HostListColumn.cc | 2 +- livestatus/src/HostListColumn.h | 7 ++-- livestatus/src/HostListStateColumn.cc | 4 ++- livestatus/src/HostListStateColumn.h | 8 +++-- livestatus/src/ServiceListColumn.cc | 2 +- livestatus/src/ServiceListColumn.h | 8 +++-- livestatus/src/ServiceListStateColumn.cc | 7 ++-- livestatus/src/ServiceListStateColumn.h | 13 ++++--- livestatus/src/TableComments.cc | 2 +- livestatus/src/TableDowntimes.cc | 2 +- livestatus/src/TableHostGroups.cc | 45 +++++++++++++------------ livestatus/src/TableHosts.cc | 54 +++++++++++++++--------------- livestatus/src/TableHostsByGroup.cc | 5 +-- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableServiceGroups.cc | 28 ++++++++-------- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServicesByGroup.cc | 4 +-- livestatus/src/TableServicesByHostGroup.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/auth.cc | 3 +- livestatus/src/auth.h | 4 ++- livestatus/src/module.cc | 2 +- 22 files changed, 115 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=399310392b…

6 years, 11 months

Removed g_service_authorization global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 174fd8a6e34accc25bbe62969a363bfbcdaef5a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174fd8a6e34acc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 14:51:09 2017 +0200 Removed g_service_authorization global variable. Change-Id: Ibbed01e6db664e56b2e90da0b0098514d8b8aa52 --- livestatus/src/MonitoringCore.h | 3 +++ livestatus/src/auth.cc | 10 ++++++---- livestatus/src/auth.h | 1 - livestatus/src/module.cc | 10 +++++++--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index dd37922..0a87e70 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -29,6 +29,7 @@ #include <chrono> #include <string> #include <vector> +#include "auth.h" #include "data_encoding.h" class Logger; @@ -92,6 +93,8 @@ public: virtual size_t maxCachedMessages() = 0; virtual bool stateHistoryFilteringEnabled() = 0; + virtual AuthorizationKind serviceAuthorization() const = 0; + virtual Logger *loggerLivestatus() = 0; // Our escape hatch, this should die in the long run... diff --git a/livestatus/src/auth.cc b/livestatus/src/auth.cc index 9e4e7d6..075223d 100644 --- a/livestatus/src/auth.cc +++ b/livestatus/src/auth.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "auth.h" +#include "MonitoringCore.h" contact *unknown_auth_user() { return reinterpret_cast<contact *>(0xdeadbeaf); } @@ -32,17 +33,18 @@ bool host_has_contact(host *hst, contact *ctc) { is_escalated_contact_for_host(hst, ctc) != 0; } -bool service_has_contact(host *hst, service *svc, contact *ctc) { +bool service_has_contact(MonitoringCore *mc, host *hst, service *svc, + contact *ctc) { return is_contact_for_service(svc, ctc) != 0 || is_escalated_contact_for_service(svc, ctc) != 0 || - (g_service_authorization == AuthorizationKind::loose && + (mc->serviceAuthorization() == AuthorizationKind::loose && host_has_contact(hst, ctc)); } } // namespace -bool is_authorized_for(MonitoringCore * /*unused*/, contact *ctc, host *hst, +bool is_authorized_for(MonitoringCore *mc, contact *ctc, host *hst, service *svc) { return ctc != unknown_auth_user() && (svc == nullptr ? host_has_contact(hst, ctc) - : service_has_contact(hst, svc, ctc)); + : service_has_contact(mc, hst, svc, ctc)); } diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 74946ae..ae6183a 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -40,7 +40,6 @@ inline contact *unknown_auth_user() { return reinterpret_cast<contact *>(0xdeadbeaf); } #else -extern AuthorizationKind g_service_authorization; extern AuthorizationKind g_group_authorization; contact *unknown_auth_user(); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index d0c7a8b..befeb9b 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -126,7 +126,7 @@ size_t fl_max_cached_messages = 500000; static uint32_t fl_max_lines_per_logfile = 1000000; size_t fl_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB int g_thread_running = 0; -AuthorizationKind g_service_authorization = AuthorizationKind::loose; +static AuthorizationKind fl_service_authorization = AuthorizationKind::loose; AuthorizationKind g_group_authorization = AuthorizationKind::strict; Encoding fl_data_encoding = Encoding::utf8; @@ -669,6 +669,10 @@ public: return fl_disable_statehist_filtering == 0; } + AuthorizationKind serviceAuthorization() const override { + return fl_service_authorization; + } + Logger *loggerLivestatus() override { return fl_logger_livestatus; } private: @@ -981,9 +985,9 @@ void livestatus_parse_arguments(const char *args_orig) { } } else if (strcmp(left, "service_authorization") == 0) { if (strcmp(right, "strict") == 0) { - g_service_authorization = AuthorizationKind::strict; + fl_service_authorization = AuthorizationKind::strict; } else if (strcmp(right, "loose") == 0) { - g_service_authorization = AuthorizationKind::loose; + fl_service_authorization = AuthorizationKind::loose; } else { Warning(fl_logger_nagios) << "invalid service authorization mode, "

6 years, 11 months

Access host authorization exclusively via MonitoringCore.

by Sven Panne

Module: check_mk Branch: master Commit: 2fbdc25f42c2deaa7bbcc3c4dea7ee46f8040e83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fbdc25f42c2de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 15:37:06 2017 +0200 Access host authorization exclusively via MonitoringCore. Change-Id: I3897c217fb35096400934ca64bdfb30a30e2f7ae --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/ServiceListStateColumn.h | 4 ++-- livestatus/src/module.cc | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 7e3a6b8..5555b3f 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -93,6 +93,7 @@ public: virtual size_t maxCachedMessages() = 0; virtual bool stateHistoryFilteringEnabled() = 0; + virtual AuthorizationKind hostAuthorization() const = 0; virtual AuthorizationKind serviceAuthorization() const = 0; virtual AuthorizationKind groupAuthorization() const = 0; diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 674bf89..3c52742 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -70,8 +70,8 @@ public: , _logictype(logictype) {} int32_t getValue(Row row, contact *auth_user) override; #ifdef CMC - static int32_t getValue(Type logictype, servicelist_t *mem, - contact *auth_user); + static int32_t getValue(MonitoringCore *mc, Type logictype, + servicelist_t *mem, contact *auth_user); #else static int32_t getValue(MonitoringCore *mc, Type logictype, servicesmember *mem, contact *auth_user); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3b88f66..6d9a179 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -669,6 +669,11 @@ public: return fl_disable_statehist_filtering == 0; } + // TODO(sp) Unused in Livestatus NEB: Strange & ugly... + AuthorizationKind hostAuthorization() const override { + return AuthorizationKind::loose; + } + AuthorizationKind serviceAuthorization() const override { return fl_service_authorization; }

6 years, 11 months

Removed g_group_authorization global variable.

by Sven Panne

Module: check_mk Branch: master Commit: 12fc3ab57e7f24681c23860ce8d617e652557913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12fc3ab57e7f24… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 15:00:40 2017 +0200 Removed g_group_authorization global variable. Change-Id: I8693bff2e7e05777aeb59190d93e50cc17aa62b0 --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/TableHostGroups.cc | 3 ++- livestatus/src/TableHostsByGroup.cc | 8 +++++--- livestatus/src/TableServiceGroups.cc | 3 ++- livestatus/src/TableServicesByGroup.cc | 8 +++++--- livestatus/src/auth.h | 2 -- livestatus/src/module.cc | 10 +++++++--- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 0a87e70..7e3a6b8 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -94,6 +94,7 @@ public: virtual bool stateHistoryFilteringEnabled() = 0; virtual AuthorizationKind serviceAuthorization() const = 0; + virtual AuthorizationKind groupAuthorization() const = 0; virtual Logger *loggerLivestatus() = 0; diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc index fdf2ecc..66b7f4d 100644 --- a/livestatus/src/TableHostGroups.cc +++ b/livestatus/src/TableHostGroups.cc @@ -27,6 +27,7 @@ #include "Column.h" #include "HostListColumn.h" #include "HostListStateColumn.h" +#include "MonitoringCore.h" #include "OffsetStringColumn.h" #include "Query.h" #include "auth.h" @@ -194,7 +195,7 @@ bool TableHostGroups::isAuthorized(Row row, contact *ctc) { auto has_contact = [=](hostsmember *mem) { return is_authorized_for(core(), ctc, mem->host_ptr, nullptr); }; - if (g_group_authorization == AuthorizationKind::loose) { + if (core()->groupAuthorization() == AuthorizationKind::loose) { // TODO(sp) Need an iterator here, "loose" means "any_of" for (hostsmember *mem = rowData<hostgroup>(row)->members; mem != nullptr; mem = mem->next) { diff --git a/livestatus/src/TableHostsByGroup.cc b/livestatus/src/TableHostsByGroup.cc index 08b5681..d69ba5d 100644 --- a/livestatus/src/TableHostsByGroup.cc +++ b/livestatus/src/TableHostsByGroup.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableHostsByGroup.h" +#include "MonitoringCore.h" #include "Query.h" #include "TableHostGroups.h" #include "TableHosts.h" @@ -52,10 +53,11 @@ string TableHostsByGroup::name() const { return "hostsbygroup"; } string TableHostsByGroup::namePrefix() const { return "host_"; } void TableHostsByGroup::answerQuery(Query *query) { - // When g_group_authorization is set to AuthorizationKind::strict we need to + // When groupAuthorization() is set to AuthorizationKind::strict we need to // pre-check if every host of this group is visible to the _auth_user - bool requires_precheck = query->authUser() != nullptr && - g_group_authorization == AuthorizationKind::strict; + bool requires_precheck = + query->authUser() != nullptr && + core()->groupAuthorization() == AuthorizationKind::strict; for (hostgroup *hg = hostgroup_list; hg != nullptr; hg = hg->next) { bool show_host_group = true; diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index 97987fd..bcc07d7 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -25,6 +25,7 @@ #include "TableServiceGroups.h" #include <memory> #include "Column.h" +#include "MonitoringCore.h" #include "OffsetStringColumn.h" #include "Query.h" #include "ServiceListColumn.h" @@ -156,7 +157,7 @@ bool TableServiceGroups::isAuthorized(Row row, contact *ctc) { service *svc = mem->service_ptr; return is_authorized_for(core(), ctc, svc->host_ptr, svc); }; - if (g_group_authorization == AuthorizationKind::loose) { + if (core()->groupAuthorization() == AuthorizationKind::loose) { // TODO(sp) Need an iterator here, "loose" means "any_of" for (servicesmember *mem = rowData<servicegroup>(row)->members; mem != nullptr; mem = mem->next) { diff --git a/livestatus/src/TableServicesByGroup.cc b/livestatus/src/TableServicesByGroup.cc index 57f56e2..32ed8f2 100644 --- a/livestatus/src/TableServicesByGroup.cc +++ b/livestatus/src/TableServicesByGroup.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "TableServicesByGroup.h" +#include "MonitoringCore.h" #include "Query.h" #include "TableServiceGroups.h" #include "TableServices.h" @@ -53,10 +54,11 @@ string TableServicesByGroup::name() const { return "servicesbygroup"; } string TableServicesByGroup::namePrefix() const { return "service_"; } void TableServicesByGroup::answerQuery(Query *query) { - // When g_group_authorization is set to AuthorizationKind::strict we need to + // When groupAuthorization() is set to AuthorizationKind::strict we need to // pre-check if every service of this group is visible to the _auth_user - bool requires_precheck = (query->authUser() != nullptr) && - g_group_authorization == AuthorizationKind::strict; + bool requires_precheck = + query->authUser() != nullptr && + core()->groupAuthorization() == AuthorizationKind::strict; for (servicegroup *sg = servicegroup_list; sg != nullptr; sg = sg->next) { bool show_service_group = true; diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index ae6183a..834a49d 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -40,8 +40,6 @@ inline contact *unknown_auth_user() { return reinterpret_cast<contact *>(0xdeadbeaf); } #else -extern AuthorizationKind g_group_authorization; - contact *unknown_auth_user(); class MonitoringCore; bool is_authorized_for(MonitoringCore *mc, contact *ctc, host *hst, diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index befeb9b..3b88f66 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -127,7 +127,7 @@ static uint32_t fl_max_lines_per_logfile = 1000000; size_t fl_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB int g_thread_running = 0; static AuthorizationKind fl_service_authorization = AuthorizationKind::loose; -AuthorizationKind g_group_authorization = AuthorizationKind::strict; +static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; Encoding fl_data_encoding = Encoding::utf8; // Map to speed up access via name/alias/address @@ -673,6 +673,10 @@ public: return fl_service_authorization; } + AuthorizationKind groupAuthorization() const override { + return fl_group_authorization; + } + Logger *loggerLivestatus() override { return fl_logger_livestatus; } private: @@ -995,9 +999,9 @@ void livestatus_parse_arguments(const char *args_orig) { } } else if (strcmp(left, "group_authorization") == 0) { if (strcmp(right, "strict") == 0) { - g_group_authorization = AuthorizationKind::strict; + fl_group_authorization = AuthorizationKind::strict; } else if (strcmp(right, "loose") == 0) { - g_group_authorization = AuthorizationKind::loose; + fl_group_authorization = AuthorizationKind::loose; } else { Warning(fl_logger_nagios) << "invalid group authorization mode, "

6 years, 11 months

4886 HTML mail notification: Added choices 'Automatic HTTP/s'

by Simon Betz

to URL prefix option Message-ID: <59774145.jJ8imXmrg4WBOz98%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d4ed3b1c45f38a346e6b53680b90b9bbb3795ec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4ed3b1c45f38a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 7 09:26:49 2017 +0200 4886 HTML mail notification: Added choices 'Automatic HTTP/s' to URL prefix option Change-Id: I21886f118289a8ad390495b232a10626c9adf959 --- .werks/4886 | 15 ++++++++++ notifications/mail | 7 +++++ web/plugins/wato/notifications.py | 62 ++++++++++++++++++++++++++++++--------- 3 files changed, 70 insertions(+), 14 deletions(-) diff --git a/.werks/4886 b/.werks/4886 new file mode 100644 index 0000000..a44f42d --- /dev/null +++ b/.werks/4886 @@ -0,0 +1,15 @@ +Title: HTML mail notification: Added choices 'Automatic HTTP/s' to URL prefix option +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499412075 +Class: feature + +URL prefixes are used for hyperlinks to Check_MK GUI so that +the recipient of the email can directly visit the host or +service in question in Check_MK. +These two new choices specify the URL prefix automatically. +If you're using more than one site this may be helpful in +order to avoid configuration of separate rules for each site. diff --git a/notifications/mail b/notifications/mail index d2b62ae..6844fc2 100755 --- a/notifications/mail +++ b/notifications/mail @@ -779,6 +779,12 @@ def construct_content(context): url_prefix = context["PARAMETER_2"] elif context.get("PARAMETER_URL_PREFIX"): url_prefix = context["PARAMETER_URL_PREFIX"] + elif context.get("PARAMETER_URL_PREFIX_MANUAL"): + url_prefix = context["PARAMETER_URL_PREFIX_MANUAL"] + elif context.get("PARAMETER_URL_PREFIX_AUTOMATIC") == "http": + url_prefix = "http://%s/%s" % (context["MONITORING_HOST"], context["OMD_SITE"]) + elif context.get("PARAMETER_URL_PREFIX_AUTOMATIC") == "https": + url_prefix = "https://%s/%s" % (context["MONITORING_HOST"], context["OMD_SITE"]) else: url_prefix = None @@ -795,6 +801,7 @@ def construct_content(context): service_url = base_url + context['SERVICEURL'] context['LINKEDSERVICEDESC'] = '<a href="%s">%s</a>' % (service_url, context['SERVICEDESC']) context['SERVICELINK'] = '\nLink: %s' % service_url + else: context['LINKEDHOSTNAME'] = context['HOSTNAME'] context['LINKEDSERVICEDESC'] = context.get('SERVICEDESC', '') diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 213ac10..6f54ced 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -24,6 +24,28 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# We have to transform because 'add_to_event_context' +# in modules/events.py can't handle complex data structures +def transform_back_html_mail_url_prefix(p): + if type(p) == tuple: + return {p[0]: p[1]} + elif p == "automatic_http": + return {"automatic": "http"} + elif p == "automatic_https": + return {"automatic": "https"} + else: + return {"manual": p} + +def transform_forth_html_mail_url_prefix(p): + if type(p) == dict: + k, v = p.items()[0] + if k == "automatic": + return "%s_%s" % (k, v) + else: + return ("manual", p) + else: + return ("manual", p) + def html_email_parameter_elements(): elements = [ ( "from", @@ -87,20 +109,32 @@ def html_email_parameter_elements(): ), ), ( "url_prefix", - TextAscii( - title = _("URL prefix for links to Check_MK"), - help = _("If you specify an URL prefix here, then several parts of the " - "email body are armed with hyperlinks to your Check_MK GUI, so " - "that the recipient of the email can directly visit the host or " - "service in question in Check_MK. Specify an absolute URL including " - "the <tt>.../check_mk/</tt>"), - regex = "^(http|https)://.*/check_mk/$", - regex_error = _("The URL must begin with <tt>http</tt> or " - "<tt>https</tt> and end with <tt>/check_mk/</tt>."), - size = 64, - default_value = "http://" + socket.gethostname() + "/" + ( - config.omd_site() and config.omd_site() + "/" or "") + "check_mk/", - ) + Transform(CascadingDropdown( + style="dropdown", + title=_("URL prefix for links to Check_MK"), + help=_("If you use <b>Automatic HTTP/s</b> the URL prefix for " + "host and service links within the notification mail " + "is filled automatically. " + "If you specify an URL prefix here, then several parts of the " + "email body are armed with hyperlinks to your Check_MK GUI. In both cases " + "the recipient of the email can directly visit the host or " + "service in question in Check_MK. Specify an absolute URL including " + "the <tt>.../check_mk/</tt>"), + choices=[ + ("automatic_http", _("Automatic HTTP")), + ("automatic_https", _("Automatic HTTPs")), + ("manual", _("Specify URL prefix"), TextAscii( + regex = "^(http|https)://.*/check_mk/$", + regex_error = _("The URL must begin with <tt>http</tt> or " + "<tt>https</tt> and end with <tt>/check_mk/</tt>."), + size = 64, + default_value = "http://" + socket.gethostname() + "/" + ( + config.omd_site() and config.omd_site() + "/" or "") + "check_mk/", + )), + ], + default_value=html.is_ssl_request() and "automatic_https" or "automatic_http", + ), forth=transform_forth_html_mail_url_prefix, + back=transform_back_html_mail_url_prefix) ), ( "no_floating_graphs", FixedValue(

6 years, 11 months

inv-plugin oracle_tablespaces: tablespaces are ordered by SID

by Simon Betz

Module: check_mk Branch: master Commit: 402d3e02a3baf9ed1f7ac705bb3f149c51807199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=402d3e02a3baf9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 25 14:58:55 2017 +0200 inv-plugin oracle_tablespaces: tablespaces are ordered by SID Change-Id: Ifb4756bf4f3a7828da5d7515f22c6a7c9ba670eb --- inventory/oracle_tablespaces | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/oracle_tablespaces b/inventory/oracle_tablespaces index df66d69..0f0c694 100644 --- a/inventory/oracle_tablespaces +++ b/inventory/oracle_tablespaces @@ -53,7 +53,7 @@ def inv_oracle_tablespaces(parsed): node = inv_tree_list("software.applications.oracle.tablespaces:") tablespaces, error_sids = parsed - for (sid, name), attrs in tablespaces.items(): + for (sid, name), attrs in sorted(tablespaces.items(), key=lambda x: x[0][0]): node.append({ "sid" : sid, "name" : name,

6 years, 11 months

4812 FIX Add missing Acknowledge author to host notifications

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 28befab7ab9f9551697bb9641750e61ea25fa345 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28befab7ab9f95… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Jul 25 13:30:40 2017 +0200 4812 FIX Add missing Acknowledge author to host notifications Change-Id: I94d2108c955ac7dd73382b7b7277f63a83d74d4a --- .werks/4812 | 11 +++++++++++ notifications/mail | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/4812 b/.werks/4812 new file mode 100644 index 0000000..1895339 --- /dev/null +++ b/.werks/4812 @@ -0,0 +1,11 @@ +Title: Add missing Acknowledge author to host notifications +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1500982341 +Class: fix + +Due to an error in the notification script no Acknowledge author +was shown in notification emails. diff --git a/notifications/mail b/notifications/mail index f51922e..d2b62ae 100755 --- a/notifications/mail +++ b/notifications/mail @@ -334,8 +334,8 @@ body_elements = [ "$HOSTOUTPUT_HTML$",), ( "ack_author", "host", False, "normal", "Acknowledge Author", - "$HOSTACKAUTHORNAME$", - "$HOSTACKAUTHORNAME$",), + "$HOSTACKAUTHOR$", + "$HOSTACKAUTHOR$",), ( "ack_comment", "host", False, "normal", "Acknowledge Comment", "$HOSTACKCOMMENT$",

6 years, 11 months

Refactored EC global settings to Wato mode

by Lars Michelsen

Module: check_mk Branch: master Commit: c4528b53b6cf345898209b5a2c11ab6e9c244624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4528b53b6cf34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 12:53:15 2017 +0200 Refactored EC global settings to Wato mode Change-Id: I8086bb7b330bfcda43217be823e9b8cfc6e8c253 --- web/htdocs/wato.py | 18 ++++++---- web/plugins/wato/mkeventd.py | 82 ++++++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 45 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 087b59c..4f16c2a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6812,7 +6812,7 @@ class ModeGlobalSettings(WatoMode): self._search = get_search_expression() - def _global_config_variable_groups(self, show_all=False): + def _group_names(self, show_all=False): group_names = [] for group_name, group_vars in configvar_groups().items(): @@ -6831,7 +6831,11 @@ class ModeGlobalSettings(WatoMode): return sorted(group_names, key=lambda a: configvar_order().get(a, 999)) - def _render_global_configuration_variables(self, group_names, edit_mode="edit_configvar"): + def _edit_mode(self): + return "edit_configvar" + + + def _show_configuration_variables(self, group_names): search_form(_("Search for settings:")) search = self._search @@ -6869,7 +6873,7 @@ class ModeGlobalSettings(WatoMode): default_value = self._default_values.get(varname, valuespec.default_value()) - edit_url = folder_preserving_link([("mode", edit_mode), + edit_url = folder_preserving_link([("mode", self._edit_mode()), ("varname", varname), ("site", html.var("site", ""))]) title = HTML('<a href="%s" class=%s title="%s">%s</a>' % \ @@ -6993,8 +6997,8 @@ class ModeEditGlobals(ModeGlobalSettings): return "" def page(self): - group_names = self._global_config_variable_groups() - self._render_global_configuration_variables(group_names) + self._show_configuration_variables(self._group_names()) + def mode_edit_configvar(phase, what = 'globalvars'): @@ -9818,8 +9822,8 @@ class ModeEditSiteGlobals(ModeSites, ModeGlobalSettings): "You cannot configure specific settings for it.")) return - group_names = self._global_config_variable_groups(show_all=True) - self._render_global_configuration_variables(group_names) + group_names = self._group_names(show_all=True) + self._show_configuration_variables(group_names) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f77e30a..99e8f37 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1785,28 +1785,47 @@ def mode_mkeventd_status(phase): html.end_form() -def mode_mkeventd_config(phase): - search = html.get_unicode_input("search") - if search != None: - search = search.strip().lower() +class ModeEventConsoleSettings(ModeGlobalSettings): + def __init__(self): + super(ModeEventConsoleSettings, self).__init__() - if phase == 'title': - if search: - return html.render_text(_("Event Console configuration matching %s") % search) + self._default_values = dict([ (varname, vs.default_value()) + for (varname, vs) + in self._ec_config_variables() ]) + + self._current_settings = load_configuration_settings() + + + def _ec_config_variables(self): + config = [] + for group_title in self._group_names(): + for entry in configvar_groups()[group_title]: + config.append((entry[1], entry[2])) + + return config + + + def _group_names(self): + group_names = [ e[1] for e in ec_config_variable_groups() ] + return sorted(group_names, key=lambda a: configvar_order().get(a, 999)) + + + def title(self): + if self._search: + return html.render_text(_("Event Console configuration matching '%s'") % self._search) else: return _('Event Console Configuration') - elif phase == 'buttons': + + def buttons(self): home_button() mkeventd_rules_button() mkeventd_changes_button() html.context_button(_("Server Status"), html.makeuri_contextless([("mode", "mkeventd_status")]), "status") - return - config_variables = ec_config_variables() - current_settings = load_configuration_settings() - if phase == "action": + # TODO: Consolidate with ModeEditGlobals.action() + def action(self): varname = html.var("_varname") action = html.var("_action") if not varname: @@ -1826,14 +1845,14 @@ def mode_mkeventd_config(phase): c = True # no confirmation for direct toggle if c: - if varname in current_settings: - current_settings[varname] = not current_settings[varname] + if varname in self._current_settings: + self._current_settings[varname] = not self._current_settings[varname] else: - current_settings[varname] = not def_value + self._current_settings[varname] = not def_value msg = _("Changed Configuration variable %s to %s.") % (varname, - current_settings[varname] and _("on") or _("off")) + self._current_settings[varname] and _("on") or _("off")) - save_global_settings(current_settings) + save_global_settings(self._current_settings) add_ec_change("edit-configvar", msg) @@ -1843,15 +1862,15 @@ def mode_mkeventd_config(phase): return "mkeventd_config" elif c == False: return "" - else: - return None - group_names = ec_config_variable_group_names() - default_values = dict([ (varname, vs.default_value()) for (varname, vs) in config_variables ]) - render_global_configuration_variables(group_names, default_values, - current_settings, search=search, - edit_mode="mkeventd_edit_configvar") + def _edit_mode(self): + return "mkeventd_edit_configvar" + + + def page(self): + self._show_configuration_variables(self._group_names()) + def ec_config_variable_groups(): @@ -1862,19 +1881,6 @@ def ec_config_variable_groups(): ] -def ec_config_variable_group_names(): - return [ e[1] for e in ec_config_variable_groups() ] - - -def ec_config_variables(): - config = [] - for group_title in ec_config_variable_group_names(): - for entry in configvar_groups()[group_title]: - config.append((entry[1], entry[2])) - - return config - - def mode_mkeventd_mibs(phase): if phase == 'title': return _('SNMP MIBs for Trap Translation') @@ -2208,7 +2214,7 @@ if mkeventd_enabled: modes["mkeventd_edit_rule"] = (["mkeventd.edit"], mode_mkeventd_edit_rule) modes["mkeventd_edit_rule_pack"] = (["mkeventd.edit"], mode_mkeventd_edit_rule_pack) modes["mkeventd_status"] = ([], mode_mkeventd_status) - modes["mkeventd_config"] = (['mkeventd.config'], mode_mkeventd_config) + modes["mkeventd_config"] = (['mkeventd.config'], ModeEventConsoleSettings) modes["mkeventd_edit_configvar"] = (['mkeventd.config'], lambda p: mode_edit_configvar(p, 'mkeventd')) modes["mkeventd_mibs"] = (['mkeventd.config'], mode_mkeventd_mibs)

6 years, 11 months

Improved exception handing in master control snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 2417b4c8db1c29b45b08ff984381c6980bf4f1a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2417b4c8db1c29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 11:26:28 2017 +0200 Improved exception handing in master control snapin Change-Id: Ic798885306833c808405db41c26091fc360b250e --- web/plugins/sidebar/shipped.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 5bf42a1..6c0732a 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1320,10 +1320,7 @@ def render_master_control(): finally: sites.live().set_prepend_site(False) - for site_id, site_alias in config.sorted_sites(): - if not config.is_single_local_site(): - html.begin_foldable_container("master_control", site_id, True, site_alias) - + def _render_master_control_site(site_id): site_state = sites.state(site_id) if site_state["state"] == "dead": html.show_error(site_state["exception"]) @@ -1361,8 +1358,18 @@ def render_master_control(): html.close_table() + for site_id, site_alias in config.sorted_sites(): if not config.is_single_local_site(): - html.end_foldable_container() + html.begin_foldable_container("master_control", site_id, True, site_alias) + + try: + _render_master_control_site(site_id) + except Exception, e: + log_exception() + write_snapin_exception(e) + finally: + if not config.is_single_local_site(): + html.end_foldable_container() sidebar_snapins["master_control"] = {

6 years, 11 months

Master control: Handle case of disabled sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 9881eb66a1b94d428915d86d40e6b4a51a2a4a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9881eb66a1b94d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 25 11:30:11 2017 +0200 Master control: Handle case of disabled sites Change-Id: I4e89246d84806e1f44a17fef93ecf29d67ac7e60 --- web/plugins/sidebar/shipped.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 6c0732a..0313339 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1325,6 +1325,9 @@ def render_master_control(): if site_state["state"] == "dead": html.show_error(site_state["exception"]) + elif site_state["state"] == "disabled": + html.show_info(_("Site is disabled")) + else: is_cmc = site_state["program_version"].startswith("Check_MK ")

6 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017