Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64687 discussions

Check_MK Git: check_mk: Fixed sorting of service discovery table ( can not be sorted interactive anymore)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d2117ef39a6fe87a9831805f6f5a43e2806425d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d2117ef39a6fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 11:19:46 2014 +0100 Fixed sorting of service discovery table (can not be sorted interactive anymore) --- 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 3ccd0c1..da15c5e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3206,7 +3206,7 @@ def show_service_table(host, firsttime): if html.var("_scan"): html.hidden_field("_scan", "on") - table.begin(css ="data", searchable = False, limit = None) + table.begin(css ="data", searchable = False, limit = None, sortable = False) # This option will later be switchable somehow

9 years, 10 months

Check_MK Git: check_mk: #1535 Disabled services on service discovery page now link to the ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: 372b5c1b1a8f9dfa57a74306a70d6fd6373585f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=372b5c1b1a8f9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 11:13:57 2014 +0100 #1535 Disabled services on service discovery page now link to the ruleset --- .werks/1535 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/1535 b/.werks/1535 new file mode 100644 index 0000000..b2501ec --- /dev/null +++ b/.werks/1535 @@ -0,0 +1,10 @@ +Title: Disabled services on service discovery page now link to the ruleset +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416996809 + + diff --git a/ChangeLog b/ChangeLog index b218b6e..443a2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 1489 Added iCalendar import for generating timeperiods e.g. for holidays... * 1495 Most WATO tables can now be sorted (where useful)... * 1504 WATO makes host tag and group information available for NagVis... + * 1535 Disabled services on service discovery page now link to the ruleset * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5305e9d..3ccd0c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3292,6 +3292,13 @@ def show_service_table(host, firsttime): ("item", mk_repr(item))]) html.icon_button(url, _("Edit and analyze the check parameters of this service"), "check_parameters") + if state_type == "ignored": + url = make_link([("mode", "edit_ruleset"), + ("varname", "ignored_services"), + ("host", hostname), + ("item", mk_repr(descr))]) + html.icon_button(url, _("Edit and analyze the disabled services rules"), "ignore") + # Permanently disable icon if state_type in ['new', 'old']: url = make_link([

9 years, 10 months

Check_MK Git: check_mk: cisco_vss: fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: a8d9066b7b785f6bb49564f1a75550db6f7b681b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d9066b7b785f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 26 10:35:31 2014 +0100 cisco_vss: fixed typo --- checks/cisco_vss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cisco_vss b/checks/cisco_vss index 8a924fb..d639a98 100644 --- a/checks/cisco_vss +++ b/checks/cisco_vss @@ -93,7 +93,7 @@ def check_cisco_vss(item, params, info): state = 0 yield state, "chassis %s: %s" % (switch_id, cisco_vss_role_names[chassis_role]) - yield 0, "%d VLS connections configured" % len(ports) + yield 0, "%d VSL connections configured" % len(ports) for core_switch_id, operstatus, conf_portcount, op_portcount in ports: if operstatus == '1':

9 years, 10 months

Check_MK Git: check_mk: This fixes an error where filtering a view leads into an empty view, because

by Lars Michelsen

Module: check_mk Branch: master Commit: 14efe0ff259d49720135a5107bc02093d4c14f36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14efe0ff259d49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 10:02:10 2014 +0100 This fixes an error where filtering a view leads into an empty view, because the enforced site filter has the first site preselected, which is not always the site of the data shown in the view. Now we use the optional site filter for most views to cleanup this error. Conflicts: ChangeLog web/plugins/views/builtin.py --- .werks/1534 | 13 ++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 4 +-- web/plugins/views/builtin.py | 52 ++++++++++++++++---------------- 4 files changed, 42 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=14efe0ff25…

9 years, 10 months

Check_MK Git: check_mk: #1533 FIX Fixed sorting of hosts with same name in "services of host" view

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e5b5814c85f17e2672156f540e1d06cfd8a587f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e5b5814c85f17… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 09:18:51 2014 +0100 #1533 FIX Fixed sorting of hosts with same name in "services of host" view --- .werks/1533 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1533 b/.werks/1533 new file mode 100644 index 0000000..b73f342 --- /dev/null +++ b/.werks/1533 @@ -0,0 +1,9 @@ +Title: Fixed sorting of hosts with same name in "services of host" view +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1416989899 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9a22256..3174235 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... * 1528 FIX: Fixed actions in mobile GUI... * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... + * 1533 FIX: Fixed sorting of hosts with same name in "services of host" view WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 2d44ed5..9662378 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -545,7 +545,9 @@ multisite_builtin_views.update({ 'play_sounds': False, 'public': True, 'show_filters': ['svcstate', 'serviceregex'], - 'sorters': [('svcdescr', False)], + 'sorters': [('site', False), + ('site_host', False), + ('svcdescr', False)], 'linktitle': _('Services'), 'title': _('Services of Host')}, 'host_export': {'browser_reload': 30,

9 years, 10 months

Check_MK Git: check_mk: Repaired inline snmp timeout handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e9f735635ebde31bbc629c9522310de23a9809a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9f735635ebde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 26 08:54:56 2014 +0100 Repaired inline snmp timeout handling --- modules/check_mk.py | 8 ++++---- modules/check_mk_base.py | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 16af22b..66abbe4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5493,7 +5493,7 @@ def restart_myself(keepalive_fd): def do_check_keepalive(): - global g_initial_times + global g_initial_times, g_timeout def check_timeout(signum, frame): raise MKCheckTimeout() @@ -5537,11 +5537,11 @@ def do_check_keepalive(): num_checks += 1 - timeout = int(keepalive_read_line()) + g_timeout = int(keepalive_read_line()) try: # catch non-timeout exceptions try: # catch timeouts signal.signal(signal.SIGALRM, check_timeout) - signal.alarm(timeout) + signal.alarm(g_timeout) if ';' in hostname: hostname, ipaddress = hostname.split(";", 1) elif hostname in ipaddress_cache: @@ -5564,7 +5564,7 @@ def do_check_keepalive(): spec = exit_code_spec(hostname) status = spec.get("timeout", 2) total_check_output = "%s - Check_MK timed out after %d seconds\n" % ( - nagios_state_names[status], timeout) + nagios_state_names[status], g_timeout) os.write(keepalive_fd, "%03d\n%08d\n%s" % (status, len(total_check_output), total_check_output)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f03b192..db6b925 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -90,6 +90,7 @@ g_single_oid_hostname = None g_single_oid_cache = {} g_broken_snmp_hosts = set([]) g_broken_agent_hosts = set([]) +g_timeout = None # variables set later by getopt

9 years, 10 months

Check_MK Git: check_mk: #1549 FIX bluecat_threads: do not inventorize this check where information is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d7c1f8dc4915eef6e33ee03eaaad929a7b54102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7c1f8dc4915e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:58:02 2014 +0100 #1549 FIX bluecat_threads: do not inventorize this check where information is missing This avoid UNKNOWN check results on devices where no thread information is available. --- .werks/1549 | 11 +++++++++++ ChangeLog | 1 + checks/bluecat_threads | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1549 b/.werks/1549 new file mode 100644 index 0000000..315bf35 --- /dev/null +++ b/.werks/1549 @@ -0,0 +1,11 @@ +Title: bluecat_threads: do not inventorize this check where information is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416913048 + +This avoid UNKNOWN check results on devices where no thread information is +available. diff --git a/ChangeLog b/ChangeLog index 229af5d..9a22256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing + * 1549 FIX: bluecat_threads: do not inventorize this check where information is missing... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/bluecat_threads b/checks/bluecat_threads index 7b67507..49c2e32 100644 --- a/checks/bluecat_threads +++ b/checks/bluecat_threads @@ -28,7 +28,8 @@ threads_default_levels = (2000, 4000) def inventory_bluecat_threads(info): - return [(None, "threads_default_levels")] + if info: + return [(None, "threads_default_levels")] def check_bluecat_threads(item, params, info): nthreads = int(info[0][0])

9 years, 10 months

Check_MK Git: check_mk: #1548 FIX bluecat_ntp: do not inventorized devices where NTP information is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: a01c99fc4fe5360db78a16842e39eefec5915d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a01c99fc4fe536… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:54:24 2014 +0100 #1548 FIX bluecat_ntp: do not inventorized devices where NTP information is missing --- .werks/1548 | 10 ++++++++++ ChangeLog | 1 + checks/bluecat_ntp | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1548 b/.werks/1548 new file mode 100644 index 0000000..215be9d --- /dev/null +++ b/.werks/1548 @@ -0,0 +1,10 @@ +Title: bluecat_ntp: do not inventorized devices where NTP information is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416912842 + + diff --git a/ChangeLog b/ChangeLog index bc3f9df..229af5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 1515 FIX: cisco_secure: fix service description, fix OK state in case of no violation * 1449 FIX: nginx_status: agent plugin no longer honours "http(s)_proxy" env variables of root user * 1532 FIX: mk_sap: Cleaning up old state information from sap.state file... + * 1548 FIX: bluecat_ntp: do not inventorized devices where NTP information is missing Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/bluecat_ntp b/checks/bluecat_ntp index 7f90e00..b76b87b 100644 --- a/checks/bluecat_ntp +++ b/checks/bluecat_ntp @@ -33,7 +33,8 @@ factory_settings["bluecat_ntp"] = { } def inventory_bluecat_ntp(info): - return [(None, None)] + if len(info) > 0 and info[0][0] != 'NULL': + return [(None, None)] def check_bluecat_ntp(item, params, info): oper_state, sys_leap, stratum = map(int, info[0])

9 years, 10 months

Check_MK Git: check_mk: Faster implementation of attrencode,

by Mathias Kettner

small speedup for large Multisite pages Message-ID: <54745ede.wW1gBWvn0xMnqWQc%mk(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: be7a859377ccad63b8740ebbf1b2e1033f87b302 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be7a859377ccad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 25 11:50:03 2014 +0100 Faster implementation of attrencode, small speedup for large Multisite pages --- web/htdocs/htmllib.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c43be21..1727e0f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1213,19 +1213,7 @@ class html: elif type(value) not in [str, unicode]: value = str(value) - new = "" - for c in value: - if c == '"': - new += """ - elif c == '<': - new += "<" - elif c == '>': - new += ">" - else: - new += c - return new - - + return value.replace('"', """).replace("<", "<").replace(">", ">") # This function returns a str object, never unicode! # Beware: this code is crucial for the performance of Multisite!

9 years, 10 months

Check_MK Git: check_mk: Re-added default monitored SAP path for dialog monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ffe01da1223745ea4ec0fe80fc61c13ec248aa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ffe01da122374… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 25 10:54:33 2014 +0100 Re-added default monitored SAP path for dialog monitoring --- agents/plugins/mk_sap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 747f9ae..d794d37 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -137,7 +137,7 @@ local_cfg = { # The * matches the whole following string and does not end on next "/". # For examples, take a look at the default config file (/etc/check_mk/sap.cfg). monitor_paths = [ -# 'SAP CCMS Monitor Templates/Dialog Overview/*', + 'SAP CCMS Monitor Templates/Dialog Overview/*', ] monitor_types = [] config_file = os.getenv('MK_CONFDIR', '/etc/check_mk') + '/sap.cfg'

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits