Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Additional python <2.5 (centos 5.x)

by Lars Michelsen

compatibility fixes Message-ID: <54eaf012.R28foFdS7Ge2k9GO%lm(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: a3dafed0913c7a16e425bd2b1e5005ee5d3f4776 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3dafed0913c7a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 10:17:00 2015 +0100 Additional python <2.5 (centos 5.x) compatibility fixes --- notifications/mail | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/notifications/mail b/notifications/mail index 60ba26c..67b6d11 100755 --- a/notifications/mail +++ b/notifications/mail @@ -36,10 +36,20 @@ import os, re, sys, subprocess -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText -from email.mime.application import MIMEApplication -from email.mime.image import MIMEImage + +try: + from email.mime.multipart import MIMEMultipart + from email.mime.text import MIMEText + from email.mime.application import MIMEApplication + from email.mime.image import MIMEImage +except ImportError: + # python <2.5 compat + from email.MIMEMultipart import MIMEMultipart + from email.MIMEText import MIMEText + from email.MIMEImage import MIMEImage + from email.MIMEBase import MIMEBase + from email import Encoders + MIMEApplication = None tmpl_head_html = ''' <html> @@ -346,7 +356,14 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content if what == 'img': part = MIMEImage(contents, name = name) else: - part = MIMEApplication(contents, name = name) + if MIMEApplication != None: + part = MIMEApplication(contents, name = name) + else: + # python <2.5 compat + part = MimeBase('application', 'octet-stream') + part.set_payload(contents) + Encoders.encode_base64(part) + part.add_header('Content-ID', '<%s>' % name) # how must be inline or attachment part.add_header('Content-Disposition', how, filename = name)

9 years, 4 months

Check_MK Git: check_mk: #2014 FIX Fixed different issues running Check_MK on CentOS 5.x

by Lars Michelsen

Module: check_mk Branch: master Commit: 81da64c2624a5be310617d18325678b78ea51f7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81da64c2624a5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 23 09:26:29 2015 +0100 #2014 FIX Fixed different issues running Check_MK on CentOS 5.x --- .werks/2014 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2014 b/.werks/2014 new file mode 100644 index 0000000..103f67b --- /dev/null +++ b/.werks/2014 @@ -0,0 +1,10 @@ +Title: Fixed different issues running Check_MK on CentOS 5.x +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424679971 + + diff --git a/ChangeLog b/ChangeLog index 0749043..aaf05ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 1977 FIX: Dramatically reduced size of Check_MK check helper processes... * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function * 2012 FIX: Piggyback hostname translation can now deal correctly with umlauts + * 2014 FIX: Fixed different issues running Check_MK on CentOS 5.x Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 3b89116..d6810d7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -250,7 +250,7 @@ old_service_descriptions = { known_vars = set(vars().keys()) known_vars.add('known_vars') execfile(modules_dir + '/config.py') -config_variable_names = set.difference(set(vars().keys()) - known_vars) +config_variable_names = set(vars().keys()).difference(known_vars) # at check time (and many of what is also needed at administration time). try:

9 years, 4 months

Check_MK Git: check_mk: Publish the plugin for the Exchange Mailbox Server checks

by Goetz Golla

Module: check_mk Branch: master Commit: b7329dbd6c6010b7cf3085d878e2d9e2629922da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7329dbd6c6010… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Feb 23 09:20:38 2015 +0100 Publish the plugin for the Exchange Mailbox Server checks --- agents/windows/plugins/msexch_dag.ps1 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/agents/windows/plugins/msexch_dag.ps1 b/agents/windows/plugins/msexch_dag.ps1 new file mode 100644 index 0000000..31823e8 --- /dev/null +++ b/agents/windows/plugins/msexch_dag.ps1 @@ -0,0 +1,11 @@ +# Load Exchange Management Powershell Plugin +try{ (Add-PSSnapin Microsoft.Exchange.Management.PowerShell.E2010 -ErrorAction:Stop) } + +# exit without any output if this fails +catch{exit} + +write-host "<<<msexch_dag:sep(58)>>>" +Get-MailboxDatabaseCopyStatus | Format-List + +write-host "<<<msexch_replhealth:sep(58)>>>" +Test-ReplicationHealth | Format-List

9 years, 4 months

Check_MK Git: check_mk: #1946 FIX WATO Web-API: edit host action does no longer unset all unspecified attributes

by Andreas Boesl

Module: check_mk Branch: master Commit: 1310cc4deee4946007fa80ee4b61887fef158eb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1310cc4deee494… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 23 09:17:11 2015 +0100 #1946 FIX WATO Web-API: edit host action does no longer unset all unspecified attributes The edit_host call is able to set and unset the attributes of a specific hosts without errors. Previously any unmentioned attributes got automatically unset. --- .werks/1946 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 6 +++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1946 b/.werks/1946 new file mode 100644 index 0000000..3a25db4 --- /dev/null +++ b/.werks/1946 @@ -0,0 +1,12 @@ +Title: WATO Web-API: edit host action does no longer unset all unspecified attributes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424679033 + +The edit_host call is able to set and unset the attributes of a specific hosts without errors. +Previously any unmentioned attributes got automatically unset. + diff --git a/ChangeLog b/ChangeLog index 8bb201f..f3f7655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -255,6 +255,7 @@ * 2009 FIX: Fixed styling of site login page for establishing a distributed monitoring WATO sync... * 2003 FIX: Fix saving of "Users are allowed to directly login into the Web GUI of this site"... * 2010 FIX: Improved error message when trying to add group assignment rule without having a group configured + * 1946 FIX: WATO Web-API: edit host action does no longer unset all unspecified attributes... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 919cff6..4cbfe4b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17848,7 +17848,11 @@ class API: self.__validate_host_parameters(None, hostname, attributes, all_hosts, True, ["host_missing", "tags", "site", "permissions_edit"]) host_foldername = all_hosts[hostname][".folder"][".path"] - target_folders.setdefault(host_foldername, {})[hostname] = {"set": attributes, + new_attr = dict([(k, v) for (k, v) in all_hosts[hostname].iteritems() \ + if (not k.startswith('.'))]) + new_attr.update(attributes) + + target_folders.setdefault(host_foldername, {})[hostname] = {"set": new_attr, "unset": host_unset_attr} for target_foldername, update_hosts in target_folders.items():

9 years, 4 months

Check_MK Git: check_mk: ibm_svc_license: added include for license.include

by Sven Rueß

Module: check_mk Branch: master Commit: 2e0fad77c43777e61b131ffe255cb4579dcc9570 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0fad77c43777… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Feb 23 08:18:29 2015 +0100 ibm_svc_license: added include for license.include --- checks/ibm_svc_license | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/ibm_svc_license b/checks/ibm_svc_license index 098d553..8761020 100644 --- a/checks/ibm_svc_license +++ b/checks/ibm_svc_license @@ -78,5 +78,6 @@ check_info["ibm_svc_license"] = { "service_description" : "License %s", "group" : "ibmsvc_licenses", "has_perfdata" : True, + "includes" : [ "license.include" ] }

9 years, 4 months

Check_MK Git: check_mk: ibm_svc_mdisk: fixed mdisk mode information

by Sven Rueß

Module: check_mk Branch: master Commit: cfd7ec624e1a2bc3d2dfc48cbe225ee6a7b7179c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfd7ec624e1a2b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sun Feb 22 09:56:54 2015 +0100 ibm_svc_mdisk: fixed mdisk mode information --- checks/ibm_svc_mdisk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/ibm_svc_mdisk b/checks/ibm_svc_mdisk index 4f2cc73..d8939c8 100644 --- a/checks/ibm_svc_mdisk +++ b/checks/ibm_svc_mdisk @@ -60,8 +60,7 @@ def check_ibm_svc_mdisk(item, params, info): mdisk_mode = line[3] yield params.get("%s_state" % mdisk_status, 1), "Status: %s" % mdisk_status - yield params.get("%s_mode" % mdisk_mode, 1), "Mode: %s" % mdisk_status - + yield params.get("%s_mode" % mdisk_mode, 1), "Mode: %s" % mdisk_mode check_info["ibm_svc_mdisk"] = { "check_function" : check_ibm_svc_mdisk,

9 years, 4 months

Check_MK Git: check_mk: #2035 FIX check_mk-netapp_api_if,

by Mathias Kettner

check_mk-if_brocade: added missing Perf-O-Meters Message-ID: <54e850cf.xxitsxAkaHyYHLV/%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: 61b3ed3df672039ba19a21c0f12cbd47636620dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61b3ed3df67203… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:32:59 2015 +0100 #2035 FIX check_mk-netapp_api_if, check_mk-if_brocade: added missing Perf-O-Meters --- .werks/2035 | 9 +++++++++ ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/2035 b/.werks/2035 new file mode 100644 index 0000000..732ffe4 --- /dev/null +++ b/.werks/2035 @@ -0,0 +1,9 @@ +Title: check_mk-netapp_api_if, check_mk-if_brocade: added missing Perf-O-Meters +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424511161 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e64a508..0a5c645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,6 +184,7 @@ NOTE: Please refer to the migration notes! * 2033 FIX: check_mk-zfs_arc_cache: add Perf-O-Meter * 2034 FIX: netapp_api_volumes: added Perf-O-Meter + * 2035 FIX: check_mk-netapp_api_if, check_mk-if_brocade: added missing Perf-O-Meters Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 74f11e1..67dd89e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -376,6 +376,8 @@ perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if perfometers["check_mk-esx_vsphere_counters.if"] = perfometer_check_mk_if perfometers["check_mk-hitachi_hnas_fc_if"] = perfometer_check_mk_if perfometers["check_mk-statgrab_net"] = perfometer_check_mk_if +perfometers["check_mk-netapp_api_if"] = perfometer_check_mk_if +perfometers["check_mk-if_brocade"] = perfometer_check_mk_if def perfometer_check_mk_fc_port(row, check_command, perf_data): unit = "B"

9 years, 4 months

Check_MK Git: check_mk: Fixed a few exceptions in Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c2e2cb8b7d8850c6c6f2f60eb4c90a1e1142b75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c2e2cb8b7d885… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:30:45 2015 +0100 Fixed a few exceptions in Perf-O-Meters --- checks/hpux_tunables | 2 +- web/plugins/perfometer/check_mk.py | 8 +++++++- web/plugins/views/perfometer.py | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checks/hpux_tunables b/checks/hpux_tunables index 647810d..0fa9ee5 100644 --- a/checks/hpux_tunables +++ b/checks/hpux_tunables @@ -114,7 +114,7 @@ check_info["hpux_tunables.maxfiles_lim"] = { } check_info["hpux_tunables.semmni"] = { - "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "semmni", "semaphore ids"), + "check_function" : lambda i, p, o: check_hpux_tunables(i, p, o, "semmni", "semaphore_ids"), "inventory_function" : lambda i: inventory_hpux_tunables(i, "semmni"), "service_description" : "Number of IPC Semaphore IDs", "has_perfdata" : True, diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index d25355a..74f11e1 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -99,7 +99,7 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): swap_total = float(entry[1]) # mem.linux if not ram_used: - return + return "","" virt_total = ram_total + swap_total virt_used = ram_used + swap_used @@ -910,6 +910,9 @@ def perfometer_check_mk_arcserve_backup(row, check_command, perf_data): perfometers["check_mk-arcserve_backup"] = perfometer_check_mk_arcserve_backup def perfometer_check_mk_ibm_svc_host(row, check_command, perf_data): + if len(perf_data) < 5: + return "", "" + h = '<table><tr>' active = int(perf_data[0][1]) inactive = int(perf_data[1][1]) @@ -940,6 +943,9 @@ def perfometer_check_mk_ibm_svc_host(row, check_command, perf_data): perfometers["check_mk-ibm_svc_host"] = perfometer_check_mk_ibm_svc_host def perfometer_check_mk_ibm_svc_license(row, check_command, perf_data): + if len(perf_data) < 2: + return "", "" + licensed = float(perf_data[0][1]) used = float(perf_data[1][1]) if used == 0 and licensed == 0: diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index bf9651e..9fd016b 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -152,6 +152,8 @@ def paint_perfometer(row): return "", "" title, h = perf_painter(row, check_command, perf_data) + if not h: + return "", "" # Test code for optically detecting old-style Perf-O-Meters if config.debug: title = '{ ' + title + ' }'

9 years, 4 months

Check_MK Git: check_mk: Added comments

by Mathias Kettner

Module: check_mk Branch: master Commit: e2963e9169971f5988c055d9d246c41318895daa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2963e9169971f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:23:45 2015 +0100 Added comments --- checks/raritan_emx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/checks/raritan_emx b/checks/raritan_emx index 13f4ffc..9677e6c 100644 --- a/checks/raritan_emx +++ b/checks/raritan_emx @@ -24,6 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# TODO: This has to be split into three subchecks: +# 1. Temperature +# 2. Fans +# 3. Door contacts +# +# Also: +# - use temperature.include +# - avoid SNMP variable names to be show to the user +# - remove saveint +# - add Perf-O-Meters + raritan_emx_sensors = { 0 : "Air Temperature", 1 : "Water Temperature",

9 years, 4 months

Check_MK Git: check_mk: #2034 FIX netapp_api_volumes: added Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: b5c91f74486c0b5e5c859c910bee87120ff35a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5c91f74486c0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 21 10:18:05 2015 +0100 #2034 FIX netapp_api_volumes: added Perf-O-Meter --- .werks/2034 | 9 +++++++++ ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/2034 b/.werks/2034 new file mode 100644 index 0000000..d7c20df --- /dev/null +++ b/.werks/2034 @@ -0,0 +1,9 @@ +Title: netapp_api_volumes: added Perf-O-Meter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424510271 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 31432c8..e64a508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,7 @@ * 2032 FIX: brocade.temp: use new generic WATO rule, add Perf-O-Meter... NOTE: Please refer to the migration notes! * 2033 FIX: check_mk-zfs_arc_cache: add Perf-O-Meter + * 2034 FIX: netapp_api_volumes: added Perf-O-Meter Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index ff11003..d25355a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1232,6 +1232,7 @@ perfometers["check_mk-ibm_svc_mdiskgrp"] = perfometer_check_mk_df perfometers["check_mk-fast_lta_silent_cubes.capacity"] = perfometer_check_mk_df perfometers["check_mk-fast_lta_volumes"] = perfometer_check_mk_df perfometers["check_mk-libelle_business_shadow.archive_dir"] = perfometer_check_mk_df +perfometers["check_mk-netapp_api_volumes"] = perfometer_check_mk_df def perfometer_check_mk_kernel_util(row, check_command, perf_data): h = '<table><tr>'

9 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015