Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Set correct default value for SNMP interval

by Mathias Kettner

Module: check_mk Branch: master Commit: e2b5fada0e5350280feccaa15e74349ebebfab9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2b5fada0e5350… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 16 15:16:05 2013 +0200 Set correct default value for SNMP interval --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 057f89e..886f85a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1509,6 +1509,7 @@ register_rule(group, title = _("Do check every"), unit = _("minutes"), min_value = 1, + default_value = 1, ), ] )

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0941

by Andreas Boesl

Module: check_mk Branch: master Commit: 165cf47f6010b11c9f8a7bc4a249376e60b5fc1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=165cf47f6010b1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 16 11:51:52 2013 +0200 Updated bug entries #0941 --- .bugs/941 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/941 b/.bugs/941 new file mode 100644 index 0000000..3922102 --- /dev/null +++ b/.bugs/941 @@ -0,0 +1,16 @@ +Title: check_tcp service description, duplicates +Component: checks +State: open +Date: 2013-10-16 11:47:45 +Targetversion: future +Class: nastiness + +Create two active tcp checks with the same port on one host +Each service description is 'TCP Port 24' + +-> Error when creating nagios config +Error creating configuration: ERROR: Duplicate service description (active check) 'TCP Port 24' for host 'localhost'! + - 1st occurrance: checktype = active(tcp), item = 'TCP Port 24' + - 2nd occurrance: checktype = active(tcp), item = None + +

10 years, 11 months

Check_MK Git: check_mk: Display site-globals button only for replication slaves

by Mathias Kettner

Module: check_mk Branch: master Commit: f42b86d71f56929d44edb5b39ba7566ca4bf340c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f42b86d71f5692… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 16 02:26:26 2013 +0200 Display site-globals button only for replication slaves --- web/htdocs/wato.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f718cb8..144c8c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6859,14 +6859,15 @@ def mode_sites(phase): table.row() # Buttons edit_url = make_link([("mode", "edit_site"), ("edit", id)]) - globals_url = make_link([("mode", "edit_site_globals"), ("site", id)]) clone_url = make_link([("mode", "edit_site"), ("clone", id)]) delete_url = html.makeactionuri([("_delete", id)]) table.cell(_("Actions"), css="buttons") html.icon_button(edit_url, _("Properties"), "edit") - html.icon_button(globals_url, _("Site-specific global configuration"), "configuration") html.icon_button(clone_url, _("Clone this connection in order to create a new one"), "clone") html.icon_button(delete_url, _("Delete"), "delete") + if site.get("replication"): + globals_url = make_link([("mode", "edit_site_globals"), ("site", id)]) + html.icon_button(globals_url, _("Site-specific global configuration"), "configuration") # Site-ID table.cell(_("Site-ID"), id) @@ -7023,6 +7024,13 @@ def mode_edit_site(phase): siteid = html.var("edit") # missing -> new site cloneid = html.var("clone") new = siteid == None + if cloneid: + site = sites[cloneid] + elif new: + site = {} + else: + site = sites.get(siteid, {}) + if phase == "title": if new: return _("Create new site connection") @@ -7031,17 +7039,10 @@ def mode_edit_site(phase): elif phase == "buttons": html.context_button(_("All Sites"), make_link([("mode", "sites")]), "back") - if not new: + if not new and site.get("replication"): html.context_button(_("Site-Globals"), make_link([("mode", "edit_site_globals"), ("site", siteid)]), "configuration") return - if cloneid: - site = sites[cloneid] - elif new: - site = {} - else: - site = sites.get(siteid, {}) - vs_tcp_port = Tuple( title = _("TCP Port to connect to"), orientation = "float",

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1049

by Mathias Kettner

Module: check_mk Branch: master Commit: cafe5ed31f52e3da8464c32f14027a3e68745998 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafe5ed31f52e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 16 02:21:53 2013 +0200 Updated bug entries #1049 --- .bugs/1049 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1049 b/.bugs/1049 index f2cdd0c..f35b91e 100644 --- a/.bugs/1049 +++ b/.bugs/1049 @@ -1,9 +1,9 @@ Title: Errormessage displayed when configuring distributed monitoring Component: multisite -State: open +Class: bug +State: done Date: 2013-09-12 10:27:16 Targetversion: 1.2.3i2 -Class: bug in distributed monitoring a remote slave is configured when clicking "save" butto multisite displays an error, where there seems to be none: @@ -11,3 +11,6 @@ Internal error:: '.siteid' (Retry with debug mode) but when klicking "Retry with debug mode" it works the connection is created correct within the first click on save + +2013-10-16 02:21:48: changed state open -> done +Finally fixed this :-)

10 years, 11 months

Check_MK Git: check_mk: FIX: fixed ".siteid" exception when added new site

by Mathias Kettner

Module: check_mk Branch: master Commit: faadf9b97abfa48cea75b3bcb4adab4f2f544990 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faadf9b97abfa4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 16 02:19:50 2013 +0200 FIX: fixed ".siteid" exception when added new site Yeah. Finally nailed that down. It appeared when you - Save a new site connection - that is your first remote replication connection - you have at least one subfolder Saving once again helped. But before that - if you use the liveproxyd - it's configuration was not written and it therefore could not connect. All fixed now :-) --- ChangeLog | 1 + web/htdocs/wato.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index af4610f..6525e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * bulk inventory: display percentage in progress bar * New option for full SNMP scan in bulk inventory * FIX: correct display of number of hosts in bulk inventory + * FIX: nailed down ".siteid" exception when added new site 1.2.3i4: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a573c7d..f718cb8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7428,6 +7428,7 @@ def save_sites(sites, activate=True): config.load_config() # make new site configuration active update_distributed_wato_file(sites) declare_site_attribute() + load_all_folders() # make sure that .siteid is present rewrite_config_files_below(g_root_folder) # fix site attributes need_sidebar_reload()

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1073

by Mathias Kettner

Module: check_mk Branch: master Commit: 596ca66942b7f1d2d24d9e1466935aecc1762288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=596ca66942b7f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 23:48:28 2013 +0200 Updated bug entries #1073 --- .bugs/1073 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1073 b/.bugs/1073 new file mode 100644 index 0000000..2852c1d --- /dev/null +++ b/.bugs/1073 @@ -0,0 +1,11 @@ +Title: Chrome: help switches on randomly +Component: multisite +State: open +Date: 2013-10-15 23:42:57 +Targetversion: 1.2.3i3 +Class: bug + +The online help sometimes randomly switches on on Chrome. +Never seen this on Firefox. Seem like the help.mk in the +user profile correctly corresponds to the settings, so +there it is no javascript problem?

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1072

by Mathias Kettner

Module: check_mk Branch: master Commit: 8604387c4798073cef1747cc52028a9dc21ada1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8604387c479807… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 15 21:34:13 2013 +0200 Updated bug entries #1072 --- .bugs/1072 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1072 b/.bugs/1072 new file mode 100644 index 0000000..a21fb0a --- /dev/null +++ b/.bugs/1072 @@ -0,0 +1,11 @@ +Title: Removing a tag: error message garbled up +Component: wato +State: open +Date: 2013-10-15 21:30:44 +Targetversion: future +Class: nastiness + +When you delete a tag group and the tag is still referred +to by a folder, the affected folders are printed in a +warning message. But the line feeds are fixed up. The first +folder is printed indented, the following ones not.

10 years, 11 months

Check_MK Git: check_mk: Blacklisting for services in the felixble notification system

by Bastian Kuhn

Module: check_mk Branch: master Commit: ce6107e1bfad4c750af91d4f3f9a4c857f588e7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce6107e1bfad4c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 15 14:51:57 2013 +0200 Blacklisting for services in the felixble notification system --- ChangeLog | 3 +++ modules/notify.py | 15 +++++++++++++++ web/htdocs/wato.py | 12 +++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cae8fd0..af4610f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,9 @@ * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses + Notifications: + * Blacklisting for services in the felixble notification system + Checks & Agents: * diskstat: removed (ever incorrect) latency computation for Linux * statgrab_load: support predictive levels, add perf-o-meter diff --git a/modules/notify.py b/modules/notify.py index 253326a..5bc52c2 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -588,6 +588,21 @@ def should_notify(context, entry): notify_log(" - Skipping: service level %d not between %d and %d" % (sl, from_sl, to_sl)) return False + # Skip blacklistet serivces + if entry.get("service_blacklist"): + servicedesc = context.get("SERVICEDESC") + if not servicedesc: + notify_log(" - Proceed: blacklist certain services, but this is a host notification") + else: + for s in entry["service_blacklist"]: + if re.match(s, servicedesc): + notify_log(" - Skipping: service '%s' matches blacklist (%s)" % ( + servicedesc, ", ".join(entry["service_blacklist"]))) + return False + + + + # Check service, if configured if entry.get("only_services"): servicedesc = context.get("SERVICEDESC") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 016174e..a573c7d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8266,7 +8266,7 @@ def load_notification_table(): ListOf( Foldable( Dictionary( - optional_keys = [ "only_hosts", "only_services", "escalation" , "match_sl"], + optional_keys = [ "service_blacklist", "only_hosts", "only_services", "escalation" , "match_sl"], columns = 1, headers = True, elements = [ @@ -8379,6 +8379,16 @@ def load_notification_table(): validate = validate_only_services, ), ), + ( "service_blacklist", + ListOfStrings( + title = _("Blacklist the following services"), + help = _("Configure regular expressions that match the beginning of the service names here. Prefix an " + "entry with <tt>!</tt> in order to <i>exclude</i> that service."), + orientation = "horizontal", + valuespec = RegExp(size = 20), + validate = validate_only_services, + ), + ), ] ), title_function = lambda v: _("Notify by: ") + notification_script_title(v["plugin"]),

10 years, 11 months

Check_MK Git: check_mk: qnap_disks: New check for Hardisks in Qnap devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1e5e7f8d3d679115e0edf5a97b9552401c4806db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e5e7f8d3d6791… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 15 14:09:45 2013 +0200 qnap_disks: New check for Hardisks in Qnap devices --- ChangeLog | 1 + checkman/qnap_disks | 18 +++++++++++++++++ checks/qnap_disks | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7fd8a10..cae8fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * steelhead_perrs: New check for Rivergate Gateways * alcatel_power: Check for power supplies on Alcatel switches + * qnap_disks: New check for Hardisks in Qnap devices WATO: * You can now have site-specific global settings when using diff --git a/checkman/qnap_disks b/checkman/qnap_disks new file mode 100644 index 0000000..97d6e19 --- /dev/null +++ b/checkman/qnap_disks @@ -0,0 +1,18 @@ +title: Qnap Harddisk Status +agents: snmp +catalog: hw/storagehw/qnap +license: GPL +distribution: check_mk +description: + This check monitors the health and current Status of + Hardisks attached to a qnap NAS device. + The check returns an {CRIT} in case of an error state reported + by the device. The check also reports the model number, size and the + temperature for each disk. + +item: + The name of the disk like reported in the MIB + +inventory: + One check is created for each Disk + diff --git a/checks/qnap_disks b/checks/qnap_disks new file mode 100644 index 0000000..74a0c45 --- /dev/null +++ b/checks/qnap_disks @@ -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_qnap_disks(info): + return [ (x[0], None) for x in info ] + +def check_qnap_disks(item, _no_params, info): + for desc, temp, status, model, size, cond in info: + if desc == item: + msg = "Model: %s, Temperatur: %s, Size: %s" % \ + ( model, temp, size ) + if int(status) != 0: + return 2, "Status: %s (Code: %s) %s" % ( cond, status, msg) + return 0, msg + return 3, "Disk not longer found in output" + +check_info["qnap_disks"] = { + "check_function" : check_qnap_disks, + "inventory_function" : inventory_qnap_disks, + "service_description" : "Disk %s", + "has_perfdata" : False, + "snmp_info" : (".1.3.6.1.4.1.24681.1.2.11.1",[ + 2, # Description + 3, # Temperature + 4, # Disk Status (-5 = missing) + 5, # Disk Model + 6, # Disk Size + 7, # Status Text + ] ), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.1.0').startswith('Linux TS-') +} +

10 years, 11 months

Check_MK Git: check_mk: steelhead_perrs: New check for Rivergate Gateways

by Bastian Kuhn

Module: check_mk Branch: master Commit: bcb0456c497f0124d27adef85ca61d985ef96e76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb0456c497f01… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 15 14:05:28 2013 +0200 steelhead_perrs: New check for Rivergate Gateways --- ChangeLog | 1 + checkman/steelhead_peers | 13 ++++++++++++ checks/steelhead_peers | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7825bb1..c67ff50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * check_sql: Database port can now be explicitly set * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params + * steelhead_perrs: New check for Rivergate Gateways WATO: * You can now have site-specific global settings when using diff --git a/checkman/steelhead_peers b/checkman/steelhead_peers new file mode 100644 index 0000000..eade665 --- /dev/null +++ b/checkman/steelhead_peers @@ -0,0 +1,13 @@ +title: Riverbed Steelhead Peer Connections +agents: snmp +catalog: hw/network/riverbed +license: GPL +distribution: check_mk +description: + This is a simple check which checks the current connected peers + of a Riverbed Steelhead appliance which a not movible clients. + As long the peer is connected the result will be {OK}. In all other cases + it is {critical}. + +inventory: + One check for each peer will be created. diff --git a/checks/steelhead_peers b/checks/steelhead_peers new file mode 100644 index 0000000..e70ba0d --- /dev/null +++ b/checks/steelhead_peers @@ -0,0 +1,51 @@ +#!/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_steelhead_peers(info): + return [ ( x[0], None ) for x in info if x[-1] != "Steelhead Mobile" ] + + +def check_steelhead_peers(item, _no_params, info): + for host, version, client, client_type in info: + if host == item: + return 0, "Version: %s, Client Address: %s (%s)" % \ + ( version, client, client_type ) + return 2, "Peer not connected" + + +check_info['steelhead_peers'] = { + "check_function" : check_steelhead_peers, + "inventory_function" : inventory_steelhead_peers, + "service_description" : "Peer %s", + "snmp_info" : (".1.3.6.1.4.1.17163.1.1.2.6.1.1" , [ + 2, #Hostname + 3, #Version + 4, #Clients + 5, #Client Type + ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.17163.") +}

10 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013