Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: 16c7a9eb945457999ad1d0870cff6bb0ee2cae11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16c7a9eb945457… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Apr 18 16:44:55 2017 +0200 htmllib: cleaned up inheritence. Change-Id: Iaf1fc267da683f6967b5a518e139af19697501fa --- web/htdocs/htmllib.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 1071697..90e1364 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -91,6 +91,7 @@ class InvalidUserInput(Exception): self.text = text super(InvalidUserInput, self).__init__(varname, text) + class RequestTimeout(MKException): pass @@ -100,9 +101,10 @@ class RequestTimeout(MKException): # class Escaper(object): - - _unescaper_text = re.compile(r'<(/?)(h2|b|tt|i|br(?: /)?|pre|a|sup|p|li|ul|ol)>') - _unescaper_href = re.compile(r'<a href="(.*?)">') + def __init__(self): + super(Escaper, self).__init__() + self._unescaper_text = re.compile(r'<(/?)(h2|b|tt|i|br(?: /)?|pre|a|sup|p|li|ul|ol)>') + self._unescaper_href = re.compile(r'<a href="(.*?)">') # Encode HTML attributes. Replace HTML syntax with HTML text. @@ -171,6 +173,7 @@ class Escaper(object): class Encoder(object): + # This function returns a str object, never unicode! # Beware: this code is crucial for the performance of Multisite! # Changing from the self coded urlencode to urllib.quote @@ -410,6 +413,7 @@ class OutputFunnel(object): def __init__(self): + super(OutputFunnel, self).__init__() self.plug_level = -1 self.plug_text = [] @@ -1355,9 +1359,10 @@ class RequestHandler(object): class html(HTMLGenerator, Encoder, RequestHandler): def __init__(self): - HTMLGenerator.__init__(self) - Encoder.__init__(self) - RequestHandler.__init__(self) + super(html, self).__init__() +# HTMLGenerator.__init__(self) +# Encoder.__init__(self) +# RequestHandler.__init__(self) # rendering state self.html_is_open = False

7 years, 4 months

Refactored perfometer.

by Roland Halbig

Module: check_mk Branch: master Commit: 498d4b8dd8f3fd0f5a78319e3e26c5dce86eba81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=498d4b8dd8f3fd… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Apr 18 13:59:07 2017 +0200 Refactored perfometer. Change-Id: Ic178d1f2a18ad4af4e2269409424d16c250719b8 --- web/plugins/perfometer/check_mk.py | 224 +++++++++++++++---------------------- web/plugins/views/painters.py | 7 +- web/plugins/views/perfometer.py | 92 ++++++--------- 3 files changed, 127 insertions(+), 196 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=498d4b8dd8…

7 years, 4 months

removed strange code

by Andreas Boesl

Module: check_mk Branch: master Commit: 511d4a0ea59563881e9bd0781291268110444fdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=511d4a0ea59563… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 21 10:18:36 2017 +0200 removed strange code Change-Id: Id403c986b7d95ff2775e00f221a832c9238d25e4 --- 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 45c2de7..776670e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -723,7 +723,7 @@ def show_hosts(folder): is_context_button=False) if withsearch: - html.text_input(top and "search" or "search") + html.text_input("search") html.button("_search", _("Search")) html.set_focus("search") table.cell(css="bulkactions", colspan=colspan-3)

7 years, 4 months

4471 FIX Windows Agent Process Monitoring: ps section is no longer completely suppressed when only parts of the data is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: f00a9212fcdf55972be3f139083b73b4b2fb8679 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f00a9212fcdf55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 19 15:17:09 2017 +0200 4471 FIX Windows Agent Process Monitoring: ps section is no longer completely suppressed when only parts of the data is missing The ps section was skipped entirely when no performance information (memory usage) could be found for the process. This has been fixed. Change-Id: Iffd4e77affdeb6ed508bfec7d924bb9efc35529e --- .werks/4471 | 13 +++++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15811066 -> 15811066 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent.exe | Bin 1316864 -> 1316864 bytes agents/windows/check_mk_agent.msi | Bin 2926080 -> 2926080 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13672482 -> 13671970 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1316864 -> 1316864 bytes agents/windows/install_agent-64.exe | Bin 591627 -> 591608 bytes agents/windows/install_agent.exe | Bin 589033 -> 589024 bytes agents/windows/sections/SectionPS.cc | 1 - 12 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4471 b/.werks/4471 new file mode 100644 index 0000000..fb39dc4 --- /dev/null +++ b/.werks/4471 @@ -0,0 +1,13 @@ +Title: Windows Agent Process Monitoring: ps section is no longer completely suppressed when only parts of the data is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492607121 +Class: fix + +The ps section was skipped entirely when no performance information (memory usage) could be found +for the process. This has been fixed. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 1826320..fd5e1fa 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2657 +2659 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b9e732b..be87804 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index cd60081..177b4a9 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4c18335..59030a6 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.exe b/agents/windows/check_mk_agent.exe index 0d3557c..cc0a487 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 a715302..2435328 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 1e3bd72..bf42672 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 8673b4b..bfd2bdb 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 64b32d4..3a9fa82 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 de70f65..7967a77 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index d4cfc00..99236ce 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -253,7 +253,6 @@ bool SectionPS::outputNative(std::ostream &out) { // the most likely cause is that the wmi query fails, i.e. because the // service is currently offline. crash_log("Exception: Error while querying process perfdata: %s", e.what()); - return false; } WinHandle hProcessSnap(CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));

7 years, 4 months

4472 FIX windows agent disabled sections: The existing WATO rule was ignored during the agent baking

by Andreas Boesl

Module: check_mk Branch: master Commit: 229d36a60d8ba1d8d38a6d6528b4f3b21b34f5e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=229d36a60d8ba1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 26 14:05:53 2017 +0200 4472 FIX windows agent disabled sections: The existing WATO rule was ignored during the agent baking Change-Id: Ifb8d2ae7a7af2ea2e6b0a9a7ae348819e7393507 --- .werks/4472 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4472 b/.werks/4472 new file mode 100644 index 0000000..691a8c7 --- /dev/null +++ b/.werks/4472 @@ -0,0 +1,10 @@ +Title: windows agent disabled sections: The existing WATO rule was ignored during the agent baking +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1493208191 +Class: fix + +

7 years, 4 months

4052 FIX Fixed escaping bug in help text.

by Roland Halbig

Module: check_mk Branch: master Commit: 0496ed0dce5b2a73ecb80ac9eb47e427fff91d59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0496ed0dce5b2a… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Apr 26 11:41:16 2017 +0200 4052 FIX Fixed escaping bug in help text. Change-Id: I443dab6c965a491259f566546a21c27f07a76cf1 --- .werks/4052 | 10 ++++++++++ web/plugins/wato/inventory.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4052 b/.werks/4052 new file mode 100644 index 0000000..7b596e8 --- /dev/null +++ b/.werks/4052 @@ -0,0 +1,10 @@ +Title: Fixed escaping bug in help text. +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1493199600 +Class: fix + + diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py index cae0777..04504ce 100644 --- a/web/plugins/wato/inventory.py +++ b/web/plugins/wato/inventory.py @@ -83,8 +83,8 @@ register_rule(group, elements = [ ( "filename", TextAscii( - title = _("Export file to create, containing <tt><HOST></tt> for the hostname"), - help = _("Please specify the path to the export file. The text <tt><HOST></tt> " + title = _("Export file to create, containing <tt><HOST></tt> for the hostname"), + help = _("Please specify the path to the export file. The text <tt><HOST></tt> " "will be replaced with the host name the inventory has been done for. " "If you use a relative path then that will be relative to Check_MK's directory " "for variable data, which is <tt>%s</tt>.") % cmk.paths.var_dir,

7 years, 4 months

Detect librrd_th or librrd via autoconf, the former is dead nowadays.

by Sven Panne

Module: check_mk Branch: master Commit: 1d5336c3cd967ef9924500c38e45085df26a0842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5336c3cd967e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 26 11:46:44 2017 +0200 Detect librrd_th or librrd via autoconf, the former is dead nowadays. Change-Id: Ib7c6b7ae921070a18eec7db93c7ec94f5e09f15f --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 241af41..b2d2965 100644 --- a/configure.ac +++ b/configure.ac @@ -52,6 +52,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(socket, connect) AC_CHECK_LIB(socket, shutdown) +AC_SEARCH_LIBS([rrd_xport], [rrd_th rrd], [], [AC_MSG_ERROR([unable to find the rrd_xport function])]) # Checks for header files. AC_HEADER_DIRENT

7 years, 4 months

Updated werk 8287

by Sven Rueß

Module: check_mk Branch: master Commit: 0c2a4a3d8c4370421275e6907bc76a8c9439fec2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c2a4a3d8c4370… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Apr 25 15:06:46 2017 +0200 Updated werk 8287 Change-Id: Ie6cd0359e8a533052437d686318d77613c66ec48 --- .werks/8287 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/8287 b/.werks/8287 index ab8664d..28f0033 100644 --- a/.werks/8287 +++ b/.werks/8287 @@ -12,6 +12,6 @@ and fixed the item name for all power supplies. Now we take only the index as it rule creation equal to all temperature checks. To get all power supplies automatically detected and renamed, you have to make a new service discovery. -With this servicce discovery it can happen that power supplies will be renamed. Now historic data and +With this servicce discovery it can happen that power supplies will be renamed. No historic data and rules exists for this check. So nothing special have to be done.

7 years, 4 months

4525 acme_agent_sessions, acme_certificates, acme_fan, acme_powersupply, acme_realm, acme_temp, acme_voltage: New checks for ACME devices which support the APSYSMGMT-MIB, APSECURITY-MIB and ACMEPACKET-ENVMON-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 5f82b98de2b0f5697173972e2704ecd69b9559e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f82b98de2b0f5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 21 10:43:38 2017 +0100 4525 acme_agent_sessions, acme_certificates, acme_fan, acme_powersupply, acme_realm, acme_temp, acme_voltage: New checks for ACME devices which support the APSYSMGMT-MIB, APSECURITY-MIB and ACMEPACKET-ENVMON-MIB Change-Id: I077359271fadb3754955bfd3fefead577501daa3 --- .werks/4525 | 10 ++++ checkman/acme_agent_sessions | 16 ++++++ checkman/acme_certificates | 15 ++++++ checkman/acme_fan | 16 ++++++ checkman/acme_powersupply | 16 ++++++ checkman/acme_realm | 15 ++++++ checkman/acme_temp | 18 +++++++ checkman/acme_voltage | 18 +++++++ checks/acme.include | 42 ++++++++++++++++ checks/acme_agent_sessions | 59 ++++++++++++++++++++++ checks/acme_certificates | 92 +++++++++++++++++++++++++++++++++ checks/acme_fan | 67 ++++++++++++++++++++++++ checks/acme_powersupply | 56 +++++++++++++++++++++ checks/acme_realm | 64 +++++++++++++++++++++++ checks/acme_temp | 81 +++++++++++++++++++++++++++++ checks/acme_voltage | 98 ++++++++++++++++++++++++++++++++++++ lib/man_pages.py | 1 + web/plugins/wato/check_parameters.py | 22 ++++++++ 18 files changed, 706 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f82b98de2…

7 years, 4 months

8288 FIX cmk-update-agent: Fixed curl HTTP error 302 Found during agent registration process

by Sven Rueß

Module: check_mk Branch: master Commit: 111e8c9b2263a664d5c8e5107fbd3df0a5521486 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=111e8c9b2263a6… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Tue Apr 25 14:03:24 2017 +0200 8288 FIX cmk-update-agent: Fixed curl HTTP error 302 Found during agent registration process Werk 8702 improved HTTP error handling with curl during agent registration process. It did not take care about all the responses during the registration process. Now only the latest response must be successful (HTTP 200). Other responses are login and redirect. Affected systems have to fulfill two points: <ul> <li>Agent version installed is 1.4.0b1 or newer</li> <li>Python requests module is not installed</li> </ul> Workaround to solve this problem is to install Python requests on the system. Change-Id: I82f4be6945b3380d9110b2e11aa3ec92b8afa606 --- .werks/8288 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/8288 b/.werks/8288 new file mode 100644 index 0000000..409fb37 --- /dev/null +++ b/.werks/8288 @@ -0,0 +1,22 @@ +Title: cmk-update-agent: Fixed curl HTTP error 302 Found during agent registration process +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1493120786 + +Werk 8702 improved HTTP error handling with curl during agent registration process. It did not +take care about all the responses during the registration process. Now only the latest response +must be successful (HTTP 200). Other responses are login and redirect. + +Affected systems have to fulfill two points: +<ul> + <li>Agent version installed is 1.4.0b1 or newer</li> + <li>Python requests module is not installed</li> +</ul> + +Workaround to solve this problem is to install Python requests on the system. +

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017