Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 237d87089397171f6614532ab22c3e72ae09a5b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=237d8708939717… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Oct 25 14:52:54 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Logger.cc | 15 +++++++++------ livestatus/src/Logger.h | 20 +++++++++++++++----- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/livestatus/src/Logger.cc b/livestatus/src/Logger.cc index 9cd04c6..40a9c7b 100644 --- a/livestatus/src/Logger.cc +++ b/livestatus/src/Logger.cc @@ -37,6 +37,7 @@ using std::mutex; using std::ostream; using std::ostringstream; using std::string; +using std::unique_ptr; ostream &operator<<(ostream &os, const LogLevel &c) { return os << static_cast<int>(c); @@ -47,14 +48,17 @@ void SimpleFormatter::format(ostream &os, const LogRecord &record) { << "[" << record.getLevel() << "] " << record.getMessage(); } -StreamHandler::StreamHandler(ostream &os) : _os(os) {} +SharedStreamHandler::SharedStreamHandler(mutex &mutex, ostream &os) + : _mutex(mutex), _os(os) {} -void StreamHandler::publish(const LogRecord &record) { +void SharedStreamHandler::publish(const LogRecord &record) { lock_guard<mutex> lg(_mutex); getFormatter()->format(_os, record); _os << endl; } +StreamHandler::StreamHandler(ostream &os) : SharedStreamHandler(_mutex, os) {} + FileHandler::FileHandler(const std::string &filename) : StreamHandler(_os) { _os.open(filename, std::ofstream::app); if (!_os) { @@ -66,11 +70,10 @@ Logger::Logger(string name, Logger *parent) : _name(move(name)) , _parent(parent) , _level(LogLevel::debug) - , _use_parent_handlers(true) { - setHandler(make_unique<StreamHandler>(cerr)); -} + , _handler(_name.empty() ? nullptr : new StreamHandler(cerr)) + , _use_parent_handlers(true) {} -Logger::~Logger() { delete getHandler(); } +Logger::~Logger() { setHandler(unique_ptr<Handler>()); } // static Logger *Logger::getLogger(const string &name) { diff --git a/livestatus/src/Logger.h b/livestatus/src/Logger.h index 3322eb0..128df41 100644 --- a/livestatus/src/Logger.h +++ b/livestatus/src/Logger.h @@ -100,32 +100,41 @@ class SimpleFormatter : public Formatter { class Handler { public: - virtual ~Handler() { delete getFormatter(); } + virtual ~Handler() { setFormatter(std::unique_ptr<Formatter>()); } virtual void publish(const LogRecord &record) = 0; Formatter *getFormatter() const { return _formatter; } void setFormatter(std::unique_ptr<Formatter> formatter) { + delete _formatter; _formatter = formatter.release(); } protected: - Handler() { setFormatter(std::make_unique<SimpleFormatter>()); } + Handler() : _formatter(new SimpleFormatter()) {} private: std::atomic<Formatter *> _formatter; }; -class StreamHandler : public Handler { +class SharedStreamHandler : public Handler { public: - explicit StreamHandler(std::ostream &os); + SharedStreamHandler(std::mutex &mutex, std::ostream &os); private: - std::mutex _mutex; + std::mutex &_mutex; std::ostream &_os; void publish(const LogRecord &record) override; }; +class StreamHandler : public SharedStreamHandler { +public: + explicit StreamHandler(std::ostream &os); + +private: + std::mutex _mutex; +}; + class FileHandler : public StreamHandler { public: explicit FileHandler(const std::string &filename); @@ -151,6 +160,7 @@ public: Handler *getHandler() const { return _handler; } void setHandler(std::unique_ptr<Handler> handler) { + delete _handler; _handler = handler.release(); }

7 years, 10 months

updated werk

by Lars Michelsen

Module: check_mk Branch: master Commit: d489186dd28e4474eab66aecb57acb07f8f01fbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d489186dd28e44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 25 14:45:19 2016 +0200 updated werk --- .werks/3970 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.werks/3970 b/.werks/3970 index 65dc504..ba6b537 100644 --- a/.werks/3970 +++ b/.werks/3970 @@ -14,3 +14,5 @@ An attacker could use this to make an authenticated GUI user open a page of his choice when the user clicks on a prepared link. One example URL which could be used: "index.py?start_url=//heise.de". + +Thanks to Marcel Bilal for reporting the issue!

7 years, 10 months

changed misleading description for bugfix

by Marcel Arentz

Module: check_mk Branch: master Commit: da4caf49ba89e1b7fd4ea005d718506038efcc62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da4caf49ba89e1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 25 14:26:58 2016 +0200 changed misleading description for bugfix --- .werks/3951 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.werks/3951 b/.werks/3951 index f971508..ceee266 100644 --- a/.werks/3951 +++ b/.werks/3951 @@ -6,5 +6,4 @@ Version: 1.4.0i2 Date: 1477397596 Class: fix -When relative levels are given in a rule but no absolute levels, the default levels from the checkplugin are still used. -This change is compatible and will ignore absolute levels in a given rule, if not explicitly set. Defaults for absolute levels are still used if no rule is given. +When relative levels were given in a rule but no absolute levels, the default levels from the checkplugin still have been used. Now absolute levels are ignored by default if setting up a rule. This allows to set up a rule for only relative levels. This change is compatible to existing rules! Additionally defaults for absolute levels are still used if no rule is given.

7 years, 10 months

3951 FIX oracle_sessions: fixed bug with default absolute levels

by Marcel Arentz

Module: check_mk Branch: master Commit: fea2f26165365954d1686a2a27201f2645503114 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea2f261653659… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 25 14:21:54 2016 +0200 3951 FIX oracle_sessions: fixed bug with default absolute levels When relative levels are given in a rule but no absolute levels, the default levels from the checkplugin are still used. This change is compatible and will ignore absolute levels in a given rule, if not explicitly set. Defaults for absolute levels are still used if no rule is given. --- .werks/3951 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_sessions | 3 ++- web/plugins/wato/check_parameters.py | 38 ++++++++++++++++++++++++------------ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/.werks/3951 b/.werks/3951 new file mode 100644 index 0000000..f971508 --- /dev/null +++ b/.werks/3951 @@ -0,0 +1,10 @@ +Title: oracle_sessions: fixed bug with default absolute levels +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i2 +Date: 1477397596 +Class: fix + +When relative levels are given in a rule but no absolute levels, the default levels from the checkplugin are still used. +This change is compatible and will ignore absolute levels in a given rule, if not explicitly set. Defaults for absolute levels are still used if no rule is given. diff --git a/ChangeLog b/ChangeLog index fd15f54..79ab9bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 3914 FIX: Roles: Aliases are now unique during cloning * 3820 FIX: Network scan: no longer fails completely if hostname already exists in configuration... * 3821 FIX: WATO Network Scan: Fixed risk of loosing site tags when performing a network scan... + * 3951 FIX: oracle_sessions: fixed bug with default absolute levels... Notifications: * 3957 mail: now allows extra HTML section between body and table diff --git a/checks/oracle_sessions b/checks/oracle_sessions index 048ab12..dfb4ebb 100644 --- a/checks/oracle_sessions +++ b/checks/oracle_sessions @@ -115,7 +115,7 @@ def check_oracle_sessions(item, params, parsed): state = 0 warn, crit = None, None - if "sessions_abs" in params: + if "sessions_abs" in params and not params["sessions_abs"] == None: warn, crit = params["sessions_abs"] if sessions >= crit: state = 2 @@ -124,6 +124,7 @@ def check_oracle_sessions(item, params, parsed): if state: infotext += " (warn/crit at %d/%d)" % (warn, crit) yield state, infotext, [ ("sessions", sessions, warn, crit, 0, sessions_max) ] + return # In case of missing information we assume that the login into diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index ca7c462..929d1ac 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8720,6 +8720,13 @@ register_check_parameters( match_type = "first", ) +def convert_oracle_sessions(value): + if isinstance(value, tuple): + return {'sessions_abs' : value } + if 'sessions_abs' not in value: + value['sessions_abs'] = (100, 200) + return value + register_check_parameters( subgroup_applications, "oracle_sessions", @@ -8728,28 +8735,35 @@ register_check_parameters( Dictionary( elements = [ ("sessions_abs", - Tuple( - title = _("Number of active sessions"), - help = _("This check monitors the current number of active sessions on Oracle"), - elements = [ - Integer(title = _("Warning at"), unit = _("sessions"), default_value = 100), - Integer(title = _("Critical at"), unit = _("sessions"), default_value = 200), - ], - ), - ), + Alternative( + title = _("Absolute levels of active sessions"), + style = "dropdown", + help = _("This check monitors the current number of active sessions on Oracle"), + elements = [ + FixedValue(None, title = _("Do not use absolute levels"), totext = ""), + Tuple( + title = _("Number of active sessions"), + elements = [ + Integer(title = _("Warning at"), unit = _("sessions"), default_value = 100), + Integer(title = _("Critical at"), unit = _("sessions"), default_value = 200), + ], + ), + ], + )), ("sessions_perc", Tuple( title = _("Relative levels of active sessions."), - help = _("Set upper levels of active sessions relative to max. number of sessions."), + help = _("Set upper levels of active sessions relative to max. number of sessions. This is optional."), elements = [ Percentage(title = _("Warning at")), Percentage(title = _("Critical at")), ], ), ), - ] + ], + optional_keys = ["sessions_perc"], ), - forth = lambda p: type(p) == tuple and { "sessions_abs" : p } or p, + forth = convert_oracle_sessions ), TextAscii( title = _("Database name"),

7 years, 10 months

fixed pylint issue

by Lars Michelsen

Module: check_mk Branch: master Commit: d064f7c4c8e323def5f4ae830fe6a8d5d9a2df16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d064f7c4c8e323… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 25 14:01:01 2016 +0200 fixed pylint issue --- modules/check_mk.py | 1 + web/htdocs/webapi.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 12e037d..259f31d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -758,6 +758,7 @@ def convert_host_ruleset(ruleset, with_foreign_hosts): # TODO: Remove this when checks have been moved to cmk_base.checks hosttags_match_taglist = rulesets.hosttags_match_taglist +get_rule_options = rulesets.get_rule_options def host_extra_conf(hostname, ruleset): diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index d0ddd6b..d9fd2b2 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -96,12 +96,12 @@ def page_api(): response = { "result_code": 0, "result": action_response } except MKException, e: - response = { "result_code": 1, "result": str(e) } + response = { "result_code": 1, "result": "%s" % e } except Exception, e: if config.debug: raise - response = { "result_code": 1, "result": str(e) } + response = { "result_code": 1, "result": "%s" % e } if html.output_format == "json": html.write(json.dumps(response))

7 years, 10 months

fixed pylint issue

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c06a5eec2bb00097c591cf8ef1e19841f880255 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c06a5eec2bb00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 25 12:22:27 2016 +0200 fixed pylint issue --- modules/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2e5bcd2..12e037d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -756,6 +756,10 @@ def convert_host_ruleset(ruleset, with_foreign_hosts): return new_rules +# TODO: Remove this when checks have been moved to cmk_base.checks +hosttags_match_taglist = rulesets.hosttags_match_taglist + + def host_extra_conf(hostname, ruleset): # When the requested host is part of the local sites configuration, # then use only the sites hosts for processing the rules

7 years, 10 months

ToDo Reporting: Add of manual page break

by Sven Rueß

Module: check_mk Branch: master Commit: f7b4ff2caa367850e2343be55a56b41de54a7f3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7b4ff2caa3678… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:50:30 2016 +0200 ToDo Reporting: Add of manual page break --- .bugs/2525 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2525 b/.bugs/2525 new file mode 100644 index 0000000..b392c00 --- /dev/null +++ b/.bugs/2525 @@ -0,0 +1,10 @@ +Title: Reports should have manual page break option +Component: multisite +State: open +Date: 2016-10-25 12:47:46 +Targetversion: 1.2.8 +Class: todo + +The reports include the content and will make a automatically page break, if needed. +It is a good option, that the user can define a static page break after one element. +We should a an option for manual page breaks.

7 years, 10 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: df2b21a38e84fa719b8a054e800a1718993ba5d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df2b21a38e84fa… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:47:37 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 06ea99c..0ddadaa 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2525 +2526

7 years, 10 months

by Sven Rueß

Module: check_mk Branch: master Commit: 5ffcad582dfa8b65c898bee062b35e11f6e3d6ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ffcad582dfa8b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:35:34 2016 +0200 Bug related to Micro Core and distributed monitoring --- .bugs/2524 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.bugs/2524 b/.bugs/2524 new file mode 100644 index 0000000..7332c5c --- /dev/null +++ b/.bugs/2524 @@ -0,0 +1,19 @@ +Title: Distributed Monitoring: Micro Core does need a restart instead of reload to activate the changes +Component: core +State: open +Date: 2016-10-25 12:29:16 +Targetversion: 1.2.8 +Class: bug + +The user is using a distributed monitoring setup with central WATO configuration. +The slave sites are only monitoring a part of the hosts configured on the master and +the site ID is inherited by the folder properties. + +If the user want to fix his broken configuration, because there were changes made on slave sites, the correct +configuration is only used, if the Micro Core is restartet completly. The normal reload does not work. + +Testscenario: +Master and two slave sites. Add some hosts on the Mater site and put add those hosts the the slave sites. +Make some changes on the slave site. Those hosts will be duplicated in the global monitoring. If you +edit the global site settings and make the activation, the hosts does not disappear. Only a cmk -R on the +slave site will fix it. The correct configuration is applied, but will not be actived for monitoring.

7 years, 10 months

Reserved 1 bug IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 40e89f569dd3a421b6247aeb2ba732701ed6cbd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40e89f569dd3a4… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Oct 25 12:29:09 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 29a7357..06ea99c 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2524 +2525

7 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016