Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

windows agent now supports plugins with file extensions that aren' t 3 characters long

by Sebastian Herbord

Module: check_mk Branch: master Commit: fe2989c3456c13bfbbd61d294d90388812c4f19b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe2989c3456c13… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Nov 18 08:53:10 2015 +0100 windows agent now supports plugins with file extensions that aren't 3 characters long --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5361545 -> 5361545 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5361545 -> 5361545 bytes agents/windows/check_mk_agent.cc | 11 +++++++---- agents/windows/check_mk_agent.exe | Bin 4223010 -> 4223010 bytes agents/windows/check_mk_agent.msi | Bin 9908224 -> 9908224 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4223010 -> 4223010 bytes agents/windows/install_agent-64.exe | Bin 1278652 -> 1278681 bytes agents/windows/install_agent.exe | Bin 1161631 -> 1161640 bytes 9 files changed, 8 insertions(+), 5 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index bb33380..775971e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -646 +648 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 91db67c..840dbf5 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 00a3947..c76c4f2 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b74f3b7..668eb7a 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2292,11 +2292,14 @@ bool banned_exec_name(char *name) if (strlen(name) < 5) return false; - char *extension = name + strlen(name) - 4; + const char *extension = strrchr(name, '.'); + if (extension == NULL) { + // ban files without extension + return true; + } + if (g_config->executeSuffixes().size()) { - if (extension[0] != '.') - return true; - extension ++; + ++extension; for (execute_suffixes_t::const_iterator it_ex = g_config->executeSuffixes().begin(); it_ex != g_config->executeSuffixes().end(); ++it_ex) if (!strcasecmp(extension, it_ex->c_str())) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e872661..883c27d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 6a2e31a..0660837 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 2b9cce5..9ab3fe6 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 444c69c..e3a792f 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index c0ae7a4..51c127b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

Explicit operators are C++11-only. *sigh*...

by Sven Panne

Module: check_mk Branch: master Commit: 7304aaa2b1a5a178f6c1ac6546f95bd206c1acbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7304aaa2b1a5a1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 17 17:38:09 2015 +0100 Explicit operators are C++11-only. *sigh*... --- livestatus/src/Mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Mutex.h b/livestatus/src/Mutex.h index b48a4f8..5085dd8 100644 --- a/livestatus/src/Mutex.h +++ b/livestatus/src/Mutex.h @@ -223,7 +223,7 @@ public: } bool owns_lock() const { return _owns_lock; } - explicit operator bool() const { return owns_lock(); } + operator bool() const { return owns_lock(); } // explicit mutex_type *mutex() const { return _mutex; } private: unique_lock(const unique_lock &); // = delete;

8 years, 7 months

New plugin for checking Check_MK agent updates

by Mathias Kettner

Module: check_mk Branch: master Commit: 256cbedcb27bf3c5cde46eacf69fe8e2602e8c2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=256cbedcb27bf3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 17 17:38:08 2015 +0100 New plugin for checking Check_MK agent updates This is not yet useful since the update mechanism itself is not yet finished. --- agents/plugins/.f12 | 2 +- checkman/check_mk.agent_update | 9 +++++ checks/check_mk | 85 ++++++++++++++++++++++++++++++++++++++++ web/htdocs/lib.py | 6 ++- 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/agents/plugins/.f12 b/agents/plugins/.f12 index 184bd99..a6cfba2 100755 --- a/agents/plugins/.f12 +++ b/agents/plugins/.f12 @@ -3,4 +3,4 @@ SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} # sudo mkdir -p /usr/lib/check_mk_agent/plugins # sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true -sudo rsync --delete -va ./ /omd/sites/$SITE/share/check_mk/agents/plugins/ +sudo rsync -va ./ /omd/sites/$SITE/share/check_mk/agents/plugins/ diff --git a/checkman/check_mk.agent_update b/checkman/check_mk.agent_update new file mode 100644 index 0000000..a0353bf --- /dev/null +++ b/checkman/check_mk.agent_update @@ -0,0 +1,9 @@ +title: Check automatic agent deployments of Check_MK Agent +agents: linux, windows +catalog: generic +license: GPL +distribution: check_mk +description: + This plugin makes sure that the Check_MK agent deploy mechanism (if used) + is working properly. It checks the time of the last successful connect + to the deployment server and if there are any error messages. diff --git a/checks/check_mk b/checks/check_mk index 21543b5..2937c0a 100644 --- a/checks/check_mk +++ b/checks/check_mk @@ -25,6 +25,14 @@ # Boston, MA 02110-1301 USA. +# .--only_from-----------------------------------------------------------. +# | _ __ | +# | ___ _ __ | |_ _ / _|_ __ ___ _ __ ___ | +# | / _ \| '_ \| | | | | | |_| '__/ _ \| '_ ` _ \ | +# | | (_) | | | | | |_| | | _| | | (_) | | | | | | | +# | \___/|_| |_|_|\__, |___|_| |_| \___/|_| |_| |_| | +# | |___/_____| | +# '----------------------------------------------------------------------' # Target value for agent's IP access configuration. Only if this # is not None, the inventory will create services @@ -97,3 +105,80 @@ check_info["check_mk.only_from"] = { 'inventory_function': inventory_only_from, 'service_description': 'Check_MK Agent Access', } + + +#. +# .--agent_update--------------------------------------------------------. +# | _ _ _ | +# | __ _ __ _ ___ _ __ | |_ _ _ _ __ __| | __ _| |_ ___ | +# | / _` |/ _` |/ _ \ '_ \| __| | | | | '_ \ / _` |/ _` | __/ _ \ | +# | | (_| | (_| | __/ | | | |_ | |_| | |_) | (_| | (_| | || __/ | +# | \__,_|\__, |\___|_| |_|\__|___\__,_| .__/ \__,_|\__,_|\__\___| | +# | |___/ |_____| |_| | +# '----------------------------------------------------------------------' + +# Example output from agent: +# <<<check_mk>>> +# AgentUpdate: last_check 1447777834.22 last_update 1447776761.52 aghash e33d0cebcf7404d9 error None + + +def inventory_cmk_agent_update(info): + for line in info: + if line[0] == "AgentUpdate:": + return [ (None, {}) ] + +def check_cmk_agent_update(_no_item, _no_params, info): + def output_age(text): + if text == "None": + return "never" + else: + return "%s ago" % (get_age_human_readable(time.time() - float(text))) + + for line in info: + if line[0] == "AgentUpdate:": + parsed = {} + parts = line[1:] + while parts: + key = parts[0] + if key == "error": + value = " ".join(parts[1:]) + parts = [] + else: + value = parts[1] + parts = parts[2:] + parsed[key] = value + + now = time.time() + + try: + last_check = float(parsed["last_check"]) + age = now - last_check + warn, crit = (3600 * 24, 2 * 3600 * 24) + if age > crit: + state = 2 + elif age > warn: + state = 1 + else: + state = 0 + if state: + levels_text = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) + else: + levels_text = "" + yield state, "last update check: " + output_age(parsed["last_check"]) + levels_text + except: + yield 1, "no successful connect to server yet" + + yield 0, "last agent update: %s" % output_age(parsed["last_update"]) + if parsed["aghash"] != "None": + yield 0, "agent configuration: %s" % parsed["aghash"] + if parsed["error"] != "None": + yield 2, "error: %s" % parsed["error"] + else: + yield 0, "no errors" + + +check_info["check_mk.agent_update"] = { + 'check_function' : check_cmk_agent_update, + 'inventory_function' : inventory_cmk_agent_update, + 'service_description' : 'Check_MK Agent' +} diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 110c144..433be23 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -187,12 +187,12 @@ def make_utf8(x): # because of loss of entropy. So we hope /dev/urandom is enough. # Furthermore we filter out non-printable characters. The byte # 0x00 for example does not make it through HTTP and the URL. -def get_random_string(size): +def get_random_string(size, from_ascii=48, to_ascii=90): secret = "" urandom = file("/dev/urandom") while len(secret) < size: c = urandom.read(1) - if ord(c) >= 48 and ord(c) <= 90: + if ord(c) >= from_ascii and ord(c) <= to_ascii: secret += c return secret @@ -438,6 +438,8 @@ def num_split(s): def cmp_service_name_equiv(r): if r == "Check_MK": + return -6 + elif r == "Check_MK Agent": return -5 elif r == "Check_MK Discovery": return -4

8 years, 7 months

#2769 Verifying that the Check_MK GUI is not used with Apache threaded MPM (e.g. worker)

by Lars Michelsen

Module: check_mk Branch: master Commit: ab8e174860a687fc6be73b48f5d53b6ed7b09b7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab8e174860a687… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 17:13:27 2015 +0100 #2769 Verifying that the Check_MK GUI is not used with Apache threaded MPM (e.g. worker) --- .werks/2769 | 9 +++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2769 b/.werks/2769 new file mode 100644 index 0000000..0882261 --- /dev/null +++ b/.werks/2769 @@ -0,0 +1,9 @@ +Title: Verifying that the Check_MK GUI is not used with Apache threaded MPM (e.g. worker) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1447776771 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bc56a72..87617b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 2684 Added icons for downloading agent data / walks of hosts... * 2713 New bookmark lists, strucutrable and shareable between users... * 2768 SHowing number of unacknowledged incompatible changes in sidebar header + * 2769 Verifying that the Check_MK GUI is not used with Apache threaded MPM (e.g. worker) * 2680 FIX: LDAP: Fixed exception when syncing groups using configurations from previous versions... * 2435 FIX: New graphing system: fixed broken graphs for iSCSI checks... * 2696 FIX: Fixed broken perfometer for update checks diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index d2ae6ca..b2a8ccc 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. from mod_python import Cookie, util, apache -from lib import make_utf8 +from lib import make_utf8, MKGeneralException import htmllib import os, time, config, weblib, re import defaults @@ -66,10 +66,20 @@ class html_mod_python(htmllib.html): self.set_output_format(self.var("output_format", "html")) + def verify_not_using_threaded_mpm(self): + if apache.mpm_query(apache.AP_MPMQ_IS_THREADED) != 0: + raise MKGeneralException( + _("You are trying to Check_MK together with a threaded Apache multiprocessing module (MPM). " + "Check_MK is only working with the prefork module. Please change the MPM module to make " + "Check_MK work.")) + + # Initializes the operation mode of the html() object. This is called # after the ChecK_MK GUI configuration has been loaded, so it is safe # to rely on the config. def init_modes(self): + self.verify_not_using_threaded_mpm() + self.init_screenshot_mode() self.init_debug_mode() self.set_buffering(config.buffered_http_stream)

8 years, 7 months

Added defer_lock_t/try_to_lock_t/unique_lock.

by Sven Panne

Module: check_mk Branch: master Commit: 36105dd20a279ff79e448f046fb80b3856eaddb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36105dd20a279f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 17 17:04:46 2015 +0100 Added defer_lock_t/try_to_lock_t/unique_lock. The stuff is slightly incomplete due to our ancient GCC 4.3 compilers, but it should suffice for our needs until we can fully switch to C++11. --- livestatus/src/Mutex.h | 141 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 135 insertions(+), 6 deletions(-) diff --git a/livestatus/src/Mutex.h b/livestatus/src/Mutex.h index 44d20b2..b48a4f8 100644 --- a/livestatus/src/Mutex.h +++ b/livestatus/src/Mutex.h @@ -29,6 +29,7 @@ #include <errno.h> #include <pthread.h> #include <string.h> +#include <algorithm> #include <stdexcept> #include <string> @@ -36,6 +37,13 @@ namespace mk { +// Alas, system_error is a C++11 feature, so we throw its superclass. +inline void throw_system_error(int err) +{ + throw std::runtime_error(std::string(strerror(err))); +} + + class mutex { public: typedef pthread_mutex_t *native_handle_type; @@ -56,9 +64,7 @@ private: static void check(int status) { - if (status != 0) { - throw std::runtime_error(std::string(strerror(status))); - } + if (status != 0) throw_system_error(status); } pthread_mutex_t _mutex; @@ -92,19 +98,26 @@ private: static void check(int status) { - if (status != 0) { - throw std::runtime_error(std::string(strerror(status))); - } + if (status != 0) throw_system_error(status); } pthread_mutex_t _mutex; }; +struct defer_lock_t { +}; +const defer_lock_t defer_lock = {}; // constexpr + +struct try_to_lock_t { +}; +const try_to_lock_t try_to_lock = {}; // constexpr + struct adopt_lock_t { }; const adopt_lock_t adopt_lock = {}; // constexpr + template <typename Mutex> class lock_guard { public: @@ -119,6 +132,122 @@ private: mutex_type &_mutex; }; + +template <typename Mutex> +class unique_lock { +public: + typedef Mutex mutex_type; + + unique_lock() : _mutex(0), _owns_lock(false) {} + explicit unique_lock(mutex_type &m) + : _mutex(addressOf(m)), _owns_lock(false) + { + lock(); + _owns_lock = true; + } + + unique_lock(mutex_type &m, defer_lock_t) + : _mutex(addressOf(m)), _owns_lock(false) + { + } + + unique_lock(mutex_type &m, try_to_lock_t) + : _mutex(addressOf(m)), _owns_lock(_mutex->try_lock()) + { + } + + unique_lock(mutex_type &m, adopt_lock_t) + : _mutex(addressOf(m)), _owns_lock(true) + { + } + + // template<typename Clock, typename Duration> + // unique_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& + // atime) + + // template<typename Rep, typename Period> + // unique_lock(mutex_type& m, const chrono::duration<_Rep, _Period>& + // __rtime) + + ~unique_lock() + { + if (_owns_lock) unlock(); + } + + // unique_lock(unique_lock&& other) + // unique_lock& operator=(unique_lock&& other) + + void lock() + { + if (!_mutex) throw_system_error(EPERM); + if (_owns_lock) throw_system_error(EDEADLK); + _mutex->lock(); + _owns_lock = true; + } + + bool try_lock() + { + if (!_mutex) throw_system_error(EPERM); + if (_owns_lock) throw_system_error(EDEADLK); + _owns_lock = _mutex->try_lock(); + return _owns_lock; + } + + // template<typename Clock, typename Duration> + // bool try_lock_until(const chrono::time_point<Clock, Duration>& atime) + + // template<typename Rep, typename Period> + // bool try_lock_for(const chrono::duration<Rep, Period>& rtime) + + void unlock() + { + if (!_owns_lock) throw_system_error(EPERM); + if (_mutex) { + _mutex->unlock(); + _owns_lock = false; + } + } + + void swap(unique_lock &other) + { + std::swap(_mutex, other._mutex); + std::swap(_owns_lock, other._owns_lock); + } + + mutex_type *release() + { + mutex_type *ret = _mutex; + _mutex = 0; + _owns_lock = false; + return ret; + } + + bool owns_lock() const { return _owns_lock; } + explicit operator bool() const { return owns_lock(); } + mutex_type *mutex() const { return _mutex; } +private: + unique_lock(const unique_lock &); // = delete; + unique_lock &operator=(const unique_lock &); // = delete; + + mutex_type *_mutex; + bool _owns_lock; + + // basically std::addressof from C++11's <memory> + template <typename T> + inline T *addressOf(T &x) + { + return reinterpret_cast<T *>( + &const_cast<char &>(reinterpret_cast<const volatile char &>(x))); + } +}; + + +template <typename Mutex> +void swap(unique_lock<Mutex> &x, unique_lock<Mutex> &y) +{ + x.swap(y); +} + } // namespace mk #endif // Mutex_h

8 years, 7 months

#2768 SHowing number of unacknowledged incompatible changes in sidebar header

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ece7f9c2104bcee29f452fbf936d0a36812ff51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ece7f9c2104bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 17 16:37:30 2015 +0100 #2768 SHowing number of unacknowledged incompatible changes in sidebar header --- .werks/2768 | 9 +++++++++ ChangeLog | 3 ++- web/htdocs/sidebar.css | 12 ++++++++++++ web/htdocs/sidebar.py | 24 +++++++++++++++--------- web/htdocs/werks.py | 6 +++++- 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/.werks/2768 b/.werks/2768 new file mode 100644 index 0000000..2b53e81 --- /dev/null +++ b/.werks/2768 @@ -0,0 +1,9 @@ +Title: SHowing number of unacknowledged incompatible changes in sidebar header +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1447774629 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9e6912a..5228b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ Multisite: * 2684 Added icons for downloading agent data / walks of hosts... * 2713 New bookmark lists, strucutrable and shareable between users... + * 2768 SHowing number of unacknowledged incompatible changes in sidebar header * 2680 FIX: LDAP: Fixed exception when syncing groups using configurations from previous versions... * 2435 FIX: New graphing system: fixed broken graphs for iSCSI checks... * 2696 FIX: Fixed broken perfometer for update checks @@ -120,7 +121,7 @@ * 2760 FIX: Fixed case where "activate changes" was not commiting the pending changes entries correctly... * 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded * 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for classical checks... - * 2793 FIX: Prevent python unicode warnings for services with umlauts... + * 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with umlauts... Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b7f96dd..fb029f5 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -113,6 +113,18 @@ body.side.screenshotmode { text-decoration: underline; } +#side_version span.unack_werks { + z-index: 15; + cursor: pointer; + background-color: #f00; + color: #fff; + padding: 2px; + border-radius: 10px; + position: absolute; + right: -12px; + top: 5px; +} + /* Scrolling part with snapins */ #side_content { z-index: 5; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 05d3bb4..b80b27b 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import config, defaults, livestatus, views, pprint, os, copy, userdb, pagetypes -import notify, urlparse +import notify, werks, urlparse from lib import * # Constants to be used in snapins @@ -172,14 +172,20 @@ def get_check_mk_edition_title(): def sidebar_head(): html.write('<div id="side_header">') html.write('<div id="side_fold"></div>') - html.write('<a title="%s" target="main" href="%s">' - '<img id="side_bg" src="images/sidebar_top.png">' - '<div id="side_version"><a href="version.py" target="main">%s<br>%s</a></div>' - '</a>' - '</div>\n' % (_("Go to main overview"), - html.attrencode(config.user.get("start_url") or config.start_url), - get_check_mk_edition_title(), - defaults.check_mk_version)) + html.write('<a title="%s" target="main" href="%s">' % + (_("Go to main overview"), html.attrencode(config.user.get("start_url") or config.start_url))) + html.write('<img id="side_bg" src="images/sidebar_top.png">') + html.write('<div id="side_version">' + '<a href="version.py" target="main" title=\"%s\">%s<br>%s' % + (_("Open release notes"), get_check_mk_edition_title(), defaults.check_mk_version)) + if werks.may_acknowledge(): + num_unacknowledged_werks = werks.num_unacknowledged_incompatible_werks() + if num_unacknowledged_werks: + html.write("<span title=\"%s\" class=\"unack_werks\">%d</span>" % + (_("%d unacknowledged incompatible werks") % num_unacknowledged_werks, num_unacknowledged_werks)) + html.write('</a></div>') + html.write('</a></div>\n') + def render_messages(): for msg in notify.get_gui_messages(): diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 9bba4ab..f163aac 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -235,6 +235,11 @@ def unacknowledged_incompatible_werks(): if werk["compatible"] == "incomp_unack"]) +def num_unacknowledged_incompatible_werks(): + load_werks() + return len(unacknowledged_incompatible_werks()) + + werk_table_option_entries = [ ( "classes", "double", @@ -567,4 +572,3 @@ def insert_manpage_links(text): def werks_sorted_by_date(werks): return sorted(werks, cmp = lambda a, b: -cmp(a["date"], b["date"])) -

8 years, 7 months

Updated bug entries #2179

by Andreas Boesl

Module: check_mk Branch: master Commit: 4bc15176b5019cefb9a34547d7745a04c7ad34b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bc15176b5019c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 16:30:16 2015 +0100 Updated bug entries #2179 --- .bugs/2179 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2179 b/.bugs/2179 new file mode 100644 index 0000000..0f16307 --- /dev/null +++ b/.bugs/2179 @@ -0,0 +1,12 @@ +Title: obscure check passwords in the web gui and command line +Component: checks +State: open +Date: 2015-11-17 16:22:42 +Targetversion: future +Class: phantasm + +Introduce a magic key which is stored in the omd site. +All passwords used by active checks or special agents are scrambled with this key. +We need a mechanism to detect scrambled keys in command lines. +Right before the execution, Check_MK unscrambles the password and executes the active check +or special agent call.

8 years, 7 months

Updated bug entries #2178

by Andreas Boesl

Module: check_mk Branch: master Commit: 2e41d91c1928e4b4222f24e631baf96a587a4562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e41d91c1928e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 16:22:09 2015 +0100 Updated bug entries #2178 --- .bugs/2178 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2178 b/.bugs/2178 new file mode 100644 index 0000000..bb95cd5 --- /dev/null +++ b/.bugs/2178 @@ -0,0 +1,8 @@ +Title: new helper function for checks: render_levels(warn, crit, what = "upper", unit = "") +Component: checks +State: open +Date: 2015-11-17 16:19:35 +Targetversion: future +Class: feature + +This function will streamline the numerous check output variations.

8 years, 7 months

#2795 FIX mkeventd: send email action did not work if message text contains umlauts

by Andreas Boesl

Module: check_mk Branch: master Commit: 519c27008372895f93ec8f312708737ef781b8e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=519c2700837289… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 17 16:07:33 2015 +0100 #2795 FIX mkeventd: send email action did not work if message text contains umlauts This werk fixes an encoding exception within the event console. Message texts like <i>"This wüll break"</i> will no longer cause trouble. --- .werks/2795 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2795 b/.werks/2795 new file mode 100644 index 0000000..020b62c --- /dev/null +++ b/.werks/2795 @@ -0,0 +1,10 @@ +Title: mkeventd: send email action did not work if message text contains umlauts +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i4 +Date: 1447772581 +Class: fix + +This werk fixes an encoding exception within the event console. +Message texts like <i>"This wüll break"</i> will no longer cause trouble. diff --git a/ChangeLog b/ChangeLog index dcec0cb..474e83d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 2733 Visibility of Event Console events more flexible now... * 2719 FIX: Events Check: Links to EC were broken when using regular expressions as application... * 2757 FIX: Events Check: Fixed check finding too many events (host search was infix search instead of full match)... + * 2795 FIX: mkeventd: send email action did not work if message text contains umlauts... Livestatus: * 2743 FIX: Fixed handling of column types in "GET columns"... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 10a6daf..f25ab57 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3251,7 +3251,7 @@ def do_event_action(action, event, user=""): if action_type == 'email': to = substitute_event_tags(settings["to"], event) subject = substitute_event_tags(settings["subject"], event) - body = substitute_event_tags(settings["body"], event) + body = to_utf8(substitute_event_tags(settings["body"], event)) send_email(to, subject, body) log_event_history(event, "EMAIL", user, "%s|%s" % (to, subject)) elif action_type == 'script':

8 years, 7 months

#2712 FIX winperf_processor: this check no longer requires multiple check cycles before counters are initialized

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2928875392a601a23dbd96189437e0ab2bb923b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2928875392a601… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Nov 17 15:22:44 2015 +0100 #2712 FIX winperf_processor: this check no longer requires multiple check cycles before counters are initialized --- .werks/2712 | 9 +++++++++ ChangeLog | 1 + checks/winperf_processor | 31 ++++++++++++++++++++++++------- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.werks/2712 b/.werks/2712 new file mode 100644 index 0000000..ef4feba --- /dev/null +++ b/.werks/2712 @@ -0,0 +1,9 @@ +Title: winperf_processor: this check no longer requires multiple check cycles before counters are initialized +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447770063 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 722fa61..215086d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 2766 FIX: juniper_fru: Don't discover devices reported as "empty"... * 2790 FIX: check_dns: now able to configure milliseconds as expected response time... * 2794 FIX: The encoding parameter set in the agent sections was not working... + * 2712 FIX: winperf_processor: this check no longer requires multiple check cycles before counters are initialized Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_processor b/checks/winperf_processor index c385508..21345a8 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -50,6 +50,9 @@ def check_winperf_util(_no_item, params, info): what_map = { "-232": "util", "-96": "user", "-94": "privileged"} + + wrapped = False + for line in info[1:]: if line[0] in what_map: what = what_map[line[0]] @@ -57,7 +60,12 @@ def check_winperf_util(_no_item, params, info): # sums up to total (called _Total). We only need that last value. ticks = int(line[-2]) num_cpus = len(line) - 3 - ticks_per_sec = get_rate("winperf_util.%s" % what, this_time, ticks, onwrap = RAISE) + try: + ticks_per_sec =\ + get_rate("winperf_util.%s" % what, this_time, ticks, onwrap = RAISE) + except MKCounterWrapped: + wrapped = True + ticks_per_sec = 0 # We get the value of the PERF_100NSEC_TIMER_INV here. # This counter type shows the average percentage of active time observed # during the sample interval. This is an inverse counter. Counters of this @@ -83,23 +91,32 @@ def check_winperf_util(_no_item, params, info): cores = [] for i in range(num_cpus): core_ticks = int(line[1 + i]) - core_ticks_per_sec = get_rate("winperf_util.core%d.util" % i, this_time, - core_ticks, onwrap = RAISE) + try: + core_ticks_per_sec = get_rate("winperf_util.core%d.util" % i, this_time, + core_ticks, onwrap = RAISE) + except MKCounterWrapped: + wrapped = True + core_ticks_per_sec = 0 core_cpusecs_per_sec = core_ticks_per_sec / 10000000.0 core_used_perc = 100.0 * (1 - core_cpusecs_per_sec) # clamp percentage to the range 0-100 core_used_perc = min(100.0, max(0.0, core_used_perc)) cores.append(("core%d" % i, core_used_perc)) - for status, infotext, perfdata in check_cpu_util(used_perc, params, this_time, cores): - if perfdata and perfdata[0][0] == "util": - perfdata[0] = perfdata[0][:5] + (num_cpus,) - yield status, infotext, perfdata + if not wrapped: + for status, infotext, perfdata in check_cpu_util(used_perc, params, + this_time, cores): + if perfdata and perfdata[0][0] == "util": + perfdata[0] = perfdata[0][:5] + (num_cpus,) + yield status, infotext, perfdata elif what == "user": yield 0, "%s perc: %.1f %%" % (what, used_perc), [(what, used_perc)] else: # privileged yield 0, "%s perc: %.1f %%" % (what, used_perc) + if wrapped: + # all counters initialized, NOW we can raise the exception + raise MKCounterWrapped("Counter wrap, skipping checks this time") yield 0, "%d CPUs" % num_cpus

8 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015