Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64690 discussions

Check_MK Git: check_mk: #1615 qnap_disks: Added support for Fujitsu NAS QR802

by Lars Michelsen

Module: check_mk Branch: master Commit: 551f8f358c16177450f1ba2fb62f387a6b8ff481 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=551f8f358c1617… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 18:24:25 2014 +0100 #1615 qnap_disks: Added support for Fujitsu NAS QR802 --- .werks/1615 | 9 +++++++++ ChangeLog | 1 + checks/qnap_disks | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1615 b/.werks/1615 new file mode 100644 index 0000000..63adc05 --- /dev/null +++ b/.werks/1615 @@ -0,0 +1,9 @@ +Title: qnap_disks: Added support for Fujitsu NAS QR802 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417627434 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 965d391..b609916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 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)... + * 1615 qnap_disks: Added support for Fujitsu NAS QR802 * 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/checks/qnap_disks b/checks/qnap_disks index be77087..d6fe272 100644 --- a/checks/qnap_disks +++ b/checks/qnap_disks @@ -50,6 +50,7 @@ check_info["qnap_disks"] = { 6, # Disk Size 7, # Status Text ] ), - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.1.0').startswith('Linux TS-') + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.1.0').startswith('Linux TS-') \ + or oid('.1.3.6.1.2.1.1.1.0').startswith('NAS QR802') }

9 years, 10 months

Check_MK Git: check_mk: #1614 FIX Fixed wrong URL in webapi.py documentation

by Lars Michelsen

Module: check_mk Branch: master Commit: e2a25f246b9868618b17ae605b017a8e11236a69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2a25f246b9868… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 18:22:09 2014 +0100 #1614 FIX Fixed wrong URL in webapi.py documentation --- .werks/1614 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/1614 b/.werks/1614 new file mode 100644 index 0000000..d4b2fe3 --- /dev/null +++ b/.werks/1614 @@ -0,0 +1,9 @@ +Title: Fixed wrong URL in webapi.py documentation +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417627315 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c69126e..965d391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * 1586 FIX: Dashboard: Toggling edit/non-edit is now reflected when reloading the page * 1605 FIX: Fixed perfometer of check check_mk-printer_supply_ricoh * 1607 FIX: check_http: Fixed broken links in escaped plugin output + * 1614 FIX: Fixed wrong URL in webapi.py documentation WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog

9 years, 10 months

Check_MK Git: check_mk: #1618 FIX ad_replication: Output of timeLastSuccess and timeLastFailure was inverted

by Lars Michelsen

Module: check_mk Branch: master Commit: a613b10b8fa8bca3963596c8820dc5b167be5823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a613b10b8fa8bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 19:09:52 2014 +0100 #1618 FIX ad_replication: Output of timeLastSuccess and timeLastFailure was inverted Thanks to Andreas Döhler for providing the patch. --- .werks/1618 | 9 +++++++++ ChangeLog | 1 + checks/ad_replication | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/1618 b/.werks/1618 new file mode 100644 index 0000000..7c32141 --- /dev/null +++ b/.werks/1618 @@ -0,0 +1,9 @@ +Title: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417630130 +Class: fix + +Thanks to Andreas Döhler for providing the patch. diff --git a/ChangeLog b/ChangeLog index 7dbc13e..4dabc1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... * 1617 FIX: lnx_if: Deal with data provided by cluster host + * 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was inverted... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/ad_replication b/checks/ad_replication index bc98b0c..ac429fd 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -84,24 +84,24 @@ def check_ad_replication(item, params, info): output += '(!) %s/%s replication of context %s reached ' \ ' the threshold of maximum failures (%s) (Last Success: %s, ' \ 'LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, maxFailuresWarn, timeLastFailure, - timeLastSuccess, numFailures, statusLastFailure) + (sourceSite, sourceDC, namingContext, maxFailuresWarn, timeLastSuccess, + timeLastFailure, numFailures, statusLastFailure) if int(numFailures) > maxFailuresCrit: status = 2 output += '(!!) %s/%s replication of context %s reached ' \ ' the threshold of maximum failures (%s) (Last Success: %s, ' \ 'LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, maxFailuresCrit, timeLastFailure, - timeLastSuccess, numFailures, statusLastFailure) + (sourceSite, sourceDC, namingContext, maxFailuresCrit, timeLastSuccess, + timeLastFailure, numFailures, statusLastFailure) if timeLastFailure is not None and timeLastSuccess is not None \ and timeLastFailure > timeLastSuccess: status = 2 output += '(!!) %s/%s replication of context %s failed ' \ '(Last Success: %s, LastFailure: %s NumFailures: %s Status: %s), ' % \ - (sourceSite, sourceDC, namingContext, timeLastFailure, - timeLastSuccess, numFailures, statusLastFailure) + (sourceSite, sourceDC, namingContext, timeLastSuccess, + timeLastFailure, numFailures, statusLastFailure) if not foundLine: return (3, 'Replication information for %s not found' % item)

9 years, 10 months

Check_MK Git: check_mk: #1616 drbd: Added support for Ahead/

by Lars Michelsen

Behind cluster states (DRBD >= 8.3.10) Message-ID: <547f5202.3ez5NhwQIqs++mb+%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: 8c96c566f324e6f743b262d7a2282868ccf5b1ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c96c566f324e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 18:40:04 2014 +0100 #1616 drbd: Added support for Ahead/Behind cluster states (DRBD >= 8.3.10) --- .werks/1616 | 9 +++++++++ ChangeLog | 1 + checks/drbd | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/1616 b/.werks/1616 new file mode 100644 index 0000000..2b87d3b --- /dev/null +++ b/.werks/1616 @@ -0,0 +1,9 @@ +Title: drbd: Added support for Ahead/Behind cluster states (DRBD >= 8.3.10) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417628356 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b609916..ca48adb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 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)... * 1615 qnap_disks: Added support for Fujitsu NAS QR802 + * 1616 drbd: Added support for Ahead/Behind cluster states (DRBD >= 8.3.10) * 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/checks/drbd b/checks/drbd index 7d3f4af..25fc108 100644 --- a/checks/drbd +++ b/checks/drbd @@ -166,6 +166,7 @@ drbd_cs_map = { 'SyncSource': 1, 'SyncTarget': 1, 'PausedSyncS': 1, 'PausedSyncT': 1, 'VerifyS': 0, 'VerifyT': 0, + 'Ahead': 1, 'Behind': 1, } drbd_ds_map = {

9 years, 10 months

Check_MK Git: check_mk: #1617 FIX lnx_if: Deal with data provided by cluster host

by Lars Michelsen

Module: check_mk Branch: master Commit: 0083522aba86ef8ec355a5585194e8e41c210a0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0083522aba86ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 19:00:30 2014 +0100 #1617 FIX lnx_if: Deal with data provided by cluster host --- .werks/1617 | 9 +++++++++ ChangeLog | 1 + checks/lnx_if | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1617 b/.werks/1617 new file mode 100644 index 0000000..724d0c3 --- /dev/null +++ b/.werks/1617 @@ -0,0 +1,9 @@ +Title: lnx_if: Deal with data provided by cluster host +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417629588 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ca48adb..a93428a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 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 + * 1617 FIX: lnx_if: Deal with data provided by cluster host Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/lnx_if b/checks/lnx_if index 1e36aff..15e2e93 100644 --- a/checks/lnx_if +++ b/checks/lnx_if @@ -53,14 +53,19 @@ def if_lnx_convert_to_if64(info): current_nic = None index = 0 for line in info: + # Be careful! On clustered hosts we have more than one perf-counters section + # and ethtool section. This needs to be handled. Sadly we have no section + # headers. Try to detect it by data format. if line[0].startswith('['): current_nic = line[0][1:-1] index += 1 nic_info[current_nic]['index'] = index - elif current_nic == None: # still in perf-counters subsection + elif len(line) == 2 and len(line[1].split()) >= 16: + # This looks like a perf-counter line nic = line[0] nic_info[nic] = { "counters": map(int, line[1].split()) } else: + # ethtool data line nic_info[current_nic][line[0].strip()] = ":".join(line[1:]).strip() # if index is 0 we either have found no nics or no information

9 years, 10 months

Check_MK Git: check_mk: #1622 FIX megaraid_bbu: handle case isSOHGood and consider it as critical

by Mathias Kettner

Module: check_mk Branch: master Commit: d59176f1d458b918a9d08ca2ed596d265f74d93b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d59176f1d458b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 18:45:26 2014 +0100 #1622 FIX megaraid_bbu: handle case isSOHGood and consider it as critical Thanks to Jukka Santala, who wrote: "Discovered (the hard way) that when MegaRAID BBU batteries degrade too low, disabling WriteBack cache, the firmware doesn't turn on "battery pack needs replacing" flag. Instead <tt>isSOHGood</tt> seems to be only reliable way to detect this condition. In this patch I've ranked it as critical, as it is fairly equivalent to battery pack missing. Unfortunately it's generally too late when this goes on, so it would be nice to have little warning. The current agents do not query "Absolute State of charge" off the controller, and on the DELL 12G RAID-controllers this statistics doesn't even exist; they also have different design capacity. Because of these limitations I've resolved to just listing the "Full Charge Capacity" in the check status. I considered having the passed on perfdata for graphing, but as they're only updated on battery re-learn, it's limited usability. This patch is against latest innovation versions, and has been tested again various DELL 9G, 11G and 12G servers with 5/i, 6/i, H700 and H710P RAID-controllers." --- .werks/1622 | 24 ++++++++++++++++++++++++ ChangeLog | 1 + checks/megaraid_bbu | 4 +++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/1622 b/.werks/1622 new file mode 100644 index 0000000..e07e28a --- /dev/null +++ b/.werks/1622 @@ -0,0 +1,24 @@ +Title: megaraid_bbu: handle case isSOHGood and consider it as critical +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417628636 +Class: fix + +Thanks to Jukka Santala, who wrote: + +"Discovered (the hard way) that when MegaRAID BBU batteries degrade too low, +disabling WriteBack cache, the firmware doesn't turn on "battery pack needs +replacing" flag. Instead <tt>isSOHGood</tt> seems to be only reliable way +to detect this condition. In this patch I've ranked it as critical, as it +is fairly equivalent to battery pack missing. Unfortunately it's generally +too late when this goes on, so it would be nice to have little warning. +The current agents do not query "Absolute State of charge" off the controller, +and on the DELL 12G RAID-controllers this statistics doesn't even exist; +they also have different design capacity. Because of these limitations I've +resolved to just listing the "Full Charge Capacity" in the check status. I +considered having the passed on perfdata for graphing, but as they're only +updated on battery re-learn, it's limited usability. This patch is against +latest innovation versions, and has been tested again various DELL 9G, +11G and 12G servers with 5/i, 6/i, H700 and H710P RAID-controllers." diff --git a/ChangeLog b/ChangeLog index 9c93ad7..d7a9062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 1566 FIX: 3ware_disks: consider VERIFYING state as OK now... * 1612 FIX: job: Fixed wrong reported start time for running jobs * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... + * 1622 FIX: megaraid_bbu: handle case isSOHGood and consider it as critical... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu index 76ae5d1..baa07cc 100644 --- a/checks/megaraid_bbu +++ b/checks/megaraid_bbu @@ -44,6 +44,7 @@ megaraid_bbu_refvalues = { 'Over Temperature' : ('No', 2), 'Over Charged' : ('No', 1), 'Voltage' : ('OK', 2), # nolearn + 'isSOHGood' : ('Yes', 2), } @@ -85,7 +86,8 @@ def check_megaraid_bbu(item, _no_params, info): if 'Relative State of Charge' not in controller: charge = ", No charge information reported for this controller" else: - charge = ", Charge is %s" % controller['Relative State of Charge'] + charge = ", Charge is %s, Capacity is %s" % \ + (controller['Relative State of Charge'], controller['Full Charge Capacity']) # verify defined important parameters to current level for varname, (refvalue, refstate) in megaraid_bbu_refvalues.items():

9 years, 10 months

Check_MK Git: check_mk: Reserved 15 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: b5dc90aff7ba87922fa4a2eb646502898dfdd6f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5dc90aff7ba87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 18:43:20 2014 +0100 Reserved 15 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index fed8f61..755d892 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1622 +1637

9 years, 10 months

Check_MK Git: check_mk: #1571 FIX check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats

by Mathias Kettner

Module: check_mk Branch: master Commit: f9fce9a6e88406a81c321f5c24ce5487d084e866 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9fce9a6e88406… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 18:40:23 2014 +0100 #1571 FIX check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats Problem on some older kernels is, that <tt>/sys/class/net/$eth/address</tt> does not contain a newline (or does not exist at all). We now always output an additional newline. This does not harm and fixes the problem. Without the fix the next section <tt>tcp_conn_stats</tt> is not correctly detected and is missing. --- .werks/1571 | 14 ++++++++++++++ ChangeLog | 3 ++- agents/check_mk_agent.linux | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/1571 b/.werks/1571 new file mode 100644 index 0000000..67eb6d8 --- /dev/null +++ b/.werks/1571 @@ -0,0 +1,14 @@ +Title: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417628312 +Class: fix + +Problem on some older kernels is, that <tt>/sys/class/net/$eth/address</tt> does +not contain a newline (or does not exist at all). We now always output an +additional newline. This does not harm and fixes the problem. + +Without the fix the next section <tt>tcp_conn_stats</tt> is not correctly +detected and is missing. diff --git a/ChangeLog b/ChangeLog index 29c21be..9c93ad7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,8 @@ * 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... * 1569 check_mk_agent.openbsd: add sections for mem and lnx_if (memory and network interfaces)... + * 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... @@ -74,6 +74,7 @@ * 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 + * 1571 FIX: check_mk_agent.linux: fix output of lnx_if on Ubuntu 8.04 (on older kernels), repairs tcp_conn_stats... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 48d6847..b301727 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -217,7 +217,7 @@ then do echo "[$eth]" ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' - echo -en "\tAddress: " ; cat /sys/class/net/$eth/address + echo -en "\tAddress: " ; cat /sys/class/net/$eth/address ; echo done fi

9 years, 10 months

Check_MK Git: check_mk: #1570 FIX Fix notification of check_http active checks with Nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: 3372d088e876a5a3c9427d4b09f1da4f64c3efb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3372d088e876a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 18:31:37 2014 +0100 #1570 FIX Fix notification of check_http active checks with Nagios core When using Nagios as the core and a check command that contains single quotes then the notification would not work. This is because the variables are enclosed in single quotes in <tt>check_mk_templates.cfg</tt>. That file has been changed so that for the check command macros double quotes are being used. Check_MK itself does never use double quotes in its strings so this is less likely to cause problems. The Check_MK Micro Core does not have this problem. Everything works fine here. --- .werks/1570 | 17 +++++++++++++++++ ChangeLog | 1 + check_mk_templates.cfg | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/1570 b/.werks/1570 new file mode 100644 index 0000000..85618f4 --- /dev/null +++ b/.werks/1570 @@ -0,0 +1,17 @@ +Title: Fix notification of check_http active checks with Nagios core +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417627787 +Class: fix + +When using Nagios as the core and a check command that contains single +quotes then the notification would not work. This is because the variables +are enclosed in single quotes in <tt>check_mk_templates.cfg</tt>. That file +has been changed so that for the check command macros double quotes are +being used. Check_MK itself does never use double quotes in its strings +so this is less likely to cause problems. + +The Check_MK Micro Core does not have this problem. Everything works +fine here. diff --git a/ChangeLog b/ChangeLog index c69126e..c546fba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts... * 1583 FIX: Can use contact groups without hosts/services assigned in RBN rules now... * 1606 FIX: Moved notify.log to var/log/notify.log in OMD environments... + * 1570 FIX: Fix notification of check_http active checks with Nagios core... BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 47bc763..77029b5 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -371,7 +371,7 @@ define command { NOTIFY_LASTHOSTUP='$LASTHOSTUP$' \ NOTIFY_HOSTSTATE='$HOSTSTATE$' \ NOTIFY_HOSTSTATEID='$HOSTSTATEID$' \ - NOTIFY_HOSTCHECKCOMMAND='$HOSTCHECKCOMMAND$' \ + NOTIFY_HOSTCHECKCOMMAND="$HOSTCHECKCOMMAND$" \ NOTIFY_HOSTOUTPUT='$HOSTOUTPUT$' \ NOTIFY_HOSTPERFDATA='$HOSTPERFDATA$' \ NOTIFY_LONGHOSTOUTPUT='$LONGHOSTOUTPUT$' \ @@ -386,7 +386,7 @@ define command { NOTIFY_SERVICEOUTPUT='$SERVICEOUTPUT$' \ NOTIFY_LONGSERVICEOUTPUT='$LONGSERVICEOUTPUT$' \ NOTIFY_SERVICEPERFDATA='$SERVICEPERFDATA$' \ - NOTIFY_SERVICECHECKCOMMAND='$SERVICECHECKCOMMAND$' \ + NOTIFY_SERVICECHECKCOMMAND="$SERVICECHECKCOMMAND$" \ NOTIFY_DATE='$DATE$' \ NOTIFY_SHORTDATETIME='$SHORTDATETIME$' \ NOTIFY_LONGDATETIME='$LONGDATETIME$' \

9 years, 10 months

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, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits