Checkmk git commits May 2013

checkmk-commits@lists.checkmk.com

3 participants
111 discussions

Check_MK Git: check_mk: EC: New rule match: only apply rule within specified time period

by Mathias Kettner

Module: check_mk Branch: master Commit: 9beb92bb39ebc4641ff713e62cb3ab6305a3a838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9beb92bb39ebc4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 17 13:08:47 2013 +0200 EC: New rule match: only apply rule within specified time period --- ChangeLog | 1 + mkeventd/bin/mkeventd | 111 ++++++++++++++++++++++++++------- mkeventd/web/plugins/wato/mkeventd.py | 13 +++- scripts/setup.sh | 1 + 4 files changed, 101 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4869f98..4eb9a49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * New rule feature: automatically delete event after actions * New filter for maximum services level (minimum already existed) * New global setting: hostname translation (allows e.g. to drop domain name) + * New rule match: only apply rule within specified time period Checks & Agents: * solaris_mem: New check for memory and swap for Solaris agent diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 563a6f6..67289e8 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -241,6 +241,60 @@ class VerboseLock: #. +# .--Timeperiods---------------------------------------------------------. +# | _____ _ _ _ | +# | |_ _(_)_ __ ___ ___ _ __ ___ _ __(_) ___ __| |___ | +# | | | | | '_ ` _ \ / _ \ '_ \ / _ \ '__| |/ _ \ / _` / __| | +# | | | | | | | | | | __/ |_) | __/ | | | (_) | (_| \__ \ | +# | |_| |_|_| |_| |_|\___| .__/ \___|_| |_|\___/ \__,_|___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# | Timeperiods are used in rule conditions | +# '----------------------------------------------------------------------' + +# Dictionary from name to True/False (active / inactive) +g_timeperiods = None +g_last_timeperiod_update = 0 + +def update_timeperiods(): + global g_timeperiods, g_last_timeperiod_update + + if g_timeperiods != None and time.time() < g_last_config_reload + 60: + return # only update once a minute + log("Updating timeperiod information") + + try: + livesock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + livesock.connect(g_livestatus_socket) + livesock.send("GET timeperiods\nColumns: name alias in\n") + livesock.shutdown(socket.SHUT_WR) + answer = livesock.recv(10000000) + table = [ line.split(';') for line in answer.split('\n')[:-1] ] + new_timeperiods = {} + for tpname, alias, isin in table: + new_timeperiods[tpname] = (alias, isin == '1' and True or False) + g_timeperiods = new_timeperiods + g_last_timeperiod_update = time.time() + except Exception, e: + log("Cannot update timeperiod information: %s" % e) + if opt_debug: + raise + +def check_timeperiod(tpname): + update_timeperiods() + if not g_timeperiods: + log("Warning: no timeperiod information. Assuming %s active" % tpname) + return True + + elif tpname not in g_timeperiods: + log("Warning: no such timeperiod %s. Assume to active" % tpname) + return True + + else: + return g_timeperiods[tpname][1] + + +#. # .--Daemonize-----------------------------------------------------------. # | ____ _ | # | | _ \ __ _ ___ _ __ ___ ___ _ __ (_)_______ | @@ -1356,6 +1410,11 @@ class EventServer: log(" did not match because of wrong syslog facility") return False + if "match_timeperiod" in rule and not check_timeperiod(rule["match_timeperiod"]): + if debug: + log(" did not match, because timeperiod %s is not active" % rule["match_timeperiod"]) + return False + if "match_ok" in rule or "cancel_priority" in rule: if "cancel_priority" in rule: up, lo = rule["cancel_priority"] @@ -2729,6 +2788,7 @@ def usage(): -C, --configdir Path to directory where mkevent.mk lives -S, --socket P Path to unix socket for querying status -E, --eventsocket P Path to unix socket for receiving events (optional) + -L, --livestatus P Path to livestatus socket of monitoring core (optional) -P, --pipe P Path to pipe for receiving events --syslog Enable builtin syslog server --syslog-fd FD Do not open UDP port 514, but inherit it via this FD @@ -2742,13 +2802,14 @@ def usage(): sys.stdout.write("""You are running OMD, which is generally a good idea. The following defaults are set: - Config dir: %(g_config_dir)s - Unix socket: %(g_socket_path)s - Event socket: %(g_eventsocket_path)s - Event Pipe: %(g_pipe_path)s - PID file: %(g_pid_file)s - Log file: %(g_logfile_path)s - Status dir: %(g_state_dir)s + Config dir: %(g_config_dir)s + Unix socket: %(g_socket_path)s + Event socket: %(g_eventsocket_path)s + Livestatus socket %(g_livestatus_socket)s + Event Pipe: %(g_pipe_path)s + PID file: %(g_pid_file)s + Log file: %(g_logfile_path)s + Status dir: %(g_state_dir)s """ % globals()) @@ -2781,27 +2842,29 @@ opt_syslog_fd = None # Set default values for options omd_root = os.getenv("OMD_ROOT") if omd_root: - g_config_dir = omd_root + "/etc/check_mk" - g_socket_path = omd_root + "/tmp/run/mkeventd/status" - g_eventsocket_path = omd_root + "/tmp/run/mkeventd/eventsocket" - g_pipe_path = omd_root + "/tmp/run/mkeventd/events" - g_pid_file = omd_root + "/tmp/run/mkeventd/pid" - g_logfile_path = omd_root + "/var/log/mkeventd.log" - g_state_dir = omd_root + "/var/mkeventd" + g_config_dir = omd_root + "/etc/check_mk" + g_socket_path = omd_root + "/tmp/run/mkeventd/status" + g_eventsocket_path = omd_root + "/tmp/run/mkeventd/eventsocket" + g_livestatus_socket = omd_root + "/tmp/run/live" + g_pipe_path = omd_root + "/tmp/run/mkeventd/events" + g_pid_file = omd_root + "/tmp/run/mkeventd/pid" + g_logfile_path = omd_root + "/var/log/mkeventd.log" + g_state_dir = omd_root + "/var/mkeventd" else: - g_config_dir = "/etc/check_mk" - g_socket_path = None - g_eventsocket_path = None - g_pipe_path = None - g_pid_file = "/var/run/mkeventd.pid" - g_logfile_path = "/var/log/mkeventd.log" - g_state_dir = "/var/lib/mkeventd" + g_config_dir = "/etc/check_mk" + g_socket_path = None + g_eventsocket_path = None + g_livestatus_socket = None + g_pipe_path = None + g_pid_file = "/var/run/mkeventd.pid" + g_logfile_path = "/var/log/mkeventd.log" + g_state_dir = "/var/lib/mkeventd" -short_options = "hvVgS:P:p:C:E:" +short_options = "hvVgS:P:p:C:E:L:" long_options = [ "help", "version", "verbose", "debug", "foreground", "socket=", "eventsocket=", "pipe=", "pidfile=", "statedir=", "configdir=", "logdir=", "profile-status", "profile-event", "debug-locking", - "syslog", "syslog-fd=" ] + "syslog", "syslog-fd=", "livestatus=" ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -2820,6 +2883,8 @@ try: g_socket_path = a elif o in [ '-E', '--eventsocket' ]: g_eventsocket_path = a + elif o in [ '-L', '--livestatus' ]: + g_livestatus_socket = a elif o in [ '-P', '--pipe' ]: g_pipe_path = a elif o == '--syslog': diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 86e70b1..a67370a 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -523,6 +523,15 @@ vs_mkeventd_rule = Dictionary( ], ), ), + ( "match_timeperiod", + TimeperiodSelection( + title = _("Match only during timeperiod"), + help = _("Match this rule only during times where the selected timeperiod from the monitoring " + "system is active. The Timeperiod definitions are taken from the monitoring core that " + "is running on the same host or OMD site as the event daemon. Please note, that this " + "selection only offers timeperiods that are defined with WATO."), + ), + ), ( "match_ok", RegExpUnicode( title = _("Text to cancel event"), @@ -610,13 +619,13 @@ vs_mkeventd_rule = Dictionary( ), ], optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", - "match_facility", "match_sl", "match_host", "match_application", + "match_facility", "match_sl", "match_host", "match_application", "match_timeperiod", "set_text", "set_host", "set_application", "set_comment", "set_contact", "cancel_priority", "match_ok" ], headers = [ ( _("General Properties"), [ "id", "description", "disabled" ] ), ( _("Matching Criteria"), [ "match", "match_host", "match_application", "match_priority", "match_facility", - "match_sl", "match_ok", "cancel_priority" ]), + "match_sl", "match_ok", "cancel_priority", "match_timeperiod" ]), ( _("Outcome & Action"), [ "state", "sl", "actions", "drop", "autodelete" ]), ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), diff --git a/scripts/setup.sh b/scripts/setup.sh index 90a7989..aafa7ff 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -612,6 +612,7 @@ VARDIR=$mkeventdstatedir CONFDIR=$confdir MKEVENTD_SYSLOG=off RUNUSER=$nagiosuser +LIVESTATUS=$livesock # DEBUG="--debug --foreground" PIDFILE=\$SOCKETDIR/pid

11 years, 1 month

Check_MK Git: check_mk: FIX: aix_lvm: handle agents that output an extra header line

by Mathias Kettner

Module: check_mk Branch: master Commit: 42926865436ecef1be19d2590e73b69630092dcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42926865436ece… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 17 11:49:10 2013 +0200 FIX: aix_lvm: handle agents that output an extra header line --- ChangeLog | 1 + checks/aix_lvm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2d03669..4869f98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * FIX: f5_bigip_vserver: fix wrong OID (13 instead of 1), thanks to Miro Ramza * FIX: f5_bigip_psu: handle more than first power supply, thanks to Miro Ramza * FIX: ipmi_sensors: ignore sensors in state [NA] (not available) + * FIX: aix_lvm: handle agents that output an extra header line Multisite: * List of views: Output the alias of a datasource instead of internal name diff --git a/checks/aix_lvm b/checks/aix_lvm index 362071d..be918ac 100644 --- a/checks/aix_lvm +++ b/checks/aix_lvm @@ -69,6 +69,9 @@ def parse_aix_lvm(info): if len(line) == 1: vgname = line[0][:-1] lvmconf.update({ vgname : {} }) + # Some versions send a title line "LV NAME ..." + elif line[0] == "LV" and line[1] == "NAME": + continue else: lv, lvtype, num_lp, num_pp, num_pv, act_state, mountpoint = line # split lv state into two relevant values

11 years, 1 month

Check_MK Git: check_mk: apache_status: New rule: set levels for number of remaining open slots

by Andreas Boesl

Module: check_mk Branch: master Commit: 9911feaca090b90322146c96bb54dfd2a9557ae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9911feaca090b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 17 11:40:20 2013 +0200 apache_status: New rule: set levels for number of remaining open slots --- ChangeLog | 1 + checkman/apache_status | 4 ++ checks/apache_status | 42 +++++++++---- pnp-templates/check_mk-apache_status.php | 101 ++++++++++++------------------ web/plugins/wato/check_parameters.py | 25 ++++++++ 5 files changed, 101 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9911feaca0…

11 years, 1 month

Check_MK Git: check_mk: FIX: fix column editor for join columns if SERVICE: is l10n'ed

by Mathias Kettner

Module: check_mk Branch: master Commit: a92b3ee3104d3505dd2d589f7d0535c7e459667d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a92b3ee3104d35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 16:17:12 2013 +0200 FIX: fix column editor for join columns if SERVICE: is l10n'ed --- ChangeLog | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5154821..17349ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -141,6 +141,7 @@ Multisite: * List of views: Output the alias of a datasource instead of internal name + * FIX: fix column editor for join columns if "SERVICE:" is l10n'ed WATO: * FIX: convert editing of global setting to POST. This avoid URL-too-long diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ef07701..bcbac05 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2009,7 +2009,7 @@ def allowed_for_joined_datasource(collection, datasourcename): def is_joined_value(collection, varname): selected_label = [ label for name, label in collection if name == html.var(varname, '') ] - return selected_label and selected_label[0][:8] == _('SERVICE:') + return selected_label and selected_label[0].startswith(_('SERVICE:')) def collist_of_collection(collection, join_target = []): def sort_list(l):

11 years, 1 month

Check_MK Git: check_mk: mk_logwatch: replace \\0 with complete message

by Mathias Kettner

Module: check_mk Branch: master Commit: c9d9c60ceb0f438e9303721cd56280973457bf8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d9c60ceb0f43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 16:00:35 2013 +0200 mk_logwatch: replace \\0 with complete message --- agents/plugins/mk_logwatch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 60163d3..46dce99 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -232,9 +232,9 @@ def process_logfile(logfile, patterns): if replace: matches = pattern.match(log_line) replace_count = 1 - new_message = replace + new_message = replace.replace('\\0', log_line) for replacement in matches.groups(): - new_message = new_message.replace('\%d' % replace_count, replacement) + new_message = new_message.replace('\\%d' % replace_count, replacement) replace_count += 1 log_line = new_message break

11 years, 1 month

Check_MK Git: check_mk: FIX: .f12 in web: do not delete mkeventd files

by Mathias Kettner

Module: check_mk Branch: master Commit: 61eb85364ae7c276925f17120af3e6f9be2efc62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61eb85364ae7c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 12:49:29 2013 +0200 FIX: .f12 in web: do not delete mkeventd files --- web/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index f2d6c0e..59f0223 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,6 +1,6 @@ #!/bin/bash SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo rsync --exclude=defaults.py --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ +sudo rsync --exclude=defaults.py --exclude "*mkevent*" --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache

11 years, 1 month

Check_MK Git: check_mk: FIX: convert editing of global setting to POST.

by Mathias Kettner

Module: check_mk Branch: master Commit: bb76f59a3e6966226aebd07c1eae526d1cd60861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb76f59a3e6966… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 12:50:14 2013 +0200 FIX: convert editing of global setting to POST. Conflicts: ChangeLog --- ChangeLog | 6 ++++++ web/htdocs/wato.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a90929e..74fb65e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,12 @@ * FIX: f5_bigip_psu: handle more than first power supply, thanks to Miro Ramza * FIX: ipmi_sensors: ignore sensors in state [NA] (not available) + Multisite: + * List of views: Output the alias of a datasource instead of internal name + + WATO: + * FIX: convert editing of global setting to POST. This avoid URL-too-long + when defining lots of Event Console actions 1.2.2p1: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb82b7a..4a8fb36 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5530,7 +5530,7 @@ def mode_edit_configvar(phase): check_mk_vars = check_mk_local_automation("get-configuration", [], [varname]) value = check_mk_vars.get(varname, valuespec.default_value()) - html.begin_form("value_editor") + html.begin_form("value_editor", method="POST") forms.header(valuespec.title()) if not config.wato_hide_varnames: forms.section(_("Variable for <tt>%s.mk</tt>" %

11 years, 1 month

Check_MK Git: check_mk: Minor code beautification

by Mathias Kettner

Module: check_mk Branch: master Commit: ace16fb151c3e8eb68bd0706a340c19154b09541 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ace16fb151c3e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 10:29:40 2013 +0200 Minor code beautification --- livestatus/src/TableStateHistory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index e111dc8..e7e5bc3 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -105,9 +105,9 @@ class TableStateHistory : public Table // Helper functions to traverse through logfiles _logfiles_t::iterator _it_logs; - logfile_entries_t* _entries; + logfile_entries_t *_entries; logfile_entries_t::iterator _it_entries; - LogEntry* _current_entry; + LogEntry *_current_entry; public: TableStateHistory();

11 years, 1 month

Check_MK Git: check_mk: WATO: New rule for notification_options of hosts and services

by Mathias Kettner

Module: check_mk Branch: master Commit: e68bb49c6767824759a7b4f312d76690569ae66b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e68bb49c676782… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 09:52:50 2013 +0200 WATO: New rule for notification_options of hosts and services --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 51 +++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41d9723..d688d30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ for each logfile on a host * Configuration of an alternativ host check command * Inventory: Display link symbol for ps ruleset + * New rule for notification_options of hosts and services * FIX: Rulesets: correct display of rules within subfolders diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2a90b6a..1bc5f19 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1257,8 +1257,57 @@ register_rule(group, "service completely. Per default all notifications are enabled."), choices = [ ("1", _("Enable service notifications")), ("0", _("Disable service notifications")) ], + ), + itemtype = "service" +) + +register_rule(group, + "extra_host_conf:notification_options", + Transform( + ListChoice( + choices = [ + ( "d", _("Host goes down")), + ( "u", _("Host gets unreachble")), + ( "r", _("Host goes up again")), + ( "f", _("Start or end of flapping state")), + ( "s", _("Start or end of a scheduled downtime")), + ], + default_value = [ "d", "u", "r", "f", "s" ], ), - itemtype = "service") + title = _("Notified events for hosts"), + help = _("This ruleset allows you to restrict notifications of host problems to certain " + "states, e.g. only notify on DOWN, but not on UNREACHABLE. Please select the types " + "of events that should initiate notifications. Please note that several other " + "filters must also be passed in order for notifications to finally being sent out."), + forth = lambda x: x != 'n' and x.split(",") or [], + back = lambda x: ",".join(x) or "n", + ), +) + +register_rule(group, + "extra_service_conf:notification_options", + Transform( + ListChoice( + choices = [ + ("w", _("Service goes into warning state")), + ("u", _("Service goes into unknown state")), + ("c", _("Service goes into critical state")), + ("r", _("Service recovers to OK")), + ("f", _("Start or end of flapping state")), + ("s", _("Start or end of a scheduled downtime")), + ], + default_value = [ "w", "u", "c", "r", "f", "s" ], + ), + title = _("Notified events for services"), + help = _("This ruleset allows you to restrict notifications of service problems to certain " + "states, e.g. only notify on CRIT, but not on WARN. Please select the types " + "of events that should initiate notifications. Please note that several other " + "filters must also be passed in order for notifications to finally being sent out."), + forth = lambda x: x != 'n' and x.split(",") or [], + back = lambda x: ",".join(x) or "n", + ), + itemtype = "service" +) register_rule(group, "extra_host_conf:notification_period",

11 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 6d83c0c189650f83437405c5fcf45f75cbb7f968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d83c0c189650f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 16 09:52:51 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 1 month

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2013