Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: ESX: new check for status of hardware sensors

by Mathias Kettner

Module: check_mk Branch: master Commit: 0028307e869fa705eb7255109f05dffb4763df13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0028307e869fa7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 18 16:46:14 2013 +0100 ESX: new check for status of hardware sensors --- agents/special/agent_vsphere | 68 ++++++++++++++++++++++++++++++++++++++-- checkman/esx_vsphere_sensors | 14 ++++++++ checks/esx_vsphere_hostsystem | 42 +++++++++++++++++++++++++ checks/esx_vsphere_sensors | 59 +++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0028307e86…

11 years, 3 months

Check_MK Git: check_mk: FIX: check_mk: convert service description unicode into utf-8

by Andreas Boesl

Module: check_mk Branch: master Commit: 8660ebed38ea3603e7cd7547b4aef2133f0016c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8660ebed38ea36… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 18 16:31:56 2013 +0100 FIX: check_mk: convert service description unicode into utf-8 --- ChangeLog | 1 + modules/check_mk.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc07080..79ac01e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * Checks can now omit the typical "OK - " or "WARN -". This text will be added automatically if missing. * FIX: livecheck: fixed compilation bug + * FIX: check_mk: convert service description unicode into utf-8 Checks & Agents: * FIX: jolokia_metrics.mem - now able to handle negative/missing max values diff --git a/modules/check_mk.py b/modules/check_mk.py index 24fa8c8..a710bb3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1894,7 +1894,7 @@ define service { check_command\t\t\t%s active_checks_enabled\t\t1 %s} -""" % (template, hostname, description, simulate_command(command), extraconf)) +""" % (template, hostname, make_utf8(description), simulate_command(command), extraconf)) # legacy checks via active_checks actchecks = [] @@ -1936,7 +1936,7 @@ define service { check_command\t\t\t%s active_checks_enabled\t\t1 %s} -""" % (template, hostname, description, simulate_command(command), extraconf)) +""" % (template, hostname, make_utf8(description), simulate_command(command), extraconf)) # Legacy checks via custom_checks @@ -2000,7 +2000,7 @@ define service { check_command\t\t\t%s active_checks_enabled\t\t%d %s%s} -""" % (template, hostname, description, simulate_command(command), +""" % (template, hostname, make_utf8(description), simulate_command(command), (command_line and not freshness) and 1 or 0, extraconf, freshness)) # Levels for host check

11 years, 3 months

Check_MK Git: check_mk: FIX: check_mk_templates: added missing check-mk-host-ping

by Andreas Boesl

Module: check_mk Branch: master Commit: bad3cba77e8d67085a033a7aecb7e72bd4cd93b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bad3cba77e8d67… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 18 16:04:19 2013 +0100 FIX: check_mk_templates: added missing check-mk-host-ping --- check_mk_templates.cfg | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index e21e65d..40b9ed6 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -337,6 +337,11 @@ define command { command_line $USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ } +define command { + command_name check-mk-host-ping + command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ +} + # General notification script. Details can be configured # in main.mk via notification_... options

11 years, 3 months

Check_MK Git: check_mk: FIX: localisation error

by Andreas Boesl

Module: check_mk Branch: master Commit: b7eb462d572204b9c70693827d6ecc4ac52d355a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7eb462d572204… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 18 15:56:53 2013 +0100 FIX: localisation error --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbcab31..1aef88d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ WATO: * FIX: Fix hiliting of errors in Nagios output + * FIX: localisation error Multisite: * FIX: Avoid duplicate "Services" button in host detail views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8dd325a..67f634b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1751,7 +1751,7 @@ def mode_editfolder(phase, new): if cgs_changed: check_user_contactgroups(attributes.get("contactgroups")) - log_pending(AFFECTED, g_folder, "edit-folder", "Edited properties of folder %s" % title) + log_pending(AFFECTED, g_folder, "edit-folder", _("Edited properties of folder %s") % title) g_folder["title"] = title

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: dd1794423f95c24739c35250798283dc6f7ebfd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd1794423f95c2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 18 15:57:52 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Minor fixes in ESX agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 80077ed92660203e6d905aa762189ec7c025707c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80077ed9266020… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 18 14:08:01 2013 +0100 Minor fixes in ESX agent --- agents/special/agent_vsphere | 2 +- checks/esx_vsphere_hostsystem | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 9a35457..d941bc7 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -70,7 +70,7 @@ try: except: if params['debug']: raise - sys.stderr.write("Cannot connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory.") + sys.stderr.write("Cannot connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory.\n") sys.exit(1) print "<<<check_mk>>>" diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 36170ae..c170e82 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -169,7 +169,7 @@ def check_esx_vsphere_hostsystem_state(item, params, info): check_info['esx_vsphere_hostsystem.state'] = { "inventory_function" : inventory_esx_vsphere_hostsystem_state, "check_function" : check_esx_vsphere_hostsystem_state, - "service_description" : "ESX State", + "service_description" : "Overall state", } @@ -235,7 +235,6 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): check_info['esx_vsphere_hostsystem.multipath'] = { "inventory_function" : inventory_esx_vsphere_hostsystem_multipath, "check_function" : check_esx_vsphere_hostsystem_multipath, - "service_description" : "ESX Multipath %s", - "group" : "cpu_utilization", + "service_description" : "Multipath %s", }

11 years, 3 months

Check_MK Git: check_mk: Finalize ESX host system memory check

by Mathias Kettner

Module: check_mk Branch: master Commit: ab1a59cadb9f6a15334f1bc0546e3fe4939ae27b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab1a59cadb9f6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 18 12:54:08 2013 +0100 Finalize ESX host system memory check --- checkman/check_mk-esx_vsphere_hostsystem.mem_usage | 36 ++++++++++++++ checks/esx_vsphere_hostsystem | 17 ++++--- .../check_mk-esx_vsphere_hostsystem.mem_usage.php | 49 ++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 2 +- web/plugins/wato/check_parameters.py | 16 ++++++- 5 files changed, 109 insertions(+), 11 deletions(-) diff --git a/checkman/check_mk-esx_vsphere_hostsystem.mem_usage b/checkman/check_mk-esx_vsphere_hostsystem.mem_usage new file mode 100644 index 0000000..9285297 --- /dev/null +++ b/checkman/check_mk-esx_vsphere_hostsystem.mem_usage @@ -0,0 +1,36 @@ +title: Check usage of physical RAM on ESX host system +agents: vsphere +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check measures the current usage of physical RAM by + an ESX host system. + +inventory: + One check per ESX host system is being created. + + +perfdata: + One value: the current usage in bytes. + +[parameters] +warning (int or float): the percentage of virtual memory used + by processes at which WARNING state is triggered. If the + level is defined as an integer value then it is interpreted + as an absolute value in megabytes. +critical (int or float): the percentage or absolute value + at which CRITICAL state is triggered + + +[configuration] +memused_default_levels (float, float): Levels used by + all checks that are created by inventory. + +mem_extended_perfdata (boolean): If this variable is set + to {True}, then the checks outputs additional performance + data, if the agent provides that information. On Linux + the amount of mapped and committed memory is output + (see {Mapped} and {Committed_AS} in {/proc/meminfo}) and + also the size used for page tables {Pagetables}. + diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index fb7ea53..36170ae 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -93,39 +93,40 @@ check_info['esx_vsphere_hostsystem.cpu_usage'] = { -esx_host_mem_default = ( 80.0, 90.0 ) +esx_host_mem_default_levels = ( 80.0, 90.0 ) def inventory_esx_vsphere_hostsystem_mem(info): data = esx_vsphere_hostsystem_convert(info).keys() if 'summary.quickStats.overallMemoryUsage' in data and 'hardware.memorySize' in data: - return [(None, esx_host_mem_default)] + return [(None, 'esx_host_mem_default_levels')] def check_esx_vsphere_hostsystem_mem(item, params, info): data = esx_vsphere_hostsystem_convert(info) memory_usage = savefloat(data['summary.quickStats.overallMemoryUsage'][0]) * 1024 * 1024 memory_size = savefloat(data['hardware.memorySize'][0]) level = memory_usage / memory_size * 100 + warn, crit = params state = 0 label = '' if level > crit: state = 2 - label = "(!!) (Levels at %d%%/%d%%)" % (warn, crit) + label = " (Levels at %d%%/%d%%)" % (warn, crit) elif level > warn: state = 1 - label = "(!) (Levels at %d%%/%d%%)" % (warn, crit) + label = " (Levels at %d%%/%d%%)" % (warn, crit) - message = "Memory usage: %d%%%s %s/%s" % \ + message = "%d%%%s used - %s/%s" % \ (level, label, get_bytes_human_readable(memory_usage), get_bytes_human_readable(memory_size)) - perf = [("usage", memory_usage, warn, crit, 0, memory_size)] + perf = [("usage", memory_usage, warn * memory_size / 100, crit * memory_size / 100, 0, memory_size)] return(state, message, perf) check_info['esx_vsphere_hostsystem.mem_usage'] = { "inventory_function" : inventory_esx_vsphere_hostsystem_mem, "check_function" : check_esx_vsphere_hostsystem_mem, - "service_description" : "ESX Memory usage", - "group" : "memory", + "service_description" : "Memory used", + "group" : "esx_host_memory", "has_perfdata" : True } diff --git a/pnp-templates/check_mk-esx_vsphere_hostsystem.mem_usage.php b/pnp-templates/check_mk-esx_vsphere_hostsystem.mem_usage.php new file mode 100644 index 0000000..2cd3095 --- /dev/null +++ b/pnp-templates/check_mk-esx_vsphere_hostsystem.mem_usage.php @@ -0,0 +1,49 @@ +<?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. + +$opt[1] = "--vertical-label 'Memory (Bytes)' --upper-limit " . $MAX[1] . " -l0 --title \"Memory usage of $hostname\" "; + +$total_gb = $MAX[1] / 1073741824.0; +$total_text = sprintf("%.2fGB", $total_gb); + +$def[1] = "DEF:used=$RRDFILE[1]:$DS[1]:MAX " + . "CDEF:usedgb=used,1073741824,/ " + . "HRULE:$MAX[1]#000080:\"Total memory\: $total_text\" "; +if ($WARN[1]) { + $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning (used)\" " + . "HRULE:$CRIT[1]#FF0000:\"Critical (used)\" "; +} + +$def[1] .= "'COMMENT:\\n' " + . "AREA:used#20cf80:\"Used main memory \" " + . "GPRINT:usedgb:LAST:\"%6.2lf GB last\" " + . "GPRINT:usedgb:AVERAGE:\"%6.2lf GB avg\" " + . "GPRINT:usedgb:MAX:\"%6.2lf GB max\\n\" " + ; + + +$def[1] .= "LINE:used#00af60:\"\" " ; + +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index b09e758..a39f7a8 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -637,7 +637,7 @@ def perfometer_simple_mem_usage(row, command, perf): maxw = float(perf[0][6]) used_level = float(perf[0][1]) used_perc = (100.0 / maxw) * used_level - return "%d%% used" % used_perc , perfometer_linear(used_perc, "#0000FF") + return "%d%%" % used_perc , perfometer_linear(used_perc, "#20cf80") perfometers['check_mk-db2_mem'] = perfometer_simple_mem_usage perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem_usage diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bc04a4a..05fc956 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1466,8 +1466,8 @@ register_check_parameters( Tuple( title = _("Specify levels in percentage of total RAM"), elements = [ - Percentage(title = _("Warning at a usage of"), label = _("% of RAM"), max_value = None), - Percentage(title = _("Critical at a usage of"), label = _("% of RAM"), max_value = None)]), + Percentage(title = _("Warning at a memory usage of"), default_value = 80.0), + Percentage(title = _("Critical at a memory usage of"), default_value = 90.0)]), Tuple( title = _("Specify levels in absolute usage values"), elements = [ @@ -1478,6 +1478,18 @@ register_check_parameters( ) register_check_parameters( + subgroup_os, + "esx_host_memory", + _("Main memory usage of ESX host system"), + Tuple( + title = _("Specify levels in percentage of total RAM"), + elements = [ + Percentage(title = _("Warning at a RAM usage of"), default_value = 80.0), + Percentage(title = _("Critical at a RAM usage of"), default_value = 90.0)]), + None, None +) + +register_check_parameters( subgroup_printing, "printer_supply", _("Printer cardridge levels"),

11 years, 3 months

Check_MK Git: check_mk: Overhauled ESX CPU check

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d64dcd2fa63e0d603962e9dee88d2e0fbef2fc7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d64dcd2fa63e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 18 12:31:26 2013 +0100 Overhauled ESX CPU check --- agents/special/agent_vsphere | 118 ++++++++++++++------ checkman/esx_vsphere_hostsystem.cpu_usage | 26 +++++ checks/agent_vsphere | 3 + checks/esx_vsphere_hostsystem | 59 +++++++--- .../check_mk-esx_vsphere_hostsystem.cpu_usage.php | 52 +++++++++ web/plugins/perfometer/check_mk.py | 8 ++ web/plugins/wato/check_parameters.py | 7 +- web/plugins/wato/datasource_programs.py | 10 ++ 8 files changed, 227 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d64dcd2fa…

11 years, 3 months

Check_MK Git: check_mk: Availability: fix broken link in BI services

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ee71a8cdcf55378096b69e0bd3fac4dbf2a8035 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ee71a8cdcf553… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 15 15:10:47 2013 +0100 Availability: fix broken link in BI services --- web/htdocs/bi.py | 4 ++-- web/htdocs/htmllib.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index d8a0809..bdaff62 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1548,10 +1548,10 @@ def aggr_render_leaf(tree, show_host, bare = False): # (4) CPU load (show_host == False, service != None) if show_host or not service: - host_url = html.makeuri([("view_name", "hoststatus"), ("site", site), ("host", host)], filename="view.py") + host_url = html.makeuri_contextless([("view_name", "hoststatus"), ("site", site), ("host", host)], filename="view.py") if service: - service_url = html.makeuri([("view_name", "service"), ("site", site), ("host", host), ("service", service)], filename="view.py") + service_url = html.makeuri_contextless([("view_name", "service"), ("site", site), ("host", host), ("service", service)], filename="view.py") if show_host: content += '<a href="%s">%s</a><b class=bullet>&diams;</b>' % (host_url, host.replace(" ", " ")) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index dc8f8d8..f762f35 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -374,11 +374,13 @@ class html: def makeactionuri(self, addvars): return self.makeuri(addvars + [("_transid", self.fresh_transid())]) - def makeuri_contextless(self, vars): + def makeuri_contextless(self, vars, filename=None): + if not filename: + filename = self.req.myfile + ".py" if vars: - return self.req.myfile + ".py?" + urlencode_vars(vars) + return filename + "?" + urlencode_vars(vars) else: - return self.req.myfile + ".py" + return filename def image_button(self, varname, title, cssclass = ''): if not self.mobile:

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 60cd54371c6ee4817f3d9e77d9a8859afd029437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60cd54371c6ee4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 18 09:09:06 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013