Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Jukka Aro

Module: check_mk Branch: master Commit: 9dcff9b8b44cedfed7140899ef1ebd2770f6b783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dcff9b8b44ced… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Mar 13 15:02:09 2018 +0100 Win-agent: const correctness fixes 2 Declare two members of SectionCheckMK as const. Move createInfoFields to a standalone function in anonymous namespace. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionCheckMK.cc | 51 +++++++++++++++++-------------- agents/windows/sections/SectionCheckMK.h | 9 +++--- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 01e0503..e145c6a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3168 +3170 diff --git a/agents/windows/sections/SectionCheckMK.cc b/agents/windows/sections/SectionCheckMK.cc index 4e7601c..d1092ec 100644 --- a/agents/windows/sections/SectionCheckMK.cc +++ b/agents/windows/sections/SectionCheckMK.cc @@ -31,17 +31,9 @@ #include "Logger.h" #include "stringutil.h" -SectionCheckMK::SectionCheckMK(Configuration &config, - OnlyFromConfigurable &only_from, - script_statistics_t &script_statistics, - Logger *logger, const WinApiAdaptor &winapi) - : Section("check_mk", "check_mk", config.getEnvironment(), logger, winapi) - , _crash_debug(config, "global", "crash_debug", false, winapi) - , _only_from(only_from) - , _info_fields(createInfoFields()) - , _script_statistics(script_statistics) {} +namespace { -std::vector<KVPair> SectionCheckMK::createInfoFields() const { +std::vector<KVPair> createInfoFields(const Environment &env) { #ifdef ENVIRONMENT32 const char *arch = "32bit"; #else @@ -53,24 +45,37 @@ std::vector<KVPair> SectionCheckMK::createInfoFields() const { {"Version", CHECK_MK_VERSION}, {"BuildDate", __DATE__}, {"AgentOS", "windows"}, - {"Hostname", _env.hostname()}, + {"Hostname", env.hostname()}, {"Architecture", arch}, - {"WorkingDirectory", _env.currentDirectory()}, - {"ConfigFile", configFileName(false, _env)}, - {"LocalConfigFile", configFileName(true, _env)}, - {"AgentDirectory", _env.agentDirectory()}, - {"PluginsDirectory", _env.pluginsDirectory()}, - {"StateDirectory", _env.stateDirectory()}, - {"ConfigDirectory", _env.configDirectory()}, - {"TempDirectory", _env.tempDirectory()}, - {"LogDirectory", _env.logDirectory()}, - {"SpoolDirectory", _env.spoolDirectory()}, - {"LocalDirectory", _env.localDirectory()}}; + {"WorkingDirectory", env.currentDirectory()}, + {"ConfigFile", configFileName(false, env)}, + {"LocalConfigFile", configFileName(true, env)}, + {"AgentDirectory", env.agentDirectory()}, + {"PluginsDirectory", env.pluginsDirectory()}, + {"StateDirectory", env.stateDirectory()}, + {"ConfigDirectory", env.configDirectory()}, + {"TempDirectory", env.tempDirectory()}, + {"LogDirectory", env.logDirectory()}, + {"SpoolDirectory", env.spoolDirectory()}, + {"LocalDirectory", env.localDirectory()}}; return info_fields; } -bool SectionCheckMK::produceOutputInner(std::ostream &out, const std::optional<std::string> &) { +} // namespace + +SectionCheckMK::SectionCheckMK(Configuration &config, + OnlyFromConfigurable &only_from, + script_statistics_t &script_statistics, + Logger *logger, const WinApiAdaptor &winapi) + : Section("check_mk", "check_mk", config.getEnvironment(), logger, winapi) + , _crash_debug(config, "global", "crash_debug", false, winapi) + , _only_from(only_from) + , _info_fields(createInfoFields(_env)) + , _script_statistics(script_statistics) {} + +bool SectionCheckMK::produceOutputInner(std::ostream &out, + const std::optional<std::string> &) { Debug(_logger) << "SectionCheckMK::produceOutputInner"; // output static fields for (const auto & [ label, value ] : _info_fields) { diff --git a/agents/windows/sections/SectionCheckMK.h b/agents/windows/sections/SectionCheckMK.h index d17f033..49ba4de 100644 --- a/agents/windows/sections/SectionCheckMK.h +++ b/agents/windows/sections/SectionCheckMK.h @@ -41,13 +41,12 @@ public: const WinApiAdaptor &winapi); protected: - virtual bool produceOutputInner(std::ostream &out, const std::optional<std::string> &) override; + virtual bool produceOutputInner( + std::ostream &out, const std::optional<std::string> &) override; private: - std::vector<KVPair> createInfoFields() const; - - Configurable<bool> _crash_debug; - OnlyFromConfigurable &_only_from; + const Configurable<bool> _crash_debug; + const OnlyFromConfigurable &_only_from; // static fields const std::vector<KVPair> _info_fields;

6 years, 6 months

Added Filter::partialFilter(), considerably simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: f768fe3268a9de18f10c974f195ac39cb9ac7056 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f768fe3268a9de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 13 13:18:47 2018 +0100 Added Filter::partialFilter(), considerably simplifying things. Note that Query::filter() returns a plain Filter now, not an AndingFilter. This was a long-standing typing wart... Change-Id: I962b758c1a416893a186c34ce3a5faa8a92f1bce --- livestatus/src/AndingFilter.cc | 12 +++-- livestatus/src/AndingFilter.h | 8 ++-- .../src/{FilterVisitor.h => ColumnFilter.cc} | 29 ++++++------ livestatus/src/ColumnFilter.h | 14 +++--- livestatus/src/Filter.h | 6 ++- livestatus/src/Makefile.am | 1 + livestatus/src/OringFilter.cc | 12 +++-- livestatus/src/OringFilter.h | 8 ++-- livestatus/src/Query.cc | 1 + livestatus/src/Query.h | 8 +--- livestatus/src/TableStateHistory.cc | 55 +++------------------- livestatus/src/TableStateHistory.h | 3 +- 12 files changed, 63 insertions(+), 94 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f768fe3268…

6 years, 6 months

5750 Add negate button to the Host Auxiliary Tags filter

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1a5da1b1bd347a238a36a5a1faac040c41522df8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a5da1b1bd347a… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Mar 12 17:24:07 2018 +0100 5750 Add negate button to the Host Auxiliary Tags filter Change-Id: I31974318e3349e2ce27f7ab8620f97b7574aa3a3 --- .werks/5750 | 10 ++++++++++ web/htdocs/views.css | 2 ++ web/plugins/visuals/filters.py | 19 +++++++++++++------ 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.werks/5750 b/.werks/5750 new file mode 100644 index 0000000..e319366 --- /dev/null +++ b/.werks/5750 @@ -0,0 +1,10 @@ +Title: Add negate button to the Host Auxiliary Tags filter +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520871739 +Class: feature + + diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3669055..3614dc0 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -116,6 +116,8 @@ div.floatfilter.double .content { div.floatfilter .content > select { width: 300px; } + +div.floatfilter .content > select.neg, div.floatfilter .content > select#opthost_group, div.floatfilter .content > select#optservice_contact_group, div.floatfilter .content > select#opthost_contact_group, diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 3002855..dd63735 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1194,8 +1194,10 @@ class FilterHostAuxTags(Filter): def __init__(self): self.count = 3 self.prefix = 'host_auxtags' - htmlvars = [ "%s_%d" % (self.prefix, num) - for num in range(self.count) ] + htmlvars = [] + for num in range(self.count): + htmlvars.append("%s_%d" % (self.prefix, num)) + htmlvars.append("%s_%d_neg" % (self.prefix, num)) Filter.__init__(self, name = 'host_auxtags', @@ -1211,11 +1213,14 @@ class FilterHostAuxTags(Filter): def display(self): selection = [] for num in range(self.count): - html.dropdown('%s_%d' % (self.prefix, num), [("", "")] + self.auxtags, sorted=True) + html.dropdown('%s_%d' % (self.prefix, num), [("", "")] + self.auxtags, sorted=True, class_='neg') + html.open_nobr() + html.checkbox('%s_%d_neg' % (self.prefix, num), False, label=_("negate")) + html.close_nobr() - def host_auxtags_filter(self, tag): - return "Filter: host_custom_variables ~ TAGS (^|[ ])%s($|[ ])" % lqencode(tag) + def host_auxtags_filter(self, tag, negate): + return "Filter: host_custom_variables %s~ TAGS (^|[ ])%s($|[ ])" % (negate, lqencode(tag)) def filter(self, infoname): @@ -1227,7 +1232,9 @@ class FilterHostAuxTags(Filter): while html.has_var( '%s_%d' % (self.prefix, num) ): this_tag = html.var( '%s_%d' % (self.prefix, num) ) if this_tag: - headers.append( self.host_auxtags_filter( this_tag ) ) + negate = ("!" if html.get_checkbox('%s_%d_neg' % (self.prefix, num)) + else "") + headers.append(self.host_auxtags_filter(this_tag, negate)) num += 1 if headers:

6 years, 6 months

Rename IDs in views.css to show dropdowns and negate buttons on one line

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a367780faa4b6459c2b8bf9ad81e5340c9791727 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a367780faa4b64… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Mar 12 15:30:43 2018 +0100 Rename IDs in views.css to show dropdowns and negate buttons on one line Change-Id: I6a377df1444dbe34567a013ef49e171bc14dc8b1 --- web/htdocs/views.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index fb0672f..3669055 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -116,11 +116,11 @@ div.floatfilter.double .content { div.floatfilter .content > select { width: 300px; } -div.floatfilter .content > select#opthostgroup, -div.floatfilter .content > select#optservice_contactgroup, -div.floatfilter .content > select#opthost_contactgroup, -div.floatfilter .content > select#optservicegroup { - width: 240px; +div.floatfilter .content > select#opthost_group, +div.floatfilter .content > select#optservice_contact_group, +div.floatfilter .content > select#opthost_contact_group, +div.floatfilter .content > select#optservice_group { + width: 237px; } div.floatfilter .content .multigroup table {

6 years, 6 months

5787 FIX Fixed broken host check command "Always assume to be up"

by Andreas Boesl

Module: check_mk Branch: master Commit: 5253202c7e4e09c2b3cd7868e3c85e345409672c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5253202c7e4e09… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 13 10:36:36 2018 +0100 5787 FIX Fixed broken host check command "Always assume to be up" Hosts with this host check command always got a ping check assigned instead of the <tt>Always up</tt> state. Change-Id: I2fd9db451403cd38394675ab3716b488956aaff2 --- .werks/5787 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5787 b/.werks/5787 new file mode 100644 index 0000000..906d109 --- /dev/null +++ b/.werks/5787 @@ -0,0 +1,11 @@ +Title: Fixed broken host check command "Always assume to be up" +Level: 2 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1520933763 +Class: fix + +Hosts with this host check command always got a ping check assigned instead of the <tt>Always up</tt> state. +

6 years, 6 months

werk 5743: ignore missing ip address

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 03aff37dd204e475bf4394fff29df96ae7e559dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03aff37dd204e4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Mar 13 09:04:38 2018 +0100 werk 5743: ignore missing ip address Change-Id: Ica4ee0aec6169780d189a31cef5e1c5610e41072 --- checks/cisco_ip_sla | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_ip_sla b/checks/cisco_ip_sla index 5101919..4b1ce42 100644 --- a/checks/cisco_ip_sla +++ b/checks/cisco_ip_sla @@ -96,7 +96,7 @@ def parse_cisco_ip_sla(info): elif len(int_list) == 6: return '%d:%d:%d:%d:%d:%d' % tuple(int_list) else: - raise ValueError('Failed to convert %s to IP Address' % repr(int_list)) + return '' #contains description, parse function, unit and type contents = [

6 years, 6 months

Win-agent: Replace MultiByteToWideChar

by Jukka Aro

Module: check_mk Branch: master Commit: 7b87f3ee6b3db68385ff8c884d7f46da1cb27f91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b87f3ee6b3db6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Mar 12 15:21:59 2018 +0100 Win-agent: Replace MultiByteToWideChar Use std::wstring_convert::from_bytes instead of WinAPI MultiByteToWideChar. This was a TODO leftover item from the commit df323514929740597f21db7c03460cf3ff28515e. There is a known bug in MinGW-w64 / libstdc++.dll that results in incorrect endianness in the conversion. With latest MinGW 5.0.3-1 based on gcc 7.2.0, we can use the workaround of passing the desired endianness (little-endian) as a template parameter to std::codecvt_utf8. --- agents/windows/WinApi.cc | 7 ------- agents/windows/WinApi.h | 4 ---- agents/windows/WinApiAdaptor.h | 4 ---- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 4 ++-- agents/windows/stringutil.cc | 26 -------------------------- agents/windows/stringutil.h | 6 +++++- agents/windows/test/MockWinApi.h | 4 ---- 8 files changed, 8 insertions(+), 49 deletions(-) diff --git a/agents/windows/WinApi.cc b/agents/windows/WinApi.cc index 0aea396..b68051d 100644 --- a/agents/windows/WinApi.cc +++ b/agents/windows/WinApi.cc @@ -466,13 +466,6 @@ HLOCAL WinApi::LocalAlloc(UINT uFlags, SIZE_T uBytes) const { HLOCAL WinApi::LocalFree(HLOCAL hMem) const { return ::LocalFree(hMem); } -int WinApi::MultiByteToWideChar(UINT CodePage, DWORD dwFlags, - LPCCH lpMultiByteStr, int cbMultiByte, - LPWSTR lpWideCharStr, int cchWideChar) const { - return ::MultiByteToWideChar(CodePage, dwFlags, lpMultiByteStr, cbMultiByte, - lpWideCharStr, cchWideChar); -} - HANDLE WinApi::OpenProcess(DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId) const { return ::OpenProcess(dwDesiredAccess, bInheritHandle, dwProcessId); diff --git a/agents/windows/WinApi.h b/agents/windows/WinApi.h index 6ab2f91..719f4a0 100644 --- a/agents/windows/WinApi.h +++ b/agents/windows/WinApi.h @@ -220,10 +220,6 @@ public: virtual HMODULE LoadLibraryW(LPCWSTR lpLibFileName) const override; virtual HLOCAL LocalAlloc(UINT uFlags, SIZE_T uBytes) const override; virtual HLOCAL LocalFree(HLOCAL hMem) const override; - virtual int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, - LPCCH lpMultiByteStr, int cbMultiByte, - LPWSTR lpWideCharStr, - int cchWideChar) const override; virtual HANDLE OpenProcess(DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId) const override; virtual WINBOOL MoveFile(LPCSTR lpExistingFileName, diff --git a/agents/windows/WinApiAdaptor.h b/agents/windows/WinApiAdaptor.h index 4ae90f5..788eef9 100644 --- a/agents/windows/WinApiAdaptor.h +++ b/agents/windows/WinApiAdaptor.h @@ -267,10 +267,6 @@ public: virtual HMODULE LoadLibraryW(LPCWSTR lpLibFileName) const = 0; virtual HLOCAL LocalAlloc(UINT uFlags, SIZE_T uBytes) const = 0; virtual HLOCAL LocalFree(HLOCAL hMem) const = 0; - virtual int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, - LPCCH lpMultiByteStr, int cbMultiByte, - LPWSTR lpWideCharStr, - int cchWideChar) const = 0; virtual HANDLE OpenProcess(DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId) const = 0; virtual WINBOOL MoveFile(LPCSTR lpExistingFileName, diff --git a/agents/windows/build_version b/agents/windows/build_version index a4c2c8d..98ee87f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3164 +3166 diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 04a646c..848c6ac 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -424,8 +424,8 @@ std::unique_ptr<IEventLog> SectionEventlog::openEventlog( Debug(_logger) << " - event log \"" << logname << "\":"; try { - std::unique_ptr<IEventLog> log(open_eventlog( - to_utf16(logname.c_str(), _winapi), *_vista_api, _logger, _winapi)); + std::unique_ptr<IEventLog> log( + open_eventlog(to_utf16(logname), *_vista_api, _logger, _winapi)); Debug(_logger) << " . successfully opened event log"; out << "[[[" << logname << "]]]\n"; diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 534a97d..eaf31a6 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -36,32 +36,6 @@ int parse_boolean(const char *value) { return -1; } -wstring to_utf16(const char *input, const WinApiAdaptor &winapi) { - // TODO: Use std::wstring_convert<std::codecvt_utf8<wchar_t>>().from_bytes - // instead of WinAPI MultiByteToWideChar. Unfortunately, from_bytes is - // broken in currently known versions of MinGW (or, more precisely, - // libstdc++.dll. We need to wait until there is a fix for this available. - wstring result; - // preflight: how many bytes to we need? - int required_size = - winapi.MultiByteToWideChar(CP_UTF8, 0, input, -1, NULL, 0); - if (required_size == 0) { - // conversion failure. What to do? - return wstring(); - } - result.resize(required_size); - - // real conversion - winapi.MultiByteToWideChar(CP_UTF8, 0, input, -1, &result[0], - required_size); - - // strip away the zero termination. This is necessary, otherwise the stored - // string length in the string is wrong - result.resize(required_size - 1); - - return result; -} - bool ci_compare_pred(unsigned char lhs, unsigned char rhs) { return std::tolower(lhs) == std::tolower(rhs); } diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 011f21e..4c9d355 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -124,7 +124,11 @@ inline std::string to_utf8(const std::wstring &input) { return std::wstring_convert<std::codecvt_utf8<wchar_t>>().to_bytes(input); } -std::wstring to_utf16(const char *input, const WinApiAdaptor &winapi); +inline std::wstring to_utf16(const std::string &input) { + return std::wstring_convert< + std::codecvt_utf8<wchar_t, 0x10ffff, std::little_endian>>() + .from_bytes(input); +} struct Utf8 { explicit Utf8(const std::wstring &value) : _value(value) {} diff --git a/agents/windows/test/MockWinApi.h b/agents/windows/test/MockWinApi.h index 804d281..9a5c749 100644 --- a/agents/windows/test/MockWinApi.h +++ b/agents/windows/test/MockWinApi.h @@ -246,10 +246,6 @@ public: MOCK_CONST_METHOD1(LoadLibraryW, HMODULE(LPCWSTR lpLibFileName)); MOCK_CONST_METHOD2(LocalAlloc, HLOCAL(UINT uFlags, SIZE_T uBytes)); MOCK_CONST_METHOD1(LocalFree, HLOCAL(HLOCAL hMem)); - MOCK_CONST_METHOD6(MultiByteToWideChar, - int(UINT CodePage, DWORD dwFlags, LPCCH lpMultiByteStr, - int cbMultiByte, LPWSTR lpWideCharStr, - int cchWideChar)); MOCK_CONST_METHOD3(OpenProcess, HANDLE(DWORD dwDesiredAccess, WINBOOL bInheritHandle, DWORD dwProcessId));

6 years, 6 months

Fixed forgotten ps.include file regarding cpu utilization of processes in Linux

by Marcel Schulte

Module: check_mk Branch: master Commit: fc0a8c85fab0ee67393ccbb9d36344e59068e581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc0a8c85fab0ee… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 12 13:04:12 2018 +0100 Fixed forgotten ps.include file regarding cpu utilization of processes in Linux Change-Id: I2b543f098aece7ad470088707ba1e11c6d58858f --- checks/ps.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index d898d92..b30ca7d 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -439,10 +439,10 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" except MKCounterWrapped, e: cputime = 0 - pcpu = cputime * 100 + pcpu = cputime * 100 / cpu_cores process.append(("pid", (pid, ""))) else: - pcpu = savefloat(process_info[3]) + pcpu = savefloat(process_info[3]) / cpu_cores percent_cpu += pcpu process.append(("cpu usage", (pcpu, "%")))

6 years, 6 months

Fix CPU utilization regarding Linux processes in ps check

by Marcel Schulte

Module: check_mk Branch: master Commit: 82add2dd8741a16bfa46a330e940382dc9cdd6e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82add2dd8741a1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Feb 22 13:02:21 2018 +0100 Fix CPU utilization regarding Linux processes in ps check Change-Id: I1b21836dca3175b632e32f0c93b85b146d6e16e4 --- checks/ps | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/checks/ps b/checks/ps index 74f97f9..9489fc7 100644 --- a/checks/ps +++ b/checks/ps @@ -236,12 +236,15 @@ def parse_ps(info): def inventory_ps(info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info return inventory_ps_common(inventory_processes, inventory_processes_rules, parsed) def check_ps(item, params, info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info + if cpu_info and len(cpu_info[0]) == 6: + cpu_cores = int(cpu_info[0][5]) + if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info: @@ -266,7 +269,7 @@ check_info['ps'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], } # NOTE: This check is deprecated and will be removed any decade now. ps now @@ -279,5 +282,5 @@ check_info['ps.perf'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], }

6 years, 6 months

5910 FIX ups_cps_outphase: Fixed decimal place in current outphase

by Marcel Arentz

Module: check_mk Branch: master Commit: 20ec7dc42c750c4c459981311b6b003caee528f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20ec7dc42c750c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 12 11:21:45 2018 +0100 5910 FIX ups_cps_outphase: Fixed decimal place in current outphase Fixed computation of the current amperage of the outphase. This bug has been introduced directly during the development and is fixed by now. Change-Id: Id9c2273be0d931e03e955c1b3993e96881a6a5f3 --- .werks/5910 | 11 +++++++++++ checks/ups_cps_outphase | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5910 b/.werks/5910 new file mode 100644 index 0000000..f3fcffb --- /dev/null +++ b/.werks/5910 @@ -0,0 +1,11 @@ +Title: ups_cps_outphase: Fixed decimal place in current outphase +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520849908 +Class: fix + +Fixed computation of the current amperage of the outphase. This bug has been +introduced directly during the development and is fixed by now. diff --git a/checks/ups_cps_outphase b/checks/ups_cps_outphase index 8213b8a..042ad7a 100644 --- a/checks/ups_cps_outphase +++ b/checks/ups_cps_outphase @@ -31,7 +31,7 @@ def parse_ups_cps_outphase(info): "voltage" : float(info[0][0]) / 10, "frequency" : float(info[0][1]) / 10, "output_load" : float(info[0][2]), - "current" : float(info[0][3]), + "current" : float(info[0][3]) / 10, } return parsed

6 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018