Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: Fixed typos in help texts and ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: d4ab5d173fe320fa450ebef5114fd1e79f23e30a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4ab5d173fe320… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 29 18:32:01 2013 +0200 Fixed typos in help texts and ChangeLog --- ChangeLog | 2 +- web/plugins/wato/check_parameters.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcab7d5..0bd0923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,7 @@ * windows agent: no longer tries to execute directories * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * fileinfo: no longer inventorize missing files(reported by windows agent) - * Add: Checks for Brocade FAN, Temperatur and Power + * New checks for Brocade fans, temperature and power supplies * cluster hosts: removed agent version output from Check_MK service (this was misleading for different agent versions on multiple nodes) * job check: better handling of unexpected agent output diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fc0120f..186b2ae 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2644,17 +2644,17 @@ register_check_parameters( register_check_parameters( subgroup_environment, "hw_temperature", - _("Harware temperature (e.g. switches)"), + _("Hardware temperature (e.g. switches)"), Tuple( help = _("Temperature levels for hardware devices like " - "brocade switches."), + "Brocade switches."), elements = [ - Integer(title = _("warning at"), unit = u"°C", default_value = 26), - Integer(title = _("critical at"), unit = u"°C", default_value = 30), + Integer(title = _("warning at"), unit = u"°C", default_value = 35), + Integer(title = _("critical at"), unit = u"°C", default_value = 40), ]), TextAscii( title = _("Sensor ID"), - help = _("The identificator of the themal sensor.")), + help = _("The identifier of the thermal sensor.")), "first" )

10 years, 11 months

Check_MK Git: check_mk: Fixed a few typos

by Mathias Kettner

Module: check_mk Branch: master Commit: dd1d9745956f3ab69dce926dc0ba635a6b9ce562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd1d9745956f3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 29 18:28:35 2013 +0200 Fixed a few typos --- checkman/brocade_fan | 2 +- checkman/brocade_power | 2 +- checks/brocade_temp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checkman/brocade_fan b/checkman/brocade_fan index 9832aee..8e5ae53 100644 --- a/checkman/brocade_fan +++ b/checkman/brocade_fan @@ -1,4 +1,4 @@ -title: Fans of a Brocade FC switch +title: Fans of Brocade FibreChannel switches catalog: hw/storagehw/brocade agents: snmp license: GPL diff --git a/checkman/brocade_power b/checkman/brocade_power index 26aae9a..d51c9d4 100644 --- a/checkman/brocade_power +++ b/checkman/brocade_power @@ -1,4 +1,4 @@ -title: Power supplies of a Brocade FC switch +title: Power supplies of Brocade FC switches catalog: hw/storagehw/brocade agents: snmp author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/checks/brocade_temp b/checks/brocade_temp index 265ff6f..062b879 100644 --- a/checks/brocade_temp +++ b/checks/brocade_temp @@ -56,13 +56,13 @@ def check_brocade_temp(item, params, info): state = 1 label = "(Levels at: %d/%d) %s" % (warn, crit, name) - return state, "Temperatur at %d°C%s " % (value, label), perf - return 3, "Temperatur Sensor not found" + return state, "Temperature at %d°C%s " % (value, label), perf + return 3, "Temperature sensor not found" check_info["brocade_temp"] = { "check_function" : check_brocade_temp, "inventory_function" : inventory_brocade_temp, - "service_description" : "Temperatur %s", + "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "hw_temperature", "includes" : [ "brocade.include"],

10 years, 11 months

Check_MK Git: check_mk: Add catalog: information for new brocade checks

by Mathias Kettner

Module: check_mk Branch: master Commit: df4c6fe22d47bdb677e51f5212ccfb54bf44d516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df4c6fe22d47bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 29 18:24:09 2013 +0200 Add catalog: information for new brocade checks --- checkman/brocade_fan | 15 ++++++++------- checkman/brocade_fcport | 3 +-- checkman/brocade_power | 13 ++++++------- checkman/brocade_temp | 15 ++++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/checkman/brocade_fan b/checkman/brocade_fan index 3c686d7..9832aee 100644 --- a/checkman/brocade_fan +++ b/checkman/brocade_fan @@ -1,20 +1,21 @@ -title: Brocade FC switches FAN speed +title: Fans of a Brocade FC switch +catalog: hw/storagehw/brocade agents: snmp -author: Bastian Kuhn <bk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This checks monitors the FAN speeds of a Brocade FC switch + This checks monitors the FAN speeds of a Brocade FC switch. item: - The Number of the FAN (1, 2, 3 ...) like descripted in the snmp output + The number of the FAN (1, 2, 3 ...) like descripted in the SNMP output. perfdata: - The speed of each FAN + The speed of each fan. inventory: - The inventory creates a service for each fan + The inventory creates a service for each fan. [parameters] -tuple (warn, crit): The levels of the minimum FAN speed +warn(int): the minimum fan speed for an OK state +crit(int): the minimum fan speed for a WARN state diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport index f34df4f..892cfdd 100644 --- a/checkman/brocade_fcport +++ b/checkman/brocade_fcport @@ -1,7 +1,6 @@ title: FibreChannel ports of Brocade FC switches +catalog: hw/storagehw/brocade agents: snmp -catalog: hw/storagehw/brocade -author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: diff --git a/checkman/brocade_power b/checkman/brocade_power index 42f1ce2..26aae9a 100644 --- a/checkman/brocade_power +++ b/checkman/brocade_power @@ -1,17 +1,16 @@ -title: Brocade FC switch power supply state +title: Power supplies of a Brocade FC switch +catalog: hw/storagehw/brocade agents: snmp author: Bastian Kuhn <bk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This checks monitors for a non ok state of a brocade power supply. + This check monitors the state of the power supplies of + a Brocade switch. item: - The Number of the power supply (1, 2, 3 ...) like descripted in the snmp output - -perfdata: - None + The number of the power supply (1, 2, 3 ...) like descripted in the SNMP output. inventory: - The inventory creates a service for each supply + The inventory creates a service for each power supply. diff --git a/checkman/brocade_temp b/checkman/brocade_temp index a65b94b..d7c6ba2 100644 --- a/checkman/brocade_temp +++ b/checkman/brocade_temp @@ -1,20 +1,21 @@ -title: Brocade FC switches hardware temperatur +title: Hardware temperature of Brocade FC switches +catalog: hw/storagehw/brocade agents: snmp -author: Bastian Kuhn <bk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This checks monitors the hardware temperatures of a Brocade FC switch + This checks monitors the hardware temperatures of a Brocade FC switch. item: - The Number of the sensor (1, 2, 3 ...) like descripted in the snmp output + The Number of the sensor (1, 2, 3 ...) like descripted in the SNMP output. perfdata: - The actual temperatur value for each sensor + The current temperature value for each sensor inventory: - The inventory creates a service for each sensor + The inventory creates a service for each sensor. [parameters] -tuple (warn, crit): The levels of the maximum temperatur +warn(int): the temperature at which a WARN state is reached +crit(int): the temperature at which a CRIT state is reached

10 years, 11 months

Check_MK Git: check_mk: Remove obsolete variable

by Mathias Kettner

Module: check_mk Branch: master Commit: a1719ffb0f9b205c7b19ea753a7cbcfdd6f12409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1719ffb0f9b20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 28 16:08:00 2013 +0200 Remove obsolete variable --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 39a66fd..3232fc4 100644 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -227,8 +227,6 @@ check_mk_perfdata_with_times = True debug_log = None monitoring_host = None # deprecated max_num_processes = 50 -timeperiod_horizon = 365 * 86400 # for CMC - # SNMP communities and encoding snmp_default_community = 'public'

10 years, 12 months

Check_MK Git: check_mk: CMC: always do reload, never restart in automation

by Mathias Kettner

Module: check_mk Branch: master Commit: 77b24a259e9b2cc06d9896c91d4f044acb1b545f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b24a259e9b2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 28 11:45:32 2013 +0200 CMC: always do reload, never restart in automation --- modules/automation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/automation.py b/modules/automation.py index c73f949..99d71f8 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -506,6 +506,7 @@ def automation_restart(job="restart"): pass else: objects_file = var_dir + "/core/config" + job = "reload" # force reload for CMC # os.closerange(3, 256) --> not available in older Python versions

10 years, 12 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: 0078c4c23598328ec272005c4c50a7b2e6a80477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0078c4c2359832… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 18:31:48 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

10 years, 12 months

Check_MK Git: check_mk: code cleanup (eclipse tabs...)

by Andreas Boesl

Module: check_mk Branch: master Commit: 1af63af4205cadedb3637d566d5db14c4ddd5519 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1af63af4205cad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 27 18:31:41 2013 +0200 code cleanup (eclipse tabs...) --- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.cc | 43 +++++++++++++------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/livestatus/src/HostSpecialDoubleColumn.cc b/livestatus/src/HostSpecialDoubleColumn.cc index 37b127d..07467a6 100644 --- a/livestatus/src/HostSpecialDoubleColumn.cc +++ b/livestatus/src/HostSpecialDoubleColumn.cc @@ -37,7 +37,7 @@ double HostSpecialDoubleColumn::getValue(void *data) switch (_type) { case HSDC_STALENESS: { - return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); + return (time(0) - hst->last_check) / ((hst->check_interval == 0 ? 1 : hst->check_interval) * 60); } } return -1; // Never reached diff --git a/livestatus/src/ServiceSpecialDoubleColumn.cc b/livestatus/src/ServiceSpecialDoubleColumn.cc index 3e135c8..205f7ff 100644 --- a/livestatus/src/ServiceSpecialDoubleColumn.cc +++ b/livestatus/src/ServiceSpecialDoubleColumn.cc @@ -36,30 +36,29 @@ double ServiceSpecialDoubleColumn::getValue(void *data) switch (_type) { case SSDC_STALENESS: { - bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); + bool is_cmk_passive = !strncmp(svc->check_command_ptr->name, "check_mk-", 9); - time_t check_result_age = time(0) - svc->last_check; - service *tmp_svc; + time_t check_result_age = time(0) - svc->last_check; + service *tmp_svc; - // check_mk PASSIVE CHECK: Find check-mk service and get its check interval - if (is_cmk_passive) { - host *host = svc->host_ptr; - servicesmember *svc_member = host->services; - double check_interval = 1; - while (svc_member != 0) { - tmp_svc = svc_member->service_ptr; - if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { - check_interval = tmp_svc->check_interval * 60; - return check_result_age / check_interval; - } - svc_member = svc_member->next; - } - return 1; // Shouldnt happen! We always except check-mk service - } - else // Other non-cmk passive and active checks - { - return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); - } + // check_mk PASSIVE CHECK: Find check-mk service and get its check interval + if (is_cmk_passive) { + host *host = svc->host_ptr; + servicesmember *svc_member = host->services; + double check_interval = 1; + while (svc_member != 0) { + tmp_svc = svc_member->service_ptr; + if (!strncmp(tmp_svc->check_command_ptr->name, "check-mk", 9)) { + return check_result_age / ((tmp_svc->check_interval == 0 ? 1 : tmp_svc->check_interval) * 60); + } + svc_member = svc_member->next; + } + return 1; // Shouldnt happen! We always except check-mk service + } + else // Other non-cmk passive and active checks + { + return check_result_age / ((svc->check_interval == 0 ? 1 : svc->check_interval) * 60); + } } } return -1; // Never reached

10 years, 12 months

Check_MK Git: check_mk: Added netstat plugin for windows, not yet used

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d84dccda16ad11a58d2b09a1635e16842dd05ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d84dccda16ad1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 27 18:03:07 2013 +0200 Added netstat plugin for windows, not yet used --- agents/windows/plugins/netstat_an.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/windows/plugins/netstat_an.bat b/agents/windows/plugins/netstat_an.bat new file mode 100644 index 0000000..1b6abd8 --- /dev/null +++ b/agents/windows/plugins/netstat_an.bat @@ -0,0 +1,3 @@ +@echo off +echo ^<^<^<win_netstat^>^>^> +netstat -an

10 years, 12 months

Check_MK Git: check_mk: Fix validator for WATO rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 27232c9f0beafb3a153e7d8ecd4b08cdee9a7ad6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27232c9f0beafb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 27 17:56:32 2013 +0200 Fix validator for WATO rules --- web/htdocs/valuespec.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 40fbd94..09b50bc 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -664,8 +664,9 @@ class ListOfStrings(ValueSpec): def validate_value(self, value, vp): if len(value) == 0 and not self._allow_empty: raise MKUserError(vp + "_0", _("Please specify at least one value")) - for nr, s in enumerate(value): - self._valuespec.validate_value(s, vp + "_%d" % nr) + if self._valuespec: + for nr, s in enumerate(value): + self._valuespec.validate_value(s, vp + "_%d" % nr) ValueSpec.custom_validate(self, value, vp) # Generic list-of-valuespec ValueSpec with Javascript-based

10 years, 12 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: 53a4c5cec45389c590e255e9718fcc8e53ca6a82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53a4c5cec45389… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 27 17:56:34 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

10 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013