Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

WATO rule search: Fixed styling of dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: d26195c52b3807c01788ee6175505f320cc706f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d26195c52b3807… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 11:20:10 2017 +0100 WATO rule search: Fixed styling of dialog Change-Id: I82e3b8abb4c9ce9bccad7fe516bf2ba9a85b13ae --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 03ce9b2..abcd1f7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13475,7 +13475,7 @@ class ModeRuleSearch(WatoMode): def page(self): - html.begin_form("search", method="GET") + html.begin_form("rule_search", method="GET") html.hidden_field("mode", self.back_mode, add_var=True) valuespec = self._valuespec()

6 years, 9 months

5247 cmk --list-hosts now supports the additional options --all-sites, --include-offline

by Andreas Boesl

Module: check_mk Branch: master Commit: c0a0207a3e094dcf4988cf81f72c15a1dcbcde84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a0207a3e094d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 4 09:45:36 2017 +0100 5247 cmk --list-hosts now supports the additional options --all-sites, --include-offline Change-Id: I930728c37367d6b19d370e054b1feca435cfb926 --- .werks/5247 | 10 ++++++++++ cmk_base/config.py | 9 +++++++++ cmk_base/modes/check_mk.py | 48 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/.werks/5247 b/.werks/5247 new file mode 100644 index 0000000..f874226 --- /dev/null +++ b/.werks/5247 @@ -0,0 +1,10 @@ +Title: cmk --list-hosts now supports the additional options --all-sites, --include-offline +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512377109 +Class: feature + + diff --git a/cmk_base/config.py b/cmk_base/config.py index 14a4307..a6bd5f3 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -528,6 +528,15 @@ def all_offline_hosts(): if not rulesets.in_binary_hostlist(hostname, only_hosts) ] + +def all_configured_offline_hosts(): + hostlist = all_configured_realhosts().union(all_configured_clusters()) + + return set([ hostname for hostname in hostlist + if not rulesets.in_binary_hostlist(hostname, only_hosts) ]) + + + #. # .--Hosts---------------------------------------------------------------. # | _ _ _ | diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 5a455b2..186708e 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -161,6 +161,7 @@ modes.register_general_option(Option( #. +#. # .--list-hosts----------------------------------------------------------. # | _ _ _ _ _ | # | | (_)___| |_ | |__ ___ ___| |_ ___ | @@ -170,25 +171,38 @@ modes.register_general_option(Option( # | | # '----------------------------------------------------------------------' -def mode_list_hosts(args): - hosts = _list_all_hosts(args) +def mode_list_hosts(options, args): + hosts = _list_all_hosts(args, options) console.output("\n".join(hosts)) if hosts: console.output("\n") # TODO: Does not care about internal group "check_mk" -def _list_all_hosts(hostgroups): - hostlist = [] +def _list_all_hosts(hostgroups, options): + + hostnames = set() + + if options.get("all-sites"): + hostnames.update(config.all_configured_hosts()) # Return all hosts, including offline + if not "include-offline" in options: + hostnames -= config.all_configured_offline_hosts() + else: + hostnames.update(config.all_active_hosts()) + if "include-offline" in options: + hostnames.update(config.all_offline_hosts()) + + + if not hostgroups: + return sorted(hostnames) - for hn in config.all_active_hosts(): - if not hostgroups: - hostlist.append(hn) - else: - for hg in config.hostgroups_of(hn): - if hg in hostgroups: - hostlist.append(hn) - break + + hostlist = [] + for hn in hostnames: + for hg in config.hostgroups_of(hn): + if hg in hostgroups: + hostlist.append(hn) + break return sorted(hostlist) @@ -205,6 +219,16 @@ modes.register(Mode( "Called without argument lists all hosts. You may " "specify one or more host groups to restrict the output to hosts " "that are in at least one of those groups.", + ], + sub_options=[ + Option( + long_option="all-sites", + short_help="Include hosts of foreign sites", + ), + Option( + long_option="include-offline", + short_help="Include offline hosts", + ), ] ))

6 years, 9 months

5248 FIX diskspace cleanup: No longer deletes agent updater registration files of hosts monitored in foreign sites

by Andreas Boesl

Module: check_mk Branch: master Commit: e02d3e6e7c68815014b7e4f24843d2defbe7d3e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e02d3e6e7c6881… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 4 09:49:47 2017 +0100 5248 FIX diskspace cleanup: No longer deletes agent updater registration files of hosts monitored in foreign sites The diskspace cleanup routine regularly deleted files of hosts which did not belong to the current site. Change-Id: I497b01052f42ba5ca6deb1bba5bfdd66c4665932 --- .werks/5248 | 11 +++++++++++ omd/packages/maintenance/diskspace | 17 +++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/5248 b/.werks/5248 new file mode 100644 index 0000000..6ca6794 --- /dev/null +++ b/.werks/5248 @@ -0,0 +1,11 @@ +Title: diskspace cleanup: No longer deletes agent updater registration files of hosts monitored in foreign sites +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512377354 +Class: fix + +The diskspace cleanup routine regularly deleted files of hosts which did not belong to the current site. + diff --git a/omd/packages/maintenance/diskspace b/omd/packages/maintenance/diskspace index 9824482..a8c5459 100755 --- a/omd/packages/maintenance/diskspace +++ b/omd/packages/maintenance/diskspace @@ -238,7 +238,7 @@ def do_cleanup_abandoned_host_files(): return try: - site_hosts = get_site_hosts() + site_hosts = get_configured_hosts() except subprocess.CalledProcessError, e: verbose("Failed to get site hosts (%s). Skipping abandoned host files cleanup" % e) return @@ -304,10 +304,19 @@ def newest_modification_time_in_dir(dir_path): return mtime -def get_site_hosts(): +def get_configured_hosts(): host_names = set([]) - host_names.update(subprocess.check_output(["check_mk", "--list-hosts"]).splitlines()) - host_names.update(subprocess.check_output(["check_mk", "--list-tag", "offline"]).splitlines()) + + distr_wato_filepath = os.path.expanduser("~/etc/check_mk/conf.d/distributed_wato.mk") + file_vars = {} + if os.path.exists(distr_wato_filepath): + execfile(distr_wato_filepath, file_vars, file_vars) + + if file_vars.get("is_wato_slave_site", False): + host_names.update(subprocess.check_output(["check_mk", "--list-hosts", "--include-offline"]).splitlines()) + else: + host_names.update(subprocess.check_output(["check_mk", "--list-hosts", "--all-sites", "--include-offline"]).splitlines()) + return host_names

6 years, 9 months

5451 FIX logwatch: Fixed reclassifying mechanism: Patterns did not apply correctly if they have changed

by Simon Betz

Module: check_mk Branch: master Commit: acf79ca80abcb0227b7e23609de15426089f69a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf79ca80abcb0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 4 10:27:44 2017 +0100 5451 FIX logwatch: Fixed reclassifying mechanism: Patterns did not apply correctly if they have changed Change-Id: I1c524452b4245b77467df69a99d29b15cfa6f451 --- .werks/5451 | 11 +++++++++++ checks/logwatch | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/5451 b/.werks/5451 new file mode 100644 index 0000000..544e111 --- /dev/null +++ b/.werks/5451 @@ -0,0 +1,11 @@ +Title: logwatch: Fixed reclassifying mechanism: Patterns did not apply correctly if they have changed +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1512379327 + + diff --git a/checks/logwatch b/checks/logwatch index e92d711..93c485b 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -607,10 +607,8 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): except Exception, e: raise MKGeneralException("User %s cannot open file for writing: %s" % (logwatch_username(), e)) - pattern_hash = hash(tuple(patterns)) - + pattern_hash = hash(repr(patterns)) net_lines = 0 - # parse cached log lines if log_exists: # new format contains hash of patterns on the first line so we only reclassify if they

6 years, 9 months

Renamings only.

by Sven Panne

Module: check_mk Branch: master Commit: 9f0db9af9be629f7ed4f6606cab309977588985c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f0db9af9be629… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 4 09:36:42 2017 +0100 Renamings only. Change-Id: Id86a813b1f3a4f6fd5911ddd94b918df26797dd7 --- livestatus/src/AndingFilter.cc | 4 ++-- livestatus/src/AndingFilter.h | 4 ++-- livestatus/src/Filter.cc | 2 +- livestatus/src/Filter.h | 2 +- livestatus/src/ListFilter.cc | 4 ++-- livestatus/src/ListFilter.h | 2 +- livestatus/src/Query.cc | 4 ++-- livestatus/src/Query.h | 2 +- livestatus/src/StringFilter.cc | 5 ++--- livestatus/src/StringFilter.h | 2 +- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableServices.cc | 8 +++++--- 12 files changed, 21 insertions(+), 20 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 28c9d74..6a1a515 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -78,10 +78,10 @@ std::unique_ptr<Filter> AndingFilter::negate() const { return std::make_unique<OringFilter>(std::move(filters)); } -const std::string *AndingFilter::findValueForIndexing( +const std::string *AndingFilter::stringValueRestrictionFor( const std::string &column_name) const { for (const auto &filter : _subfilters) { - if (auto value = filter->valueForIndexing(column_name)) { + if (auto value = filter->stringValueRestrictionFor(column_name)) { return value; } } diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index 0a542a0..f75d299 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -50,8 +50,8 @@ public: std::chrono::seconds timezone_offset) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; - const std::string *findValueForIndexing( - const std::string &column_name) const; + const std::string *stringValueRestrictionFor( + const std::string &column_name) const override; auto begin() const { return _subfilters.begin(); } auto end() const { return _subfilters.end(); } diff --git a/livestatus/src/Filter.cc b/livestatus/src/Filter.cc index 3df6e33..0a23dcc 100644 --- a/livestatus/src/Filter.cc +++ b/livestatus/src/Filter.cc @@ -26,7 +26,7 @@ Filter::~Filter() = default; -const std::string *Filter::valueForIndexing( +const std::string *Filter::stringValueRestrictionFor( const std::string & /* column_name */) const { return nullptr; } diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index ea25f89..d83456c 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -40,7 +40,7 @@ public: virtual void accept(FilterVisitor &) const = 0; virtual bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const = 0; - virtual const std::string *valueForIndexing( + virtual const std::string *stringValueRestrictionFor( const std::string &column_name) const; virtual void findIntLimits(const std::string &column_name, int *lower, int *upper, diff --git a/livestatus/src/ListFilter.cc b/livestatus/src/ListFilter.cc index 09672c2..2c7de07 100644 --- a/livestatus/src/ListFilter.cc +++ b/livestatus/src/ListFilter.cc @@ -23,8 +23,8 @@ // Boston, MA 02110-1301 USA. #include "ListFilter.h" +#include <strings.h> #include <algorithm> -#include <cstring> #include <sstream> #include <string> #include "Filter.h" @@ -116,7 +116,7 @@ bool ListFilter::accepts(Row row, const contact *auth_user, return false; // unreachable } -const std::string *ListFilter::valueForIndexing( +const std::string *ListFilter::stringValueRestrictionFor( const std::string &column_name) const { switch (_relOp) { case RelationalOperator::greater_or_equal: diff --git a/livestatus/src/ListFilter.h b/livestatus/src/ListFilter.h index 8f49494..c23ce45 100644 --- a/livestatus/src/ListFilter.h +++ b/livestatus/src/ListFilter.h @@ -45,7 +45,7 @@ public: std::string value); bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; - const std::string *valueForIndexing( + const std::string *stringValueRestrictionFor( const std::string &column_name) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 58bde3d..a4e2a55 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -721,9 +721,9 @@ void Query::finish(QueryRenderer &q) { } } -const std::string *Query::findValueForIndexing( +const std::string *Query::stringValueRestrictionFor( const std::string &column_name) const { - return _filter->findValueForIndexing(column_name); + return _filter->stringValueRestrictionFor(column_name); } void Query::findIntLimits(const std::string &column_name, int *lower, diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index f7e713e..a76d634 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -67,7 +67,7 @@ public: const contact *authUser() const { return _auth_user; } std::chrono::seconds timezoneOffset() const { return _timezone_offset; } - const std::string *findValueForIndexing( + const std::string *stringValueRestrictionFor( const std::string &column_name) const; void findIntLimits(const std::string &column_name, int *lower, int *upper) const; diff --git a/livestatus/src/StringFilter.cc b/livestatus/src/StringFilter.cc index ae211da..93e0272 100644 --- a/livestatus/src/StringFilter.cc +++ b/livestatus/src/StringFilter.cc @@ -23,9 +23,8 @@ // Boston, MA 02110-1301 USA. #include "StringFilter.h" +#include <strings.h> #include <algorithm> -#include <cstring> -#include <sstream> #include "Filter.h" #include "Row.h" #include "StringColumn.h" @@ -86,7 +85,7 @@ bool StringFilter::accepts(Row row, const contact * /* auth_user */, return false; // unreachable } -const std::string *StringFilter::valueForIndexing( +const std::string *StringFilter::stringValueRestrictionFor( const std::string &column_name) const { switch (_relOp) { case RelationalOperator::equal: diff --git a/livestatus/src/StringFilter.h b/livestatus/src/StringFilter.h index 208e0d3..f3cea37 100644 --- a/livestatus/src/StringFilter.h +++ b/livestatus/src/StringFilter.h @@ -43,7 +43,7 @@ public: std::string value); bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; - const std::string *valueForIndexing( + const std::string *stringValueRestrictionFor( const std::string &column_name) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index ec8544c..245376d 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -642,7 +642,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, void TableHosts::answerQuery(Query *query) { // do we know the host group? - if (const std::string *value = query->findValueForIndexing("groups")) { + if (const std::string *value = query->stringValueRestrictionFor("groups")) { if (hostgroup *hg = find_hostgroup(const_cast<char *>(value->c_str()))) { for (hostsmember *mem = hg->members; mem != nullptr; diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 821fb9e..3245a92 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -466,7 +466,8 @@ void TableServices::addColumns(Table *table, const std::string &prefix, void TableServices::answerQuery(Query *query) { // do we know the host? - if (const std::string *value = query->findValueForIndexing("host_name")) { + if (const std::string *value = + query->stringValueRestrictionFor("host_name")) { // Older Nagios headers are not const-correct... :-P if (host *host = find_host(const_cast<char *>(value->c_str()))) { for (servicesmember *m = host->services; m != nullptr; @@ -480,7 +481,7 @@ void TableServices::answerQuery(Query *query) { } // do we know the service group? - if (const std::string *name = query->findValueForIndexing("groups")) { + if (const std::string *name = query->stringValueRestrictionFor("groups")) { if (servicegroup *sg = find_servicegroup(const_cast<char *>(name->c_str()))) { for (servicesmember *m = sg->members; m != nullptr; m = m->next) { @@ -493,7 +494,8 @@ void TableServices::answerQuery(Query *query) { } // do we know the host group? - if (const std::string *name = query->findValueForIndexing("host_groups")) { + if (const std::string *name = + query->stringValueRestrictionFor("host_groups")) { if (hostgroup *hg = find_hostgroup(const_cast<char *>(name->c_str()))) { for (hostsmember *m = hg->members; m != nullptr; m = m->next) { for (servicesmember *smem = m->host_ptr->services;

6 years, 9 months

5564 FIX Fixed site filter when using "analyse notification"

by Lars Michelsen

Module: check_mk Branch: master Commit: de600209f034974ee9a33b17997770302d1b42aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de600209f03497… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 09:42:43 2017 +0100 5564 FIX Fixed site filter when using "analyse notification" When analyzing notifications forwarded from remote sites, the site filter did not work as intended. The site filter was always using the local (central) site ID as value for OMD_SITE instead of the origin site. Change-Id: I6ec79ef298cce27c1dea48e6a5ff6299f62c8701 --- .werks/5564 | 12 ++++++++++++ cmk_base/events.py | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.werks/5564 b/.werks/5564 new file mode 100644 index 0000000..c4d6e31 --- /dev/null +++ b/.werks/5564 @@ -0,0 +1,12 @@ +Title: Fixed site filter when using "analyse notification" +Level: 1 +Component: notifications +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512376886 +Class: fix + +When analyzing notifications forwarded from remote sites, the site filter did not work as +intended. The site filter was always using the local (central) site ID as value for OMD_SITE +instead of the origin site. diff --git a/cmk_base/events.py b/cmk_base/events.py index 1f20f1e..7766eae 100644 --- a/cmk_base/events.py +++ b/cmk_base/events.py @@ -265,15 +265,24 @@ def add_rulebased_macros(raw_context): raw_context["CONTACTNAME"] = "check-mk-notify" -# Add a few further helper variables that are useful in notification and alert plugins def complete_raw_context(raw_context, with_dump, event_log): + """Extend the raw notification context + + This ensures that all raw contexts processed in the notification code has specific variables + set. Add a few further helper variables that are useful in notification and alert plugins. + + Please not that this is not only executed on the source system. When notifications are + forwarded to another site and the analysis is executed on that site, this function will be + executed on the central site. So be sure not to overwrite site specific things. + """ raw_keys = list(raw_context.keys()) try: raw_context["WHAT"] = raw_context.get("SERVICEDESC") and "SERVICE" or "HOST" - raw_context["MONITORING_HOST"] = socket.gethostname() - raw_context["OMD_ROOT"] = cmk.paths.omd_root - raw_context["OMD_SITE"] = cmk.omd_site() + + raw_context.setdefault("MONITORING_HOST", socket.gethostname()) + raw_context.setdefault("OMD_ROOT", cmk.paths.omd_root) + raw_context.setdefault("OMD_SITE", cmk.omd_site()) # The Check_MK Micro Core sends the MICROTIME and no other time stamps. We add # a few Nagios-like variants in order to be compatible

6 years, 9 months

5414 FIX Windows agent: Exchange Availability Service was broken

by Jukka Aro

Module: check_mk Branch: master Commit: 72d0a0afec46cd54e95d55f20b3cf31719328804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72d0a0afec46cd… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Dec 4 08:23:27 2017 +0100 5414 FIX Windows agent: Exchange Availability Service was broken The name of the WMI class Win32_PerfRawData_MSExchangeAvailabilityService_MSExchangeAvailabilityService was misspelled. As a result, the Exchange Availability Service was broken in all versions since 1.4.0. The misspelled name was introduced by the refactoring done in commit c5ee818358e695b01c2f2dbc05ad0713723a37f8. Change-Id: I4bb354ed43d579b7d8b49d685d5ddab9bebd8d71 --- .werks/5414 | 16 ++++++++++++++++ agents/windows/SectionManager.cc | 2 +- agents/windows/build_version | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/5414 b/.werks/5414 new file mode 100644 index 0000000..3123ed0 --- /dev/null +++ b/.werks/5414 @@ -0,0 +1,16 @@ +Title: Windows agent: Exchange Availability Service was broken +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512371847 +Class: fix + +The name of the WMI class +Win32_PerfRawData_MSExchangeAvailabilityService_MSExchangeAvailabilityService +was misspelled. As a result, the Exchange Availability Service was broken in +all versions since 1.4.0. The misspelled name was introduced by the +refactoring done in commit c5ee818358e695b01c2f2dbc05ad0713723a37f8. + + diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index e202ed2..e0aa5e2 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -146,7 +146,7 @@ void SectionManager::loadStaticSections(Configuration &config) { (new SectionWMI("msexch_availability", "msexch_availability", _env, _logger, _winapi)) ->withObject( - L"Win32_PerfRawData_MSExchangeAvailabilityService")) + L"Win32_PerfRawData_MSExchangeAvailabilityService_MSExchangeAvailabilityService")) ->withSubSection( (new SectionWMI("msexch_owa", "msexch_owa", _env, _logger, _winapi)) diff --git a/agents/windows/build_version b/agents/windows/build_version index e93610b..fd1dbd8 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3014 +3016

6 years, 9 months

5563 FIX Renamed "Site Management" configuration options introduced with #5173

by Lars Michelsen

Module: check_mk Branch: master Commit: d8e701a879fe69415eca770f65b38522800daf31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8e701a879fe69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 1 16:18:29 2017 +0100 5563 FIX Renamed "Site Management" configuration options introduced with #5173 The configuration options introduced with #5173 (Set OMD config via WATO) had to be renamed. This is mostly an internal change, but you may have set one of these options in a site using a daily master snapshot or the 1.5.0i1 version. Renaming the settings will reset your already configured settings to default. Change-Id: Id8c88d514d063f5a82488ae979fcc758233b3125 --- .werks/5563 | 14 ++++++++++++++ web/htdocs/watolib.py | 6 ++++++ web/plugins/wato/omd_configuration.py | 24 ++++++++++++------------ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.werks/5563 b/.werks/5563 new file mode 100644 index 0000000..9a31cc0 --- /dev/null +++ b/.werks/5563 @@ -0,0 +1,14 @@ +Title: Renamed "Site Management" configuration options introduced with #5173 +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512141358 +Class: fix + +The configuration options introduced with #5173 (Set OMD config via WATO) had +to be renamed. This is mostly an internal change, but you may have set one +of these options in a site using a daily master snapshot or the 1.5.0i1 +version. Renaming the settings will reset your already configured settings +to default. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7787bad..0ae5eba 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -689,6 +689,9 @@ class ConfigDomainOMD(ConfigDomain): else: settings["MKEVENTD"] = None + # Convert from OMD key (to lower, add "site_" prefix) + settings = dict([ ("site_%s" % key.lower(), val) for key, val in settings.items() ]) + return settings @@ -697,6 +700,9 @@ class ConfigDomainOMD(ConfigDomain): def _to_omd_config(self, config): settings = {} + # Convert to OMD key + config = dict([ (key.upper()[5:], val) for key, val in config.items() ]) + if "LIVESTATUS_TCP" in config: if config["LIVESTATUS_TCP"] is not None: config["LIVESTATUS_TCP_PORT"] = "%s" % config["LIVESTATUS_TCP"]["port"] diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index e92ac06..67629fb 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -43,7 +43,7 @@ group = _('Site Management') # '----------------------------------------------------------------------' register_configvar(group, - "AUTOSTART", + "site_autostart", Checkbox( title = _("Start during system boot"), help = _("Whether or not this site should be started during startup of " @@ -67,7 +67,7 @@ def _monitoring_core_choices(): register_configvar(group, - "CORE", + "site_core", DropdownChoice( title = _("Monitoring core"), help = _("Choose the monitoring core to run for monitoring. You can also " @@ -81,7 +81,7 @@ register_configvar(group, register_configvar(group, - "LIVESTATUS_TCP", + "site_livestatus_tcp", Optional( Dictionary( elements = [ @@ -116,7 +116,7 @@ register_configvar(group, register_configvar(group, - "MKEVENTD", + "site_mkeventd", Optional( ListChoice( choices = [ @@ -142,7 +142,7 @@ register_configvar(group, register_configvar(group, - "NSCA", + "site_nsca", Optional( Integer( title = _("Port number"), @@ -358,8 +358,8 @@ class ConfigDomainApache(watolib.ConfigDomain): output = watolib.wato_fileheader() if config: - output += "ServerLimit %d\n" % config["process_tuning"]["number_of_processes"] - output += "MaxClients %d\n" % config["process_tuning"]["number_of_processes"] + output += "ServerLimit %d\n" % config["apache_process_tuning"]["number_of_processes"] + output += "MaxClients %d\n" % config["apache_process_tuning"]["number_of_processes"] config_file_path = os.path.join(cmk.paths.omd_root, "etc/apache/conf.d", "zzz_check_mk.conf") store.save_file(config_file_path, output) @@ -374,7 +374,7 @@ class ConfigDomainApache(watolib.ConfigDomain): def default_globals(self): return { - "process_tuning": { + "apache_process_tuning": { "number_of_processes" : self._get_value_from_config("MaxClients", int, 64), } } @@ -399,7 +399,7 @@ class ConfigDomainApache(watolib.ConfigDomain): register_configvar(group, - "process_tuning", + "apache_process_tuning", Dictionary( title = _("Apache process tuning"), elements = [ @@ -460,7 +460,7 @@ class ConfigDomainRRDCached(watolib.ConfigDomain): config = self._get_effective_config() output = watolib.wato_fileheader() - for key, val in sorted(config.get("tuning", {}).items()): + for key, val in sorted(config.get("rrdcached_tuning", {}).items()): output += "%s=%d\n" % (key, val) config_file_path = os.path.join(cmk.paths.omd_root, "etc/rrdcached.d", "zzz_check_mk.conf") @@ -475,7 +475,7 @@ class ConfigDomainRRDCached(watolib.ConfigDomain): def default_globals(self): return { - "tuning": { + "rrdcached_tuning": { "TIMEOUT" : self._get_value_from_config("TIMEOUT", int, 3600), "RANDOM_DELAY" : self._get_value_from_config("RANDOM_DELAY", int, 1800), "FLUSH_TIMEOUT" : self._get_value_from_config("FLUSH_TIMEOUT", int, 7200), @@ -502,7 +502,7 @@ class ConfigDomainRRDCached(watolib.ConfigDomain): register_configvar(group, - "tuning", + "rrdcached_tuning", Dictionary( title = _("RRDCached tuning"), elements = [

6 years, 10 months

5562 Flap settings can now be configured individually for hosts/services

by Lars Michelsen

Module: check_mk Branch: master Commit: cc6dcb630de19a805c860b21a6910bccb6990bd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc6dcb630de19a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 1 15:33:56 2017 +0100 5562 Flap settings can now be configured individually for hosts/services It is now possible to configure the flaping settings individuall for each host and service. This was previously only configurable globally via the global setting "Tuning of flap detection". No you can use the rulesets "Flap detection settings for hosts" and "Flap detection settings for services" to configure this using rules. Change-Id: I2137d9f4d9f7c7bb11a8407aea55f89ffb13ce45 --- .werks/5562 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/5562 b/.werks/5562 new file mode 100644 index 0000000..8472f24 --- /dev/null +++ b/.werks/5562 @@ -0,0 +1,15 @@ +Title: Flap settings can now be configured individually for hosts/services +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i2 +Date: 1512138685 +Class: feature + +It is now possible to configure the flaping settings individuall for each +host and service. This was previously only configurable globally via +the global setting "Tuning of flap detection". + +No you can use the rulesets "Flap detection settings for hosts" and +"Flap detection settings for services" to configure this using rules.

6 years, 10 months

Removed distro files of outdated versions

by Lars Michelsen

Module: check_mk Branch: master Commit: a6a41e7ef4c225bcc4962bc626461ad11fd8b157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6a41e7ef4c225… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 1 13:31:46 2017 +0100 Removed distro files of outdated versions Change-Id: I3070a7f0b6a67790f821c9e22224c0291f11e2d2 --- omd/distros/SLES_11.mk | 103 ---------------------------------------- omd/distros/UBUNTU_10.04.mk | 101 ---------------------------------------- omd/distros/UBUNTU_10.10.mk | 99 --------------------------------------- omd/distros/UBUNTU_11.04.mk | 100 --------------------------------------- omd/distros/UBUNTU_11.10.mk | 101 ---------------------------------------- omd/distros/UBUNTU_12.10.mk | 103 ---------------------------------------- omd/distros/UBUNTU_13.10.mk | 101 ---------------------------------------- omd/distros/UBUNTU_14.10.mk | 111 -------------------------------------------- omd/distros/UBUNTU_15.10.mk | 111 -------------------------------------------- 9 files changed, 930 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a6a41e7ef4…

6 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017