Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64450 discussions

Check_MK Git: check_mk: FIX: fix localization in non-OMD environment

by Mathias Kettner

Module: check_mk Branch: master Commit: be468317793ca57e2f8ef7d8fbe0ef83444d5901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be468317793ca5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 30 11:31:33 2013 +0100 FIX: fix localization in non-OMD environment --- ChangeLog | 4 ++++ web/htdocs/lib.py | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 942ee07..3677f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,10 @@ (Thanks to Mathias Decker) * check_http: now support the option -L (urlizing the result) + Multisite: + * FIX: fix localization in non-OMD environment + (thanks to あきら) + Notifications: * FIX: fix event type for recoveries * FIX: fix custom notifications on older nagios versions diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 180c6a7..96c5411 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -191,11 +191,14 @@ def load_language(lang): if lang: locale_base = defaults.locale_dir - local_locale_path = defaults.omd_root + "/local/share/check_mk/locale" - po_path = '/%s/LC_MESSAGES/multisite.mo' % lang - # Use file in OMD local strucuture when existing - if os.path.exists(local_locale_path + po_path): - locale_base = local_locale_path + + # OMD users can put their localization into a local path into the site + if defaults.omd_root: + local_locale_path = defaults.omd_root + "/local/share/check_mk/locale" + po_path = '/%s/LC_MESSAGES/multisite.mo' % lang + # Use file in OMD local strucuture when existing + if os.path.exists(local_locale_path + po_path): + locale_base = local_locale_path try: i18n = gettext.translation('multisite', locale_base, languages = [ lang ], codeset = 'UTF-8')

11 years, 6 months

Check_MK Git: check_mk: FIX: setup: detect check_icmp also on 64-Bit CentOS

by Mathias Kettner

Module: check_mk Branch: master Commit: 2756b2bb7be0de088e9226610a9ff20b6820320e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2756b2bb7be0de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 30 11:17:35 2013 +0100 FIX: setup: detect check_icmp also on 64-Bit CentOS --- ChangeLog | 4 ++++ scripts/autodetect.py | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c6eb9..942ee07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,10 @@ * Inventory: Display link symbol for ps ruleset 1.2.2b6: + Core: + * FIX: setup: detect check_icmp also on 64-Bit CentOS + (thanks to あきら) + Checks & Agents: * FIX: apc_symmetra_power: resurrect garble PNP template for * FIX: check_mk_agent.freebsd: remove garble from output diff --git a/scripts/autodetect.py b/scripts/autodetect.py index 144b0a7..21ccb64 100755 --- a/scripts/autodetect.py +++ b/scripts/autodetect.py @@ -563,6 +563,7 @@ try: for dir in plugin_paths + \ [ '/usr/lib/nagios/plugins', + '/usr/lib64/nagios/plugins', '/usr/local/nagios/libexec', '/usr/local/nagios/plugins' ]: try:

11 years, 6 months

Check_MK Git: check_mk: FIX: notify: fix event types and CUSTOM on old nagios cores

by Mathias Kettner

Module: check_mk Branch: master Commit: ed4eb567add4cd43cf473b7c7dadaccf22aa4c2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4eb567add4cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 30 10:52:46 2013 +0100 FIX: notify: fix event types and CUSTOM on old nagios cores --- ChangeLog | 4 ++++ modules/notify.py | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ebaca9..72c6eb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,10 @@ * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) * check_http: now support the option -L (urlizing the result) + + Notifications: + * FIX: fix event type for recoveries + * FIX: fix custom notifications on older nagios versions Livestatus: * FIX: memory leak when removing downtime / comment diff --git a/modules/notify.py b/modules/notify.py index 8dc5b80..7d19662 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -553,15 +553,13 @@ def check_notification_type(context, host_events, service_events): if context["WHAT"] == "HOST": allowed_events = host_events state = context["HOSTSTATE"] - events = { "UP" : 'u', "DOWN" : 'd' } + events = { "UP" : 'r', "DOWN" : 'd', "UNREACHABLE" : 'u' } else: allowed_events = service_events state = context["SERVICESTATE"] - events = { "WARNING" : 'w', "CRITICAL" : 'c', "UNKNOWN" : 'u' } + events = { "OK" : 'r', "WARNING" : 'w', "CRITICAL" : 'c', "UNKNOWN" : 'u' } - if notification_type == "PROBLEM": - event = events[state] - elif notification_type == "RECOVERY": + if notification_type == "RECOVERY": event = 'r' elif notification_type in [ "FLAPPINGSTART", "FLAPPINGSTOP", "FLAPPINGDISABLED" ]: event = 'f' @@ -570,7 +568,7 @@ def check_notification_type(context, host_events, service_events): elif notification_type == "ACKNOWLEDGEMENT": event = 'x' else: - event = '?' + event = events.get(state, '?') return event, allowed_events

11 years, 6 months

Check_MK Git: check_mk: livestatus: fix memory leak on removing downtime / comment

by Andreas Boesl

Module: check_mk Branch: master Commit: 2832272f7e7762d108d761b4d59db066c64435f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2832272f7e7762… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 30 09:31:47 2013 +0100 livestatus: fix memory leak on removing downtime / comment --- ChangeLog | 5 ++++- livestatus/src/TableDownComm.cc | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 982489c..1ebaca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,13 +79,16 @@ * Configuration of an alternativ host check command * Inventory: Display link symbol for ps ruleset -1.2.2: +1.2.2b6: Checks & Agents: * FIX: apc_symmetra_power: resurrect garble PNP template for * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) * check_http: now support the option -L (urlizing the result) + Livestatus: + * FIX: memory leak when removing downtime / comment + 1.2.2b5: Core: * Checks can now omit the typical "OK - " or "WARN -". This text diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 23109be..c267a85 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -109,7 +109,8 @@ void TableDownComm::addComment(nebstruct_comment_data *data) { add(new Comment(data)); } else if (data->type == NEBTYPE_COMMENT_DELETE) { - remove(new Comment(data)); + Comment comment(data); + remove(&comment); } } @@ -120,7 +121,8 @@ void TableDownComm::addDowntime(nebstruct_downtime_data *data) add(new Downtime(data)); } else if (data->type == NEBTYPE_DOWNTIME_DELETE) { - remove(new Downtime(data)); + Downtime downtime(data); + remove(&downtime); } }

11 years, 6 months

Check_MK Git: check_mk: check_http: now support the option -L (

by Mathias Kettner

urlizing the result) Message-ID: <5155a1fc.KjrdF3zpr2DnipLV%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 7b80fe8962be0e1ce0431012d76c901316261b1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b80fe8962be0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 29 15:15:07 2013 +0100 check_http: now support the option -L (urlizing the result) --- ChangeLog | 1 + checks/check_http | 3 +++ web/plugins/wato/active_checks.py | 9 +++++++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fae9c29..982489c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * FIX: apc_symmetra_power: resurrect garble PNP template for * FIX: check_mk_agent.freebsd: remove garble from output (Thanks to Mathias Decker) + * check_http: now support the option -L (urlizing the result) 1.2.2b5: Core: diff --git a/checks/check_http b/checks/check_http index 03f736d..ed8e361 100644 --- a/checks/check_http +++ b/checks/check_http @@ -115,6 +115,9 @@ def check_http_arguments(params): if "max_age" in settings: args += ' -M %d' % settings["max_age"] + if settings.get("urlize"): + args += ' -L' + if not omit_ip: args = " -I $HOSTADDRESS$" + args return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 4a1b3d0..56d8d7e 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -450,6 +450,15 @@ register_rule(group, default_value = 3600 * 24, ) ), + ( "urlize", + FixedValue( + value = True, + title = _("Clickable URLs"), + totext = _("Format check output as hyperlink"), + help = _("With this option the check produces an output that is a valid hyperlink " + "to the checked URL and this clickable."), + ) + ), ] ),

11 years, 6 months

Check_MK Git: check_mk: FIX: check_mk_agent.freebsd: remove garble from output

by Mathias Kettner

Module: check_mk Branch: master Commit: 8bf817e7500f432124c2e6eacd9ab4fed090efe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bf817e7500f43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 29 10:50:51 2013 +0100 FIX: check_mk_agent.freebsd: remove garble from output --- ChangeLog | 2 ++ agents/check_mk_agent.freebsd | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 685f1b8..fae9c29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,8 @@ 1.2.2: Checks & Agents: * FIX: apc_symmetra_power: resurrect garble PNP template for + * FIX: check_mk_agent.freebsd: remove garble from output + (Thanks to Mathias Decker) 1.2.2b5: Core: diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 0eaa990..0f45885 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -291,7 +291,7 @@ fi # check zpool status if [ -x /sbin/zpool ]; then echo "<<<zpool_status>>>" - /sbin/zpool status -x + /sbin/zpool status -x | grep -v "errors: No known data errors" fi

11 years, 6 months

Check_MK Git: check_mk: FIX: apc_symmetra_power: resurrect garble PNP template for

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ed3a3495b39633593a4d06158887828636a04c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed3a3495b3963… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 29 09:46:59 2013 +0100 FIX: apc_symmetra_power: resurrect garble PNP template for Conflicts: ChangeLog --- ChangeLog | 4 ++ pnp-templates/check_mk-apc_symmetra_power.php | 64 +++++++++++++++---------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fecf7a..685f1b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,10 @@ * Configuration of an alternativ host check command * Inventory: Display link symbol for ps ruleset +1.2.2: + Checks & Agents: + * FIX: apc_symmetra_power: resurrect garble PNP template for + 1.2.2b5: Core: * Checks can now omit the typical "OK - " or "WARN -". This text diff --git a/pnp-templates/check_mk-apc_symmetra_power.php b/pnp-templates/check_mk-apc_symmetra_power.php index 93eba5e..63b2c8b 100644 --- a/pnp-templates/check_mk-apc_symmetra_power.php +++ b/pnp-templates/check_mk-apc_symmetra_power.php @@ -1,25 +1,39 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 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. - +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +$opt[1] = "--vertical-label \"Watt\" -l 0 -u 60 --title \"Current Power\" "; + + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#800040:\"Power\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%2.0lfW\" "; +$def[1] .= "LINE1:var1#800040:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfW,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfW)\" "; +$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]W\" "; + + + +?>

11 years, 6 months

Check_MK Git: check_mk: Makefile: fix checks for mingw

by Mathias Kettner

Module: check_mk Branch: master Commit: 9274ab8362555e16d220fb4bc7e8b172b3182ae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9274ab8362555e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 28 11:58:34 2013 +0100 Makefile: fix checks for mingw --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 7dbce1f..55a333f 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.04" \ - -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.10" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi

11 years, 6 months

Check_MK Git: check_mk: FIX: make filesystem_default_levels effective in esx_vsphere_datastores

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b007d1cb344ceba5f471bd427371a545db35c26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b007d1cb344ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 28 09:03:56 2013 +0100 FIX: make filesystem_default_levels effective in esx_vsphere_datastores --- checks/esx_vsphere_datastores | 13 +++++++------ checks/vms_diskstat | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index b621981..695e6d8 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -81,12 +81,13 @@ def check_esx_vsphere_datastores(item, params, info): return state, infotext, perfdata check_info['esx_vsphere_datastores'] = { - "inventory_function" : inventory_esx_vsphere_datastores, - "check_function" : check_esx_vsphere_datastores, - "service_description" : "fs_%s", - "includes" : [ 'df.include' ], - "has_perfdata" : True, - "group" : "filesystem", + "inventory_function" : inventory_esx_vsphere_datastores, + "check_function" : check_esx_vsphere_datastores, + "service_description" : "fs_%s", + "includes" : [ 'df.include' ], + "has_perfdata" : True, + "group" : "filesystem", + "default_levels_variable" : "filesystem_default_levels", } #. diff --git a/checks/vms_diskstat b/checks/vms_diskstat index 32fef75..bf30841 100644 --- a/checks/vms_diskstat +++ b/checks/vms_diskstat @@ -57,4 +57,5 @@ check_info['vms_diskstat.df'] = { "has_perfdata" : True, "group" : "filesystem", "includes" : [ "df.include" ], + "default_levels_variable" : "filesystem_default_levels", }

11 years, 6 months

Check_MK Git: check_mk: agent_vsphere: option for including data of Check_MK Agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e7964878a92c73608cf5e91892e131a224bab51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e7964878a92c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 27 19:50:49 2013 +0100 agent_vsphere: option for including data of Check_MK Agent --- agents/special/agent_vsphere | 68 ++++++++++++++++++++----------- checks/agent_vsphere | 7 ++- modules/check_mk_base.py | 4 +- web/plugins/wato/datasource_programs.py | 5 +- 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index a9a80ba..815b01c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -26,6 +26,7 @@ import sys import argparse +import socket import inspect, pprint # FOR DEBUGGING @@ -47,6 +48,11 @@ parser.add_argument('-D', '--direct', action="store_true", "we expect data about only one HostSystem to be found and do " "not create piggy host data for that host.") +parser.add_argument('-a', '--agent', action="store_true", + help="Also retrieve data from the normal Check_MK Agent. This makes " + "sense if you query a vCenter that is installed on a Windows " + "host that you also want to monitor with Check_MK.") + parser.add_argument('--debug', action="store_true", help="Debug mode: let Python exceptions come through") @@ -55,13 +61,49 @@ parser.add_argument('HOST', params = vars(parser.parse_args()) +def get_agent_info_tcp(hostname): + output = "" + try: + if hostname[0] in "123456789": + ipaddress = hostname + else: + ipaddress = socket.gethostbyname(hostname) + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + s.settimeout(3.0) + except: + pass # some old Python versions lack settimeout(). Better ignore than fail + s.connect((ipaddress, 6556)) + try: + s.setblocking(1) + except: + pass + output = "" + while True: + out = s.recv(4096, socket.MSG_WAITALL) + if out and len(out) > 0: + output += out + else: + break + s.close() + return output + except Exception, e: + if params["debug"]: + raise + return output + +error_exit = 1 +if params['agent']: + sys.stdout.write(get_agent_info_tcp(params["HOST"])) + error_exit = 0 # do not fail if vSphere fails + try: from pysphere import VIServer, VIProperty, MORTypes from pysphere.resources import VimService_services as VI except: sys.stderr.write("pysphere API not found. Please install and try again.\n") - sys.exit(1) + sys.exit(error_exit) host = VIServer() @@ -72,34 +114,12 @@ except: if params['debug']: raise sys.stderr.write("Cannot connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory.\n") - sys.exit(1) + sys.exit(error_exit) print "<<<check_mk>>>" print "Version: %s" % host.get_api_version() print "AgentOs: %s " % host.get_server_type() -# import inspect, pprint -# for x in host._retrieve_properties_traversal(property_names=[], obj_type = MORTypes.ManagedEntity): -# print x.Obj -# print inspect.getmembers(x) -# sys.exit(17) - -# hosts = host.get_hosts() -# pprint.pprint(inspect.getmembers(VIProperty(host, hosts.keys()[0]).hardware)) -# sys.exit(1) - -#for p in VIProperty(host, hosts.keys()[0]).network: - # print host.get_resource_pools(p) - # for n in p: - # pprint.pprint(inspect.getmembers(p)) - -# print p -# print hosts - - -# sys.exit(1) - - def output_mors(what, properties, direct=False): if what == "hostsystem": diff --git a/checks/agent_vsphere b/checks/agent_vsphere index 8b5af0e..6c310e0 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -35,14 +35,15 @@ def agent_vsphere_arguments(params, hostname, ipaddress): args = '' if "tcp_port" in params: args += " -p %d" % params["tcp_port"] - if "lower" in params: - args += " -lower" args += " -u " + quote_shell_string(params["user"]) args += " -s " + quote_shell_string(params["secret"]) args += " -i " + ",".join(params["infos"]) - if params.get("direct"): + direct = params.get("direct", False) + if direct: args += ' --direct' + if direct == "agent": + args += ' --agent' args += " " + quote_shell_string(ipaddress) return args diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2cabeaf..1c5ae56 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -561,9 +561,9 @@ def get_agent_info(hostname, ipaddress, max_cache_age): if hostname in g_broken_agent_hosts: raise MKAgentError("") - # If the host ist listed in datasource_programs the data from + # If the host is listed in datasource_programs the data from # that host is retrieved by calling an external program (such - # as ssh or rsy) instead of a TCP connect. + # as ssh or rsh or agent_vsphere) instead of a TCP connect. commandline = get_datasource_program(hostname, ipaddress) if commandline: output = get_agent_info_program(commandline) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 29e81a5..ef8d568 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -75,8 +75,9 @@ register_rule(group, DropdownChoice( title = _("Type of query"), choices = [ - ( True, _("Queried host is a host system" ) ), - ( False, _("Queried host is the vCenter") ), + ( True, _("Queried host is a host system" ) ), + ( False, _("Queried host is the vCenter") ), + ( "agent", _("Queried host is the vCenter with Check_MK Agent installed") ), ], default = True, )

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits