Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: synology_raid: fixed output of check (

by Mathias Kettner

remove SNMP variable names) Message-ID: <55b9e6ff.nvjt5l8qPsbsZEL9%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bcf27788647d9215791aa3ecf5ae7c2d4937052b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcf27788647d92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 10:57:32 2015 +0200 synology_raid: fixed output of check (remove SNMP variable names) --- checks/synology_raid | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/checks/synology_raid b/checks/synology_raid index 5cdedf8..8caad26 100644 --- a/checks/synology_raid +++ b/checks/synology_raid @@ -30,18 +30,18 @@ def inventory_synology_raid(info): def check_synology_raid(item, _no_params, info): states = { - 1 : ("OK" ,0), - 2 : ("Repairing" ,1), - 3 : ("Migrating" ,1), - 4 : ("Expanding" ,1), - 5 : ("Deleting" ,1), - 6 : ("Creating" ,1), - 7 : ("RaidSyncing" ,0), - 8 : ("RaidParityChecking" ,0), - 9 : ("RaidAssembling" ,1), - 10 : ("Canceling" ,1), - 11 : ("Degrade" ,2), - 12 : ("Crashed" ,2), + 1 : ("OK" ,0), + 2 : ("repairing" ,1), + 3 : ("migrating" ,1), + 4 : ("expanding" ,1), + 5 : ("deleting" ,1), + 6 : ("creating" ,1), + 7 : ("RAID syncing" ,0), + 8 : ("RAID parity checking" ,0), + 9 : ("RAID assembling" ,1), + 10 : ("cancelling" ,1), + 11 : ("degraded" ,2), + 12 : ("crashed" ,2), } for raid, status in info: if raid == item:

8 years, 11 months

Check_MK Git: check_mk: juniper_trpz_aps: fixed syntax a bit

by Mathias Kettner

Module: check_mk Branch: master Commit: 3630659a47d4649ce0f3bcaeb14e637865bda860 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3630659a47d464… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 10:08:18 2015 +0200 juniper_trpz_aps: fixed syntax a bit --- checks/juniper_trpz_aps | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/checks/juniper_trpz_aps b/checks/juniper_trpz_aps index acdd421..99cbe5c 100644 --- a/checks/juniper_trpz_aps +++ b/checks/juniper_trpz_aps @@ -29,7 +29,7 @@ def inventory_juniper_trpz_aps(info): def check_juniper_trpz_aps(_no_item, _no_params, info): aps = info[0][0] - message = "%s Access Points online" % aps + message = "%s access points online" % aps return 0, message check_info["juniper_trpz_aps"] = { @@ -40,6 +40,4 @@ check_info["juniper_trpz_aps"] = { "snmp_info" : (".1.3.6.1.4.1.14525.4.5.1.1",[ 1, #number of Access Points ]) - - }

8 years, 11 months

Check_MK Git: check_mk: Added example notification script for slack into the treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: 6e5d3486835a50b84b1fc979ee3f86c6f64f59f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5d3486835a50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 09:44:53 2015 +0200 Added example notification script for slack into the treasures --- doc/treasures/notifications/slack | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/treasures/notifications/slack b/doc/treasures/notifications/slack new file mode 100755 index 0000000..585f582 --- /dev/null +++ b/doc/treasures/notifications/slack @@ -0,0 +1,14 @@ +#!/bin/bash +# Notify via Slack + +# In order to use this script: +# - copy it into your site into ~/local/share/check_mk/notificaions +# - make sure it is executable +# - adapt the variable TEXT= to your needs +# - insert your correct Slack-URL into URL= +# - create a notification rule that makes use of the new plugin + +TEXT="$NOTIFY_HOSTNAME: $NOTIFY_SERVICEDESC: $NOTIFY_SERVICESTATE $NOTIFY_SERVICEOUTPUT" +URL="https://hooks.slack.com/services/A08BZU3D0/B08C03CKQ/owiefjowiejfoweijfwoei…" + +curl -X POST --data-urlencode 'payload={"channel": "#check_mk", "username": "webhookbot", "text": "'"$TEXT"'", "icon_emoji": ":ghost:"}' "$URL"

8 years, 11 months

Check_MK Git: check_mk: New option --compress-history for optimizing monitoring history files

by Mathias Kettner

Module: check_mk Branch: master Commit: 336c84a2f451e6c0d7e6cc5f8017e22d70d9a3fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=336c84a2f451e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 09:13:24 2015 +0200 New option --compress-history for optimizing monitoring history files Note: this is still experimental. Also only use this when using CMC, please. --- modules/check_mk.py | 9 ++- modules/compresslog.py | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ee7dd36..7394b81 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4505,6 +4505,7 @@ def usage(): cmk --notify used to send notifications from core cmk --create-rrd [--keepalive|SPEC] create round robin database (only CEE) cmk --convert-rrds [--split] [H...] convert exiting RRD to new format (only CEE) + cmk --compress-history FILES... optimize monitoring history files for CMC cmk --handle-alerts alert handling, always in keepalive mode (only CEE) cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin @@ -5756,7 +5757,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "snmptranslate", "bake-agents", "force", "show-snmp-stats", "usewalk", "scan-parents", "procs=", "automation=", "handle-alerts", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", - "convert-rrds", "split-rrds", + "convert-rrds", "compress-history", "split-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "paths", @@ -5766,7 +5767,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--handle-alerts', '--notify', '--man', '-V', '--version' ,'-h', '--help', '--automation', - '--create-rrd', '--convert-rrds', '--keepalive', '--cap' ] + '--create-rrd', '--convert-rrds', '--compress-history', '--keepalive', '--cap' ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -5984,6 +5985,10 @@ try: execfile(modules_dir + "/rrd.py") do_convert_rrds(args) done = True + elif o == '--compress-history': + execfile(modules_dir + "/compresslog.py") + do_compress_history(args) + done = True elif o in [ '-A', '--bake-agents' ]: if 'do_bake_agents' not in globals(): bail_out("Agent baking is not implemented in your version of Check_MK. Sorry.") diff --git a/modules/compresslog.py b/modules/compresslog.py new file mode 100755 index 0000000..0a0e195 --- /dev/null +++ b/modules/compresslog.py @@ -0,0 +1,151 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +# Helper file for more effectively organizing monitoring log files. +# Rewrites existing logfiles for CMC. You can concatenate several +# logfiles and then compress them. Do *not* compress compressed +# files again. + + +def do_compress_history(args): + if not args: + bail_out("Please specify files to compress.") + + for filename in args: + try: + verbose("%s..." % filename) + compress_history_file(filename, filename + ".compressed") + verbose("OK\n") + except Exception, e: + if opt_debug: + raise + bail_out(str(e)) + + +def compress_history_file(input_path, output_path): + known_services = {} + machine_state = "START" + + output = file(output_path, "w") + for line in file(input_path): + skip_this_line = False + timestamp = int(line[1:11]) + line_type, host, service = parse_history_line(line) + + vverbose("%s (%s) %s / %s / %s\n" % (line, machine_state, line_type, host, service)) + + if line_type == "RESTART" or line_type == "LOGGING_INITIAL": + if machine_state != "START": + machine_state = "AFTER_RESTART" + services_after_reload = {} + if line_type == "LOGGING_INITIAL": + skip_this_line = True + + elif line_type == "CURRENT": + if machine_state not in ("START", "CURRENT", "AFTER_RESTART"): + raise Exception("Unexpected line %s (while in state %s)" % (line, machine_state)) + machine_state = "CURRENT" + known_services.setdefault(host, set([])).add(service) + + elif line_type == "INITIAL": + if machine_state == "OPERATION": + pass # happens at CMC. That does not create a log entry on reload + elif machine_state == "START": + machine_state = "INITIAL" + known_services.setdefault(host, set([])).add(service) + services_after_reload = {} + elif machine_state not in ("AFTER_RESTART", "INITIAL"): + raise Exception("Unexpected line %s (while in state %s)" % (line, machine_state)) + else: + machine_state = "INITIAL" + services_after_reload.setdefault(host, set([])).add(service) + if host in known_services and service in known_services[host]: + skip_this_line = True + + elif line_type == "OPERATION": + if machine_state != "START": + if machine_state == "INITIAL": + for host in known_services.keys(): + if host not in services_after_reload: + for service in known_services[host]: + log_vanished_object(output, timestamp, host, service) + del known_services[host] + else: + known = known_services[host] + after_reload = services_after_reload[host] + for service in list(known): + if service not in after_reload: + log_vanished_object(output, timestamp, host, service) + known.remove(service) + machine_state = "OPERATION" + else: + pass + + + + if not skip_this_line: + output.write(line) + + +def parse_history_line(line): + command = get_line_command(line) + if "INITIAL" in command: + host, service = get_host_service_from_history_line(command, line) + return "INITIAL", host, service + elif "CURRENT" in command: + host, service = get_host_service_from_history_line(command, line) + return "CURRENT", host, service + elif "logging intitial" in command \ + or "logging initial" in command: + return "LOGGING_INITIAL", None, None + elif "LOG ROTATION" in command \ + or "LOG VERSION" in command: + return "RESTART", None, None + else: + return "OPERATION", None, None + + +def get_host_service_from_history_line(command, line): + arguments = line.split(":")[1].strip().split(";") + if "HOST" in command: + return arguments[0], None + else: + return arguments[0], arguments[1] + + +def get_line_command(line): + if ":" in line: + return line.split(":")[0].split("]")[1].strip() + else: + return line.split("]")[1].strip() + + +def log_vanished_object(output, timestamp, host, service): + if service: + output.write("[%s] VANISHED SERVICE: %s;%s\n" % (timestamp, host, service)) + else: + output.write("[%s] VANISHED HOST: %s\n" % (timestamp, host)) +

8 years, 11 months

Check_MK Git: check_mk: Added missing icon from previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: 7430456e0d8a8b07e5dc0457e4d1aadc5772a353 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7430456e0d8a8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 08:55:43 2015 +0200 Added missing icon from previous commit --- web/htdocs/images/alert_reload.png | Bin 0 -> 3488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/alert_reload.png b/web/htdocs/images/alert_reload.png new file mode 100644 index 0000000..58c154e Binary files /dev/null and b/web/htdocs/images/alert_reload.png differ

8 years, 11 months

Check_MK Git: check_mk: Icon for reloading monitoring configuration in log view

by Mathias Kettner

Module: check_mk Branch: master Commit: a19c0e5460aa72f0c5d56fa1526ecffdcbc886a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a19c0e5460aa72… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 08:55:23 2015 +0200 Icon for reloading monitoring configuration in log view --- web/plugins/views/painters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2f6b5de..e1ff050 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2042,6 +2042,8 @@ def paint_log_icon(row): img = "command" elif "restarting..." in log_type: img = "restart" + elif "Reloading configuration" in log_type: + img = "reload" elif "starting..." in log_type: img = "start" elif "shutdown..." in log_type or "shutting down" in log_type:

8 years, 11 months

Check_MK Git: check_mk: added missing files for werk 2292

by Simon Betz

Module: check_mk Branch: master Commit: 9e41fb62b67d2e3656fe4e57be29c318e4308716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e41fb62b67d2e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 30 08:32:22 2015 +0200 added missing files for werk 2292 --- .werks/2292 | 2 +- ChangeLog | 2 +- checkman/kentix_amp_sensors.humidity | 23 +++ checkman/kentix_amp_sensors.leakage | 22 +++ checkman/kentix_amp_sensors.smoke | 23 +++ checkman/kentix_amp_sensors.temperature | 23 +++ checks/kentix_amp_sensors | 235 +++++++++++++++++++++++++++++++ 7 files changed, 328 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9e41fb62b6…

8 years, 11 months

Check_MK Git: check_mk: #2292 New check for the Kentix Alarmmanager Pro: kentix_amp_sensors

by Simon Betz

Module: check_mk Branch: master Commit: 385ad59ee799af4df7f26f30feb53df30dee15fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=385ad59ee799af… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 30 08:14:54 2015 +0200 #2292 New check for the Kentix Alarmmanager Pro: kentix_amp_sensors This checks has four subchecks which monitor the temperature, humidity, smoke and leakage detection of sensors which are connected to the Kentix Alarmmanager Pro. --- .werks/2292 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/2292 b/.werks/2292 new file mode 100644 index 0000000..e081012 --- /dev/null +++ b/.werks/2292 @@ -0,0 +1,10 @@ +Title: New check for the Kentix Alarmmanager Pro: kentix_amp_sensors +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438236592 +Class: feature + +This checks has four subchecks which monitor the temperature, humidity, smoke and leakage detection of +sensors which are connected to the Kentix Alarmmanager Pro. diff --git a/ChangeLog b/ChangeLog index 260912e..44cdce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 2410 ESX / agent_vsphere: Now able to re-use session cookies... * 2290 New check hp_procurve_temp: monitors the system temperature of HP Switches which support the HP-ICF-CHASSIS-Mib * 2291 check juniper_trpz_aps: now monitor the number of access points of all juniper trapeze devices which support the TRAPEZE-NETWORKS-REGISTRATION-MIB + * 2292 New check for the Kentix Alarmmanager Pro: kentix_amp_sensors... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...

8 years, 11 months

Check_MK Git: check_mk: Some corrections

by Konstantin Büttner

Module: check_mk Branch: master Commit: f9c599033cb6764205e5c36175014b0055e001df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c599033cb676… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jul 29 16:15:59 2015 +0200 Some corrections --- checkman/mikrotik_signal | 6 +++--- web/htdocs/pagetypes.py | 2 +- web/plugins/wato/check_parameters.py | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/checkman/mikrotik_signal b/checkman/mikrotik_signal index 814e239..562d52e 100644 --- a/checkman/mikrotik_signal +++ b/checkman/mikrotik_signal @@ -4,9 +4,9 @@ catalog: hw/network/mikrotik license: GPL distribution: check_mk description: - This check is for Mikrotik wlan devices who e.g. used to - etablish a wireless network connection between two buildings. - It reads the current singnal strenght in decibel and calculates + This check is for Mikrotik wlan devices that are e.g. used to + establish a wireless network connection between two buildings. + It reads the current signal strength in decibel and calculates the quality in a scale up to 100. 100 means optimal signal quality. inventory: diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index c6fad15..5423fb7 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -101,7 +101,7 @@ class Base: )), ( 1.3, 'description', TextAreaUnicode( title = _('Description') + '<sup>*</sup>', - help = _("The description is optional and can be used for explainations or documentation"), + help = _("The description is optional and can be used for explanations or documentation"), rows = 4, cols = 50, )), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b5f7b1e..559329a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -333,16 +333,16 @@ register_check_parameters( ( "signature_age", Tuple( title = _("Time Settings for Signature"), elements = [ - Age(title=_("Warning at:"), default_value = 86400), - Age(title=_("Critical at:"), default_value = 7*86400), + Age(title=_("Warning at"), default_value = 86400), + Age(title=_("Critical at"), default_value = 7*86400), ], ), ), ( "fullscan_age", Tuple( title = _("Time Settings for Fullscan"), elements = [ - Age(title=_("Warning at:"), default_value = 86400), - Age(title=_("Critical at:"), default_value = 7*86400), + Age(title=_("Warning at"), default_value = 86400), + Age(title=_("Critical at"), default_value = 7*86400), ], ), ), @@ -1051,8 +1051,8 @@ process_level_elements = [ title = _("Maximum allowed age"), help = _("Alarms you if the age of the process (not the consumed CPU time, but the real time) exceed the configured levels."), elements = [ - Age(title=_("Warning at:"), default_value = 3600), - Age(title=_("Critical at:"), default_value = 7200), + Age(title=_("Warning at"), default_value = 3600), + Age(title=_("Critical at"), default_value = 7200), ] )), ( "virtual_levels",

8 years, 11 months

Check_MK Git: check_mk: #1276 FIX brocade_mlx_temperature:

by Bastian Kuhn

Fixed the shown Temperature Values Message-ID: <55b8dc1a.e4PNq/UZYcoSawtr%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b06c77b07ebb21c079e2a47c9a8ddff0d8492bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b06c77b07ebb21… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 29 15:58:22 2015 +0200 #1276 FIX brocade_mlx_temperature: Fixed the shown Temperature Values --- .werks/1276 | 10 ++++++++++ ChangeLog | 1 + checks/brocade_mlx_temp | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1276 b/.werks/1276 new file mode 100644 index 0000000..e429452 --- /dev/null +++ b/.werks/1276 @@ -0,0 +1,10 @@ +Title: brocade_mlx_temperature: Fixed the shown Temperature Values +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438178266 + + diff --git a/ChangeLog b/ChangeLog index 9d0059c..260912e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ NOTE: Please refer to the migration notes! * 1275 FIX: Fileinfo: Fixed handling of output from AIX Agent * 2500 FIX: qlogic_fcport: Can now deal with missing port status information... + * 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp index 32d6fb8..3636e32 100644 --- a/checks/brocade_mlx_temp +++ b/checks/brocade_mlx_temp @@ -31,13 +31,13 @@ factory_settings["brocade_mlx_temperature_default_levels"] = { def parse_brocade_mlx_temp(info): parsed = {} for temp_descr, temp_value in info: - if temp_value: + if temp_value and temp_value != '0': item = temp_descr.replace("temperature", "")\ .replace("module", "Module")\ .replace("sensor", "Sensor")\ .replace(",", "")\ .strip() - parsed[item] = int(temp_value) + parsed[item] = float(temp_value) * 0.5 return parsed

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015