[checkmk-commits] Check_MK Git: check_mk: FIX agent_ibmsvc: raw data for System Info Check and License Check now in correct format

Module: check_mk Branch: master Commit: f8f7a2c1e138b2b78cb4d62714891a7d75f873ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f7a2c1e138b2… Author: Bernd Stroessenreuther &lt;bs(a)mathias-kettner.de&gt; Date: Mon Apr 7 16:20:59 2014 +0200 FIX agent_ibmsvc: raw data for System Info Check and License Check now in correct format The System Info Check did return noting and the License Check did not work when using special agent ibmsvc because the system commands were called with the wrong parameters. This is fixed now. --- .werks/803 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 32 +++++++++++++++++++------------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.werks/803 b/.werks/803 new file mode 100644 index 0000000..75c9088 --- /dev/null +++ b/.werks/803 @@ -0,0 +1,10 @@ +Title: agent_ibmsvc: raw data for System Info Check and License Check now in correct format +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1396880282 +Class: fix + +The System Info Check did return noting and the License Check did not work when using +special agent ibmsvc because the system commands were called with the wrong parameters. +This is fixed now. diff --git a/ChangeLog b/ChangeLog index e6f3b02..70ee9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection + * 0803 FIX: agent_ibmsvc: raw data for System Info Check and License Check now in correct format... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index d409a97..91b4e07 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -92,15 +92,24 @@ user = None mortypes = [ 'all' ] command_options = { - "lshost" : {"section_header" : "ibm_svc_host", "active" : False}, - "lslicense" : {"section_header" : "ibm_svc_license", "active" : False}, - "lsmdisk" : {"section_header" : "ibm_svc_mdisk", "active" : False}, - "lsmdiskgrp" : {"section_header" : "ibm_svc_mdiskgrp", "active" : False}, - "lsnode" : {"section_header" : "ibm_svc_node", "active" : False}, - "lsnodestats" : {"section_header" : "ibm_svc_nodestats", "active" : False}, - "lssystem" : {"section_header" : "ibm_svc_system", "active" : False}, - "lssystemstats" : {"section_header" : "ibm_svc_systemstats", "active" : False}, - "lseventlog" : {"section_header" : "ibm_svc_eventlog", "active" : False}, + "lshost" : {"section_header" : "ibm_svc_host", "active" : False, + "command" : "lshost -nohdr -delim :"}, + "lslicense" : {"section_header" : "ibm_svc_license", "active" : False, + "command" : "lslicense -delim :"}, + "lsmdisk" : {"section_header" : "ibm_svc_mdisk", "active" : False, + "command" : "lsmdisk -nohdr -delim :"}, + "lsmdiskgrp" : {"section_header" : "ibm_svc_mdiskgrp", "active" : False, + "command" : "lsmdiskgrp -nohdr -delim :"}, + "lsnode" : {"section_header" : "ibm_svc_node", "active" : False, + "command" : "lsnode -nohdr -delim :"}, + "lsnodestats" : {"section_header" : "ibm_svc_nodestats", "active" : False, + "command" : "lsnodestats -nohdr -delim :"}, + "lssystem" : {"section_header" : "ibm_svc_system", "active" : False, + "command" : "lssystem -delim :"}, + "lssystemstats" : {"section_header" : "ibm_svc_systemstats", "active" : False, + "command" : "lssystemstats -nohdr -delim :"}, + "lseventlog" : {"section_header" : "ibm_svc_eventlog", "active" : False, + "command" : "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr"}, } for o,a in opts: @@ -158,10 +167,7 @@ cmd = "ssh -o ConnectTimeout=%s %s %s@%s '" % (opt_timeout, opt_any_hostkey, use for module in command_options.keys(): if command_options[module]["active"] == True: cmd += "echo \<\<\<%s:sep\(58\)\>\>\>;" % command_options[module]["section_header"] - if module == "lseventlog": - cmd += "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr;" - else: - cmd += "%s -nohdr -delim :;" % module + cmd += "%s;" % command_options[module]["command"] cmd += "'" if opt_debug: