Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: #1451 users: new check to monitor number of users logged in on a linux system

by Goetz Golla

Module: check_mk Branch: master Commit: ae3f4495d7ffcc1458918603db8202bed5df51b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae3f4495d7ffcc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Dec 3 18:20:13 2014 +0100 #1451 users: new check to monitor number of users logged in on a linux system This check currently needs the mk_users agent plugin installed in the monitoring client. The agent section may at some later point be moved into check_mk_agent.linux --- .werks/1451 | 11 +++++++ ChangeLog | 3 +- agents/plugins/mk_users | 29 +++++++++++++++++ checkman/users | 24 ++++++++++++++ checks/users | 59 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 12 +++++++ 6 files changed, 137 insertions(+), 1 deletion(-) diff --git a/.werks/1451 b/.werks/1451 new file mode 100644 index 0000000..08f7427 --- /dev/null +++ b/.werks/1451 @@ -0,0 +1,11 @@ +Title: users: new check to monitor number of users logged in on a linux system +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417627059 +Class: feature + +This check currently needs the mk_users agent plugin installed in the monitoring client. +The agent section may at some later point be moved into check_mk_agent.linux + diff --git a/ChangeLog b/ChangeLog index 17f057c..b03f1b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,9 +35,10 @@ * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... * 1567 postfix_mailq: speedup in Linux agent for large mail queues... - * 1450 checkpoint_connections, checkpoint_packets: new checks to monitor Checkpoint firewalls * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 + * 1450 checkpoint_connections, checkpoint_packets: new checks to monitor Checkpoint firewalls + * 1451 users: new check to monitor number of users logged in on a linux system... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/plugins/mk_users b/agents/plugins/mk_users new file mode 100755 index 0000000..7058b96 --- /dev/null +++ b/agents/plugins/mk_users @@ -0,0 +1,29 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +if type who >/dev/null; then + echo "<<<users>>>" + who | wc -l +fi diff --git a/checkman/users b/checkman/users new file mode 100644 index 0000000..c3ebbce --- /dev/null +++ b/checkman/users @@ -0,0 +1,24 @@ +title: Number of Users Currently Logged In +agents: linux +catalog: os/misc +license: GPL +distribution: check_mk +description: + Monitor the number of users currently logged in. + The default levels are set to {20} and {30}. + +inventory: + A check of this type is created automatically on each Linux host as soon + as the mk_users plugin is installed on the host. + +perfdata: + On variable: the current number of users logged in + +[parameters] +warn (int): Number of users logged in at which a warning level + is triggered +crit (int): Number for a critical state + +[configuration] +users_default_levels (int, int): Levels used for all checks found + by inventory. This variable is preset to {(20, 30)}. diff --git a/checks/users b/checks/users new file mode 100644 index 0000000..71287de --- /dev/null +++ b/checks/users @@ -0,0 +1,59 @@ +#!/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. + + +# Example output from agent: +# <<<user>>> +# 3 + +users_default_levels = (20,30) + +def inventory_users(info): + if info: + return [ (None, "users_default_levels") ] + +def check_users(_no_item, params, info): + if info: + users = int(info[0][0]) + warn, crit = params + state = 0 + if users >= crit: + state = 2 + elif users >= warn: + state = 1 + + infotext = "%d users logged in, levels at %d/%d" % ( users, warn, crit ) + perfdata = [ ( "users", users, warn, crit, 0 ) ] + yield state, infotext, perfdata + + +check_info["users"] = { + 'check_function' : check_users, + 'inventory_function' : inventory_users, + 'service_description' : 'Users', + 'has_perfdata' : True, + 'group' : 'users', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 781df59..45be91a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4238,6 +4238,18 @@ register_check_parameters( ) register_check_parameters( + subgroup_os, + "users", + _("Number of Users Logged In"), + Tuple( + help = _("This rule defines levels for the number of users logged in on a system."), + elements = [ + Integer(title = _("Warning if above"), unit = _("users"), default_value = 20), + Integer(title = _("Critical if above"), unit = _("users"), default_value = 30)]), + None, None +) + +register_check_parameters( subgroup_applications, "vms_procs", _("Number of processes on OpenVMS"),

9 years, 11 months

Check_MK Git: check_mk: Minor code cleanup in Livestatus

by Mathias Kettner

Module: check_mk Branch: master Commit: 0327276e068bdcab76b0f84457cbb104812e639d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0327276e068bdc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:55:58 2014 +0100 Minor code cleanup in Livestatus --- livestatus/src/LogCache.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 90d3ecf..4b90914 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -122,12 +122,12 @@ bool LogCache::logCachePreChecks() // Has Nagios rotated logfiles? => Update // our file index. And delete all memorized // log messages. - #ifdef CMC +#ifdef CMC if (g_core->_last_logfile_rotation > _last_index_update) { - #else +#else if (last_log_rotation > _last_index_update) { - #endif - logger(LG_INFO, "Nagios has rotated logfiles. Rebuilding logfile index"); +#endif + logger(LG_INFO, "Core has rotated logfiles. Rebuilding logfile index"); forgetLogfiles(); updateLogfileIndex(); }

9 years, 11 months

Check_MK Git: check_mk: #1613 FIX Fixed invalid json format in Stats query with requested heaeders

by Lars Michelsen

Module: check_mk Branch: master Commit: 74d8f5c5c2e22b4f39062ff32765342ceba65205 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74d8f5c5c2e22b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 17:52:57 2014 +0100 #1613 FIX Fixed invalid json format in Stats query with requested heaeders The "," after header line was missing --- .werks/1613 | 9 +++++++++ ChangeLog | 3 +++ livestatus/src/Query.cc | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1613 b/.werks/1613 new file mode 100644 index 0000000..51ba9bf --- /dev/null +++ b/.werks/1613 @@ -0,0 +1,9 @@ +Title: Fixed invalid json format in Stats query with requested heaeders +Level: 1 +Component: livestatus +Compatible: compat +Version: 1.2.5i7 +Date: 1417625520 +Class: fix + +The "," after header line was missing diff --git a/ChangeLog b/ChangeLog index 43586c5..c5a3bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -160,6 +160,9 @@ * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events * 1610 FIX: Hostname translation now also works for incoming SNMP traps + Livestatus: + * 1613 FIX: Fixed invalid json format in Stats query with requested heaeders... + HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... NOTE: Please refer to the migration notes! diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 448d4ab..27a3f7d 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -912,9 +912,10 @@ void Query::finish() it != _stats_groups.end(); ++it) { - // dataset separator after first group - if (it != _stats_groups.begin() && _output_format != OUTPUT_FORMAT_CSV) + if (_need_ds_separator && _output_format != OUTPUT_FORMAT_CSV) _output->addBuffer(",\n", 2); + else + _need_ds_separator = true; outputDatasetBegin();

9 years, 11 months

Check_MK Git: check_mk: #1569 check_mk_agent.openbsd: add sections for mem and lnx_if (memory and network interfaces)

by Mathias Kettner

Module: check_mk Branch: master Commit: 67c9e598f2b493f6667fda651f8fdb3eefaa97a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c9e598f2b493… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:46:23 2014 +0100 #1569 check_mk_agent.openbsd: add sections for mem and lnx_if (memory and network interfaces) Thanks to Henry Wahl for this contribution. --- .werks/1569 | 9 +++ ChangeLog | 3 +- agents/check_mk_agent.openbsd | 136 ++++++++++++++++++++++++++++++++++------- agents/plugins/lnx_if.bsd | 105 ------------------------------- 4 files changed, 125 insertions(+), 128 deletions(-) diff --git a/.werks/1569 b/.werks/1569 new file mode 100644 index 0000000..64b548b --- /dev/null +++ b/.werks/1569 @@ -0,0 +1,9 @@ +Title: check_mk_agent.openbsd: add sections for mem and lnx_if (memory and network interfaces) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417625147 +Class: feature + +Thanks to Henry Wahl for this contribution. diff --git a/ChangeLog b/ChangeLog index 17f057c..713e381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,9 +35,10 @@ * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... * 1567 postfix_mailq: speedup in Linux agent for large mail queues... - * 1450 checkpoint_connections, checkpoint_packets: new checks to monitor Checkpoint firewalls * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 + * 1450 checkpoint_connections, checkpoint_packets: new checks to monitor Checkpoint firewalls + * 1569 check_mk_agent.openbsd: add sections for mem and lnx_if (memory and network interfaces)... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index cd25740..75ff1d1 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -78,7 +78,29 @@ echo `sysctl -n vm.loadavg | tr -d '{}'` `top -b -n 1 | grep -E '^[0-9]+ process echo '<<<uptime>>>' echo `date +%s` - `sysctl -n kern.boottime | cut -d' ' -f 4,7 | tr ',' '.' | tr -d ' '` | bc -echo '<<<netctr>>>' +echo "<<<mem>>>" +MEM_FREE=$(vmstat | tail -n1 | awk '{ print $5 }') +MEM_TOTAL=$(sysctl hw.usermem | cut -d= -f2) +MEM_TOTAL=$(echo $MEM_TOTAL/1024 | bc) + +SWAPCTL_OUTPUT=$(swapctl -k -s) +SWAP_FREE=$(echo $SWAPCTL_OUTPUT | awk '{ print $7 }') +SWAP_TOTAL=$(echo $SWAPCTL_OUTPUT | awk '{ print $2 }') + +# if there is no swap space swap values are 0 +if [ -z "$SWAPCTL_OUTPUT" ] + then + SWAP_FREE=0 + SWAP_TOTAL=0 +fi + +echo "MemTotal:\t" $MEM_TOTAL kB +echo "MemFree:\t" $MEM_FREE kB +echo "SwapTotal:\t" $SWAP_TOTAL kB +echo "SwapFree:\t" $SWAP_FREE kB + +echo '<<<lnx_if:sep(58)>>>' +# MC= MAC address # BI= Bytes in # PI= Packets in # EI= Errors in @@ -86,33 +108,103 @@ echo '<<<netctr>>>' # BO= Bytes out # PO= Packets out # CO= Colls -# NI= number of interfaces +# NI= Number of interfaces +# INTERFACES= Array of interfaces + +set -A INTERFACES +set -A MC +set -A BI +set -A BO +set -A PI +set -A PO +set -A EI +set -A EO +set -A CO -Z1=1 -Z2=p -NI=$(netstat -in | grep 'Link' | wc -l) +NI=0 +# special (lo/pfsync/pflog/enc) and inactive (*) interfaces are not needed +NETSTAT_OUTPUT=$(netstat -in | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") +NETSTAT_OUTPUT_BYTES=$(netstat -inb | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") + +# adjust internal field separator to get lines from netstat and backup it before +OFS=$IFS +IFS=' +' +# collect netstat values and interface number +for NS in $NETSTAT_OUTPUT + do + NI=$(($NI+1)) + INTERFACES[$NI]=$(echo $NS | awk '{print $1}') + MC[$NI]=$(echo $NS | awk '{print $4}') + PI[$NI]=$(echo $NS | awk '{print $5}') + EI[$NI]=$(echo $NS | awk '{print $6}') + PO[$NI]=$(echo $NS | awk '{print $7}') + EO[$NI]=$(echo $NS | awk '{print $8}') + CO[$NI]=$(echo $NS | awk '{print $9}') +done + +# need NIC counter again for byte values - reset it +NI=0 +for NS in $NETSTAT_OUTPUT_BYTES + do + NI=$(($NI+1)) + BI[$NI]=$(echo $NS | awk '{print $5}') + BO[$NI]=$(echo $NS | awk '{print $6}') +done + +# what is this for? [ "${NI}" -ge 1 ] || NI=15 +# jot is OpenBSD "range" +for i in $(jot $NI) + do + echo "${INTERFACES[$i]}:${BI[$i]} ${PI[$i]} ${EI[$i]} 0 0 0 0 0 ${BO[$i]} ${PO[$i]} ${EO[$i]} 0 0 ${CO[$i]} 0 0" +done + +for IF in $(jot $NI) + do + echo \[${INTERFACES[$IF]}\] + + IFCONFIG_OUTPUT=$(ifconfig ${INTERFACES[$IF]}) + for IO in $IFCONFIG_OUTPUT + do + # Speed + SP=$(echo "$IO" | egrep "media:.*base" | cut -d\( -f2 | cut -db -f1) + if [ "$SP" ] + then + echo "\tSpeed: "$SP"Mb/s" + fi + # Detect duplexity - in reality only available for physical devices but + # virtual ones like CARP devices will get at least a half duplex + if [ "$(echo "$IO" | egrep "media:.*full-duplex")" ] + then + echo "\tDuplex: Full" + elif [ "$(echo "$IO" | grep "media:" | grep -v "full-duplex")" ] + then + echo "\tDuplex: Half" + fi + # Auto-negotiation + if [ "$(echo "$IO" | egrep "media:.*autoselect")" ] + then + echo "\tAuto-negotiation: on" + elif [ "$(echo "$IO" | grep "media:" | grep -v "autoselect")" ] + then + echo "\tAuto-negotiation: off" + fi + # Detect detected link + if [ "$(echo "$IO" | grep "status:" | egrep "active|backup|master")" ] + then + echo "\tLink detected: yes" + fi + done + + echo "\tAddress: "${MC[$IF]} -date +%s -while [ $Z1 -lt $NI ] - do - BI=$( netstat -inb | egrep -v Name | grep Link | awk '{print $1" "$5}' | sed -ne $Z1$Z2 ) - PI=$( netstat -in | egrep -v Name | grep Link | awk '{print $5}' | sed -ne $Z1$Z2 ) - EI=$( netstat -in | egrep -v Name | grep Link | awk '{print $6}' | sed -ne $Z1$Z2 ) - FF1="0 0 0 0 0" - BO=$( netstat -inb | egrep -v Name | grep Link | awk '{print $6}' | sed -ne $Z1$Z2 ) - PO=$( netstat -in | egrep -v Name | grep Link | awk '{print $7}' | sed -ne $Z1$Z2 ) - EO=$( netstat -in | egrep -v Name | grep Link | awk '{print $8}' | sed -ne $Z1$Z2 ) - CO=$( netstat -in | egrep -v Name | grep Link | awk '{print $9}' | sed -ne $Z1$Z2 ) - FF2="0 0" - if [ "$(echo ${PI} | cut -c 1-3)" -gt 0 ] - then - echo $BI $PI $EI $FF1 $BO $PO $EO $FF2 $CO $FF2 - fi - Z1=$(($Z1+1)) done +# reset IFS to default +IFW=$OFS + # IPMI-Data (Fans, CPU, temperature, etc) # needs the sysutils/ipmitool and kldload ipmi.ko if which ipmitool >/dev/null ; then diff --git a/agents/plugins/lnx_if.bsd b/agents/plugins/lnx_if.bsd deleted file mode 100755 index 7b5b686..0000000 --- a/agents/plugins/lnx_if.bsd +++ /dev/null @@ -1,105 +0,0 @@ -echo '<<<lnx_if:sep(58)>>>' -# MC= MAC address -# BI= Bytes in -# PI= Packets in -# EI= Errors in -# EO= Errors out -# BO= Bytes out -# PO= Packets out -# CO= Colls -# NI= Number of interfaces -# INTERFACES= Array of interfaces - -set -A INTERFACES -set -A MC -set -A BI -set -A BO -set -A PI -set -A PO -set -A EI -set -A EO -set -A CO - -NI=0 -# special (lo/pfsync/pflog/enc) and inactive (*) interfaces are not needed -NETSTAT_OUTPUT=$(netstat -in | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") -NETSTAT_OUTPUT_BYTES=$(netstat -inb | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") - -# adjust internal field separator to get lines from netstat and backup it before -OFS=$IFS -IFS=' -' -# collect netstat values and interface number -for NS in $NETSTAT_OUTPUT - do - NI=$(($NI+1)) - INTERFACES[$NI]=$(echo $NS | awk '{print $1}') - MC[$NI]=$(echo $NS | awk '{print $4}') - PI[$NI]=$(echo $NS | awk '{print $5}') - EI[$NI]=$(echo $NS | awk '{print $6}') - PO[$NI]=$(echo $NS | awk '{print $7}') - EO[$NI]=$(echo $NS | awk '{print $8}') - CO[$NI]=$(echo $NS | awk '{print $9}') -done - -# need NIC counter again for byte values - reset it -NI=0 -for NS in $NETSTAT_OUTPUT_BYTES - do - NI=$(($NI+1)) - BI[$NI]=$(echo $NS | awk '{print $5}') - BO[$NI]=$(echo $NS | awk '{print $6}') -done - -# what is this for? -[ "${NI}" -ge 1 ] || NI=15 - -# jot is OpenBSD "range" -for i in $(jot $NI) - do - echo "${INTERFACES[$i]}:${BI[$i]} ${PI[$i]} ${EI[$i]} 0 0 0 0 0 ${BO[$i]} ${PO[$i]} ${EO[$i]} 0 0 ${CO[$i]} 0 0" -done - -for IF in $(jot $NI) - do - echo \[${INTERFACES[$IF]}\] - - IFCONFIG_OUTPUT=$(ifconfig ${INTERFACES[$IF]}) - for IO in $IFCONFIG_OUTPUT - do - # Speed - SP=$(echo "$IO" | egrep "media:.*base" | cut -d\( -f2 | cut -db -f1) - if [ "$SP" ] - then - echo "\tSpeed: "$SP"Mb/s" - fi - # Detect duplexity - in reality only available for physical devices but - # virtual ones like CARP devices will get at least a half duplex - if [ "$(echo "$IO" | egrep "media:.*full-duplex")" ] - then - echo "\tDuplex: Full" - elif [ "$(echo "$IO" | grep "media:" | grep -v "full-duplex")" ] - then - echo "\tDuplex: Half" - fi - # Auto-negotiation - if [ "$(echo "$IO" | egrep "media:.*autoselect")" ] - then - echo "\tAuto-negotiation: on" - elif [ "$(echo "$IO" | grep "media:" | grep -v "autoselect")" ] - then - echo "\tAuto-negotiation: off" - fi - # Detect detected link - if [ "$(echo "$IO" | grep "status:" | egrep "active|backup|master")" ] - then - echo "\tLink detected: yes" - fi - done - - echo "\tAddress: "${MC[$IF]} - -done - -# reset IFS to default -IFW=$OFS

9 years, 11 months

Check_MK Git: check_mk: Fix two compile problems in Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 8e49670210228005cc034b56cb93cdaa15ebc498 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e496702102280… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:41:42 2014 +0100 Fix two compile problems in Windows agent --- agents/windows/check_mk_agent.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 33b9d89..852fd5b 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3651,7 +3651,7 @@ void add_only_from(char *value) int bits = 32; if (strchr(value, '/')) { - if (5 != sscanf(value, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits)) { + if (5 != sscanf(value, "%u.%u.%u.%u/%d", &a, &b, &c, &d, &bits)) { fprintf(stderr, "Invalid value %s for only_hosts\n", value); exit(1); } @@ -4200,7 +4200,8 @@ void stop_threads() // Signal any threads to shut down // We don't rely on any check threat running/suspended calls // just check the script_container status - HANDLE hThreadArray[script_containers.size()]; + int sizedt = script_containers.size(); + HANDLE hThreadArray[sizedt]; int active_thread_count = 0; script_containers_t::iterator it_cont = script_containers.begin();

9 years, 11 months

Check_MK Git: check_mk: Change detection of postfix in Linux agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 867742b2f3feff096906f653226cf5bbc6f7428d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=867742b2f3feff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:35:14 2014 +0100 Change detection of postfix in Linux agent --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 51b425b..48d6847 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -501,7 +501,7 @@ fi # Only handle the last 6 lines (includes the summary line at the bottom and # the last message in the queue. The last message is not used at the moment # but it could be used to get the timestamp of the last message. -if type mailq >/dev/null 2>&1 && [ -x /usr/sbin/postfix ] && getent passwd postfix >/dev/null 2>&1; then +if type postconf ; then echo '<<<postfix_mailq>>>' echo -- \ $(du -kd0 $(postconf -h queue_directory)/deferred | awk '{print $1 }') Kbytes in \

9 years, 11 months

Check_MK Git: check_mk: Fix permissions of several plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 86dc26683a6d77f6e482c75bea9b9bc83eaab515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86dc26683a6d77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:25:51 2014 +0100 Fix permissions of several plugins --- 0 files changed diff --git a/agents/plugins/hpux_lunstats b/agents/plugins/hpux_lunstats old mode 100644 new mode 100755 diff --git a/agents/plugins/hpux_statgrab b/agents/plugins/hpux_statgrab old mode 100644 new mode 100755 diff --git a/agents/plugins/mk_logwatch_aix b/agents/plugins/mk_logwatch_aix old mode 100644 new mode 100755 diff --git a/agents/plugins/mk_oracle.solaris b/agents/plugins/mk_oracle.solaris old mode 100644 new mode 100755 diff --git a/agents/plugins/nfsexports.solaris b/agents/plugins/nfsexports.solaris old mode 100644 new mode 100755

9 years, 11 months

Check_MK Git: check_mk: added lnx_if.bsd from Henry Wahl

by Mathias Kettner

Module: check_mk Branch: master Commit: c2f45d2a4da128da2433e35ffb7226585a202ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f45d2a4da128… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:26:06 2014 +0100 added lnx_if.bsd from Henry Wahl --- agents/plugins/lnx_if.bsd | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/agents/plugins/lnx_if.bsd b/agents/plugins/lnx_if.bsd new file mode 100755 index 0000000..7b5b686 --- /dev/null +++ b/agents/plugins/lnx_if.bsd @@ -0,0 +1,105 @@ +echo '<<<lnx_if:sep(58)>>>' +# MC= MAC address +# BI= Bytes in +# PI= Packets in +# EI= Errors in +# EO= Errors out +# BO= Bytes out +# PO= Packets out +# CO= Colls +# NI= Number of interfaces +# INTERFACES= Array of interfaces + +set -A INTERFACES +set -A MC +set -A BI +set -A BO +set -A PI +set -A PO +set -A EI +set -A EO +set -A CO + +NI=0 +# special (lo/pfsync/pflog/enc) and inactive (*) interfaces are not needed +NETSTAT_OUTPUT=$(netstat -in | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") +NETSTAT_OUTPUT_BYTES=$(netstat -inb | grep '<Link>' | egrep -v "\*|lo|pfsync|enc") + +# adjust internal field separator to get lines from netstat and backup it before +OFS=$IFS +IFS=' +' +# collect netstat values and interface number +for NS in $NETSTAT_OUTPUT + do + NI=$(($NI+1)) + INTERFACES[$NI]=$(echo $NS | awk '{print $1}') + MC[$NI]=$(echo $NS | awk '{print $4}') + PI[$NI]=$(echo $NS | awk '{print $5}') + EI[$NI]=$(echo $NS | awk '{print $6}') + PO[$NI]=$(echo $NS | awk '{print $7}') + EO[$NI]=$(echo $NS | awk '{print $8}') + CO[$NI]=$(echo $NS | awk '{print $9}') +done + +# need NIC counter again for byte values - reset it +NI=0 +for NS in $NETSTAT_OUTPUT_BYTES + do + NI=$(($NI+1)) + BI[$NI]=$(echo $NS | awk '{print $5}') + BO[$NI]=$(echo $NS | awk '{print $6}') +done + +# what is this for? +[ "${NI}" -ge 1 ] || NI=15 + +# jot is OpenBSD "range" +for i in $(jot $NI) + do + echo "${INTERFACES[$i]}:${BI[$i]} ${PI[$i]} ${EI[$i]} 0 0 0 0 0 ${BO[$i]} ${PO[$i]} ${EO[$i]} 0 0 ${CO[$i]} 0 0" +done + +for IF in $(jot $NI) + do + echo \[${INTERFACES[$IF]}\] + + IFCONFIG_OUTPUT=$(ifconfig ${INTERFACES[$IF]}) + for IO in $IFCONFIG_OUTPUT + do + # Speed + SP=$(echo "$IO" | egrep "media:.*base" | cut -d\( -f2 | cut -db -f1) + if [ "$SP" ] + then + echo "\tSpeed: "$SP"Mb/s" + fi + # Detect duplexity - in reality only available for physical devices but + # virtual ones like CARP devices will get at least a half duplex + if [ "$(echo "$IO" | egrep "media:.*full-duplex")" ] + then + echo "\tDuplex: Full" + elif [ "$(echo "$IO" | grep "media:" | grep -v "full-duplex")" ] + then + echo "\tDuplex: Half" + fi + # Auto-negotiation + if [ "$(echo "$IO" | egrep "media:.*autoselect")" ] + then + echo "\tAuto-negotiation: on" + elif [ "$(echo "$IO" | grep "media:" | grep -v "autoselect")" ] + then + echo "\tAuto-negotiation: off" + fi + # Detect detected link + if [ "$(echo "$IO" | grep "status:" | egrep "active|backup|master")" ] + then + echo "\tLink detected: yes" + fi + done + + echo "\tAddress: "${MC[$IF]} + +done + +# reset IFS to default +IFW=$OFS

9 years, 11 months

Check_MK Git: check_mk: redo commit after removing one file

by Goetz Golla

Module: check_mk Branch: master Commit: 90b78998b99ddcb458bef6c3c675123465322b6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90b78998b99ddc… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Dec 3 17:14:20 2014 +0100 redo commit after removing one file --- .werks/1450 | 9 ++++ ChangeLog | 1 + checkman/checkpoint_connections | 22 +++++++++ checkman/checkpoint_packets | 34 +++++++++++++ checks/checkpoint_connections | 57 ++++++++++++++++++++++ checks/checkpoint_packets | 89 ++++++++++++++++++++++++++++++++++ modules/catalog.py | 1 + web/plugins/wato/check_parameters.py | 62 ++++++++++++++++++++++- 8 files changed, 274 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90b78998b9…

9 years, 11 months

Check_MK Git: check_mk: #1612 FIX job: Fixed wrong reported start time for running jobs

by Lars Michelsen

Module: check_mk Branch: master Commit: bbb866fabde1c05110e42472e41054693a6d9fc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbb866fabde1c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 17:10:55 2014 +0100 #1612 FIX job: Fixed wrong reported start time for running jobs --- .werks/1612 | 9 +++++++++ ChangeLog | 1 + checks/job | 35 +++++++++++++++-------------------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.werks/1612 b/.werks/1612 new file mode 100644 index 0000000..8c6446c --- /dev/null +++ b/.werks/1612 @@ -0,0 +1,9 @@ +Title: job: Fixed wrong reported start time for running jobs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417623022 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 7ba5338..d1193f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... + * 1612 FIX: job: Fixed wrong reported start time for running jobs Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/job b/checks/job index 83f3ba6..f8c895f 100644 --- a/checks/job +++ b/checks/job @@ -71,31 +71,27 @@ def job_parse_real_time(s): return float(parts[-1]) + min_sec + hour_sec def job_parse(item, info): - found = False - found_running = False data = {} + prefix = None for line in info: - if ' '.join(line[1:-1]) == item: - found = True + if line[0] == '==>': - elif ' '.join(line[1:-1]) == item + '.running': - # There might be a second section per job, the contents of the - # <ident>.running file which exists during execution of the job. - # We use the start_time from this file. - found_running = True + if ' '.join(line[1:-1]) == item: + prefix = '' - elif found_running and line[0] == '==>': - continue # simply skip over this line + elif ' '.join(line[1:-1]) == item + '.running': + # There might be a second section per job, the contents of the + # <ident>.running file which exists during execution of the job. + # We use the start_time from this file. + prefix = 'running_' - elif found_running and len(line) == 2: - key, val = line - if key == 'start_time': - data['running_start_time'] = int(val) + elif 'start_time' in data.keys() and 'running_start_time' in data.keys(): + break # both sections completed => we are done here - elif found and line[0] == '==>': - break # Stop at next section + else: + prefix = None - elif found and len(line) == 2: + elif len(line) == 2 and prefix is not None: key, val = line # Convert several keys/values if key == 'real_time': @@ -107,7 +103,7 @@ def job_parse(item, info): elif key in [ 'max_res_kbytes', 'avg_mem_kbytes' ]: key = key.replace('kbytes', 'bytes') val = int(val) * 1000 - data[key] = val + data[prefix+key] = val return data @@ -138,7 +134,6 @@ def check_job(item, params, info): output.append('(Started: %s)' % display_value) return state, ' '.join(output) - txt = 'Exit-Code: %d' % job['exit_code'] if job['exit_code'] != 0: state = max(state, 2)

9 years, 11 months

← Newer
1
...
39
40
41
42
43
44
45
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014