Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: FIX Mails sent with mail/ asciimail plugin now really set the from address

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dc07ca6e436fe3ce4b34fa2a4cf01cd98098ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dc07ca6e436fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 10:04:09 2014 +0200 FIX Mails sent with mail/asciimail plugin now really set the from address --- .werks/828 | 8 ++++++++ ChangeLog | 1 + notifications/asciimail | 9 ++++++--- notifications/mail | 9 ++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/828 b/.werks/828 new file mode 100644 index 0000000..3d4f443 --- /dev/null +++ b/.werks/828 @@ -0,0 +1,8 @@ +Title: Mails sent with mail/asciimail plugin now really set the from address +Level: 1 +Component: notifications +Version: 1.2.5i5 +Date: 1404461025 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9228911..26f3ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ Notifications: * 1042 Rule based notifications: allow matching on host groups... + * 0828 FIX: Mails sent with mail/asciimail plugin now really set the from address Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... diff --git a/notifications/asciimail b/notifications/asciimail index 16a0526..80ac250 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -83,8 +83,11 @@ def build_mail(target, subject, from_address, reply_to, content_txt): return m -def send_mail(m, target): - p = subprocess.Popen(["/usr/sbin/sendmail", "-i", target ], stdin = subprocess.PIPE) +def send_mail(m, target, from_address): + cmd = ["/usr/sbin/sendmail", "-i", target ] + if from_address: + cmd += ['-f', from_address] + p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) def construct_content(context): @@ -232,6 +235,6 @@ def main(): from_address = context.get("PARAMETER_FROM") reply_to = context.get("PARAMETER_REPLY_TO") m = build_mail(mailto, subject, from_address, reply_to, content_txt) - send_mail(m, mailto) + send_mail(m, mailto, from_address) main() diff --git a/notifications/mail b/notifications/mail index 2509d63..8663e4b 100755 --- a/notifications/mail +++ b/notifications/mail @@ -302,8 +302,11 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content return m -def send_mail(m, target): - p = subprocess.Popen(["/usr/sbin/sendmail", "-i", target ], stdin = subprocess.PIPE) +def send_mail(m, target, from_address): + cmd = ["/usr/sbin/sendmail", "-i", target ] + if from_address: + cmd += ['-f', from_address] + p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) return True @@ -592,6 +595,6 @@ def main(): from_address = context.get("PARAMETER_FROM") reply_to = context.get("PARAMETER_REPLY_TO") m = multipart_mail(mailto, subject, from_address, reply_to, content_txt, content_html, attachments) - send_mail(m, mailto) + send_mail(m, mailto, from_address) main()

10 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2132

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d81d4e10e775bb42c50d321ead720ce96d4e23b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d81d4e10e775b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 09:32:25 2014 +0200 Updated bug entries #2132 --- .bugs/2132 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2132 b/.bugs/2132 new file mode 100644 index 0000000..407ab21 --- /dev/null +++ b/.bugs/2132 @@ -0,0 +1,11 @@ +Title: WATO context button on quicksearch result page broken +Component: multisite +State: open +Date: 2014-07-04 09:30:24 +Targetversion: 1.2.5i1 +Class: bug + +When searching for a host substring, for example "node", results in a page listing +all services of the hosts node1 and node2. When clicking on the context button +WATO, it displays a red error message that the host "node" (the substring) is not +managed by WATO.

10 years, 3 months

Check_MK Git: check_mk: HTML mail: substitute $SUJECT$ in hidden HTML title

by Mathias Kettner

Module: check_mk Branch: master Commit: fd8d258a6694274d7a4171ed9eb2aeaf1c7986e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd8d258a669427… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 4 09:11:30 2014 +0200 HTML mail: substitute $SUJECT$ in hidden HTML title --- notifications/mail | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/notifications/mail b/notifications/mail index fa30836..2509d63 100755 --- a/notifications/mail +++ b/notifications/mail @@ -500,7 +500,9 @@ def construct_content(context): '<tr class="even0"><td colspan=2 class=graphs>%s</td></tr>' % graph_code ) - content_html = tmpl_head_html + content_html + tmpl_foot_html + content_html = substitute_context(tmpl_head_html, context) + \ + content_html + \ + substitute_context(tmpl_foot_html, context) return content_txt, content_html, attachments

10 years, 3 months

Check_MK Git: check_mk: raritan_pdu_outletcount: got levels now to check the value against and a WATO rule to set them

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ab07d442026c05a84f65c19c2d807f9a50f7e209 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab07d442026c05… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Jul 3 17:42:46 2014 +0200 raritan_pdu_outletcount: got levels now to check the value against and a WATO rule to set them --- checkman/raritan_pdu_outletcount | 15 ++++++++++++--- checks/raritan_pdu_outletcount | 18 +++++++++++++++--- web/plugins/wato/check_parameters.py | 18 ++++++++++++++++++ 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/checkman/raritan_pdu_outletcount b/checkman/raritan_pdu_outletcount index 6725d86..f5c6a97 100644 --- a/checkman/raritan_pdu_outletcount +++ b/checkman/raritan_pdu_outletcount @@ -4,14 +4,23 @@ catalog: hw/other license: GPL distribution: check_mk description: - This check displays the current outlet count of the Raritan PX-2000 + Checks the current outlet count of the Raritan PX-2000 family of intelligent rack power distribution units (iPDUs). - It is for reporting only and returns always {OK}. + By default this check does report only and returns always {OK}. + Only if you set levels explicitly, it returns {WARN} or {CRIT} if + the value is outside the given ranges. perfdata: - Exactly one number: The outlet count. + Exactly one number: The outlet count. If levels are given: Together + with it's levels. inventory: Creates exactly one check per host called Outlet Count. +[parameters] +tuple(int, int, int, int): crit_low, warn_low, warn_high, crit_high: + If the value is lower or equal crit_low, the check returns {CRIT}. + If the value is lower or equal warn_low, the check returns {WARN}. + If the value is higher or equal warn_high, the check returns {WARN}. + If the value is higher or equal crit_high, the check returns {CRIT}. diff --git a/checks/raritan_pdu_outletcount b/checks/raritan_pdu_outletcount index f55fa3a..0f3fb72 100644 --- a/checks/raritan_pdu_outletcount +++ b/checks/raritan_pdu_outletcount @@ -31,14 +31,26 @@ def inventory_raritan_pdu_outletcount(info): return [] def check_raritan_pdu_outletcount(item, params, info): - message = "Outlet Count is %s" % info[0][0] - perfdata = [ ("outletcount", int(info[0][0])) ] - return 0, message, perfdata + outletcount = int(info[0][0]) + status = 0 + if params: + crit_low, warn_low, warn_high, crit_high = params + perfdata = [ ("outletcount", outletcount, "%d:%d" % (warn_low, warn_high), "%d:%d" % (crit_low, crit_high), 0) ] + if outletcount <= warn_low or outletcount >= warn_high: + status = 1 + if outletcount <= crit_low or outletcount >= crit_high: + status = 2 + else: + perfdata = [ ("outletcount", outletcount, None, None, 0) ] + + message = "Outlet Count is %s" % outletcount + return status, message, perfdata check_info['raritan_pdu_outletcount'] = { "inventory_function" : inventory_raritan_pdu_outletcount, "check_function" : check_raritan_pdu_outletcount, "service_description" : "Outlet Count", + "group" : "plug_count", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.13742.6.3.2.2.1.4", ["1"]), # outletCount "snmp_scan_function" : lambda oid: \ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9a3a1f0..4785542 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5365,3 +5365,21 @@ register_check_parameters( ), "first" ) + +register_check_parameters( + subgroup_environment, + "plug_count", + _("Number of active Plugs"), + Tuple( + help = _("Levels for the number of active plugs in a devices."), + elements = [ + Integer(title = _("critical if below or equal"), default_value = 30), + Integer(title = _("warning if below or equal"), default_value = 32), + Integer(title = _("warning if above or equal"), default_value = 38), + Integer(title = _("critical if above or equal"), default_value = 40), + ]), + None, + "first" +) + +

10 years, 3 months

Check_MK Git: check_mk: hp_proliant_power: fixed inventory on not supported devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 735267d7711b4873c28d1c3a37437dd27e3c2407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=735267d7711b48… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 3 16:59:47 2014 +0200 hp_proliant_power: fixed inventory on not supported devices --- checks/hp_proliant_power | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power index f4cf877..62eed56 100755 --- a/checks/hp_proliant_power +++ b/checks/hp_proliant_power @@ -27,7 +27,7 @@ hp_prolaint_power_default_levels = ( 300, 400 ) def inventory_hp_proliant_power(info): - if len(info) > 0: + if len(info) > 0 and info[0][0] != '0': return [ ( None, 'hp_prolaint_power_default_levels') ] def check_hp_proliant_power(item, params, info): @@ -35,7 +35,7 @@ def check_hp_proliant_power(item, params, info): 1 : "other", 3 : "absent", } - status, reading = map(saveint, info[0]) + status, reading = map(int, info[0]) if status != 2: return 2, "Power Meter state: %s" % ( status_table[status] ) warn, crit = params

10 years, 3 months

Check_MK Git: check_mk: FIX Remove icon for service parameters in WATO service list for missing services

by Mathias Kettner

Module: check_mk Branch: master Commit: 4017bd67e1594df300f426d91c32db2d93262c09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4017bd67e1594d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 3 16:41:45 2014 +0200 FIX Remove icon for service parameters in WATO service list for missing services In the services list of a host in WATO in the section Available (missing) services the icon for the service parameters has been removed. It didn't work properly because Check_MK cannot safely analyse non-existent services. It is dangerous anyway if the user thinks he could do configuration for those services. --- .werks/1044 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 2 +- web/htdocs/wato.py | 11 ++++++----- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.werks/1044 b/.werks/1044 new file mode 100644 index 0000000..c5061b4 --- /dev/null +++ b/.werks/1044 @@ -0,0 +1,11 @@ +Title: Remove icon for service parameters in WATO service list for missing services +Level: 1 +Component: wato +Version: 1.2.5i5 +Date: 1404398390 +Class: fix + +In the services list of a host in WATO in the section Available (missing) services +the icon for the service parameters has been removed. It didn't work properly because +Check_MK cannot safely analyse non-existent services. It is dangerous anyway if the user +thinks he could do configuration for those services. diff --git a/ChangeLog b/ChangeLog index b501045..9228911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 1004 FIX: Fix exception when saving rules, caused by empty item * 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains * 0826 FIX: Fixed problem where user access times were not updated correctly + * 1044 FIX: Remove icon for service parameters in WATO service list for missing services... Notifications: * 1042 Rule based notifications: allow matching on host groups... diff --git a/modules/automation.py b/modules/automation.py index e0eca6c..2882a54 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -637,7 +637,7 @@ def automation_analyse_service(args): "item" : item, "inv_parameters" : params, "factory_settings" : fs, - "parameters" : compute_check_parameters(hostname, ct, item, params), + "parameters" : compute_check_parameters(hostname, ct, item, params), } except: if opt_debug: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4fb4a60..a96c89a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3343,12 +3343,13 @@ def show_service_table(host, firsttime): # #html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % # # (url, title)) - # Icon for Service parameters + # Icon for Service parameters. Not for missing services! table.cell("", "") - params_url = make_link([("mode", "object_parameters"), - ("host", hostname), - ("service", descr)]) - html.icon_button(params_url, _("View and modify the parameters for this service"), "rulesets") + if state_type != "new": + params_url = make_link([("mode", "object_parameters"), + ("host", hostname), + ("service", descr)]) + html.icon_button(params_url, _("View and modify the parameters for this service"), "rulesets") # Permanently disable icon

10 years, 3 months

Check_MK Git: check_mk: Parameter icon also removed for disabled services

by Mathias Kettner

Module: check_mk Branch: master Commit: 41d5591770c27a0dca9a93d028cb4be9713c01be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41d5591770c27a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 3 16:43:19 2014 +0200 Parameter icon also removed for disabled services --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a96c89a..84854b5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3345,7 +3345,7 @@ def show_service_table(host, firsttime): # Icon for Service parameters. Not for missing services! table.cell("", "") - if state_type != "new": + if state_type not in [ "new", "ignored" ]: params_url = make_link([("mode", "object_parameters"), ("host", hostname), ("service", descr)])

10 years, 3 months

Check_MK Git: check_mk: FIX printer_supply: fix value error in default parameters

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c3529a6a8d6b3cd416d75c012df001eb6bbc772 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c3529a6a8d6b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 3 16:29:41 2014 +0200 FIX printer_supply: fix value error in default parameters In WATO newly created checks of type <tt>printer_supply</tt> where displayed as Invalid check parameters. The reason was a confusion between float and integer values. This has been fixed. --- .werks/1043 | 10 ++++++++++ ChangeLog | 1 + checks/printer_supply | 2 +- web/htdocs/valuespec.py | 2 +- web/plugins/wato/check_parameters.py | 15 ++++++++------- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.werks/1043 b/.werks/1043 new file mode 100644 index 0000000..2c4131c --- /dev/null +++ b/.werks/1043 @@ -0,0 +1,10 @@ +Title: printer_supply: fix value error in default parameters +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404397710 +Class: fix + +In WATO newly created checks of type <tt>printer_supply</tt> where displayed as +Invalid check parameters. The reason was a confusion between float and +integer values. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 0f2e3e9..55d0c9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0173 FIX: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines * 1037 FIX: bintec_info: support bintec RXL12500 * 0948 FIX: mk_inventory.ps1: increased caching time to 14400, fixed incorrect default cachefile path + * 1043 FIX: printer_supply: fix value error in default parameters... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/printer_supply b/checks/printer_supply index 95f1529..7e3c5d0 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -43,7 +43,7 @@ #['Waste Toner box OKI DATA CORP', '1', '-2', ''] # Warn/Crit/upturn current -printer_supply_default_levels = (20, 10, False) +printer_supply_default_levels = (20.0, 10.0, False) # When the printer reports -3 as fill threshold the toner # might be empty or might have some small remaining capacities diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cbd72f5..16b4c2f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -926,7 +926,7 @@ class Float(Integer): class Percentage(Float): def __init__(self, **kwargs): - Integer.__init__(self, **kwargs) + Float.__init__(self, **kwargs) if "minvalue" not in kwargs: self._minvalue = 0.0 if "maxvalue" not in kwargs: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9a3a1f0..8e7a9b3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2493,16 +2493,17 @@ def transform_printer_supply(l): register_check_parameters( subgroup_printing, "printer_supply", - _("Printer cardridge levels"), + _("Printer cartridge levels"), Transform( Tuple( - kelp = _("Levels for printer cardridges."), + kelp = _("Levels for printer cartridges."), elements = [ - Float(title = _("Warning remaining")), - Float(title = _("Critical remaining")), + Percentage(title = _("Warning remaining"), allow_int = True, default_value = 20.0), + Percentage(title = _("Critical remaining"), allow_int = True, default_value = 10.0), Checkbox( - title = _("Upturn toner levels" ), - help = _ ("Some Printers (eg. Konica for Drum Cartdiges) returning the available" + title = _("Upturn toner levels"), + label = _("Printer sends used material instead of remaining"), + help = _("Some Printers (eg. Konica for Drum Cartdiges) returning the available" " fuel instead of what is left. In this case it's possible" " to upturn the levels to handle this behavior" ) @@ -2511,7 +2512,7 @@ register_check_parameters( forth = transform_printer_supply, ), TextAscii( - title = _("cardridge specification"), + title = _("cartridge specification"), allow_empty = True ), None,

10 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2164

by Andreas Boesl

Module: check_mk Branch: master Commit: 7ffe1c14b638de16c79470a7b5257808f55f62f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ffe1c14b638de… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 3 14:49:13 2014 +0200 Updated bug entries #2164 --- .bugs/2164 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2164 b/.bugs/2164 new file mode 100644 index 0000000..df46487 --- /dev/null +++ b/.bugs/2164 @@ -0,0 +1,11 @@ +Title: quicksearch: streamline single/multi pattern search plugin +Component: multisite +State: open +Date: 2014-07-03 14:44:05 +Targetversion: future +Class: nastiness + +The configurable quicksearch search filters use two different url generating concepts. +Single filters use predefined default templated - specified in sidebar.py. +Multi filters create the url out of functions or given url templates - specified in the filter defintion. +

10 years, 3 months

Check_MK Git: check_mk: websphere_mq_queues: Adden queue length to output

by Bastian Kuhn

Module: check_mk Branch: master Commit: b10731d92fda7fbc12fe121b2bd3665746e79cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b10731d92fda7f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 3 14:31:54 2014 +0200 websphere_mq_queues: Adden queue length to output --- agents/plugins/websphere_mq.sh | 46 ++++++++++++++++++++++------------------ checks/websphere_mq_queues | 14 ++++++------ 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/agents/plugins/websphere_mq.sh b/agents/plugins/websphere_mq.sh index a5b556f..fa12b05 100755 --- a/agents/plugins/websphere_mq.sh +++ b/agents/plugins/websphere_mq.sh @@ -7,27 +7,31 @@ else # Loop over all local mq instances for QM in $( ps -ef | grep -i '[/]usr/mqm/bin/runmqchl -c' | awk '{ print $NF }' | uniq) do - echo '<<<websphere_mq_channels>>>' - for i in `echo " display CHANNEL (*) TYPE (SDR) " | /usr/bin/runmqsc $QM | grep CHLTYPE | grep -v SYSTEM | awk '{print $1}'` - do - j=`echo "display $i " | /usr/bin/runmqsc $QM | grep XMITQ | tr " " "\n" | grep XMITQ | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` - a=`echo " display qlocal ($j) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tr " " "\n" | grep CURDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` - c=`echo " display qlocal ($j) MAXDEPTH " | /usr/bin/runmqsc $QM | grep MAXDEPTH | tr " " "\n" | grep MAXDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` + echo '<<<websphere_mq_channels>>>' + for i in `echo " display CHANNEL (*) TYPE (SDR) " | /usr/bin/runmqsc $QM | grep CHLTYPE | grep -v SYSTEM | awk '{print $1}'` + do + j=`echo "display $i " | /usr/bin/runmqsc $QM | grep XMITQ | tr " " "\n" | grep XMITQ | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + a=`echo " display qlocal ($j) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tr " " "\n" | grep CURDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` + c=`echo " display qlocal ($j) MAXDEPTH " | /usr/bin/runmqsc $QM | grep MAXDEPTH | tr " " "\n" | grep MAXDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` - l=`echo $i | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` - s=`echo " display chstatus($l)" | /usr/bin/runmqsc $QM | grep STATUS | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $NF }'` + l=`echo $i | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + s=`echo " display chstatus($l)" | /usr/bin/runmqsc $QM | grep STATUS | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $NF }'` - if [ "$s" = "" ] - then - s="Unknown" - fi - echo "$a $i $c $s" - done - echo '<<<websphere_mq_queues>>>' - for t in `echo " display queue (*) where (USAGE EQ NORMAL) " | /usr/bin/runmqsc $QM | grep QLOCAL | grep -v SYSTEM | grep -v _T0 | grep -v _T1 | grep -v _T2 | grep -v _T3 | grep -v mqtest | grep QUEUE | awk '{ print $1 }' | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` - do - a=`echo " display queue ($t) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` - echo "$a $t" - done - done + if [ "$s" = "" ] + then + s="Unknown" + fi + echo "$a $i $c $s" + done + echo '<<<websphere_mq_queues>>>' + for t in `echo " display queue (*) where (USAGE EQ NORMAL) " | /usr/bin/runmqsc $QM | grep QLOCAL | grep -v SYSTEM | grep -v _T0 | grep -v _T1 | grep -v _T2 | grep -v _T3 | grep -v mqtest | grep QUEUE | awk '{ print $1 }' | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + do + a=`echo " display queue ($t) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + b=`echo " display qlocal ($t) MAXDEPTH " | /usr/bin/runmqsc $QM | grep MAXDEPTH | tr " " "\n" | grep MAXDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` + + # Muster: Anzahl eingehender Messages $a auf $t Max-Queues $b + + echo "$a $t $b" + done + done fi diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 4ced3ec..087c118 100755 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -25,11 +25,11 @@ # Boston, MA 02110-1301 USA. #<<<websphere_mq_queues>>> -#0 CD.ISS.CATSOS.REPLY.C000052 -#0 CD.ISS.COBA.REPLY.C000052 -#0 CD.ISS.DEUBA.REPLY.C000052 -#0 CD.ISS.TIQS.REPLY.C000052 -#0 CD.ISS.VWD.REPLY.C000052 +#0 CD.ISS.CATSOS.REPLY.C000052 5000 +#0 CD.ISS.COBA.REPLY.C000052 5000 +#0 CD.ISS.DEUBA.REPLY.C000052 5000 +#0 CD.ISS.TIQS.REPLY.C000052 5000 +#0 CD.ISS.VWD.REPLY.C000052 5000 websphere_mq_queues_default_levels = ( 1000, 1200 ) @@ -37,11 +37,11 @@ def inventory_websphere_mq_queues(info): return [ ( x[1], 'websphere_mq_queues_default_levels' ) for x in info ] def check_websphere_mq_queues(item, params, info): - for messages, queue in info: + for messages, queue, queue_length in info: if queue == item: warn, crit = params messages = saveint(messages) - message = "%d Messages in Queue" % messages + message = "%d/%s Messages in Queue" % ( messages, queue_length ) perf = [ ( "queue", messages, warn, crit ) ] if messages >= crit: return 2, message, perf

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits