Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

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, 10 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, 10 months

Check_MK Git: check_mk: Remove _() from internal filter code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e953e94ce92c52d434c156d49e830cd83e186177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e953e94ce92c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 6 13:37:57 2012 +0100 Remove _() from internal filter code --- web/plugins/views/filters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 4fe3a1b..3415559 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -42,7 +42,7 @@ class FilterText(Filter): htmlvar = self.htmlvars[0] current_value = html.var(htmlvar) if current_value: - return _("Filter: %s %s %s\n") % (self.column, self.op, current_value) + return "Filter: %s %s %s\n" % (self.column, self.op, current_value) else: return ""

11 years, 10 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: a966de2e570461560a1b4a829af7694c8c8a6c67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a966de2e570461… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 09:38:43 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Dashboard header can now be hidden by setting " title" to None

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85211d3b3d7ead4072d0495b2b3d263fba730e95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85211d3b3d7ead… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 08:37:04 2012 +0100 Dashboard header can now be hidden by setting "title" to None --- ChangeLog | 1 + web/htdocs/dashboard.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8ce60d..1ade945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * Dashboard globes can now be filtered by host_contact_group/service_contact_group * Dashboard "iframe" attribute can now be rendered dynamically using the "iframefunc" attribute in the dashlet declaration + * Dashboard header can now be hidden by setting "title" to None Livestatus: * Added new table statehist, used for SLA queries diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2bb4e12..7aa0907 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -123,8 +123,16 @@ def render_dashboard(name): # in order to make it clear to the user, that he is seeing only partial # data. title = board["title"] - if wato_folder is not None: + + if title is None: + # If the title is none, hide the header line + html.set_render_headfoot(False) + header_height = 0 + title = '' + + elif wato_folder is not None: title = wato.api.get_folder_title(wato_folder) + " - " + title + html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"]) html.write("<div id=dashboard class=\"dashboard_%s\">\n" % name) # Container of all dashlets

11 years, 10 months

Check_MK Git: check_mk: Fix: Changed pdu_gude from INT to FLOAT output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4944a849d88a65e38f1f615e3fc8967c3517cdd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4944a849d88a65… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 17:15:16 2012 +0100 Fix: Changed pdu_gude from INT to FLOAT output --- checks/pdu_gude.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/pdu_gude.include b/checks/pdu_gude.include index 53f77f9..279b013 100644 --- a/checks/pdu_gude.include +++ b/checks/pdu_gude.include @@ -52,7 +52,7 @@ def check_pdu_gude(item, params, info): perf = [] state = 0 for pos, data in units.items(): - value = saveint(values[pos]) + value = savefloat(values[pos]) unit, div = data if div: value = value / div @@ -73,7 +73,7 @@ def check_pdu_gude(item, params, info): elif warn != None and value > warn: state = max(state, 1) label = "(!)" - message.append("%d%s%s" % (value, unit, label)) + message.append("%.2f%s%s" % (value, unit, label)) return(state, nagios_state_names[0] + " - " + ", ".join(message), perf)

11 years, 10 months

Check_MK Git: check_mk: Changed cisco_mem check to inventory all available memory pools.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9915937b8bac2d04318f0ba2467e43f6a5c8150d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9915937b8bac2d… Author: Andreas Doehler <andreas.doehler(a)gmail.com> Date: Sun Nov 4 17:25:52 2012 +0100 Changed cisco_mem check to inventory all available memory pools. Signed-off-by: Andreas Doehler <andreas.doehler(a)gmail.com> --- checks/cisco_mem | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/cisco_mem b/checks/cisco_mem index ec439e9..65e25a1 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -23,22 +23,23 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -# .1.3.6.1.4.1.9.9.48.1.1.1.7.1 ciscoMemoryPoolLargestFree CPU Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.7.2 ciscoMemoryPoolLargestFree CPU Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.6.1 ciscoMemoryPoolUsed I/0 Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.6.2 ciscoMemoryPoolUsed I/0 Pool +# +# ciscoMemoryPoolName 1.3.6.1.4.1.9.9.48.1.1.1.2 +# ciscoMemoryPoolUsed 1.3.6.1.4.1.9.9.48.1.1.1.5 +# ciscoMemoryPoolFree 1.3.6.1.4.1.9.9.48.1.1.1.6 +# ciscoMemoryPoolLargestFree 1.3.6.1.4.1.9.9.48.1.1.1.7 +# cisco_mem_default_levels = (80.0, 90.0) -def check_cisco_mem(item, params, info): - if item == 'cpu': - mem_free = saveint(info[0][0]) - mem_used = saveint(info[0][1]) - elif item == 'io': - mem_free = saveint(info[0][2]) - mem_used = saveint(info[0][3]) +def inventory_cisco_mem(info): + return [ (line[0], "cisco_mem_default_levels") for line in info ] +def check_cisco_mem(item, params, info): + for line in info: + if line[0] == item: + mem_free = saveint(line[2]) + mem_used = saveint(line[1]) mem_total = mem_free + mem_used return check_cisco_mem_sub(params, mem_used, mem_total) @@ -69,11 +70,10 @@ def check_cisco_mem_sub(params, mem_used, mem_total): check_info["cisco_mem"] = { "check_function" : check_cisco_mem, - "inventory_function" : lambda info: [("cpu", "cisco_mem_default_levels"), ("io", "cisco_mem_default_levels")], - "service_description" : "Mem used %s pool", + "inventory_function" : inventory_cisco_mem, + "service_description" : "Mem used %s", "has_perfdata" : True, "group" : "memory", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.48.1.1.1.6.1"), - "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ 6.1, 6.2, 7.1, 7.2 ]), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2", "5", "6", "7" ]), } -

11 years, 10 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: 1b47b5749c5f04e8547023d09466196efdc5e461 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b47b5749c5f04… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 17:16:01 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: updated check_mk.example.ini with logfiles section

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd23888d4759adb655edc8ddfe4b444c5d76573f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd23888d4759ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 16:06:45 2012 +0100 updated check_mk.example.ini with logfiles section --- agents/windows/check_mk.example.ini | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 04c1059..dab8f1b 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -21,6 +21,22 @@ # are needed by checks shipped with check_mk. # counters = 10332:msx_queues + +[logfiles] + # Define textfiles to be monitored, separated by | + textfile = C:\tmp logfiles\message_*.log | D:\log\sample.txt + # Set patterns for defined textfiles + ok = Successfully logged in* + crit = Error in* + warning = Unable to contact* + ignore = Backup * saved + + # Define additional textfiles with different patterns + textfile = C:\tmp\memo.udf + # Set patterns for defined textfile + warning = *overdue* + ok = *mail sent* + [logwatch] # Testing: output *all* messages from the eventlogs # sendall = yes

11 years, 10 months

Check_MK Git: check_mk: Added pnp Template for apc_symetra_power

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e75df2d4a1c80ebe6e23e23a034b855b7ae348a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e75df2d4a1c80… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 14:53:18 2012 +0100 Added pnp Template for apc_symetra_power --- pnp-templates/check_mk-apc_symmetra_power.php | 39 +++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk-apc_symmetra_power.php b/pnp-templates/check_mk-apc_symmetra_power.php new file mode 100644 index 0000000..63b2c8b --- /dev/null +++ b/pnp-templates/check_mk-apc_symmetra_power.php @@ -0,0 +1,39 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$opt[1] = "--vertical-label \"Watt\" -l 0 -u 60 --title \"Current Power\" "; + + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#800040:\"Power\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%2.0lfW\" "; +$def[1] .= "LINE1:var1#800040:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfW,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfW)\" "; +$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]W\" "; + + + +?>

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits