Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 571920f8e66adf865417e40a67dc1df085509ceb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=571920f8e66adf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 11:55:29 2017 +0100 minor cleanup Change-Id: I87e5be1b2643870d0db9cf998b488bde01bdbd80 --- checks/df.include | 2 +- checks/uptime.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/df.include b/checks/df.include index 4e73135..ea8a8d9 100644 --- a/checks/df.include +++ b/checks/df.include @@ -287,7 +287,7 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved_mb, inodes_total, inodes_avail, params, this_time = None): if size_mb == 0: - return (1, "size of filesystem is 0 MB", []) + return (1, "Size of filesystem is 0 MB", []) used_mb = size_mb - avail_mb used_perc = 100.0 * (float(used_mb) / size_mb) diff --git a/checks/uptime.include b/checks/uptime.include index ccc2344..9794cd5 100644 --- a/checks/uptime.include +++ b/checks/uptime.include @@ -51,7 +51,7 @@ def check_uptime_seconds(params, uptime_sec): since = time.strftime("%c", time.localtime(time.time() - uptime_sec)) state = 0 - infotext = "up since %s (%dd %02d:%02d:%02d)" % \ + infotext = "Up since %s (%dd %02d:%02d:%02d)" % \ (since, days, hours, minutes, seconds) if params == None: # legacy: support older versions of parameters

7 years, 6 months

Refactored htmllib: Some small reorderings, fixed tests and minor cleanups.

by Roland Halbig

Module: check_mk Branch: master Commit: e9e9123979bcc768b1800e3bdb11f75baff65036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e9123979bcc7… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 11:09:11 2017 +0100 Refactored htmllib: Some small reorderings, fixed tests and minor cleanups. Change-Id: If9dd37415a2437345ad458ee570431efaebb2441 --- tests/test_request_handler.py | 56 --------- tests/web/test_request_handler.py | 107 +++++++++++++++++ web/htdocs/htmllib.py | 237 +++++++++++++++++--------------------- 3 files changed, 214 insertions(+), 186 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e9e9123979…

7 years, 6 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: dd27f302246505e3c00d243752269381652f73df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd27f302246505… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Feb 23 10:38:23 2017 +0100 Reserved 10 Werk IDS Change-Id: If5275ac8ef88a2e725b6ac655cdbd784e1b1f724 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3c7295b..e7718be 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4436 +4446

7 years, 6 months

Refactoring htmllib: Moved classes around.

by Roland Halbig

Module: check_mk Branch: master Commit: 9ffd60d693dd9bc0daab856b7aea632b2545a413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ffd60d693dd9b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 22 11:06:10 2017 +0100 Refactoring htmllib: Moved classes around. Change-Id: I9e5cb7cb38540126c13f15c0bd5092cf8dcc397c --- web/htdocs/htmllib.py | 494 +++++++++++++++++++++++++------------------------- 1 file changed, 247 insertions(+), 247 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9ffd60d693…

7 years, 6 months

Refactored htmllib: Changed class structure and also one class name.

by Roland Halbig

Module: check_mk Branch: master Commit: 9da10cad55e4ab10e07ccb5b39e5dfe27d880c12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9da10cad55e4ab… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 22 11:10:56 2017 +0100 Refactored htmllib: Changed class structure and also one class name. Change-Id: Idd617b2bfc2442f83d8c1150d191b7c82d9a229f --- tests/web/auto_build_test.py | 4 +- tests/web/class_deprecated_renderer.py | 25 +- tests/web/classes.py | 79 +- tests/web/generate_integration.py | 4 +- tests/web/html_tests.py | 28 +- tests/web/test_OutputFunnel.py | 2 +- tests/web/test_html_tests.py | 2 +- tests/web/test_integration.py | 4 +- tests/web/test_table.py | 34 +- tests/web/unittest_files/text_input.unittest | 434 +++--- web/htdocs/htmllib.py | 2050 +++++++++++++------------- 11 files changed, 1319 insertions(+), 1347 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9da10cad55…

7 years, 6 months

Fixed html refactoring bug causing problems with javascript

by Roland Halbig

Module: check_mk Branch: master Commit: 62776558120853471436e45050c648b44d4c215e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62776558120853… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 10:10:17 2017 +0100 Fixed html refactoring bug causing problems with javascript Change-Id: I6f3f00f529be8190f237527336de6ab2ae748b9e --- web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 82c7417..ad66baf 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -609,7 +609,7 @@ class HTMLGenerator(Escaper, OutputFunnel): def write_html(self, content): """ Write HTML code directly, without escaping. """ - self.write(content + "\n") + self.write(content) def comment(self, comment_text): diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c6b6215..86e716a 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1922,8 +1922,8 @@ function valuespec_toggle_dropdownn(oDropdown, divid) { input field as soon as the user focusses the last field. */ function list_of_strings_init(divid) { var oContainer = document.getElementById(divid); - var numChilds = oContainer.childNodes.length; - var oLastChild = oContainer.childNodes[numChilds-1]; + var oDivChildren = oContainer.getElementsByTagName("div") + var oLastChild = oDivChildren[oDivChildren.length-1]; list_of_strings_add_focus(oLastChild); }

7 years, 6 months

Fixed optiondial after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c239a8a2fdd725ffd7ea9820464439859379005 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c239a8a2fdd72… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 23 10:01:43 2017 +0100 Fixed optiondial after refactoring Change-Id: I554a80078a64b5e0750a25aa2e0b32235a5959ae --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 2dd6e7c..c6b6215 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2684,7 +2684,7 @@ function view_dial_option(oDiv, viewname, option, choices) { // way ranges from -10 to 10 means centered (normal place) function turn_dial(option, text, way, direction) { - var oDiv = document.getElementById("optiondial_" + option).firstChild; + var oDiv = document.getElementById("optiondial_" + option).getElementsByTagName("DIV")[0]; if (text && oDiv.innerHTML != text) oDiv.innerHTML = text; oDiv.style.top = (way * 1.3 * direction) + "px";

7 years, 6 months

4033 Quicksearch: Now cycles through the filters h:/ad:/al:/s:

by Andreas Boesl

when no specific filters are set Message-ID: <58aea700.zZJV4RVytjzezJGr%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9aa43e747bfbca92c74ccec4cadc1590e5cfd9a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aa43e747bfbca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 23 10:02:53 2017 +0100 4033 Quicksearch: Now cycles through the filters h:/ad:/al:/s: when no specific filters are set Once a match is found the data is shown. So if the address matches, the query won't issue an al: or s: query. Change-Id: Ib2205aa84a2ccba9579f0e859b4f6573ff379aea --- .werks/4033 | 13 +++++++++++++ web/htdocs/sidebar.py | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/4033 b/.werks/4033 new file mode 100644 index 0000000..d9019d2 --- /dev/null +++ b/.werks/4033 @@ -0,0 +1,13 @@ +Title: Quicksearch: Now cycles through the filters h:/ad:/al:/s: when no specific filters are set +Level: 1 +Component: multisite +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487840420 + +Once a match is found the data is shown. So if the address matches, +the query won't issue an al: or s: query. + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index b420974..383d371 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -807,10 +807,14 @@ class LivestatusQuicksearch(object): self._determine_used_filters() self._execute_livestatus_command() - # If no rows were found with the given (filterless) query, issue a service query + # If no rows were found with the given (filterless) query, issue + # -> Hostaddress -> Hostalias -> Service description if not self._rows and self._no_filters_set: - self._used_filters = {"s": [self._query]} - self._execute_livestatus_command() + for try_filter in ["ad", "al", "s"]: + self._used_filters = {try_filter: [self._query]} + self._execute_livestatus_command() + if self._rows: + break def _determine_used_filters(self):

7 years, 6 months

Fixed reschedule of hosts/services after recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a11ebc6388ffffc8f502cee1dc6c1399950e7fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a11ebc6388fff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 23 09:59:17 2017 +0100 Fixed reschedule of hosts/services after recent refactoring Change-Id: I2960e98c3049ad6994ff3c922e5f1ce48e45cd7e --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 9a4a12e..2dd6e7c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -939,7 +939,7 @@ function reschedule_check_response_handler(img, code) { } function reschedule_check(oLink, site, host, service, wait_svc) { - var img = oLink.childNodes[0]; + var img = oLink.getElementsByTagName("IMG")[0]; remove_class(img, "reload_failed"); add_class(img, "reloading");

7 years, 6 months

4426 FIX Fixed PID file locking

by Sven Panne

Module: check_mk Branch: master Commit: da08419ff59ad76244b29f575b5b2dae44627bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da08419ff59ad7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 23 09:07:45 2017 +0100 4426 FIX Fixed PID file locking Previously it was possible to start the Check_MK Micro Core multiple times, which resulted in totally erratic behavior. This has been fixed by correctly locking the core's PID file. Change-Id: I5ddb02d7f2dd182c649a3624f733369699f0f703 --- .werks/4426 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/4426 b/.werks/4426 new file mode 100644 index 0000000..5cad661 --- /dev/null +++ b/.werks/4426 @@ -0,0 +1,12 @@ +Title: Fixed PID file locking +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1487837114 +Class: fix + +Previously it was possible to start the Check_MK Micro Core multiple times, +which resulted in totally erratic behavior. This has been fixed by +correctly locking the core's PID file.

7 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017