Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64661 discussions

Check_MK Git: check_mk: #1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers

by Goetz Golla

Module: check_mk Branch: master Commit: b353501ead5c199c7e9a761bdf9c26decfc4848b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b353501ead5c19… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 12:29:19 2014 +0200 #1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers --- .werks/1447 | 9 ++++++ ChangeLog | 1 + checkman/domino_transactions | 24 ++++++++++++++ checks/domino_transactions | 58 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 14 ++++++++ 5 files changed, 106 insertions(+) diff --git a/.werks/1447 b/.werks/1447 new file mode 100644 index 0000000..3b88448 --- /dev/null +++ b/.werks/1447 @@ -0,0 +1,9 @@ +Title: domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414146516 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e8d89ac..715cb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 1188 veeam_client: Check now also outputs ReadSize and TransferedSize... * 0663 domino_info: new check to extract informational data about a Lotus Domino Server * 0664 domino_users: new check to monitor the number of users on a Domino Notes server + * 1447 domino_transactions: new check to monitor the number of transactions per minute on Lotus Domino servers * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/domino_transactions b/checkman/domino_transactions new file mode 100644 index 0000000..e492821 --- /dev/null +++ b/checkman/domino_transactions @@ -0,0 +1,24 @@ +title: IBM Lotus Domino: Number of Transactions +agents: snmp +catalog: app/lotusnotes +license: GPL +distribution: check_mk +description: + + This check uses snmp to extract the average number of transactions per + minute on a Lotus Domino Server. Warning and critical upper limits can be + set. + +perfdata: + The number of transactions per minute + +[parameters] +parameters(tuple): parameters is a tuple of two values + + {warn}: (int) The warning level + + {crit}: (int) The critical level + +[configuration] +domino_transactions_default_levels (tuple): This variable is preset to { (30000,35000) } + diff --git a/checks/domino_transactions b/checks/domino_transactions new file mode 100644 index 0000000..77e25ea --- /dev/null +++ b/checks/domino_transactions @@ -0,0 +1,58 @@ +#!/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. + +domino_transactions_default_levels = ( 30000, 35000 ) + +def inventory_domino_transactions(info): + if info: + yield None, 'domino_transactions_default_levels' + +def check_domino_transactions(_no_item, params, info): + if info: + reading = int(info[0][0]) + warn, crit = params + infotext = "Transactions per minute (avg): %s" % reading + levels = " (Warn/Crit at %s/%s)" % ( warn, crit ) + perfdata = [ ( "transactions", reading, warn, crit ) ] + state = 0 + if reading >= crit: + state = 2 + infotext += levels + elif reading >= warn: + state = 1 + infotext += levels + yield state, infotext, perfdata + + +check_info["domino_transactions"] = { + "check_function" : check_domino_transactions, + "inventory_function" : inventory_domino_transactions, + "service_description" : "Domino Server Transactions", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", + "snmp_info" : (".1.3.6.1.4.1.334.72.1.1.6.3", [2]), + "group" : "domino_transactions" +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 14ecc9c..6cc3199 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6880,3 +6880,17 @@ register_check_parameters( ), None, None ) + +register_check_parameters( + subgroup_applications, + "domino_transactions", + _("Lotus Domino Transactions"), + Tuple( + title = _("Number of Transactions per Minute on a Lotus Domino Server"), + elements = [ + Integer(title = _("warning if above"), default_value = 30000 ), + Integer(title = _("critical if above"), default_value = 35000 ), + ] + ), + None, None +)

9 years, 11 months

Check_MK Git: check_mk: Reserved 30 Werk IDS

by Goetz Golla

Module: check_mk Branch: master Commit: c4bd19d380ce9b276d2c6328338d2a8e63ad18ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4bd19d380ce9b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 12:28:19 2014 +0200 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b1cff30..3ffc420 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1447 +1477

9 years, 11 months

Check_MK Git: check_mk: #0664 domino_users: new check to monitor the number of users on a Domino Notes server

by Goetz Golla

Module: check_mk Branch: master Commit: 61b4c3f761ba2745bec9b6458c5777969a62240d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61b4c3f761ba27… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 11:55:36 2014 +0200 #0664 domino_users: new check to monitor the number of users on a Domino Notes server --- .werks/664 | 9 ++++++ ChangeLog | 1 + checkman/domino_users | 22 +++++++++++++ checks/domino_users | 58 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 14 ++++++++ 5 files changed, 104 insertions(+) diff --git a/.werks/664 b/.werks/664 new file mode 100644 index 0000000..84d949c --- /dev/null +++ b/.werks/664 @@ -0,0 +1,9 @@ +Title: domino_users: new check to monitor the number of users on a Domino Notes server +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414144487 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c90686c..e8d89ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 0662 domino_mailqueues: new check to monitor mail queues in Lotus Domino * 1188 veeam_client: Check now also outputs ReadSize and TransferedSize... * 0663 domino_info: new check to extract informational data about a Lotus Domino Server + * 0664 domino_users: new check to monitor the number of users on a Domino Notes server * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/domino_users b/checkman/domino_users new file mode 100644 index 0000000..5d69d70 --- /dev/null +++ b/checkman/domino_users @@ -0,0 +1,22 @@ +title: IBM Lotus Domino: Domino Users +agents: snmp +catalog: app/lotusnotes +license: GPL +distribution: check_mk +description: + This check uses snmp to extract the number of users on a Lotus Domino Server. + Warning and critical upper limits can be set to the number of users. + +perfdata: + The number of users + +[parameters] +parameters(tuple): parameters is a tuple of two values + + {warn}: (int) The warning level + + {crit}: (int) The critical level + +[configuration] +domino_users_default_levels (tuple): This variable is preset to { (1000,1500) } + diff --git a/checks/domino_users b/checks/domino_users new file mode 100644 index 0000000..b2496ea --- /dev/null +++ b/checks/domino_users @@ -0,0 +1,58 @@ +#!/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. + +domino_users_default_levels = ( 1000, 1500 ) + +def inventory_domino_users(info): + if info: + yield None, 'domino_users_default_levels' + +def check_domino_users(_no_item, params, info): + if info: + users = int(info[0][0]) + warn, crit = params + infotext = "%d Domino Users on Server" % users + levels = " (Warn/Crit at %s/%s)" % ( warn, crit ) + perfdata = [ ( "users", users, warn, crit ) ] + state = 0 + if users >= crit: + state = 2 + infotext += levels + elif users >= warn: + state = 1 + infotext += levels + yield state, infotext, perfdata + + +check_info["domino_users"] = { + "check_function" : check_domino_users, + "inventory_function" : inventory_domino_users, + "service_description" : "Domino Users", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", + "snmp_info" : (".1.3.6.1.4.1.334.72.1.1.6.3", [6]), + "group" : "domino_users" +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7d34671..14ecc9c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6866,3 +6866,17 @@ register_check_parameters( ), "first" ) + +register_check_parameters( + subgroup_applications, + "domino_users", + _("Lotus Domino Users"), + Tuple( + title = _("Number of Lotus Domino Users"), + elements = [ + Integer(title = _("warning if above"), default_value = 1000 ), + Integer(title = _("critical if above"), default_value = 1500 ), + ] + ), + None, None +)

9 years, 11 months

Check_MK Git: check_mk: domino_mailqueues, domino_tasks: minor cleanup

by Goetz Golla

Module: check_mk Branch: master Commit: 54e5fe950acd91d8b94d1d059d56a8afc8368bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54e5fe950acd91… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 11:52:06 2014 +0200 domino_mailqueues, domino_tasks: minor cleanup --- checks/domino_mailqueues | 10 +++------- checks/domino_tasks | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/checks/domino_mailqueues b/checks/domino_mailqueues index f09f56e..280690b 100644 --- a/checks/domino_mailqueues +++ b/checks/domino_mailqueues @@ -37,12 +37,10 @@ domino_mailqueues = { } def inventory_domino_mailqueues(info): - inventory = [] for line in info: val = int(line[0][0].split(".")[12]) if val in domino_mailqueues.keys(): - inventory.append(( domino_mailqueues[val][0], "domino_mailqueues_defaults" )) - return inventory + yield domino_mailqueues[val][0], {} def check_domino_mailqueues(item, params, info): for line in info: @@ -61,14 +59,12 @@ def check_domino_mailqueues(item, params, info): elif reading >= warn: state = 1 infotext += levels - return state, infotext, perfdata - - return 3, "no information found" + yield state, infotext, perfdata check_info["domino_mailqueues"] = { "check_function" : check_domino_mailqueues, "inventory_function" : inventory_domino_mailqueues, - "service_description" : "Domino %s", + "service_description" : "Domino Queue %s", "has_perfdata" : True, "default_levels_variable" : "domino_mailqueues_defaults", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", diff --git a/checks/domino_tasks b/checks/domino_tasks index 322822b..b71d7e0 100644 --- a/checks/domino_tasks +++ b/checks/domino_tasks @@ -53,7 +53,7 @@ check_info['domino_tasks'] = { "inventory_function" : inventory_domino_tasks, "has_perfdata" : True, "group" : "domino_tasks", - "service_description" : "Task %s", + "service_description" : "Domino Task %s", "includes" : [ "ps.include" ], "node_info" : True, # add first column with actual host name "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2",

9 years, 11 months

Check_MK Git: check_mk: #0663 domino_info: new check to extract informational data about a Lotus Domino Server

by Goetz Golla

Module: check_mk Branch: master Commit: 9613fb5d83214aa8d36ed9502b9b4823d3854ac8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9613fb5d83214a… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Oct 24 10:01:16 2014 +0200 #0663 domino_info: new check to extract informational data about a Lotus Domino Server --- .werks/663 | 9 ++++++++ ChangeLog | 1 + checkman/domino_info | 10 +++++++++ checks/domino_info | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/.werks/663 b/.werks/663 new file mode 100644 index 0000000..1457c9e --- /dev/null +++ b/.werks/663 @@ -0,0 +1,9 @@ +Title: domino_info: new check to extract informational data about a Lotus Domino Server +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414137636 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1c45197..c90686c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1442 ups_socomec_out_source: New check for checking the power source of out phases for Socomec UPSs * 0662 domino_mailqueues: new check to monitor mail queues in Lotus Domino * 1188 veeam_client: Check now also outputs ReadSize and TransferedSize... + * 0663 domino_info: new check to extract informational data about a Lotus Domino Server * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/domino_info b/checkman/domino_info new file mode 100644 index 0000000..6464205 --- /dev/null +++ b/checkman/domino_info @@ -0,0 +1,10 @@ +title: IBM Lotus Domino: Informational Data +agents: snmp +catalog: app/lotusnotes +license: GPL +distribution: check_mk +description: + This check uses snmp to extract the following informational data about a + Lotus Notes Server: {lnServerName} the server name, {lnMailDomain} the server + domain, {lnServerNotesVersion} the Lotus Notes version. No configuration and + no limits can be set in this check. diff --git a/checks/domino_info b/checks/domino_info new file mode 100644 index 0000000..4055dbc --- /dev/null +++ b/checks/domino_info @@ -0,0 +1,57 @@ +#!/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 SNMP walk: +# +# .1.3.6.1.4.1.334.72.1.1.4.8.0 MEDEMA +# .1.3.6.1.4.1.334.72.1.1.6.2.1.0 CN=HH-BK4/OU=SRV/O=MEDEMA/C=DE +# .1.3.6.1.4.1.334.72.1.1.6.2.4.0 Release 8.5.3FP5 HF89 + + +def inventory_domino_info(info): + if info and len(info) == 3: + yield None, None + +def check_domino_info(_no_item, _no_params, info): + if len(info) == 3: + domain, name, release = info + infotext = "Name: %s, Domain: %s, %s" % ( domain[0][0], name[0][0], release[0][0] ) + yield 0, infotext + +check_info['domino_info'] = { + "check_function" : check_domino_info, + "inventory_function" : inventory_domino_info, + "has_perfdata" : False, + "service_description" : "Domino Info", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", + "snmp_info" : [ + [ ".1.3.6.1.4.1.334.72.1.1.4", [ 8 ] ], # lnMailDomain + [ ".1.3.6.1.4.1.334.72.1.1.6.2", [ 1 ] ], # lnServerName + [ ".1.3.6.1.4.1.334.72.1.1.6.2", [ 4 ] ], # lnServerNotesVersion + ] +} +

9 years, 11 months

Check_MK Git: check_mk: temperature.include: Changed formatting of infotext

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2cfe6e3acb417e02a3ac906cb93d0db07d0db2f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cfe6e3acb417e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 23 17:53:47 2014 +0200 temperature.include: Changed formatting of infotext --- checks/temperature.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index efca005..c28dc95 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -42,7 +42,7 @@ def check_temperature(temp, params): warn, crit = params perfdata = [ ("temp", temp, warn, crit) ] - infotext = "Temperature is %s °C" % tostring(temp) + infotext = "Temperature: %s °C" % tostring(temp) levelstext = " (warn/crit at %s/%s °C)" % (tostring(warn), tostring(crit)) if crit != None and temp >= crit:

9 years, 11 months

Check_MK Git: check_mk: #1189 sms notification: also send information about Downtimes, Acknowledgments and Fallping now

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4652adf5366e1eff29b9bdcb4e81b8312413c656 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4652adf5366e1e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 23 15:54:48 2014 +0200 #1189 sms notification: also send information about Downtimes, Acknowledgments and Fallping now --- .werks/1189 | 9 +++++++++ ChangeLog | 1 + notifications/sms | 38 +++++++++++++++++++++++++++++++------- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/.werks/1189 b/.werks/1189 new file mode 100644 index 0000000..1497efa --- /dev/null +++ b/.werks/1189 @@ -0,0 +1,9 @@ +Title: sms notification: also send information about Downtimes, Acknowledgments and Fallping now +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1414072375 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d5b1e7c..1c45197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -164,6 +164,7 @@ * 1400 Added example notification script for Pushover to doc/treasures/notifications... * 1123 Rule based notifications: New condition "Match Service Groups" * 1186 RBN: It's now possible to Filter for contactgroups... + * 1189 sms notification: also send information about Downtimes, Acknowledgments and Fallping now * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... * 1407 FIX: Fix exception in rule based notification on non-Ascii characters in log message diff --git a/notifications/sms b/notifications/sms index 6156fa1..89e2119 100755 --- a/notifications/sms +++ b/notifications/sms @@ -49,17 +49,41 @@ if not send_path and not spool_dir: max_len = 160 message = os.environ['NOTIFY_HOSTNAME'] + " " +notification_type = os.environ["NOTIFICATIONTYPE"] + +# Prepare Default information and Type PROBLEM, RECOVERY if os.environ['NOTIFY_WHAT'] == 'SERVICE': - message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " - avail_len = max_len - len(message) - message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " - avail_len = max_len - len(message) - message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + if notification_type in [ "PROBLEM", "RECOVERY" ]: + message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " + avail_len = max_len - len(message) + message += os.environ['NOTIFY_SERVICEOUTPUT'][:avail_len] + else: + message += os.environ['NOTIFY_SERVICEDESC'] else: - message += "is " + os.environ['NOTIFY_HOSTSTATE'] + if notification_type in [ "PROBLEM", "RECOVERY" ]: + message += "is " + os.environ['NOTIFY_HOSTSTATE'] + +# Ouput the other State +if notification_type.startswith("FLAP"): + if "START" in notification_type: + message += " Started Flapping" + else: + message += " Stopped Flapping" + +elif notification_type.startswith("DOWNTIME"): + what = notification_type[8:].title() + message += " Downtime " + what + +elif notification_type == "ACKNOWLEDGEMENT": + message += " Acknowledged" + +elif notification_type == "CUSTOM": + message += " Custom Notification" -recipient = os.environ['NOTIFY_CONTACTPAGER'].replace( " ", "") +recipient = os.environ['NOTIFY_CONTACTPAGER'].replace(" ", "") if send_path: if os.system("%s %s '%s'" % (send_path, recipient, message[:160])) >> 8 != 0:

9 years, 11 months

Check_MK Git: check_mk: veeam_client: Changed check output

by Bastian Kuhn

Module: check_mk Branch: master Commit: 18c1d3c97eb23e366d3147dfc622944072172f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18c1d3c97eb23e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 23 15:35:08 2014 +0200 veeam_client: Changed check output --- checks/veeam_client | 26 +++++++++++++++++++++----- modules/check_mk_base.py | 4 ++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/checks/veeam_client b/checks/veeam_client index 07a194f..d86df58 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -51,11 +51,30 @@ def check_veeam_client(item, params, info): # Only output the Job name infotexts.append("Job: %s" % data['JobName'] ) + + + size_info = [] + size_legend = [] + + TotalSizeByte = int(data['TotalSizeByte']) + perfdata.append(('totalsize', TotalSizeByte)) + size_info.append(get_bytes_human_readable(TotalSizeByte)) + size_legend.append("total") + # Output ReadSize and TransferedSize if available if "ReadSizeByte" in data: - infotexts.append("Read Size: %s" % get_bytes_human_readable(int(data['ReadSizeByte']))) + ReadSizeByte = int(data['ReadSizeByte']) + perfdata.append(('readsize', ReadSizeByte)) + size_info.append(get_bytes_human_readable(ReadSizeByte)) + size_legend.append("read") + if "TransferedSizeByte" in data: - infotexts.append("Transferred Size: %s" % get_bytes_human_readable(int(data['TransferedSizeByte']))) + TransferedSizeByte = int(data['TransferedSizeByte']) + perfdata.append(('transferredsize', TransferedSizeByte)) + size_info.append(get_bytes_human_readable(TransferedSizeByte)) + size_legend.append("transferred") + + infotexts.append("Size (%s): %s" % ("/".join(size_legend), "/ ".join(size_info))) # Check Stop time in any case, that we can catch hanging backups if "StopTime" not in data: @@ -95,9 +114,6 @@ def check_veeam_client(item, params, info): perfdata.append(('avgspeed', AvgSpeedBps)) infotexts.append(("Average Speed: %s/s" % get_bytes_human_readable(AvgSpeedBps))) - TotalSizeByte = int(data['TotalSizeByte']) - perfdata.append(('totalsize', TotalSizeByte)) - infotexts.append(("Total Size: %s" % get_bytes_human_readable(TotalSizeByte))) return state, ", ".join(infotexts), perfdata diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4e697f2..795c989 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1793,12 +1793,12 @@ def get_age_human_readable(secs): return "%d min" % mins hours, mins = divmod(mins, 60) if hours < 12 and mins > 0: - return "%d hours, %d min" % (hours, mins) + return "%d hours %d min" % (hours, mins) elif hours < 48: return "%d hours" % hours days, hours = divmod(hours, 24) if days < 7 and hours > 0: - return "%d days, %d hours" % (days, hours) + return "%d days %d hours" % (days, hours) return "%d days" % days # Quote string for use as arguments on the shell

9 years, 11 months

Check_MK Git: check_mk: ps, ps.perf: fixed duplicate service detection

by Andreas Boesl

Module: check_mk Branch: master Commit: 679f82a6cc50d1d3d25cfa1838cf7ada3a824c63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679f82a6cc50d1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 23 14:37:54 2014 +0200 ps, ps.perf: fixed duplicate service detection --- checks/ps.include | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 995bef3..22e5336 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -69,21 +69,15 @@ def inventory_ps_common(invdata, invrules, info, with_perfdata = False): v = rule[0] - # set values for user und perfdata to None if they dont exist - d_user = v.get('user') - v['user'] = d_user - d_perfdata = v.get('perfdata') - v['perfdata'] = d_perfdata - # Make ps skip rules for ps.perf and vice versa # Ignore if perfdata key is not set - if v.get('perfdata') and with_perfdata != v.get('perfdata'): + if v.get('perfdata', False) != with_perfdata: continue extra_options = [] for token in [ 'cpulevels', 'cpu_average', 'virtual_levels', 'resident_levels', 'handle_count' ]: extra_options.append( (token, v.get(token)) ) - entries.append((v['descr'], v['match'], v['user']) + v['levels'] + (extra_options,) ) + entries.append((v['descr'], v['match'], v.get('user')) + v['levels'] + (extra_options,) ) for servicedesc, pattern, userspec, warnmin, okmin, okmax, warnmax, extra_options in entries: num_perc_s = servicedesc.count("%s")

9 years, 11 months

Check_MK Git: check_mk: Fixed typo

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8306feb004b639ec34d0c1dd4b54d157c349b11b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8306feb004b639… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 23 14:22:00 2014 +0200 Fixed typo --- checks/veeam_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/veeam_client b/checks/veeam_client index b6ea4f2..07a194f 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -55,7 +55,7 @@ def check_veeam_client(item, params, info): if "ReadSizeByte" in data: infotexts.append("Read Size: %s" % get_bytes_human_readable(int(data['ReadSizeByte']))) if "TransferedSizeByte" in data: - infotexts.append("Transfered Size: %s" % get_bytes_human_readable(int(data['TransferedSizeByte']))) + infotexts.append("Transferred Size: %s" % get_bytes_human_readable(int(data['TransferedSizeByte']))) # Check Stop time in any case, that we can catch hanging backups if "StopTime" not in data:

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits