Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Updated werk #1957 and improved handling of default values for text input fields

by Sven Rueß

Module: check_mk Branch: master Commit: 4ca5cbd780e937c233594c55b26718baf8696c91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ca5cbd780e937… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Apr 17 12:18:14 2015 +0200 Updated werk #1957 and improved handling of default values for text input fields --- .werks/1957 | 6 +++--- ChangeLog | 2 +- web/htdocs/valuespec.py | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.werks/1957 b/.werks/1957 index 49c70f8..6bd6b28 100644 --- a/.werks/1957 +++ b/.werks/1957 @@ -1,4 +1,4 @@ -Title: Fixed usage of default values in valuespec alternative selection +Title: Fixed default value for text input fields in notification plugins Level: 1 Component: multisite Class: fix @@ -7,5 +7,5 @@ State: unknown Version: 1.2.7i1 Date: 1429257630 -No default values were used in valuespec alternative selection. -Now all default values are shown in subelements of alternative selection. +No default values were used for text input fields in notification plugins. +Other text input fields may also be affected. diff --git a/ChangeLog b/ChangeLog index e7b2e2d..b0b324e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,7 +397,7 @@ * 2142 FIX: Fix non-working option for disabling column headers in grouped boxed views... * 2168 FIX: Fixed automation actions with transid=-1 when using basic authentication * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now - * 1957 FIX: Fixed usage of default values in valuespec alternative selection... + * 1957 FIX: Fixed default value for text input fields in notification plugins... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cec47d9..5d4d190 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2561,7 +2561,13 @@ class Alternative(ValueSpec): return self._elements[0].canonical_value() def default_value(self): - return self._elements[0].default_value() + try: + if type(self._default_value) == type(lambda:True): + return self._default_value() + else: + return self._default_value + except: + return self._elements[0].default_value() def value_to_text(self, value): vs = self.matching_alternative(value)

9 years, 5 months

Check_MK Git: check_mk: Added missing column to Event Console icon

by Lars Michelsen

Module: check_mk Branch: master Commit: b6448f2ccd8513b4258c4b87eae23ee39fd055b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6448f2ccd8513… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 11:19:51 2015 +0200 Added missing column to Event Console icon --- mkeventd/web/plugins/icons/mkeventd.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py index 3607619..f25eac3 100644 --- a/mkeventd/web/plugins/icons/mkeventd.py +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -94,6 +94,7 @@ def paint_mkeventd(what, row, tags, custom_vars): if mkeventd_enabled: multisite_icons.append({ + 'columns': [ 'check_command' ], 'host_columns': [ 'address', 'name' ], 'paint': paint_mkeventd, })

9 years, 5 months

Check_MK Git: check_mk: Fixed exception when trying to use the new web logging

by Lars Michelsen

Module: check_mk Branch: master Commit: 69856defc6f5633406ee3bbacf2bbfcd69e25eb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69856defc6f563… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 17 11:21:00 2015 +0200 Fixed exception when trying to use the new web logging --- web/htdocs/html_mod_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 89b937f..5e4a64d 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -137,7 +137,7 @@ class html_mod_python(htmllib.html): return (omd_mode, omd_site) def log(self, msg): - from lib import logger + from lib import logger, LOG_NOTICE logger(LOG_NOTICE, msg) def http_redirect(self, url):

9 years, 5 months

Check_MK Git: check_mk: windows agent: improved werk 2049

by Andreas Boesl

Module: check_mk Branch: master Commit: 3ad1be7a08489fb3f47b29f1e31f0bc3dd411edf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ad1be7a08489f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 17 10:57:08 2015 +0200 windows agent: improved werk 2049 --- agents/windows/check_mk_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 106c062..3b2c576 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3242,7 +3242,7 @@ void section_plugins(SOCKET &out) output(out, "<<<>>>\n"); output_external_programs(out, PLUGIN); // Prevent errors from plugins with missing final newline - output(out, "<<<>>>\n"); + output(out, "\n<<<>>>\n"); }

9 years, 5 months

Check_MK Git: check_mk: windows agent: improved werk 2049

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f1720e6bf6a06b4c800c13d765f5d516ed35a87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f1720e6bf6a06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 17 10:57:08 2015 +0200 windows agent: improved werk 2049 --- agents/windows/check_mk_agent.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 106c062..3b2c576 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3242,7 +3242,7 @@ void section_plugins(SOCKET &out) output(out, "<<<>>>\n"); output_external_programs(out, PLUGIN); // Prevent errors from plugins with missing final newline - output(out, "<<<>>>\n"); + output(out, "\n<<<>>>\n"); }

9 years, 5 months

Check_MK Git: check_mk: Removed debug code

by Sven Rueß

Module: check_mk Branch: master Commit: c31795f0ce9fc73f325b71b03ac3e5ead56f4fcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c31795f0ce9fc7… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Apr 17 10:24:48 2015 +0200 Removed debug code --- web/htdocs/valuespec.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c40f3bf..cec47d9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2284,7 +2284,6 @@ class Timerange(CascadingDropdown): return (from_time, now), titles[0] else: # last (previous) - html.debug("HIRN", rangespec) if rangespec[0] == 'd': return (from_time - 86400, from_time), titles[1] elif rangespec[0] == 'w':

9 years, 5 months

Check_MK Git: check_mk: #1957 FIX Fixed usage of default values in valuespec alternative selection

by Sven Rueß

Module: check_mk Branch: master Commit: b54a1e993d625e3179ddab1e9a4d1678aab76349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54a1e993d625e… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Apr 17 10:06:43 2015 +0200 #1957 FIX Fixed usage of default values in valuespec alternative selection No default values were used in valuespec alternative selection. Now all default values are shown in subelements of alternative selection. --- .werks/1957 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 6 +++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1957 b/.werks/1957 new file mode 100644 index 0000000..49c70f8 --- /dev/null +++ b/.werks/1957 @@ -0,0 +1,11 @@ +Title: Fixed usage of default values in valuespec alternative selection +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1429257630 + +No default values were used in valuespec alternative selection. +Now all default values are shown in subelements of alternative selection. diff --git a/ChangeLog b/ChangeLog index b4ad364..e7b2e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -397,6 +397,7 @@ * 2142 FIX: Fix non-working option for disabling column headers in grouped boxed views... * 2168 FIX: Fixed automation actions with transid=-1 when using basic authentication * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now + * 1957 FIX: Fixed usage of default values in valuespec alternative selection... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3054f8f..c40f3bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2530,9 +2530,6 @@ class Alternative(ValueSpec): vs.render_input(varprefix + "_%d" % nr, cur_val) html.write("</span>") - - - def render_input_radio(self, varprefix, value): mvs = self.matching_alternative(value) for nr, vs in enumerate(self._elements): @@ -2564,6 +2561,9 @@ class Alternative(ValueSpec): def canonical_value(self): return self._elements[0].canonical_value() + def default_value(self): + return self._elements[0].default_value() + def value_to_text(self, value): vs = self.matching_alternative(value) if vs:

9 years, 5 months

Check_MK Git: check_mk: WATO checkgroup livestatus_status:

by Andreas Boesl

fixed broken keys Message-ID: <55302134.JQp+X25b/9O85PAv%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: 870f30f60df500d834a2bd117540c8a34cf408f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870f30f60df500… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 16 22:53:05 2015 +0200 WATO checkgroup livestatus_status: fixed broken keys --- web/plugins/wato/check_parameters.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c723d3a..05fb366 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -148,27 +148,27 @@ register_check_parameters( elements = [ ( "site_stopped", MonitoringState(title = "State when the site is stopped", default_value = 2)), - ( "execute host checks", + ( "execute_host_checks", MonitoringState(title = "State when host checks are disabled", default_value = 2)), - ( "execute service checks", + ( "execute_service_checks", MonitoringState(title = "State when service checks are disabled", default_value = 2)), ( "accept_passive_host_checks", MonitoringState(title = "State when not accepting passive host checks", default_value = 2)), ( "accept_passive_service_checks", MonitoringState(title = "State when not accepting passive service checks", default_value = 2)), - ( "check host freshness", + ( "check_host_freshness", MonitoringState(title = "State when not checking host freshness", default_value = 2)), - ( "check service freshness", + ( "check_service_freshness", MonitoringState(title = "State when not checking service freshness", default_value = 2)), - ( "enable event handlers", + ( "enable_event_handlers", MonitoringState(title = "State when event handlers are disabled", default_value = 0)), - ( "enable flap detection", + ( "enable_flap_detection", MonitoringState(title = "State when flap detection is disabled", default_value = 1)), - ( "enable notifications", + ( "enable_notifications", MonitoringState(title = "State when notifications are disabled", default_value = 2)), - ( "process performance data", + ( "process_performance_data", MonitoringState(title = "State when performance data is disabled", default_value = 1)), - ( "check external commands", + ( "check_external_commands", MonitoringState(title = "State when not checking external commands", default_value = 2)), ] ),

9 years, 5 months

Check_MK Git: check_mk: df.include: fixed exception with grouped filesystems

by Andreas Boesl

Module: check_mk Branch: master Commit: 6161e1a7f5f1574a788f53bc5bc29df69d6ad2cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6161e1a7f5f157… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 16 21:33:46 2015 +0200 df.include: fixed exception with grouped filesystems --- checks/df.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/df.include b/checks/df.include index 7fd2ad1..b88b97d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -273,7 +273,7 @@ def df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes = None): if count == 0: return (3, "No filesystem matching the patterns") else: - status, infotext, perfdata = df_check_filesystem_single(g_hostname, item, total_size_mb, total_avail_mb, total_inodes, total_inodes_avail, params) + status, infotext, perfdata = df_check_filesystem_single(g_hostname, item, total_size_mb, total_avail_mb, total_reserved_mb, total_inodes, total_inodes_avail, params) infotext += " (%d filesystems)" % count return status, infotext, perfdata else:

9 years, 5 months

Check_MK Git: check_mk: Minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 61ec11bf46665a5fa75f6cd0099996b0bce92d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61ec11bf46665a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 16 16:25:00 2015 +0200 Minor cleanups --- web/htdocs/js/checkmk.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 4bdd60b..3c149ae 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -950,9 +950,6 @@ function update_header_timer() // When called with two parmeters the 2nd one is used as new url. function set_reload(secs, url) { - if (typeof url === 'undefined') - url = ''; - if (g_reload_timer) clearTimeout(g_reload_timer); @@ -960,7 +957,7 @@ function set_reload(secs, url) if (secs !== 0) { g_reload_interval = secs; - schedule_reload(url, parseFloat(g_reload_interval)*1000); + schedule_reload(); } } @@ -968,6 +965,12 @@ function set_reload(secs, url) // running, this timer is terminated and replaced by the new one. function schedule_reload(url, milisecs) { + if (typeof url === 'undefined') + url = ''; // reload current page (or just the content) + + if (typeof milisecs === 'undefined') + milisecs = parseFloat(g_reload_interval) * 1000; // use default reload interval + if (g_reload_timer) clearTimeout(g_reload_timer); @@ -985,7 +988,7 @@ function handle_content_reload(_unused, code) { // Update the header time update_header_timer(); - schedule_reload(''); + schedule_reload(); } function handle_content_reload_error(data, status_code) @@ -998,7 +1001,7 @@ function handle_content_reload_error(data, status_code) } // Continue update after the error - schedule_reload(''); + schedule_reload(); } function do_reload(url)

9 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015