Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: esx_vsphere_vm.guest_tools: renamed check ( formerly esx_vsphere_vm.guestTools)

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f7f194566e4ba6492c17c6e810e8b4d270d1fb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f7f194566e4ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 21 10:31:17 2014 +0200 esx_vsphere_vm.guest_tools: renamed check (formerly esx_vsphere_vm.guestTools) Due to a inconstent naming we had to rename the check {esx_vsphere_vm.guestTools} into {esx_vsphere_vm.guest_tools}. Please reinventorize the affected hosts in order to switch over to the new plugin. --- .werks/975 | 9 +++++++++ ChangeLog | 2 ++ checks/esx_vsphere_vm | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/975 b/.werks/975 new file mode 100644 index 0000000..601647a --- /dev/null +++ b/.werks/975 @@ -0,0 +1,9 @@ +Title: esx_vsphere_vm.guest_tools: renamed check (formerly esx_vsphere_vm.guestTools) +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1400660997 +Class: incomp + +Due to a inconstent naming we had to rename the check {esx_vsphere_vm.guestTools} into {esx_vsphere_vm.guest_tools}. +Please reinventorize the affected hosts in order to switch over to the new plugin. diff --git a/ChangeLog b/ChangeLog index f0a9fda..fac7fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ * 0162 if_brocade: New if64 Check version for Brocade VDX Switches... NOTE: Please refer to the migration notes! * 0956 fast_lta_headunit.status, fast_lta_headunit.replication: New checks for FAST LTA Storage Systems + * 0975 esx_vsphere_vm.guest_tools: renamed check (formerly esx_vsphere_vm.guestTools)... + NOTE: Please refer to the migration notes! * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 219b12e..fdef02e 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -119,6 +119,7 @@ check_info['esx_vsphere_vm.name'] = { +#. # .--Runtime Host--------------------------------------------------------. # | ____ _ _ _ _ _ | # | | _ \ _ _ _ __ | |_(_)_ __ ___ ___ | | | | ___ ___| |_ | @@ -152,6 +153,7 @@ check_info['esx_vsphere_vm.running_on'] = { } +#. # .--VM Datastores--------------------------------------------------------. # | __ ____ __ ____ _ _ | # | \ \ / / \/ | | _ \ __ _| |_ __ _ ___| |_ ___ _ __ ___ | @@ -248,13 +250,14 @@ def check_esx_vsphere_vm_guest_tools(_no_item, params, info): return state, info -check_info['esx_vsphere_vm.guestTools'] = { +check_info['esx_vsphere_vm.guest_tools'] = { "inventory_function" : inventory_esx_vsphere_vm_guest_tools, "check_function" : check_esx_vsphere_vm_guest_tools, "service_description" : "ESX Guest Tools", "group" : "vm_guest_tools" } + #. # .--Heartbeat-----------------------------------------------------------. # | _ _ _ _ _ |

10 years, 4 months

Check_MK Git: check_mk: Fixed syntax error in manpage of esx_vsphere_vm. guest_tools

by Mathias Kettner

Module: check_mk Branch: master Commit: 890b9b0c48b12d765fe0282c65dd51398a9fc101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=890b9b0c48b12d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 21 10:29:54 2014 +0200 Fixed syntax error in manpage of esx_vsphere_vm.guest_tools --- checkman/esx_vsphere_vm.guest_tools | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/checkman/esx_vsphere_vm.guest_tools b/checkman/esx_vsphere_vm.guest_tools index ddebdde..a29969a 100644 --- a/checkman/esx_vsphere_vm.guest_tools +++ b/checkman/esx_vsphere_vm.guest_tools @@ -21,9 +21,8 @@ inventory: On each VM one check is generated. [parameters] -parameters (dict): A dictionary with the following keys -{"guestToolsUnmanaged"}: 1 # default WARN -{"guestToolsNeedUpgrade"} 1 # default WARN -{"guestToolsCurrent"}: 0 # default OK -{"guestToolsNotInstalled"}: 2 # default CRIT +parameters (dict): A dictionary with the following keys, that define the state of the check in + the various possible error conditions. Use {0} for OK, {1} for WARN, {2} for CRIT and {3} for + UNKNOWN. The default settings are: {"guestToolsUnmanaged"}: 1, {"guestToolsNeedUpgrade"}: 1, + {"guestToolsCurrent"}: 0, {"guestToolsNotInstalled"}: 2

10 years, 4 months

Check_MK Git: check_mk: fast_lta_silent_cubes.capacity: New check for Total Capacity over all Silent Cubes on FAST LTA Storage Systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: d7f2e41014ad2bc10739d1d0f71a2104a01d3791 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7f2e41014ad2b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed May 21 10:28:56 2014 +0200 fast_lta_silent_cubes.capacity: New check for Total Capacity over all Silent Cubes on FAST LTA Storage Systems --- .werks/957 | 8 +++ ChangeLog | 1 + checkman/fast_lta_silent_cubes.capacity | 35 +++++++++++++ checks/fast_lta_silent_cubes | 55 ++++++++++++++++++++ .../check_mk-fast_lta_silent_cubes.capacity.php | 1 + pnp-templates/check_mk-hitachi_hnas_span.php | 26 +++++++++ web/plugins/perfometer/check_mk.py | 1 + 7 files changed, 127 insertions(+) diff --git a/.werks/957 b/.werks/957 new file mode 100644 index 0000000..0f8a83f --- /dev/null +++ b/.werks/957 @@ -0,0 +1,8 @@ +Title: fast_lta_silent_cubes.capacity: New check for Total Capacity over all Silent Cubes on FAST LTA Storage Systems +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1400660881 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index f0a9fda..e6b4441 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 0162 if_brocade: New if64 Check version for Brocade VDX Switches... NOTE: Please refer to the migration notes! * 0956 fast_lta_headunit.status, fast_lta_headunit.replication: New checks for FAST LTA Storage Systems + * 0957 fast_lta_silent_cubes.capacity: New check for Total Capacity over all Silent Cubes on FAST LTA Storage Systems * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/fast_lta_silent_cubes.capacity b/checkman/fast_lta_silent_cubes.capacity new file mode 100644 index 0000000..a16c511 --- /dev/null +++ b/checkman/fast_lta_silent_cubes.capacity @@ -0,0 +1,35 @@ +title: FAST LTA Storage Systems: Total Capacity over all Silent Cubes +agents: snmp +catalog: hw/storagehw/fastlta +license: GPL +distribution: check_mk +description: + Checks the total / used capacity over all silent cubes connected to a FAST + LTA Storage System. + + Returns {WARN} or {CRIT} if usage is above given levels. + + It uses the check logic of the {df} check, so for configuration + parameters and examples please refer to the man page of {df}. + +item: + "Total" for now is the only item. + +perfdata: + Three values: The first value is the used space in total over all connected + silent cubes in MB. Also the minimum (0 MB), maximum (total size over all + silent cubes) and the warning and critical levels in MB are provided. + The second is the change of the usage in MB per range since the last check + (e.g. in MB per 24 hours) and the 3rd is the averaged change (so called + trend), also in MB per range. Please note, that performance data for + trends is enabled per default. You can globally disable that in {main.mk} + with {filesystem_default_levels["trend_perfdata"] = False}. + +inventory: + Finds exactly one check on every system (head unit). + +[parameters] +parameters (dict): See man page of {df}. + +[configuration] +filesystem_default_levels: And other, see man page of {df}. diff --git a/checks/fast_lta_silent_cubes b/checks/fast_lta_silent_cubes new file mode 100644 index 0000000..581fd6a --- /dev/null +++ b/checks/fast_lta_silent_cubes @@ -0,0 +1,55 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + + +def inventory_fast_lta_silent_cubes_status(info): + if len(info[0]) > 1: + return [ ("Total", {}) ] + else: + return [] + +def check_fast_lta_silent_cubes_status(item, params, info): + fslist = [] + for total, used in info: + size_mb = int(total) / 1048576.0 + avail_mb = ( int(total) - int(used) ) / 1048576.0 + fslist.append((item, size_mb, avail_mb)) + + return df_check_filesystem_list(item, params, fslist) + +check_info["fast_lta_silent_cubes.capacity"] = { + "check_function" : check_fast_lta_silent_cubes_status, + "inventory_function" : inventory_fast_lta_silent_cubes_status, + "service_description" : "Silent Cubes Capacity %s", + "has_perfdata" : True, + "group" : "filesystem", + "includes" : [ "df.include" ], + "snmp_info" : (".1.3.6.1.4.1.27417.3", [2, # scTotalCapacity + 3] # scTotalUsedCapacity + ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.2.10"), +} + diff --git a/pnp-templates/check_mk-fast_lta_silent_cubes.capacity.php b/pnp-templates/check_mk-fast_lta_silent_cubes.capacity.php new file mode 120000 index 0000000..aac1010 --- /dev/null +++ b/pnp-templates/check_mk-fast_lta_silent_cubes.capacity.php @@ -0,0 +1 @@ +check_mk-hitachi_hnas_volume.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hitachi_hnas_span.php b/pnp-templates/check_mk-hitachi_hnas_span.php index 6b314eb..18544ad 100644 --- a/pnp-templates/check_mk-hitachi_hnas_span.php +++ b/pnp-templates/check_mk-hitachi_hnas_span.php @@ -128,4 +128,30 @@ if (isset($RRD['growth'])) { $def[3] .= "COMMENT:\"\\n\" "; } +if (isset($RRD['trend_hoursleft'])) { + // Trend + $opt[4] = "--vertical-label 'Days left' -l -1 -u 365 -X0 --title '$hostname: Days left for $servicedesc' "; + $def[4] = "DEF:hours_left=${RRD_AVG['trend_hoursleft']} "; + $def[4] .= "DEF:hours_left_min=${RRD_MIN['trend_hoursleft']} "; + // negative hours indicate no growth + // the dataset hours_left_isneg stores this info for each point as True/False + $def[4] .= "CDEF:hours_left_isneg=hours_left_min,-1,EQ "; + $def[4] .= "CDEF:hours_left_unmon=hours_left_min,400,0,IF "; + $def[4] .= "CDEF:days_left=hours_left,24,/ "; + $def[4] .= "CDEF:days_left_cap=days_left,400,MIN "; + // Convert negative points to 400 (y-axis cap) + $def[4] .= "CDEF:days_left_cap_positive=hours_left_isneg,400,days_left_cap,IF "; + // The AREA has a rendering problem. Points are too far to the right + $def[4] .= "AREA:hours_left_unmon#AA2200: "; + + $def[4] .= "AREA:days_left_cap_positive#22AA44:\"Days left\:\" "; + if ($ACT[4] == -1) + { + $def[4] .= "COMMENT:\"Not growing\" "; + } + else { + $def[4] .= "GPRINT:days_left:LAST:\"%7.2lf days\" "; + } +} + ?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index d2023a4..eb758ae 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -117,6 +117,7 @@ perfometers["check_mk-hitachi_hnas_volume"] = perfometer_check_mk_df perfometers["check_mk-emcvnx_raidgroups.capacity"] = perfometer_check_mk_df perfometers["check_mk-emcvnx_raidgroups.capacity_contiguous"] = perfometer_check_mk_df perfometers["check_mk-ibm_svc_mdiskgrp"] = perfometer_check_mk_df +perfometers["check_mk-fast_lta_silent_cubes.capacity"] = perfometer_check_mk_df def perfometer_esx_vsphere_datastores(row, check_command, perf_data): used_mb = perf_data[0][1]

10 years, 4 months

Check_MK Git: check_mk: Added missing file from previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: 5933b1f0547f8f4efe87aaf4445adb31b82ceff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5933b1f0547f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 20 17:24:27 2014 +0200 Added missing file from previous commit --- notifications/asciimail | 237 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 237 insertions(+) diff --git a/notifications/asciimail b/notifications/asciimail new file mode 100755 index 0000000..16a0526 --- /dev/null +++ b/notifications/asciimail @@ -0,0 +1,237 @@ +#!/usr/bin/python +# ASCII Email +# Bulk: yes + +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + + +# This script creates an ASCII email. It replaces the builtin ASCII email feature and +# is configurable via WATO with named parameters (only). + +import os, re, sys, subprocess +from email.mime.text import MIMEText + +opt_debug = '-d' in sys.argv +bulk_mode = '--bulk' in sys.argv + +# Note: When you change something here, please also change this +# in web/plugins/wato/notifications.py in the default values of the configuration +# ValueSpec. +tmpl_host_subject = 'Check_MK: $HOSTNAME$ - $EVENT_TXT$' +tmpl_service_subject = 'Check_MK: $HOSTNAME$/$SERVICEDESC$ $EVENT_TXT$' +tmpl_common_body = """Host: $HOSTNAME$ +Alias: $HOSTALIAS$ +Address: $HOSTADDRESS$ +""" +tmpl_host_body = """Event: $EVENT_TXT$ +Output: $HOSTOUTPUT$ +Perfdata: $HOSTPERFDATA$ +$LONGHOSTOUTPUT$ +""" +tmpl_service_body = """Service: $SERVICEDESC$ +Event: $EVENT_TXT$ +Output: $SERVICEOUTPUT$ +Perfdata: $SERVICEPERFDATA$ +$LONGSERVICEOUTPUT$ +""" + +def substitute_context(template, context): + # First replace all known variables + for varname, value in context.items(): + template = template.replace('$'+varname+'$', value) + + # Remove the rest of the variables and make them empty + template = re.sub("\$[A-Z_][A-Z_0-9]*\$", "", template) + return template + + +def build_mail(target, subject, from_address, reply_to, content_txt): + # The plain text part + m = MIMEText(content_txt, 'plain', _charset='utf-8') + + m['Subject'] = subject + m['To'] = target + + # Set a few configurable headers + if from_address: + m['From'] = from_address + + if reply_to: + m['Reply-To'] = reply_to + + return m + +def send_mail(m, target): + p = subprocess.Popen(["/usr/sbin/sendmail", "-i", target ], stdin = subprocess.PIPE) + p.communicate(m.as_string()) + +def construct_content(context): + + # Create a notification summary in a new context variable + # Note: This code could maybe move to cmk --notify in order to + # make it available every in all notification scripts + # We have the following types of notifications: + + # - Alerts OK -> CRIT + # NOTIFICATIONTYPE is "PROBLEM" or "RECOVERY" + + # - Flapping Started, Ended + # NOTIFICATIONTYPE is "FLAPPINGSTART" or "FLAPPINGSTOP" + + # - Downtimes Started, Ended, Cancelled + # NOTIFICATIONTYPE is "DOWNTIMESTART", "DOWNTIMECANCELLED", or "DOWNTIMESTOPPED" + + # - Acknowledgements + # NOTIFICATIONTYPE is "ACKNOWLEDGEMENT" + + # - Custom notifications + # NOTIFICATIONTYPE is "CUSTOM" + + notification_type = context["NOTIFICATIONTYPE"] + if notification_type in [ "PROBLEM", "RECOVERY" ]: + txt_info = "$PREVIOUS@HARDSHORTSTATE$ -> $@SHORTSTATE$" + + elif notification_type.startswith("FLAP"): + if "START" in notification_type: + txt_info = "Started Flapping" + else: + txt_info = "Stopped Flapping ($@SHORTSTATE$)" + + elif notification_type.startswith("DOWNTIME"): + what = notification_type[8:].title() + txt_info = "Downtime " + what + " ($@SHORTSTATE$)" + + elif notification_type == "ACKNOWLEDGEMENT": + txt_info = "Acknowledged ($@SHORTSTATE$)" + + elif notification_type == "CUSTOM": + txt_info = "Custom Notification ($@SHORTSTATE$)" + + else: + txt_info = notification_type # Should neven happen + + txt_info = substitute_context(txt_info.replace("@", context["WHAT"]), context) + + context["EVENT_TXT"] = txt_info + + # Prepare the mail contents + if "PARAMETER_COMMON_BODY" in context: + tmpl_body = context['PARAMETER_COMMON_BODY'] + else: + tmpl_body = tmpl_common_body + + # Compute the subject and body of the mail + if context['WHAT'] == 'HOST': + tmpl = context.get('PARAMETER_HOST_SUBJECT') or tmpl_host_subject + if "PARAMETER_HOST_BODY" in context: + tmpl_body += context["PARAMETER_HOST_BODY"] + else: + tmpl_body += tmpl_host_body + else: + tmpl = context.get('PARAMETER_SERVICE_SUBJECT') or tmpl_service_subject + if "PARAMETER_SERVICE_BODY" in context: + tmpl_body += context["PARAMETER_SERVICE_BODY"] + else: + tmpl_body += tmpl_service_body + + context['SUBJECT'] = substitute_context(tmpl, context) + body = substitute_context(tmpl_body, context) + + return body + +def read_bulk_contexts(): + parameters = {} + contexts = [] + in_params = True + + # First comes a section with global variables + for line in sys.stdin: + line = line.strip() + if line: + try: + key, value = line.split("=", 1) + value = value.replace("\1", "\n") + except: + print "Invalid line '%s' in bulked notification context" % line + continue + + if in_params: + parameters[key] = value + else: + context[key] = value + + else: + in_params = False + context = {} + contexts.append(context) + + return parameters, contexts + +def main(): + if bulk_mode: + attachments = [] + content_txt = "" + content_html = "" + parameters, contexts = read_bulk_contexts() + hosts = set([]) + for context in contexts: + context.update(parameters) + txt = construct_content(context) + content_txt += txt + mailto = context['CONTACTEMAIL'] # Assume the same in each context + subject = context['SUBJECT'] + hosts.add(context["HOSTNAME"]) + + # Create a useful subject + hosts = list(hosts) + if len(contexts) > 1: + if len(hosts) == 1: + subject = "Check_MK: %d notifications for %s" % (len(contexts), hosts[0]) + else: + subject = "Check_MK: %d notifications for %d hosts" % ( + len(contexts), len(hosts)) + + else: + # gather all options from env + context = dict([ + (var[7:], value.decode("utf-8")) + for (var, value) + in os.environ.items() + if var.startswith("NOTIFY_")]) + content_txt = construct_content(context) + mailto = context['CONTACTEMAIL'] + subject = context['SUBJECT'] + + if not mailto: # e.g. empty field in user database + sys.stdout.write("Cannot send HTML email: empty destination email address") + sys.exit(2) + + # Create the mail and send it + from_address = context.get("PARAMETER_FROM") + reply_to = context.get("PARAMETER_REPLY_TO") + m = build_mail(mailto, subject, from_address, reply_to, content_txt) + send_mail(m, mailto) + +main()

10 years, 4 months

Check_MK Git: check_mk: New notification plugin for ASCII emails

by Mathias Kettner

Module: check_mk Branch: master Commit: cdd87dbd4c718016e064f8fed1125eaf73340502 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdd87dbd4c7180… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 20 17:23:50 2014 +0200 New notification plugin for ASCII emails There is now a new notification script for ASCII emails. Just like the HTML email template it is configurable with WATO via host rules and notification rules. You can configure several header fields as well as the exact body content. It also supports bulk notifications. This new script obsoletes the plain builtin ASCII emails that are now called ASCII email (legacy). --- .werks/974 | 14 +++++++ ChangeLog | 1 + modules/notify.py | 5 ++- notifications/mail | 26 +++++++++++++ notifications/sms | 26 +++++++++++++ web/htdocs/check_mk.css | 4 ++ web/htdocs/valuespec.py | 14 ++++++- web/htdocs/wato.py | 2 +- web/plugins/wato/notifications.py | 77 +++++++++++++++++++++++++++++++++++++ 9 files changed, 164 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cdd87dbd4c…

10 years, 4 months

Check_MK Git: check_mk: fast_lta_headunit.status, fast_lta_headunit. replication: New checks for FAST LTA Storage Systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: efea3bda30ae6a44b95eda6a68c6ca9ec74a95bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efea3bda30ae6a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue May 20 15:44:53 2014 +0200 fast_lta_headunit.status, fast_lta_headunit.replication: New checks for FAST LTA Storage Systems --- .werks/956 | 8 ++ ChangeLog | 1 + checkman/fast_lta_headunit.replication | 14 ++++ checkman/fast_lta_headunit.status | 11 +++ checks/fast_lta_headunit | 131 ++++++++++++++++++++++++++++++++ modules/catalog.py | 1 + 6 files changed, 166 insertions(+) diff --git a/.werks/956 b/.werks/956 new file mode 100644 index 0000000..d7b41b1 --- /dev/null +++ b/.werks/956 @@ -0,0 +1,8 @@ +Title: fast_lta_headunit.status, fast_lta_headunit.replication: New checks for FAST LTA Storage Systems +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1400593435 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0a95a0c..ee50dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 0955 zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS arc Cache * 0162 if_brocade: New if64 Check version for Brocade VDX Switches... NOTE: Please refer to the migration notes! + * 0956 fast_lta_headunit.status, fast_lta_headunit.replication: New checks for FAST LTA Storage Systems * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/fast_lta_headunit.replication b/checkman/fast_lta_headunit.replication new file mode 100644 index 0000000..da14a96 --- /dev/null +++ b/checkman/fast_lta_headunit.replication @@ -0,0 +1,14 @@ +title: FAST LTA Storage Systems: Replication Status and Mode +agents: snmp +catalog: hw/storagehw/fastlta +license: GPL +distribution: check_mk +description: + Checks if the Replication between Head Units is running on FAST LTA Storage + System. Returns {OK} if running and {CRIT} if not. + + The replication mode (master, slave or standalone) is displayed only. + It does not trigger a status change of the check. + +inventory: + Finds exactly one check on every system (head unit). diff --git a/checkman/fast_lta_headunit.status b/checkman/fast_lta_headunit.status new file mode 100644 index 0000000..da52791 --- /dev/null +++ b/checkman/fast_lta_headunit.status @@ -0,0 +1,11 @@ +title: FAST LTA Storage Systems: Head Unit Status +agents: snmp +catalog: hw/storagehw/fastlta +license: GPL +distribution: check_mk +description: + Checks the Head Unit Status of a FAST LTA Storage System. + Returns {OK} on status {appReady} and {CRIT} on every other. + +inventory: + Finds exactly one check on every system (head unit). diff --git a/checks/fast_lta_headunit b/checks/fast_lta_headunit new file mode 100644 index 0000000..2e44e81 --- /dev/null +++ b/checks/fast_lta_headunit @@ -0,0 +1,131 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +fast_lta_headunit_info = [(".1.3.6.1.4.1.27417.2", [1, # headUnitStatus + 2, # replicationMode + 5] # replicationRunning + )] + +def fast_lta_headunit_scan(oid): + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.2.10") + +# .--status--------------------------------------------------------------. +# | _ _ | +# | ___| |_ __ _| |_ _ _ ___ | +# | / __| __/ _` | __| | | / __| | +# | \__ \ || (_| | |_| |_| \__ \ | +# | |___/\__\__,_|\__|\__,_|___/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_fast_lta_headunit_status(info): + return [ (None, None) ] + +def check_fast_lta_headunit_status(item, _no_params, info): + head_unit_status_map = { + "-1": "workerDefect", + "-2": "workerNotStarted", + "2" : "workerBooting", + "3" : "workerRfRRunning", + "10": "appBooting", + "20": "appNoCubes", + "30": "appVirginCubes", + "40": "appRfrPossible", + "45": "appRfrMixedCubes", + "50": "appRfrActive", + "60": "appReady", + "65": "appMixedCubes", + "70": "appReadOnly", + "75": "appEnterpriseCubes", + "80": "appEnterpriseMixedCubes", + } + + if info[0][0][0] == "60": + status = 0 + else: + status = 2 + + if info[0][0][0] in head_unit_status_map.keys(): + message = "Head Unit status is %s." % head_unit_status_map[info[0][0][0]] + else: + message = "Head Unit status is %s." % info[0][0][0] + + return status, message + +check_info["fast_lta_headunit.status"] = { + "check_function" : check_fast_lta_headunit_status, + "inventory_function" : inventory_fast_lta_headunit_status, + "service_description" : "Fast LTA Headunit Status", + "has_perfdata" : False, + "snmp_info" : fast_lta_headunit_info, + "snmp_scan_function" : fast_lta_headunit_scan +} + +#. +# .--replication---------------------------------------------------------. +# | _ _ _ _ | +# | _ __ ___ _ __ | (_) ___ __ _| |_(_) ___ _ __ | +# | | '__/ _ \ '_ \| | |/ __/ _` | __| |/ _ \| '_ \ | +# | | | | __/ |_) | | | (_| (_| | |_| | (_) | | | | | +# | |_| \___| .__/|_|_|\___\__,_|\__|_|\___/|_| |_| | +# | |_| | +# '----------------------------------------------------------------------' + +def inventory_fast_lta_headunit_replication(info): + return [ (None, None) ] + +def check_fast_lta_headunit_replication(item, _no_params, info): + head_unit_replication_map = { + "0" : "Slave", + "1" : "Master", + "255" : "standalone", + } + + if info[0][0][2] == "1": + message = "Replication is running." + status = 0 + else: + message = "Replication is not running (!!)." + status = 2 + + if info[0][0][1] in head_unit_replication_map.keys(): + message += " This node is %s." \ + % head_unit_replication_map[info[0][0][1]] + else: + message += " Replication mode of this node is %s." % info[0][0][1] + + return status, message + +check_info["fast_lta_headunit.replication"] = { + "check_function" : check_fast_lta_headunit_replication, + "inventory_function" : inventory_fast_lta_headunit_replication, + "service_description" : "Fast LTA Replication", + "has_perfdata" : False, + "snmp_info" : fast_lta_headunit_info, + "snmp_scan_function" : fast_lta_headunit_scan +} + +#. diff --git a/modules/catalog.py b/modules/catalog.py index d6b23e7..c1231b7 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -46,6 +46,7 @@ manpage_catalog_titles = { "ibm" : "IBM", "storagehw" : "Storage (filers, SAN, tape libs)", "brocade" : "Brocade", + "fastlta" : "FAST LTA", "fujitsu" : "Fujitsu", "mcdata" : "McDATA", "netapp" : "NetApp",

10 years, 4 months

Check_MK Git: check_mk: Host renaming: also deal with parent definitions

by Mathias Kettner

Module: check_mk Branch: master Commit: b4298eb942715955b490977c1863e397ff3f8995 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4298eb9427159… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 20 14:21:50 2014 +0200 Host renaming: also deal with parent definitions --- web/htdocs/wato.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3732489..2f8caf2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2331,6 +2331,7 @@ def rename_host(host, newname): # Is this host node of a cluster? all_hosts = load_all_hosts() clusters = [] + parents = [] for somehost in all_hosts.values(): if ".nodes" in somehost: nodes = somehost[".nodes"] @@ -2340,9 +2341,19 @@ def rename_host(host, newname): save_folder_and_hosts(folder) mark_affected_sites_dirty(folder) + if somehost.get("parents"): + if rename_host_in_list(somehost["parents"], oldname, newname): + parents.append(somehost[".name"]) + folder = somehost['.folder'] + save_folder_and_hosts(folder) + mark_affected_sites_dirty(folder) + if clusters: actions.append(_("The following cluster definitions: %s") % (", ".join(clusters))) + if parents: + actions.append(_("The parents of the following hosts: %s") % (", ".join(parents))) + # Rules that explicitely name that host (no regexes) changed_rulesets = [] def rename_host_in_folder_rules(folder):

10 years, 4 months

Check_MK Git: check_mk: Removed obsolete comment

by Mathias Kettner

Module: check_mk Branch: master Commit: b1f44c62e81f2800eef4e6032c3f0ccc29859987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f44c62e81f28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 20 12:47:35 2014 +0200 Removed obsolete comment --- web/htdocs/wato.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3d1f548..3732489 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2292,18 +2292,6 @@ def mode_rename_host(phase): html.help(_("The renaming of hosts is a complex operation since a host's name is being " "used as a unique key in various places. It also involves stopping and starting " "of the monitoring core. You cannot rename a host while you have pending changes.")) - ### html.write("<ul>") - ### html.write("<li>%s</li>" % _("Name of the host in the WATO folder.")) - ### html.write("<li>%s</li>" % _("Cluster definitions (if the host is the node of a cluster")) - ### html.write("<li>%s</li>" % _("Configuration rules (when the host is explicitely named in the rule condition")) - ### html.write("<li>%s</li>" % _("Global and user specific notification rules")) - ### html.write("<li>%s</li>" % _("Check_MK temporary and cache information")) - ### html.write("<li>%s</li>" % _("The service configuration of the host")) - ### html.write("<li>%s</li>" % _("Stored logfiles (from logwatch plugin)")) - ### html.write("<li>%s</li>" % _("Stored SNMP walks")) - ### html.write("<li>%s</li>" % _("Performance data (RR databased)")) - ### html.write("<li>%s</li>" % _("NagVis map definitions")) - ### html.write("</ul>") html.begin_form("rename_host", method="POST") forms.header(_("Rename to host %s") % hostname)

10 years, 4 months

Check_MK Git: check_mk: Renaming of hosts via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: ea078f72cd2bfe1b0879029e6cf59c53a532794f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea078f72cd2bfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 20 12:45:18 2014 +0200 Renaming of hosts via WATO WATO has now a new function Rename Host. You will find a button with that name in the Properties of a host. It allows a renaming of an existing host. Before you can use that feature you need to have all changes activated, so nothing is pending. Renaming a host is a complex precedure that will not only rename the host in WATO, but also in: <ul> <li>all rules from Host & Service Parameters</li> <li>cluster's node definitions</li> <li>a host's parent definitions</li> <li>Business Intelligence rules</li> <li>notification rules (both rule based and flexible notifications)</li> <li>internal Check_MK data like caches and performance counters</li> <li>auto-disovered services of the host</li> <li>logfile information of logwatch plugin</li> <li>stored SNMP walks</li> <li>RR databases with performance data</li> <li>RRD updates in journal of RRD Cache</li> <li>spool files of PNP4Nagios</li> <li>NagVis maps</li> <li>monitoring history entries (events and availability)</li> <li>the current monitoring state (including ackowledgements and downtimes)</li> </ul> Please note that renaming of a host involves a temporary stop of the monitoring core. This is neccessary in order to avoid situation where the old and the new name of a host is being used at the same time. --- .werks/973 | 35 ++++++++++++++ ChangeLog | 1 + doc/drafts/LIESMICH.hosts_umbenennen | 27 +---------- modules/automation.py | 17 +++++++ modules/check_mk.py | 9 +++- web/htdocs/wato.py | 88 ++++++++++++++++++++++++++-------- 6 files changed, 132 insertions(+), 45 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ea078f72cd…

10 years, 4 months

Check_MK Git: check_mk: FIX notification: fixed exception when sending notifications as sms / ascii mail

by Andreas Boesl

Module: check_mk Branch: master Commit: 56920752518ea123eeef39344f4489aeaed9da53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56920752518ea1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 20 12:13:57 2014 +0200 FIX notification: fixed exception when sending notifications as sms / ascii mail Flexible notification plugins with configurable parameters did not work if the parameters were configured as list of strings. This exception happened on notications send by ASCII mails and sms. --- .werks/918 | 10 ++++++++++ ChangeLog | 1 + modules/notify.py | 10 +++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/918 b/.werks/918 new file mode 100644 index 0000000..491087e --- /dev/null +++ b/.werks/918 @@ -0,0 +1,10 @@ +Title: notification: fixed exception when sending notifications as sms / ascii mail +Level: 2 +Component: notifications +Version: 1.2.5i3 +Date: 1400580654 +Class: fix + +Flexible notification plugins with configurable parameters did not work if +the parameters were configured as list of strings. +This exception happened on notications send by ASCII mails and sms. diff --git a/ChangeLog b/ChangeLog index 029b577..94d0d05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ * 0753 FIX: FIX: correctly show original state in HTML notification mails... * 0609 FIX: mail notification script now uses 6 digit hex codes for colors to be better compatible with web based mail browsers * 0964 FIX: Fix hanging shutdown of CMC on RedHat 5.X... + * 0918 FIX: notification: fixed exception when sending notifications as sms / ascii mail... Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... diff --git a/modules/notify.py b/modules/notify.py index 4ab982b..3e08ec4 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -513,9 +513,13 @@ def notify_rulebased(raw_context, analyse=False): return analysis_info def rbn_finalize_plugin_parameters(hostname, plugin, rule_parameters): - parameters = host_extra_conf_merged(hostname, notification_parameters.get(plugin, [])) - parameters.update(rule_parameters) - return parameters + # Right now we are only able to finalize notification plugins with dict parameters.. + if type(rule_parameters) == dict: + parameters = host_extra_conf_merged(hostname, notification_parameters.get(plugin, [])) + parameters.update(rule_parameters) + return parameters + else: + return rule_parameters def add_rulebased_macros(raw_context): # For the rule based notifications we need the list of contacts

10 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits