Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

EC config: loading rule packs less often on page rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: eb47178efaf0530ba994ca091e46cbaa77f2ad20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb47178efaf053… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 16:59:45 2017 +0100 EC config: loading rule packs less often on page rendering Change-Id: Ie6d95841c22017aecb88223f11353e60ddbafcc9 --- web/plugins/wato/mkeventd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 027e1c7..7c5b08a 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1003,8 +1003,6 @@ def save_mkeventd_sample_config(): # '----------------------------------------------------------------------' def mode_mkeventd_rule_packs(phase): - legacy_rules, rule_packs = load_mkeventd_rules() - if phase == "title": return _("Event Console Rule Packages") @@ -1020,6 +1018,7 @@ def mode_mkeventd_rule_packs(phase): mkeventd_mibs_button() return + legacy_rules, rule_packs = load_mkeventd_rules() if phase == "action": action_outcome = event_simulation_action()

7 years, 5 months

mail notify plugin: Slightly improved error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 54476f301f84c6fbfa0c5f515164d917943ac474 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54476f301f84c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 15:41:01 2017 +0100 mail notify plugin: Slightly improved error handling Change-Id: Ia9d4e42984e23fdcd7b2e2e9f87ebf0ae77ce8e2 --- notifications/mail | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index e4dd11f..a47de6d 100755 --- a/notifications/mail +++ b/notifications/mail @@ -436,12 +436,15 @@ def send_mail_sendmail(m, target, from_address): cmd += ['-F', from_address, "-f", from_address] cmd += [ "-i", target.encode("utf-8")] try: - p = subprocess.Popen(cmd, stdin = subprocess.PIPE) + p = subprocess.Popen(cmd, stdin=subprocess.PIPE) except OSError: raise Exception("Failed to send the mail: /usr/sbin/sendmail is missing") + p.communicate(m.as_string()) + if p.returncode != 0: + raise Exception("sendmail returned with exit code: %d" % p.returncode) - sys.stdout.write("Spooled mail to local mail transmission agent") + sys.stdout.write("Spooled mail to local mail transmission agent\n") return 0 def send_mail_smtp(message, target, from_address, context):

7 years, 5 months

Fix 4202: PEND for host states resulted in crash

by Mathias Kettner

Module: check_mk Branch: master Commit: 67695ab6bb8194f731d0de88f04722352c2a97e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67695ab6bb8194… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 13:40:00 2017 +0100 Fix 4202: PEND for host states resulted in crash Change-Id: I6ae9de5184a33d76af340912d3cce37fb5b30bc7 --- web/htdocs/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 16f193c..df6fa64 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2422,7 +2422,7 @@ def execute_leaf_node(node, status_info, aggregation_options): st = host_hard_state else: st = host_state - aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN, -1:PENDING}[st] + aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN, -1:PENDING, None: None}[st] state = { "state" : aggr_state, "output" : host_output,

7 years, 5 months

Slight change in new checkbox styling

by Mathias Kettner

Module: check_mk Branch: master Commit: b66ab524e72c215afdbf4c38f4174cbe3563eb51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b66ab524e72c21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 13:28:46 2017 +0100 Slight change in new checkbox styling makes checked boxes more easily distinguishable from unchecked ones Change-Id: I16cd16b7c69c17779338805f7328a9759865f5e1 --- web/htdocs/check_mk.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d437153..2e3872a 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -121,17 +121,18 @@ input[type="checkbox"] + label:before { background-color: #fff; content: "\00a0"; display: inline-block; - font-size: 6pt; - height: 7pt; - margin: 0 .25em 0 0; + font-size: 7pt; + height: 7.5pt; + margin: 0 .6em 0 0; padding: 0; vertical-align: middle; - width: 7pt; + width: 7.5pt; } input[type="checkbox"]:checked + label:before { color: #000; - content: "\2713"; + content: "\2716"; + background-color: #ddd; text-align: center; }

7 years, 5 months

updated gitignore

by Andreas Boesl

Module: check_mk Branch: master Commit: fcbe982088dd0a3ad40203ca72e48127e8c6ac40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcbe982088dd0a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 16 11:34:59 2017 +0100 updated gitignore Change-Id: I0848884a442d184d8e14ccda11fca2cd2c671cb6 --- agents/windows/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 0c0e6a4..8b1ab35 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -13,3 +13,4 @@ log .depend check_mk_agent*.unstripped.exe depend +testtools

7 years, 5 months

Improved text overflow of av options (german translation)

by Lars Michelsen

Module: check_mk Branch: master Commit: 760e6817aba592c73006a598a5ff7e23451ce95c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=760e6817aba592… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 11:23:50 2017 +0100 Improved text overflow of av options (german translation) Change-Id: I3940f03c7d970c3df3d8873c34654b43a066d604 --- web/htdocs/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index d64de67..db50c8d 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -123,7 +123,7 @@ def get_avoption_entries(what): ] def aligned_label(text): - return "<div style=\"width: 196px; display: inline-block;\">%s:</div>" % text + return "<div style=\"width: 186px; display: inline-block;\">%s:</div>" % text return [ # Time range selection

7 years, 5 months

Updated python version test to 2.7.13

by Lars Michelsen

Module: check_mk Branch: master Commit: e28d6a16f1544a4ad4a78b0116a77469c43fa0ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e28d6a16f1544a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 10:08:08 2017 +0100 Updated python version test to 2.7.13 Change-Id: I3903c347f944d6d6c3cef1aeb735046b76e7cc1b --- tests/omd/test_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index 1a16238..d691512 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -20,7 +20,7 @@ def test_03_python_interpreter_version(site): p = site.execute(["python", "-V"], stderr=subprocess.PIPE) version = p.stderr.read() - assert version.startswith("Python 2.7.12") + assert version.startswith("Python 2.7.13") def test_03_python_path(site):

7 years, 5 months

added some comments and handling of cluster hosts in check API function get_agent_data_time ()

by Simon Betz

Module: check_mk Branch: master Commit: 1ac4550017903893f592e1ec548c8111fda3cf2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ac45500179038… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jan 16 09:56:44 2017 +0100 added some comments and handling of cluster hosts in check API function get_agent_data_time() Change-Id: Ia58eeaac4d6336120bed1675499712f740e52de2 --- modules/check_mk_base.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 80414d4..b68e266 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2054,11 +2054,18 @@ def passwordstore_get_cmdline(fmt, pw): # '----------------------------------------------------------------------' +# Use this function to get the age of the agent data cache file +# of tcp or snmp hosts or None in case of piggyback data because +# we do not exactly know the latest agent data. Maybe one time +# we can handle this. For cluster hosts an exception is raised. def get_agent_data_time(): return agent_cache_file_age(g_hostname, g_check_type) def agent_cache_file_age(hostname, check_type): + if is_cluster(hostname): + raise MKGeneralException("get_agent_data_time() not valid for cluster") + if is_snmp_check(check_type): cachefile = cmk.paths.tcp_cache_dir + "/" + hostname + "." + check_type.split(".")[0] elif is_tcp_check(check_type):

7 years, 5 months

Fixed missing attribute error

by Lars Michelsen

Module: check_mk Branch: master Commit: bd7a691b927518191cf3ea0cdb3737e55a79495f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd7a691b927518… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 09:39:06 2017 +0100 Fixed missing attribute error Change-Id: I332f61dd7b58e9b8a8f50eed776d4acab45b30e4 --- web/plugins/sidebar/search.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index b0c8840..a228daf 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -138,6 +138,7 @@ sidebar_snapins["search"] = { class QuicksearchMatchPlugin(object): def __init__(self, livestatus_tables): self._livestatus_tables = livestatus_tables + self._filter_shortname = None super(QuicksearchMatchPlugin, self).__init__()

7 years, 5 months

new check api function: get_agent_data_time()

by Simon Betz

Module: check_mk Branch: master Commit: 4b424962470d0faff226af4080a05e26d3a9c840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b424962470d0f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 13 15:23:37 2017 +0100 new check api function: get_agent_data_time() Change-Id: Ibea51454b16efe0fc35569c34fa21f849813e2c7 --- modules/check_mk_base.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8dadcef..80414d4 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2053,6 +2053,25 @@ def passwordstore_get_cmdline(fmt, pw): # | Helper function for being used in checks | # '----------------------------------------------------------------------' + +def get_agent_data_time(): + return agent_cache_file_age(g_hostname, g_check_type) + + +def agent_cache_file_age(hostname, check_type): + if is_snmp_check(check_type): + cachefile = cmk.paths.tcp_cache_dir + "/" + hostname + "." + check_type.split(".")[0] + elif is_tcp_check(check_type): + cachefile = cmk.paths.tcp_cache_dir + "/" + hostname + else: + cachefile = None + + if cachefile is not None and os.path.exists(cachefile): + return cachefile_age(cachefile) + else: + return None + + # Generic function for checking a value against levels. This also supports # predictive levels. # value: currently measured value @@ -2068,7 +2087,7 @@ def passwordstore_get_cmdline(fmt, pw): def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemarkers=False): if unit: unit = " " + unit # Insert space before MB, GB, etc. - perfdata = [] + perfdata = [] infotexts = [] def scale_value(v):

7 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017