Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: akcp_sensor_drycontact: New Check for AKCP drycontact Sensors

by Bastian Kuhn

Module: check_mk Branch: master Commit: c4a90c75a1abf0635645624836d2c2a84aed0130 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4a90c75a1abf0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 18 16:00:29 2013 +0200 akcp_sensor_drycontact: New Check for AKCP drycontact Sensors --- ChangeLog | 1 + checkman/akcp_sensor_drycontact | 17 +++++++++++++ checks/akcp_sensor_drycontact | 52 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/ChangeLog b/ChangeLog index 02e920f..1116424 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * FIX: logwatch.ec: No longer forwards "I" lines to event console * windows_tasks: New Check to monitor the Windows Task Scheduler * sensatronics_temp: New Check for Sensatronic E4 Temperatur Sensor + * akcp_sensor_drycontact: New Check for AKCP drycontact Sensors WATO: * You can now have site-specific global settings when using diff --git a/checkman/akcp_sensor_drycontact b/checkman/akcp_sensor_drycontact new file mode 100644 index 0000000..ff5b61f --- /dev/null +++ b/checkman/akcp_sensor_drycontact @@ -0,0 +1,17 @@ +title: AKCP Drycontact Sensor +agents: snmp +catalog: hw/environment +license: GPL +distribution: +description: + This check monitors the status of a AKCP Drycontact Sensor. + The Sensor can have a state {OK} or {CRITICAL} and Check_MK display + this states. + +item: + The item is the sensor description of the sensor as string. + + +inventory: + All available sensors are automatically inventorized. + diff --git a/checks/akcp_sensor_drycontact b/checks/akcp_sensor_drycontact new file mode 100644 index 0000000..ff0a5c7 --- /dev/null +++ b/checks/akcp_sensor_drycontact @@ -0,0 +1,52 @@ +#!/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_akcp_sensor_drycontact(info): + return [ ( x[0], None ) for x in info if x[2] == "1" ] + +def check_akcp_sensor_drycontact(item, _no_params, info): + for line in info: + if item == line[0]: + state = saveint(line[1]) + if state == 2: + return 0, "Drycontact OK" + return 2, "Drycontact on Error" + return 3, "Drycontact not found anymore" + +check_info["akcp_sensor_drycontact"] = { + "check_function" : check_akcp_sensor_drycontact, + "inventory_function" : inventory_akcp_sensor_drycontact, + "service_description" : "Device %s", + "has_perfdata" : False, + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], + 'snmp_info' : ( ".1.3.6.1.4.1.3854.1.2.2.1.18.1" , [ + 1, #Sensor Name + 3, #Sensor Status (2 = OK, 4 = Not ok) + 5, #Sensor Online + ] ), +} +

10 years, 11 months

Check_MK Git: check_mk: Hopefully cleanedup akcp_sensors_temp scan function . Please feedback in case of missing inventory of the sensors

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1eb2907771b4ce8ab37d0474ec2cb5fa7a9e4969 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb2907771b4ce… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 18 15:27:45 2013 +0200 Hopefully cleanedup akcp_sensors_temp scan function. Please feedback in case of missing inventory of the sensors --- checks/akcp_sensor_temp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index e4e40c6..0da73e0 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -34,11 +34,7 @@ akcp_sensor_temp_defaultlevels = (28, 32) def inventory_akcp_sensor_temp(info): - inventory = [] - for desc, degree, status, online, degreetype, degreeraw in info: - if online == "1": - inventory.append( (desc, "akcp_sensor_temp_defaultlevels") ) - return inventory + return [ (x[0], "akcp_sensor_temp_defaultlevels" ) for x in info if x[3] == "1" ] def check_akcp_sensor_temp(item, params, info): for desc, degree, status, online, degreetype, degreeraw in info: @@ -90,7 +86,7 @@ check_info["akcp_sensor_temp"] = { 14, #sensorProbeTempDegreeRaw - SP Only: The raw degree data from the temperature sensor, slightly hig ], ), - 'snmp_scan_function': \ - lambda oid: "AKCP" in oid(".1.3.6.1.4.1.3854.1.1.6.0") and "sensorProbe" in oid(".1.3.6.1.4.1.3854.1.1.8.0"), - 'group': 'room_temperature', + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in\ + [ ".1.3.6.1.4.1.3854.1.2.2.1.1", ".1.3.6.1.4.1.3854.1" ], + 'group' : 'room_temperature', }

10 years, 11 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 06811d3e00a43339f2e502e6909a9efed21e8bda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06811d3e00a433… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 18 17:38:13 2013 +0200 merge conflict ---

10 years, 11 months

Check_MK Git: check_mk: hp_blade_blades fixed crash on inventory

by Andreas Boesl

Module: check_mk Branch: master Commit: 873e77487ff4c80ca6aa6e0d1c5e720487eb489b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=873e77487ff4c8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 18 14:26:13 2013 +0200 hp_blade_blades fixed crash on inventory --- ChangeLog | 2 ++ checks/hp_blade_blades | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc5b15a..61621b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ * FIX: local: tolerate invalid output lines * FIX: hp_proliant: Correct handling of missing snmp data * FIX: logwatch.ec: No longer forwards "I" lines to event console + * FIX: hp_blade_blades: Fixed crash on inventory when receiving + unexpected snmp data WATO: * You can now have site-specific global settings when using diff --git a/checks/hp_blade_blades b/checks/hp_blade_blades index a1422fc..ddb5e1a 100644 --- a/checks/hp_blade_blades +++ b/checks/hp_blade_blades @@ -50,7 +50,7 @@ hp_blade_status_map = { 1: 'Other', 2: 'Ok', 3: 'Degraded', 4: 'Fa hp_blade_status2nagios_map = { 'Other': 2, 'Ok': 0, 'Degraded': 1, 'Failed': 2, } def inventory_hp_blade_blades(info): - return [ (line[0], None) for line in info if hp_blade_present_map[int(line[1])] == 'present' ] + return [ (line[0], None) for line in info if hp_blade_present_map.get(int(line[1]), "") == 'present' ] def check_hp_blade_blades(item, params, info): for line in info:

10 years, 11 months

Check_MK Git: check_mk: mkeventd: Fixed Makefile. Improved error handling, fixed unixsocket connection

by Andreas Boesl

Module: check_mk Branch: master Commit: e14e3d615197ae0e3dec17b8325d948e6a488d0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e14e3d615197ae… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 18 12:46:12 2013 +0200 mkeventd: Fixed Makefile. Improved error handling, fixed unixsocket connection --- mkeventd/lib/Makefile | 2 +- mkeventd/lib/check_mkevents.cc | 32 ++++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/mkeventd/lib/Makefile b/mkeventd/lib/Makefile index 3a9e735..fc6cfd7 100644 --- a/mkeventd/lib/Makefile +++ b/mkeventd/lib/Makefile @@ -24,7 +24,7 @@ all: check_mkevents_c -check_mkevents_c: +check_mkevents_c: check_mkevents.cc g++ -O2 -o check_mkevents_c check_mkevents.cc clean: diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index 0e5415d..ca4b769 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -42,6 +42,12 @@ using namespace std; #define PF_LOCAL PF_UNIX #endif +void usage() +{ + printf("Usage: check_mkevents_c [-H REMOTE:PORT] [-a] HOST [APPLICATION]"); + printf("\n -a do not take into account acknowledged events.\n"); +} + int main(int argc, char** argv) { // Parse arguments @@ -72,6 +78,11 @@ int main(int argc, char** argv) } } + if (!host) { + usage(); + exit(3); + } + // Get omd environment char *omd_path = getenv("OMD_ROOT"); char unixsocket_path[1024]; @@ -104,23 +115,28 @@ int main(int argc, char** argv) addr.sin_port = htons(remote_port); if(0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_in))){ - printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d\n", - remote_hostaddress, remote_port); + printf("UNKNOWN - Cannot connect to event daemon via TCP %s:%d (%s)\n", + remote_hostaddress, remote_port, strerror(errno)); exit(3); } } else { - sock = socket(AF_UNIX, SOCK_STREAM , 0); + sock = socket(PF_LOCAL, SOCK_STREAM , 0); + if (sock < 0) { + printf("UNKNOWN - Cannot create client socket: %s\n", strerror(errno)); + exit(3); + } + tv.tv_sec = 3; setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)&tv, sizeof(struct timeval)); struct sockaddr_un addr; memset(&addr, 0, sizeof(struct sockaddr_un)); - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, unixsocket_path, sizeof(addr.sun_path)-1); + addr.sun_family = AF_LOCAL; + strncpy(addr.sun_path, unixsocket_path, sizeof(addr.sun_path)); - if(0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr))){ - printf("UNKNOWN - Cannot connect to event daemon via UNIX socket %s\n", - unixsocket_path); + if(0 > connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr_un))){ + printf("UNKNOWN - Cannot connect to event daemon via UNIX socket %s (%s)\n", + unixsocket_path, strerror(errno)); exit(3); } }

10 years, 11 months

Check_MK Git: check_mk: FIX: fixed setting for locking mode from 'ait' to ' wait'

by Mathias Kettner

Module: check_mk Branch: master Commit: 49b009a44fe1cbb3ae77b0e197494a7f549a70aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49b009a44fe1cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 15:10:56 2013 -0500 FIX: fixed setting for locking mode from 'ait' to 'wait' --- ChangeLog | 3 ++- web/plugins/wato/check_mk_configuration.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac526a6..fc5b15a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * Dell Open Manage: SNNP Checks for Physical Disks, CPU and Memory * check_tcp: Now able to set custom service description * Apache ActiveMQ: New Special Agent and Check to query ActiveMQ Queues + * check_ftp: can now be configured via Wato * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * FIX: local: tolerate invalid output lines @@ -58,7 +59,7 @@ * 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 - * Check_ftp: can now be configured via Wato + * FIX: fixed setting for locking mode from 'ait' to 'wait' 1.2.3i4: Core: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 886f85a..d1ea01e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -867,7 +867,7 @@ register_configvar(group, "off locking altogether."), choices = [ ('abort', _("Abort with an error")), - ('ait' , _("Wait until the other has finished") ), + ('wait' , _("Wait until the other has finished") ), (None , _("Disable locking") ), ]), need_restart = False

10 years, 11 months

Check_MK Git: check_mk: FIX: Fix exception when showing BI tree in reporting time warp

by Mathias Kettner

Module: check_mk Branch: master Commit: a6084cd5519f0efe6934704897b879fd4ad754cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6084cd5519f0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 12:31:00 2013 -0500 FIX: Fix exception when showing BI tree in reporting time warp --- ChangeLog | 3 +++ web/htdocs/bi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e01e70b..6ebe996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,9 @@ * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses + BI: + * FIX: Fix exception when showing BI tree in reporting time warp + Notifications: * Blacklisting for services in the felixble notification system diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 35caefd..fc6d18c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1459,7 +1459,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, h += aggr_render_node(tree, tree[2]["title"], mc, show_host) if not is_empty: - h += '<ul id="%d:%s" %sclass="subtree">' % (expansion_level, path_id, style) + h += '<ul id="%d:%s" %sclass="subtree">' % (expansion_level or 0, path_id, style) if not omit_content: for node in tree[3]: estate = node[1] != None and node[1] or node[0]

10 years, 11 months

Check_MK Git: check_mk: Cleaned up ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: bcb4fdefed12ea9f6a35286227aeb990b30a369a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb4fdefed12ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 12:31:49 2013 -0500 Cleaned up ChangeLog --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ebe996..ac526a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,10 @@ * FIX: avoid invalid cache of 2nd and up hosts in bulk inventory * FIX: fixed error handling in SNMP scan, inventory check fails now if SNMP agent is not responding + * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) * Automatically remove duplicate checks when monitoring with Agent+SNMP at the same time. TCP based ones have precedence. * inventory check of SNMP devices now does scan per default (configurable) - * FIX: Ignore snmp_check_interval cache in interactive situations (e.g. -nv) Event Console: * check_mkevents now available as C binary: check_mkevents_c @@ -44,10 +44,10 @@ * qnap_disks: New check for Hardisks in Qnap devices * Dell Open Manage: SNNP Checks for Physical Disks, CPU and Memory * check_tcp: Now able to set custom service description + * Apache ActiveMQ: New Special Agent and Check to query ActiveMQ Queues * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch * FIX: esx_vsphere_hostsystem: fixed bug in handling of params * FIX: local: tolerate invalid output lines - * Apache ActiveMQ: New Special Agent and Check to query ActiveMQ Queues * FIX: hp_proliant: Correct handling of missing snmp data * FIX: logwatch.ec: No longer forwards "I" lines to event console

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1077

by Mathias Kettner

Module: check_mk Branch: master Commit: 46d52ee4109198435c413775d349cb021d1a458d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46d52ee4109198… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 12:25:33 2013 -0500 Updated bug entries #1077 --- .bugs/1077 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/1077 b/.bugs/1077 index 7ae26b1..b445d46 100644 --- a/.bugs/1077 +++ b/.bugs/1077 @@ -1,10 +1,14 @@ Title: BI: Host/Service search just show first host tag Component: bi -State: open +Class: bug +State: works4me Date: 2013-10-17 10:54:51 Targetversion: 1.4.0 -Class: bug In the WATO editor of BI when you use host/service search for creating nodes then only the first host tag selection is being shown. The rest ist missing. + +2013-10-17 12:25:30: changed state open -> works4me +Was not a bug. Tags were just missing because of the test +setup.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #1077, #1078

by Mathias Kettner

Module: check_mk Branch: master Commit: 3ab0b3b4bb3cef0ef932bfaee3edda6a6818b5d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ab0b3b4bb3cef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 17 10:56:38 2013 -0500 Updated bug entries #1077, #1078 --- .bugs/1077 | 10 ++++++++++ .bugs/1078 | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/.bugs/1077 b/.bugs/1077 new file mode 100644 index 0000000..7ae26b1 --- /dev/null +++ b/.bugs/1077 @@ -0,0 +1,10 @@ +Title: BI: Host/Service search just show first host tag +Component: bi +State: open +Date: 2013-10-17 10:54:51 +Targetversion: 1.4.0 +Class: bug + +In the WATO editor of BI when you use host/service search +for creating nodes then only the first host tag selection +is being shown. The rest ist missing. diff --git a/.bugs/1078 b/.bugs/1078 new file mode 100644 index 0000000..dde9bb0 --- /dev/null +++ b/.bugs/1078 @@ -0,0 +1,11 @@ +Title: BI: Triangle link is not specific enough +Component: bi +State: open +Date: 2013-10-17 10:55:37 +Targetversion: 1.4.0 +Class: bug + +If you have two BI aggregates where the name of one is a +prefix of the name of another, then klicking the triangle +in Multisite on the shorter name will show both of the +aggregates.

10 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
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