Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Staleness: show last check time in red if stale

by Mathias Kettner

Module: check_mk Branch: master Commit: 2725759603cd0810a86e59bf147694eba7ba1743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2725759603cd08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:57:18 2013 +0200 Staleness: show last check time in red if stale --- web/htdocs/status.css | 4 ++++ web/plugins/views/painters.py | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 6fe4b2b..8c74566 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -273,6 +273,10 @@ table.data td.age { color: #666; white-space: nowrap; } +table.data td.age.staletime { + color: red; + font-weight: bold; +} table.data td.age.recent { font-weight: bold; diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5cc842c..463f764 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -490,12 +490,19 @@ multisite_painters["svc_state_age"] = { "paint" : lambda row: paint_age(row["service_last_state_change"], row["service_has_been_checked"] == 1, 60 * 10), "sorter" : "stateage", } + +def paint_checked(row): + css, td = paint_age(row["service_last_check"], row["service_has_been_checked"] == 1, 0) + if is_stale(row): + css += " staletime" + return css, td + multisite_painters["svc_check_age"] = { "title" : _("The time since the last check of the service"), "short" : _("Checked"), "columns" : [ "service_has_been_checked", "service_last_check" ], "options" : [ "ts_format", "ts_date" ], - "paint" : lambda row: paint_age(row["service_last_check"], row["service_has_been_checked"] == 1, 0), + "paint" : paint_checked, } multisite_painters["svc_next_check"] = {

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0989, #0990

by Mathias Kettner

Module: check_mk Branch: master Commit: 8251d13d34a8fcb9a6eec6f90c8606399271a158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8251d13d34a8fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:49:10 2013 +0200 Updated bug entries #0989, #0990 --- .bugs/989 | 10 ++++++++++ .bugs/990 | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/.bugs/989 b/.bugs/989 new file mode 100644 index 0000000..2843983 --- /dev/null +++ b/.bugs/989 @@ -0,0 +1,10 @@ +Title: Liveproxyd: Flap detection +Component: livestatus +State: open +Date: 2013-09-26 10:39:53 +Targetversion: 1.4.0 +Class: feature + +When a connection breaks down than we could set the target +site to down for some longer time - in order to avoid +flapping situations. diff --git a/.bugs/990 b/.bugs/990 new file mode 100644 index 0000000..0d834d7 --- /dev/null +++ b/.bugs/990 @@ -0,0 +1,13 @@ +Title: Allow rescheduling of several checks to spread over time +Component: multisite +State: open +Date: 2013-09-26 10:41:56 +Targetversion: 1.2.3i3 +Class: feature + +When rescheduling more than one check we could offer a checkbox. If that +is checked then we spread the rescheduled services over a longer time. +Do we know the check period? Then we could use that. Otherwise make +a number entry for minutes. + +Very usefull for inventory checks.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0988

by Mathias Kettner

Module: check_mk Branch: master Commit: 6eb2de33ed64051fb870f4bbfa84b5f042fbb3ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eb2de33ed6405… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:32:10 2013 +0200 Updated bug entries #0988 --- .bugs/988 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/988 b/.bugs/988 new file mode 100644 index 0000000..bbf9474 --- /dev/null +++ b/.bugs/988 @@ -0,0 +1,9 @@ +Title: vsphere/piggyback: optionally use alias instead of hostname +Component: checks +State: open +Date: 2013-09-26 10:30:51 +Targetversion: future +Class: feature + +We could enable the host alias to be used for hostname matching. +That way users could use that field for their VMware host name.

10 years, 11 months

Check_MK Git: check_mk: agent_vsphere: added -D, --direct to usage

by Mathias Kettner

Module: check_mk Branch: master Commit: 2bfb9e0cb8cce08c4402181acb5181011499b215 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bfb9e0cb8cce0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:30:42 2013 +0200 agent_vsphere: added -D, --direct to usage --- agents/special/agent_vsphere | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f506e17..7565706 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -127,6 +127,9 @@ OPTIONS: -h, --help Show this help message and exit -u USER, --user USER Username for vSphere login -s SECRET, --secret SECRET Secret/Password for vSphere login + -D, --direct Assume a directly queried host system (no vCenter). In + This we expect data about only one HostSystem to be + Found and do not create piggy host data for that host. -H, --hostname Specify a hostname. This is neccessary if this is different from HOST. It is being used when outputting the hosts power state.

10 years, 11 months

Check_MK Git: check_mk: logwatch.ec: show logfiles from that we forwarded messages

by Mathias Kettner

Module: check_mk Branch: master Commit: 53478b254194a6cb1ebba8f03c4f9a8a17afb1e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53478b254194a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:12:59 2013 +0200 logwatch.ec: show logfiles from that we forwarded messages --- ChangeLog | 1 + checks/logwatch | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f0f3611..b07771c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * vSphere checks: secret is not shown to the user via WATO anymore * WATO rule to check state of physical switch (currently used by etherbox check) * cisco_wlc: Allows to configure handling of missing AP + * logwatch.ec: show logfiles from that we forwarded messages * FIX: blade_blades: Fixed output of "(UNKNOWN)" even if state is OK * FIX: apache_status: fix exception if parameter is None * FIX: hr_mem: handle virtual memory correct on some devices diff --git a/checks/logwatch b/checks/logwatch index 1669bf2..c3d10e5 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -467,11 +467,13 @@ def check_logwatch_ec(item, params, info): facility = params.get('facility', 17) << 3 # default to "local1" messages = [] cur_time = syslog_time() + forwarded_logfiles = set([]) for logfile, lines in logs.items(): for line in lines: msg = '<%d>' % (facility + logwatch_to_prio(line[0]),) msg += '%s %s %s: %s' % (cur_time, g_hostname, logfile, line[2:]) messages.append(msg) + forwarded_logfiles.add(logfile) # 4. send lines to event console # a) local in same omd site @@ -520,7 +522,12 @@ def check_logwatch_ec(item, params, info): file('%s/%s' % (spool_path, file_name), 'w').write('\n'.join(messages) + '\n') os.rename('%s/%s' % (spool_path, file_name), '%s/%s' % (spool_path, file_name[1:])) - return (0, 'Forwarded %d messages to event console' % num_messages, [('messages', num_messages)]) + if forwarded_logfiles: + logfile_info = " from " + ",".join(list(forwarded_logfiles)) + else: + logfile_info = "" + return (0, 'Forwarded %d messages%s to event console' % ( + num_messages, logfile_info ), [('messages', num_messages)]) except Exception, e: return (2, 'Unable to forward messages to event console (%s). Lost %d messages.' % (e, num_messages))

10 years, 11 months

Check_MK Git: check_mk: FIX: EC: fix error message for missing action

by Mathias Kettner

Module: check_mk Branch: master Commit: a2f782452c34c9be697f17479c33b987ad2656ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2f782452c34c9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:05:25 2013 +0200 FIX: EC: fix error message for missing action --- mkeventd/.f12 | 2 ++ mkeventd/bin/mkeventd | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mkeventd/.f12 b/mkeventd/.f12 index 4e8d41f..8074b44 100644 --- a/mkeventd/.f12 +++ b/mkeventd/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | sort | head -n 1)} OMD_ROOT=/omd/sites/${SITE} diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 6887e21..5ce1187 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2125,7 +2125,7 @@ class StatusServer: event = g_event_status.event(int(event_id)) if action_id not in g_config["action"]: raise MKClientError("The action '%s' is not defined. After adding new commands please " - "make sure that you activate the changes in the Event Console.") % action_id + "make sure that you activate the changes in the Event Console." % action_id) action = g_config["action"][action_id] do_rule_action(action, event, user)

10 years, 11 months

Check_MK Git: check_mk: FIX: EC: persist user settings for generated event

by Mathias Kettner

Module: check_mk Branch: master Commit: 2f7072bcd286e2301d4bc249de1cc21b9bbffa9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f7072bcd286e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 10:01:50 2013 +0200 FIX: EC: persist user settings for generated event --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 25a5c43..44c5068 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -777,6 +777,7 @@ def mode_mkeventd_rules(phase): if html.var("simulate") or html.var("_generate"): event = vs_mkeventd_event.from_html_vars("event") vs_mkeventd_event.validate_value(event, "event") + config.save_user_file("simulated_event", event) if html.has_var("_generate") and html.check_transaction(): if not event.get("application"): @@ -867,7 +868,6 @@ def mode_mkeventd_rules(phase): if html.var("simulate"): event = vs_mkeventd_event.from_html_vars("event") - config.save_user_file("simulated_event", event) else: event = None

10 years, 11 months

Check_MK Git: check_mk: New filters: Host state type and Service state type

by Andreas Boesl

Module: check_mk Branch: master Commit: 9b658649e2ed1a34fbf21e523ba4a8c75f9ebc98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b658649e2ed1a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 26 09:46:17 2013 +0200 New filters: Host state type and Service state type --- ChangeLog | 1 + web/plugins/views/filters.py | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 98893f9..4dce63f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,7 @@ to configure the interval of sidebar popup notification updates e.g. via WATO Global Settings. * New option for painting timestamp: as Unix Epoch time + * New filters: Host state type and Service state type * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 739dcce..958e950 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -286,6 +286,8 @@ class FilterHostState(Filter): declare_filter(115, FilterHostState()) + + class FilterTristate(Filter): def __init__(self, name, title, info, column, deflt = -1): self.column = column @@ -316,6 +318,25 @@ class FilterTristate(Filter): else: return self.filter_code(infoname, False) + +class FilterStateType(FilterTristate): + def __init__(self, info, column, title, deflt = -1): + FilterTristate.__init__(self, column, title, info, None, deflt) + + def display(self): + current = html.var(self.varname) + html.begin_radio_group(horizontal = True) + for value, text in [("0", _("SOFT")), ("1", _("HARD")), ("-1", _("(ignore)"))]: + checked = current == value or (current in [ None, ""] and int(value) == self.deflt) + html.radiobutton(self.varname, value, checked, text + "   ") + html.end_radio_group() + + def filter_code(self, infoname, positive): + return "Filter: state_type = %d\n" % int(positive) + +declare_filter(116, FilterStateType("host", "host_state_type", _("Host state type"))) +declare_filter(217, FilterStateType("service", "service_state_type", _("Service state type"))) + class FilterNagiosFlag(FilterTristate): def __init__(self, info, column, title, deflt = -1): FilterTristate.__init__(self, column, title, info, column, deflt)

10 years, 11 months

Check_MK Git: check_mk: FIX: mrpe: gracefully handle invalid exit code of plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b53efa3cb3c7715de507eff96e59bdf4ee2fc9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b53efa3cb3c77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:45:55 2013 +0200 FIX: mrpe: gracefully handle invalid exit code of plugin --- ChangeLog | 1 + checks/mrpe | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 98893f9..a74ba76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ by the check plugin * FIX: check_disk_smb: Remove $ from share when creating service description. Otherwise Nagios will not accept the service description. + * FIX: mrpe: gracefully handle invalid exit code of plugin Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/mrpe b/checks/mrpe index aa1390e..986e73b 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -59,6 +59,7 @@ def check_mrpe(item, params, info): check_name = None if line[0] == item: state = int(line[1]) + # convert to original format by joining and replacing \1 back with \n rest = " ".join(line[2:]).replace("\1", "\n") # split into lines @@ -66,6 +67,9 @@ def check_mrpe(item, params, info): # First line: OUTPUT|PERFDATA parts = lines[0].split("|", 1) output = [parts[0].strip()] + if state not in [ 0, 1, 2, 3]: + output[0] = "Invalid plugin status %d. Output is: %s" % (state, output[0]) + state = 3 if len(parts) > 1: perfdata = parts[1].strip().split() else:

10 years, 11 months

Check_MK Git: check_mk: Futher checkhelper supports .site

by Mathias Kettner

Module: check_mk Branch: master Commit: 8e6c2d7ed4a6af94182f2c8d6137adddc1dff84b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e6c2d7ed4a6af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 26 09:42:45 2013 +0200 Futher checkhelper supports .site --- checks/.f12 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/.f12 b/checks/.f12 index c4e5e87..5e1a7fa 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/

10 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013