Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: Fixed .gitignore of Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 257d9a60a37cb335a1a72d566073938ff87acc70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=257d9a60a37cb3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 14:49:41 2013 +0100 Fixed .gitignore of Windows agent --- agents/windows/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/windows/.gitignore b/agents/windows/.gitignore index 3ce073d..ea9deef 100644 --- a/agents/windows/.gitignore +++ b/agents/windows/.gitignore @@ -1,2 +1,4 @@ check_mk.ini logstate.txt +spool +success.log

10 years, 9 months

Check_MK Git: check_mk: cmciii_psm_current: remove debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: b55509197d8f47310aed28e22b8d217cf3de723f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b55509197d8f47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 14:46:50 2013 +0100 cmciii_psm_current: remove debug output --- checks/cmciii_psm_current | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cmciii_psm_current b/checks/cmciii_psm_current index e089529..b2c8bff 100644 --- a/checks/cmciii_psm_current +++ b/checks/cmciii_psm_current @@ -43,7 +43,6 @@ def check_cmciii_psm_current(item, params, info): current = info[unit+4][bus] max_current = info[unit+5][bus] min_current = info[unit+6][bus] - print descr, typ, current status = info[unit+7][bus].lower() if status == "ok": state = 0

10 years, 9 months

Check_MK Git: check_mk: Multisite: (.) is now rendered as OK, like (!) and (!!)

by Mathias Kettner

Module: check_mk Branch: master Commit: 285e022feeff264f3cf0c3a469cfe7a9429aa448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=285e022feeff26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 14:43:13 2013 +0100 Multisite: (.) is now rendered as OK, like (!) and (!!) --- web/htdocs/lib.py | 5 ++++- web/htdocs/status.css | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 43d9808..b96bdf5 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -226,6 +226,7 @@ def pnp_cleanup(s): .replace('/', '_') \ .replace('\\', '_') +ok_marker = 'OK' warn_marker = 'WARN' crit_marker = 'CRIT' unknown_marker = 'UNKN' @@ -251,7 +252,9 @@ def format_plugin_output(output, row = None): output = output.replace("(!)", warn_marker) \ .replace("(!!)", crit_marker) \ - .replace("(?)", unknown_marker) + .replace("(?)", unknown_marker) \ + .replace("(.)", ok_marker) + if row and "[running on" in output: a = output.index("[running on") e = output.index("]", a) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 8c74566..7fc12af 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -91,7 +91,7 @@ table.data td.perfometer.stale div.title { /* inline state markers in check output */ b.stmark { - margin-left: 4px; + margin-left: 2px; padding: 1px 3px; border-radius: 4px; font-size: 7pt;

10 years, 9 months

Check_MK Git: check_mk: The vCenter agent is now also able to handle the option -p

by Andreas Boesl

Module: check_mk Branch: master Commit: 1e635bc6e0b180f270e32a169e4089a02c3fb02c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e635bc6e0b180… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 4 14:42:08 2013 +0100 The vCenter agent is now also able to handle the option -p --- .werks/238 | 1 - agents/special/agent_vsphere | 3 +- agents/special/agent_vsphere.pysphere | 47 +++++++++++++++++++++++++------ checks/agent_vsphere | 5 ++-- web/plugins/wato/datasource_programs.py | 3 +- 5 files changed, 43 insertions(+), 16 deletions(-) diff --git a/.werks/238 b/.werks/238 index 2bbe504..6aa4f15 100644 --- a/.werks/238 +++ b/.werks/238 @@ -8,6 +8,5 @@ Class: feature When using a Site Recovery Manager (SRM) some of the virtualmachines are only used as fallback. The new agent_vsphere option -p allows to suppress any output regarding placeholder vms. -Right now this option only works when querying a host system. Placeholder vms are identified by not having an assigned VirtualDisk Device. The option is also configurable via the WATO rule "Check state of VMWare ESX via vSphere" diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f99d9a5..94a4f44 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -129,11 +129,10 @@ OPTIONS: -s SECRET, --secret SECRET Secret/Password for vSphere login -D, --direct Assume a directly queried host system (no vCenter). In This we expect data about only one HostSystem to be - Found and do not create piggy host data for that host. + found and do not create piggy host data for that host. -p, Skip placeholder virtualmachines. These backup vms are created by the Site Recovery Manager (SRM) and are identified by not having any assigned virtual disks. - Found and do not create piggy host data for that host. -H, --hostname Specify a hostname. This is neccessary if this is different from HOST. It is being used when outputting the hosts power state. diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 45402e7..658037c 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -53,6 +53,9 @@ OPTIONS: -D, --direct Assume a directly queried host system (no vCenter). In This we expect data about only one HostSystem to be Found and do not create piggy host data for that host. + -p, Skip placeholder virtualmachines. These backup vms are created + by the Site Recovery Manager (SRM) and are identified by not + having any assigned virtual disks. -H, --hostname Specify a hostname. This is neccessary if this is different from HOST. It is being used in --direct mode as the name of the host system when outputting @@ -79,7 +82,7 @@ OPTIONS: """) -short_options = 'hi:u:s:Dat:H:c' +short_options = 'hi:u:s:Dat:H:cp' long_options = [ 'help', 'user=', 'secret=', 'direct', 'agent', 'debug', 'modules=', 'timeout=', 'hostname=', 'dump-counters', 'profile' @@ -91,12 +94,13 @@ except getopt.GetoptError, err: sys.stderr.write("%s\n" % err) sys.exit(1) -opt_debug = False -opt_direct = False -opt_agent = False -opt_dump_counters = False -opt_timeout = 60 -opt_hostname = None +opt_debug = False +opt_direct = False +opt_agent = False +opt_dump_counters = False +opt_timeout = 60 +opt_hostname = None +opt_skip_placeholder_vm = False g_profile = None g_profile_path = "vsphere_profile.out" @@ -117,6 +121,8 @@ for o,a in opts: opt_direct = True elif o in [ '-a', '--agent' ]: opt_agent = True + elif o in [ '-p' ]: + opt_skip_placeholder_vm = True elif o in [ '-u', '--user' ]: user = a elif o in [ '-s', '--secret' ]: @@ -547,6 +553,27 @@ def output_mors(what, properties, direct=False): if not mors: return + # Filter placeholder virtual machines + if obj_type == MORTypes.VirtualMachine and opt_skip_placeholder_vm: + used_mors = [] + for mor in mors: + found_virtual_disk = False + for p in mor.PropSet: + if p.Name == "config.hardware.device": + try: + devices = p.Val.get_element_VirtualDevice() + for entry in devices: + if entry.typecode.type == ('urn:vim25', 'VirtualDisk'): + found_virtual_disk = True + break + except: + # If this property fails it is something different -> let it pass + found_virtual_disk = True + break + if found_virtual_disk: + used_mors.append(mor) + mors = used_mors + for mor in mors: sections = [] count += 1 @@ -609,7 +636,7 @@ def output_datastores(): property_names += [ "summary.maintenanceMode", ] - + # print inspect.getmembers(MORTypes) print "<<<esx_vsphere_datastores:sep(%d)>>>" % ord('\t') for mor in host._retrieve_properties_traversal(property_names=property_names, obj_type=MORTypes.Datastore): @@ -699,7 +726,7 @@ vm_propertys = { "summary.quickStats.overallCpuDemand": str, "summary.quickStats.staticCpuEntitlement": str, "summary.quickStats.distributedCpuEntitlement": str, - + # Memory "summary.quickStats.guestMemoryUsage": str, "summary.quickStats.hostMemoryUsage": str, @@ -715,6 +742,8 @@ vm_propertys = { # Virtual machine configuration "config.hardware.memoryMB": str, "config.hardware.numCPU": str, + "config.hardware.device": lambda x: "unused", # unused in check + # we need it to determine placeholder vms #"config.hardware.hwVersion": str, #"config.hardware.guestId": str, #"config.hardware.uuid": str, diff --git a/checks/agent_vsphere b/checks/agent_vsphere index d6843b2..afb7462 100644 --- a/checks/agent_vsphere +++ b/checks/agent_vsphere @@ -46,8 +46,9 @@ def agent_vsphere_arguments(params, hostname, ipaddress): args += ' --agent' elif direct: args += ' --direct --hostname ' + quote_shell_string(hostname) - if params.get("skip_placeholder_vms"): - args += " -p" + + if params.get("skip_placeholder_vms"): + args += " -p" if "timeout" in params: args += ' --timeout %d' % params["timeout"] diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 42aaaf5..e84830a 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -103,8 +103,7 @@ register_rule(group, FixedValue(True, title = _("Skip placeholder VMs"), totext="", help = _("Placeholder VMs are created by the Site Recovery Manager(SRM) and act as backup " "virtual machines in case the default vm is unable to start. This option tells the " - "vsphere agent to exclude placeholder vms in its output. This option only works " - "when querying a host system" + "vsphere agent to exclude placeholder vms in its output." )) ), ( "direct",

10 years, 9 months

Check_MK Git: check_mk: Updated Werk 16 again

by Mathias Kettner

Module: check_mk Branch: master Commit: 5dc9cbc140b8178e598f3197a1e8711dbdb2e388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dc9cbc140b817… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 12:34:11 2013 +0100 Updated Werk 16 again --- .werks/16 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/16 b/.werks/16 index 39dad34..f43c131 100644 --- a/.werks/16 +++ b/.werks/16 @@ -25,7 +25,7 @@ that number, it will be ignored. This will usually set the corresponding services in the monitoring to UNKNOWN. That way you can make sure that you will be alarmed if no fresh monitoring data is available. -Here is an example for a spool file using a [check_local|<tt>local</tt>] section: +Here is an example for a spool file using a [localchecks|<tt>local</tt>] section: F+:C:\Program Files\Check_MK\spool\600_foobar.txt <<<local>>>

10 years, 9 months

Check_MK Git: check_mk: Updated Werk 16

by Mathias Kettner

Module: check_mk Branch: master Commit: 76cd58f5cace88c62d09230e647eb24e30d9193d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76cd58f5cace88… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 12:32:12 2013 +0100 Updated Werk 16 --- .werks/16 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.werks/16 b/.werks/16 index e0a1bac..39dad34 100644 --- a/.werks/16 +++ b/.werks/16 @@ -24,3 +24,12 @@ number of seconds. If the last modification of the file is older than that number, it will be ignored. This will usually set the corresponding services in the monitoring to UNKNOWN. That way you can make sure that you will be alarmed if no fresh monitoring data is available. + +Here is an example for a spool file using a [check_local|<tt>local</tt>] section: + +F+:C:\Program Files\Check_MK\spool\600_foobar.txt +<<<local>>> +0 Service_FOO V=1 This Check is OK +1 Bar_Service - This is WARNING and has no performance data +2 NotGood V=120;50;100;0;1000 A critical check +F-:

10 years, 9 months

Check_MK Git: check_mk: Windows agent: added crash_debug to example ini file

by Mathias Kettner

Module: check_mk Branch: master Commit: 65c663141bca3e4d7597e6d996da5e36e50a5850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65c663141bca3e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 12:13:05 2013 +0100 Windows agent: added crash_debug to example ini file --- agents/windows/check_mk.example.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 078eab5..1501bc8 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -21,6 +21,9 @@ # Maximum timeout for all plugins combined # timeout_plugins_total = 60 + # Write a logfile for tackling down crashes of the agent + # crash_debug = yes + [winperf] # Select counters to extract. The following counters

10 years, 9 months

Check_MK Git: check_mk: Linux+Windows agent: allow spooling plugin outputs via files

by Mathias Kettner

Module: check_mk Branch: master Commit: 9453eeda633b80359f61e305f1c01535b403199e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9453eeda633b80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 12:28:07 2013 +0100 Linux+Windows agent: allow spooling plugin outputs via files The Windows and Linux agent now have a new feature for sending the contents of files as a part of the agent output. This is useful for generating monitoring data asychronously, e.g. by a cron job. Simply let the job create or update a file in the directory <tt>/etc/check_mk/spool</tt> (Linux) or in the subdirection <tt>spool</tt> of the agent directory (Windows). If that directory is missing, simply create it. The agent will then add the contents of all files contained in that directory to its output. You can use any filename you like. Just files beginning with a dot are ignored. This is an easy way to have applications on the host drop monitoring data into Check_MK. Especially conveniant is using a local <tt><<<local>>></tt> section here. If you prefix the file name with a number (e.g. <tt>600MyOutput</tt> or <tt>3600_app_data.txt</tt>) then that number is interpreted as a number of seconds. If the last modification of the file is older than that number, it will be ignored. This will usually set the corresponding services in the monitoring to UNKNOWN. That way you can make sure that you will be alarmed if no fresh monitoring data is available. --- .werks/16 | 26 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 41 +++++++++++++++- agents/windows/check_mk_agent.cc | 96 ++++++++++++++++++++++++++++++++++--- agents/windows/check_mk_agent.exe | Bin 152064 -> 153088 bytes agents/windows/install_agent.exe | Bin 146971 -> 147591 bytes 6 files changed, 156 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9453eeda63…

10 years, 9 months

Check_MK Git: check_mk: Windows agent: avoid executing plugins and local when disabled

by Mathias Kettner

Module: check_mk Branch: master Commit: a0776fb810acfebe4e0519e2c6c2704a39abbc44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0776fb810acfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 4 12:14:08 2013 +0100 Windows agent: avoid executing plugins and local when disabled --- agents/windows/check_mk_agent.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4b3a592..6a25e89 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2410,8 +2410,8 @@ DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) void run_script_container(script_container *cont) { - if ( (cont->type == PLUGIN && ! enabled_sections && SECTION_PLUGINS) || - (cont->type == LOCAL && ! enabled_sections && SECTION_LOCAL) ) + if ( (cont->type == PLUGIN && !(enabled_sections & SECTION_PLUGINS)) || + (cont->type == LOCAL && !(enabled_sections & SECTION_LOCAL)) ) return; time_t now = time(0);

10 years, 9 months

Check_MK Git: check_mk: renamed host diag button 'Save' to 'Save & Exit'

by Andreas Boesl

Module: check_mk Branch: master Commit: ca3ddf4a162abc91b6a755221928abec074d6f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca3ddf4a162abc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 4 11:26:54 2013 +0100 renamed host diag button 'Save' to 'Save & Exit' --- 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 8de73ae..9f8c1dc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2318,7 +2318,7 @@ def mode_diag_host(phase): forms.end() html.write('<div style="margin-bottom:10px">') - html.button("_save", _("Save")) + html.button("_save", _("Save & Exit")) html.write('</div>') forms.header(_('Options'))

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013