Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Added comments into example notification script

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62d22fea12c0b30a5e437e124b8201662b30fede URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62d22fea12c0b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 8 09:37:42 2012 +0100 Added comments into example notification script --- notifications/debug | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/notifications/debug b/notifications/debug index c9ee5b4..8cf29ee 100755 --- a/notifications/debug +++ b/notifications/debug @@ -1,6 +1,21 @@ #!/bin/bash # Debug Notifications -# Turn on notification logging and you will see the environment in -# your notification logfile (var/check_mk/notify/notify.log) + +# This notification script is just an example and shows how the +# script is being called: + +# Check_MK will call this without an command line arguments. +# All information is passed in environment variables that begin +# with NOTIFY_. + +# This debug script will fetch those variables and simply +# write them to the standard output. If you have enabled +# notification logging by setting notification_logging=1 +# or notification_logging=2 in main.mk (or via WATO in the +# global settings: Notification -> Debug notifications, then +# you will see this output in the notitifcation log file. +# Under OMD this file is in ~/var/check_mk/notify/notify.log. + +# Please refer to the official documentation for more details. env | grep NOTIFY_ | sort

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0f5ad4f0e8e13f2d4820e8d8c3ad364087e024dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5ad4f0e8e13f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 8 09:37:44 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Fixed setting of global var to disable the dashboard title

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 996755e1ce00254a187af9e4d940eaa47dec8072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=996755e1ce0025… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 8 08:59:48 2012 +0100 Fixed setting of global var to disable the dashboard title --- web/htdocs/dashboard.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 7aa0907..2f389d8 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -127,6 +127,7 @@ def render_dashboard(name): if title is None: # If the title is none, hide the header line html.set_render_headfoot(False) + global header_height header_height = 0 title = ''

11 years, 7 months

Check_MK Git: check_mk: Fixed ImportError "Cannot import name attrencode" when importing wato module (at least in some rare situations/ python versions)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04c4a2236e368c1e6ab552c88ac4b72f7856ae88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04c4a2236e368c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 8 09:02:12 2012 +0100 Fixed ImportError "Cannot import name attrencode" when importing wato module (at least in some rare situations/python versions) --- web/htdocs/valuespec.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0801d6b..5da0caa 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,9 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time, re, sre_constants, urlparse, forms +import math, os, time, re, sre_constants, urlparse, forms, htmllib from lib import * -from htmllib import attrencode # Abstract base class of all value declaration classes. class ValueSpec: @@ -310,7 +309,7 @@ class TextAscii(ValueSpec): return _("none") else: if self._attrencode: - return attrencode(value) + return htmllib.attrencode(value) else: return value

11 years, 7 months

Check_MK Git: check_mk: New notifications should work,

by git＠mathias-kettner.de

documentation still missing User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d4a8debcbee61c4be6d8125d5c463c92055e1149 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4a8debcbee61c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 17:25:24 2012 +0100 New notifications should work, documentation still missing --- ChangeLog | 3 + Makefile | 3 +- check_mk_templates.cfg | 2 + defaults | 1 + modules/check_mk.py | 5 + modules/notify.py | 137 +++++++++++++++++++++--- modules/packaging.py | 3 +- notifications/.f12 | 3 + notifications/README | 10 ++ notifications/debug | 6 + scripts/setup.sh | 4 + web/htdocs/wato.py | 174 ++++++++++++++++++++++++++++- web/plugins/wato/globals_notification.py | 2 +- 13 files changed, 331 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d4a8debcbe…

11 years, 7 months

Check_MK Git: check_mk: New notifications: intermediate state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0b3111bc1647eba6a169831a6d19b9433c77b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b3111bc1647e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 13:33:39 2012 +0100 New notifications: intermediate state --- modules/notify.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 92791c6..18f858c 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -191,14 +191,22 @@ def notify_flexible(contact, context, notification_table): for entry in notification_table: plugin = entry["plugin"] notify_log("Plugin: %s" % plugin) - if entry["disabled"]: + + # Check disabling + if entry.get("disabled"): notify_log("- Skipping: it is disabled for this user") continue + + # Check service, if configured + if entry.get([" + + # Was fehlt noch? # 1. Event-Typ filtern # 2. timepreriod filtern (dazu Livestatusanfrage notwendig, wenn nicht 7X24 # 3. Eskalation # 4. Dann das Plugin aufrufen, dabei aber das Environment vorher vorbereiten + # 5. Services notify_log(repr(notification_table))

11 years, 7 months

Check_MK Git: check_mk: New sub-permissions for changing comment and contact while updating an event

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82e3eb1238123e2a8fd554ed917278ffe49da002 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82e3eb1238123e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 10:31:23 2012 +0100 New sub-permissions for changing comment and contact while updating an event --- ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 34 +++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21d4190..2d80ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * check_mkevents outputs last worst line in service output * Max. number of queued connections on status sockets is configurable now * check_mkevents: new option -a for ignoring acknowledged events + * New sub-permissions for changing comment and contact while updating an event Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index c8c0873..7aa4cec 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -571,14 +571,28 @@ if mkeventd_enabled: _("Update an event"), _("Needed for acknowledging and changing the comment and contact of an event"), [ "user", "admin" ]) + + # Sub-Permissions for Changing Comment, Contact and Acknowledgement + config.declare_permission("mkeventd.update_comment", + _("Update an event: change comment"), + _("Needed for changing a comment when updating an event"), + [ "user", "admin" ]) + config.declare_permission("mkeventd.update_contact", + _("Update an event: change contact"), + _("Needed for changing a contact when updating an event"), + [ "user", "admin" ]) def render_mkeventd_update(): html.write('<table border=0 cellspacing=3 cellpadding=0>') - html.write('<tr><td>%s</td><td>' % _("Change comment:")) - html.text_input('_mkeventd_comment', size=50) - html.write('</td></tr><tr><td>%s</td><td>' % _("Change contact:")) - html.text_input('_mkeventd_contact', size=50) - html.write('</td></tr><td></td><td>') + if config.may("mkeventd.update_comment"): + html.write('<tr><td>%s</td><td>' % _("Change comment:")) + html.text_input('_mkeventd_comment', size=50) + html.write('</td></tr>') + if config.may("mkeventd.update_contact"): + html.write('<tr><td>%s</td><td>' % _("Change contact:")) + html.text_input('_mkeventd_contact', size=50) + html.write('</td></tr>') + html.write('<td></td><td>') html.checkbox('_mkeventd_acknowledge', True, label=_("Set event to acknowledged")) html.write('</td></tr>') html.write('</table>') @@ -586,8 +600,14 @@ if mkeventd_enabled: def command_mkeventd_update(cmdtag, spec, row): if html.var('_mkeventd_update'): - comment = html.var_utf8("_mkeventd_comment").strip().replace(";",",") - contact = html.var_utf8("_mkeventd_contact").strip().replace(":",",") + if config.may("mkeventd.update_comment"): + comment = html.var_utf8("_mkeventd_comment").strip().replace(";",",") + else: + comment = "" + if config.may("mkeventd.update_contact"): + contact = html.var_utf8("_mkeventd_contact").strip().replace(":",",") + else: + contact = "" ack = html.get_checkbox("_mkeventd_acknowledge") return "UPDATE;%s;%s;%s;%s;%s" % \ (row["event_id"], config.user_id, ack and 1 or 0, comment, contact), \

11 years, 7 months

Check_MK Git: check_mk: Update WATO rule for new option -a for check_mkevents

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 847a30a853c87c16242e081a822573aa075e3642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=847a30a853c87c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 10:18:05 2012 +0100 Update WATO rule for new option -a for check_mkevents --- mkeventd/checks/check_mkevents | 2 ++ mkeventd/web/plugins/wato/mkeventd.py | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/mkeventd/checks/check_mkevents b/mkeventd/checks/check_mkevents index 10a5bca..3f54b74 100644 --- a/mkeventd/checks/check_mkevents +++ b/mkeventd/checks/check_mkevents @@ -5,6 +5,8 @@ def check_mkevents_arguments(params): args = "" if "remote" in params: args += "-H %s:%d " % (params["remote"]) + if params.get("ignore_acknowledged"): + args += "-a " args += params.get("hostspec", "$HOSTADDRESS$") if "application" in params: args += " " + quote_shell_string(params["application"]) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 3269f03..6395413 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1425,6 +1425,16 @@ register_rule( allow_empty = False, ) ), + ( "ignore_acknowledged", + FixedValue( + True, + title = _("Ignore Acknowledged Events"), + help = _("If you check this box then only open events are honored when " + "determining the event state. Acknowledged events are displayed " + "(i.e. their count) but not taken into account."), + totext = _("acknowledged events will not be honored"), + ) + ), ( "remote", Tuple( elements = [ @@ -1447,7 +1457,7 @@ register_rule( ) ), ], - optional_keys = [ "application", "remote" ], + optional_keys = [ "application", "remote", "ignore_acknowledged" ], ), match = 'all', )

11 years, 7 months

Check_MK Git: check_mk: check_mkevent: new option -a for ignoring acknowledged events

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 35ab9ba6ad1dda76f073847a576fc8b6d298f62e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ab9ba6ad1dda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 10:07:32 2012 +0100 check_mkevent: new option -a for ignoring acknowledged events --- ChangeLog | 1 + mkeventd/lib/check_mkevents | 39 ++++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ade945..21d4190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * New icon linking to event views for the event services * check_mkevents outputs last worst line in service output * Max. number of queued connections on status sockets is configurable now + * check_mkevents: new option -a for ignoring acknowledged events Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 9d93fce..f875861 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -46,6 +46,12 @@ def query(query, remote_host): try: remote_host = None + try: + del sys.argv[sys.argv.index('-a')] + opt_ignore_acknowledged = True + except: + opt_ignore_acknowledged = False + if sys.argv[1] == '-H': remote_host = sys.argv[2] del sys.argv[1:3] @@ -54,8 +60,10 @@ try: application = sys.argv[2] else: application = None -except: - sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT] HOST [APPLICATION]\n") +except 1: + sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT] [-a] HOST [APPLICATION]\n") + sys.stdout.write("\n -a do not take into account acknowledged events.\n") + sys.stdout.write("\n") sys.exit(3) q = "GET events\n" \ @@ -73,17 +81,19 @@ worst_row = None count = 0 unhandled = 0 for line in response[1:]: + count += 1 row = dict(zip(headers, line)) - s = row["event_state"] - if s == 3: - if worst_state < 2: - worst_state = 3 + p = row["event_phase"] + if p == 'open' or not opt_ignore_acknowledged: + s = row["event_state"] + if s == 3: + if worst_state < 2: + worst_state = 3 + worst_row = row + elif s >= worst_state: + worst_state = s worst_row = row - elif s >= worst_state: - worst_state = s - worst_row = row - count += 1 - if row["event_phase"] == 'open': + if p == 'open': unhandled += 1 nagios_state_names = { @@ -99,8 +109,11 @@ elif count == 0: sys.stdout.write("OK - no events for %s\n" % host_name) else: sys.stdout.write(nagios_state_names[worst_state] + \ - " - %d events (%d unacknowledged), worst state is %s (Last line: %s)\n" % \ - (count, unhandled, nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) + " - %d events (%d unacknowledged)" % (count, unhandled)) + if worst_row: + sys.stdout.write(", worst state is %s (Last line: %s)" % \ + (nagios_state_names[worst_state], worst_row['event_text'].encode('utf-8'))) + sys.stdout.write("\n") sys.exit(worst_state)

11 years, 7 months

Check_MK Git: check_mk: Fix inline docu in check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 796e62ad33e21eadba867ca316de280fb2b39e7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796e62ad33e21e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 09:38:40 2012 +0100 Fix inline docu in check --- checks/fileinfo | 8 ++-- modules/notify.py | 96 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 76 insertions(+), 28 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 9fb3e57..6086fce 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -36,10 +36,10 @@ # M:\crash.exe|20024|12968154426 # Parameters -# "minsize" : ( 5000, 4000 ), in bytes -# "maxsize" : ( 8000, 9000 ), in bytes -# "minage" : ( 10, 20 ), in minutes -# "maxage" : ( 50, 80 ), in minutes +# "minsize" : ( 5000, 4000 ), in bytes +# "maxsize" : ( 8000, 9000 ), in bytes +# "minage" : ( 600, 1200 ), in seconds +# "maxage" : ( 6000, 12000 ), in seconds fileinfo_groups = [] def inventory_fileinfo(info, case): diff --git a/modules/notify.py b/modules/notify.py index 600a0c9..92791c6 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -89,6 +89,22 @@ def do_notify(args): sys.stderr.write("check_mk --notify does not take any arguments.\n") sys.exit(1) + + # Hier müssen wir erstmal rausfinden, an wen die Notifikation gehen soll. + # Das sollte hoffentlich als Env-Variable da sein. Wenn nicht in check_mk_templates.cfg + # einbauen. Dann können wir in den Kontaktdefinitionen nachschauen. Diese sollten + # ja in main.mk/conf.d vorhanden sein. Die neue Notifikationstabelle muss auf jeden + # fall da rein. Für den Benutzer rufen also diese Tabelle auf. Wenn es die + # nicht gibt (garkein Eintrag), verfahren wir nach dem alten Verfahren und + # senden direkt eine Email. Wenn es die Tabelle aber gibt, werten wir + # Zeile für Zeile aus: + # - Bestimmen, ob die Zeile aktiv ist. Dazu ist evtl. eine Livestatus-Rückanfrage + # notwendig. Das ist nicht optimal, aber zumindest wegen der Timeperiods notwendig. + # - Wenn aktiv, dann rufen wir das Plugin dazu auf. Dieses hat sich mit einer + # Python-Funktion registriert. Wo werden diese definiert? Im precompiled-Fall + # brauchen wir das *nicht*. Man könnte die Plugins also einfach nur bei --notify + # einlesen. Zeitkritisch ist das nicht sehr, denn Notifikationen sind selten. + # Information about notification is excpected in the # environment in variables with the prefix NOTIFY_ context = dict([ @@ -115,32 +131,19 @@ def do_notify(args): "that are prefixed with NOTIFY_\n") sys.exit(1) - try: - notify_log(substitute_context(notification_log_template, context)) + # Get notification settings for the contact in question - if available. + method = "email" + contact = contacts.get(context["CONTACTNAME"]) - if "SERVICEDESC" in context: - subject_t = notification_service_subject - body_t = notification_service_body + try: + if contact: + method = contact.get("notification_method") + else: + method = 'email' + if type(method) == tuple and method[0] == 'flexible': + notify_flexible(contact, context, method[1]) else: - subject_t = notification_host_subject - body_t = notification_host_body - - subject = substitute_context(subject_t, context) - context["SUBJECT"] = subject - body = substitute_context(notification_common_body + body_t, context) - command = substitute_context(notification_mail_command, context) - command_utf8 = command.encode("utf-8") - if notification_logging >= 2: - notify_log("Executing command: %s" % command) - notify_log(body) - # Make sure that mail(x) is using UTF-8. More then - # setting the locale cannot be done here. We hope that - # C.UTF-8 is always available. Please check the output - # of 'locale -a' on your system if you are curious. - os.putenv("LANG", "C.UTF-8") - if notification_logging >= 2: - file(var_dir + "/notify/body.log", "w").write(body.encode("utf-8")) - os.popen(command_utf8, "w").write(body.encode("utf-8")) + notify_via_email(context) except Exception, e: notify_log("ERROR: %s\n%s" % (e, format_exception())) @@ -148,12 +151,57 @@ def do_notify(args): if notification_log: sys.stderr.write("Details have been logged to %s.\n" % notification_log) sys.exit(1) + except Exception, e: crash_dir = var_dir + "/notify" if not os.path.exists(crash_dir): os.makedirs(crash_dir) file(crash_dir + "/crash.log", "a").write("CRASH:\n%s\n\n" % format_exception()) + +def notify_via_email(context): + notify_log(substitute_context(notification_log_template, context)) + + if "SERVICEDESC" in context: + subject_t = notification_service_subject + body_t = notification_service_body + else: + subject_t = notification_host_subject + body_t = notification_host_body + + subject = substitute_context(subject_t, context) + context["SUBJECT"] = subject + body = substitute_context(notification_common_body + body_t, context) + command = substitute_context(notification_mail_command, context) + command_utf8 = command.encode("utf-8") + if notification_logging >= 2: + notify_log("Executing command: %s" % command) + notify_log(body) + # Make sure that mail(x) is using UTF-8. More then + # setting the locale cannot be done here. We hope that + # C.UTF-8 is always available. Please check the output + # of 'locale -a' on your system if you are curious. + os.putenv("LANG", "C.UTF-8") + if notification_logging >= 2: + file(var_dir + "/notify/body.log", "w").write(body.encode("utf-8")) + os.popen(command_utf8, "w").write(body.encode("utf-8")) + +def notify_flexible(contact, context, notification_table): + notify_log("Flexible notification for %s" % context["CONTACTNAME"]) + for entry in notification_table: + plugin = entry["plugin"] + notify_log("Plugin: %s" % plugin) + if entry["disabled"]: + notify_log("- Skipping: it is disabled for this user") + continue + # Was fehlt noch? + # 1. Event-Typ filtern + # 2. timepreriod filtern (dazu Livestatusanfrage notwendig, wenn nicht 7X24 + # 3. Eskalation + # 4. Dann das Plugin aufrufen, dabei aber das Environment vorher vorbereiten + notify_log(repr(notification_table)) + + def format_exception(): import traceback, StringIO, sys txt = StringIO.StringIO()

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012