[checkmk-commits] 4304 FIX mk_inventory.linux: fixed missing redirection to null device in if statement

Module: check_mk Branch: master Commit: 255f203c44d8869b889ecc373ad471c34e773f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255f203c44d886… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Wed Jan 25 16:10:09 2017 +0100 4304 FIX mk_inventory.linux: fixed missing redirection to null device in if statement Change-Id: I1f81dc934be99c15cdae7e9f3d44f97d1da89bfd --- .werks/4304 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 2 +- checks/blade_bx_powermod | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4304 b/.werks/4304 new file mode 100644 index 0000000..5fc5dd5 --- /dev/null +++ b/.werks/4304 @@ -0,0 +1,10 @@ +Title: mk_inventory.linux: fixed missing redirection to null device in if statement +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485356915 + + diff --git a/ChangeLog b/ChangeLog index d4f8c43..ec16e63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ * 4213 FIX: fjdarye101_syscaps: Fix failing check when using Nagios core * 4303 FIX: sap_state: fixed error handling * 4214 FIX: jolokia_metrics.tp: Fix crash in case of partial thread information... + * 4304 FIX: mk_inventory.linux: fixed missing redirection to null device in if statement Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 11d5278..6c22dde 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -82,7 +82,7 @@ then fi # Some networking information - if type ip ; then + if type ip > /dev/null ; then echo "<<<lnx_ip_a:persist($UNTIL)>>>" ip a echo "<<<lnx_ip_r:persist($UNTIL)>>>" diff --git a/checks/blade_bx_powermod b/checks/blade_bx_powermod index 32c1dab..31aa186 100644 --- a/checks/blade_bx_powermod +++ b/checks/blade_bx_powermod @@ -32,8 +32,8 @@ def check_blade_bx_powermod(item, _no_param, info): 4 : "error", 5 : "critical", 6 : "off", - 7 : "dummy" - } + 7 : "dummy", + } for index, status, product_name in info: status = saveint(status)