Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: Small rewrite of ibm_imm_fan

by Mathias Kettner

Module: check_mk Branch: master Commit: 032ec9c10476d92b43e9301e9025b8a8a0201ca2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=032ec9c10476d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 9 10:12:01 2015 +0200 Small rewrite of ibm_imm_fan --- checks/ibm_imm_fan | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index ac097c7..5930e59 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -24,51 +24,57 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -ibm_imm_fan_default_levels = (28, 25) + +factory_settings["ibm_imm_fan_default_levels"] = { + "levels_lower" : (28, 25), # Just a guess. Please give feedback. +} + def inventory_ibm_imm_fan(info): - for descr, speed in info: - if speed.lower() != 'offline': - yield descr, "ibm_imm_fan_default_levels" + for descr, speed_text in info: + if speed_text.lower() != 'offline': + yield descr, {} + def check_ibm_imm_fan(item, params, info): - for descr, speed in info: + for descr, speed_text in info: if descr == item: - if speed.lower() == "offline": - return 2, "is offline" + if speed_text.lower() == "offline": + yield 2, "is offline" + return - # speed can be "34 %", or "34%", or "34 % of maximum" + # speed_text can be "34 %", or "34%", or "34 % of maximum" # or simply a text without quotes.. - rpm_perc = int(speed.strip().replace("[\"%]", " ").replace("%", " ").split(" ")[0]) - infotext = "%d%% of max rpm" % rpm_perc + rpm_perc = int(speed_text.strip().replace("[\"%]", " ").replace("%", " ").split(" ")[0]) + yield 0, "%d%% of max RPM" % rpm_perc - state = 0 levels_info = "" - if type(params) == tuple: - params = {'levels_lower' : params} - warn_lower, crit_lower = params.get('levels_lower', (None, None)) + warn_lower, crit_lower = params['levels_lower'] warn, crit = params.get('levels', (None, None)) if warn_lower: - if rpm_perc <= crit_lower: + if rpm_perc < crit_lower: state = 2 - elif rpm_perc <= warn_lower: + elif rpm_perc < warn_lower: state = 1 - levels_info += " (warn/crit below %d%%/%d%%)" % (warn_lower, crit_lower) + else: + state = 0 + if state > 0: + yield state, "(warn/crit below %d%%/%d%%)" % (warn_lower, crit_lower) if warn: if rpm_perc >= crit: state = 2 elif rpm_perc >= warn: state = 1 - levels_info += " (warn/crit at %d%%/%d%%)" % (warn, crit) + else: + state = 0 + if state > 0: + yield state, "(warn/crit at %d%%/%d%%)" % (warn, crit) - if state > 0: - infotext += levels_info - return state, infotext check_info["ibm_imm_fan"] = { 'check_function' : check_ibm_imm_fan, @@ -79,7 +85,8 @@ check_info["ibm_imm_fan"] = { oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"), 'snmp_info' : ('.1.3.6.1.4.1.2.3.51.3.1.3.2.1', [ # fanTable.fanEntry 2, # fanDescr - 3, # fanSpeed + 3, # fanSpeed (as text) ]), + "default_levels_variable" : "ibm_imm_fan_default_levels", 'group' : 'hw_fans_perc', }

9 years, 2 months

Check_MK Git: check_mk: #2561 FIX check-mk-agent rpm is now also replacing check_mk_agent named rpms

by Lars Michelsen

Module: check_mk Branch: master Commit: c0457f93b21bdf56760acaaef93ab23dedee4a56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0457f93b21bdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 9 10:00:22 2015 +0200 #2561 FIX check-mk-agent rpm is now also replacing check_mk_agent named rpms We used the package name check_mk_agent only for some versions. To make upgrade as easy as possible we also support upgrade from these packages. --- .werks/2561 | 10 ++++++++++ ChangeLog | 1 + agents/check-mk-agent-1.2.7i3-1.noarch.rpm | Bin 21617 -> 21917 bytes agents/check-mk-agent.spec | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2561 b/.werks/2561 new file mode 100644 index 0000000..83f7a10 --- /dev/null +++ b/.werks/2561 @@ -0,0 +1,10 @@ +Title: check-mk-agent rpm is now also replacing check_mk_agent named rpms +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441785546 +Class: fix + +We used the package name check_mk_agent only for some versions. To make +upgrade as easy as possible we also support upgrade from these packages. diff --git a/ChangeLog b/ChangeLog index 8e27100..084a1a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -170,6 +170,7 @@ * 2570 FIX: winperf_msx_queues: fixed crash when winperf data is missing... * 2593 FIX: cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected... * 2571 FIX: local: improved reporting of bad local check output + * 2561 FIX: check-mk-agent rpm is now also replacing check_mk_agent named rpms... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check-mk-agent-1.2.7i3-1.noarch.rpm b/agents/check-mk-agent-1.2.7i3-1.noarch.rpm index 1ee6f8d..d3f0cb9 100644 Binary files a/agents/check-mk-agent-1.2.7i3-1.noarch.rpm and b/agents/check-mk-agent-1.2.7i3-1.noarch.rpm differ diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 7b950b3..07dc10f 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -34,7 +34,7 @@ BuildRoot: %{_topdir}/buildroot AutoReq: off AutoProv: off BuildArch: noarch -Obsoletes: check_mk-agent +Obsoletes: check_mk-agent check_mk_agent %description The Check_MK Agent uses xinetd to provide information about the system

9 years, 2 months

Check_MK Git: check_mk: new WATO rule and ibm_imm_fan is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: c963de5f94d9040cb7c3ff604b3b94b01ef2140a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c963de5f94d904… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 9 09:48:46 2015 +0200 new WATO rule and ibm_imm_fan is now configurable --- checkman/ibm_imm_fan | 4 ++-- checks/ibm_imm_fan | 40 +++++++++++++++++++++++----------- web/plugins/wato/check_parameters.py | 32 ++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/checkman/ibm_imm_fan b/checkman/ibm_imm_fan index c7ce6c3..1eeae8c 100644 --- a/checkman/ibm_imm_fan +++ b/checkman/ibm_imm_fan @@ -8,8 +8,8 @@ description: Integrated Management Module (IMM). It uses snmp and the IBM IMM MIB to gather the fan data. - The check uses hardcoded lower warning and critical levels of (28%,25%) - to calculate the state of the service. + The lower default levels are set to 28%/25%. + Upper and lower levels are configurable. inventory: The service discovery will find one service per fan diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 6f8d4e4..ac097c7 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -24,14 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - +ibm_imm_fan_default_levels = (28, 25) def inventory_ibm_imm_fan(info): for descr, speed in info: if speed.lower() != 'offline': - yield descr, {} + yield descr, "ibm_imm_fan_default_levels" -def check_ibm_imm_fan(item, _no_params, info): +def check_ibm_imm_fan(item, params, info): for descr, speed in info: if descr == item: @@ -43,17 +43,30 @@ def check_ibm_imm_fan(item, _no_params, info): rpm_perc = int(speed.strip().replace("[\"%]", " ").replace("%", " ").split(" ")[0]) infotext = "%d%% of max rpm" % rpm_perc - warn, crit = (28, 25) # preliminary estimates of levels - levelstext = " (warn/crit at %d%%/%d%%)" % (warn,crit) + state = 0 + levels_info = "" + if type(params) == tuple: + params = {'levels_lower' : params} + + warn_lower, crit_lower = params.get('levels_lower', (None, None)) + warn, crit = params.get('levels', (None, None)) + + if warn_lower: + if rpm_perc <= crit_lower: + state = 2 + elif rpm_perc <= warn_lower: + state = 1 + levels_info += " (warn/crit below %d%%/%d%%)" % (warn_lower, crit_lower) + + if warn: + if rpm_perc >= crit: + state = 2 + elif rpm_perc >= warn: + state = 1 + levels_info += " (warn/crit at %d%%/%d%%)" % (warn, crit) - if rpm_perc <= crit: - state = 2 - infotext += levelstext - elif rpm_perc <= warn: - state = 1 - infotext += levelstext - else: - state = 0 + if state > 0: + infotext += levels_info return state, infotext @@ -68,4 +81,5 @@ check_info["ibm_imm_fan"] = { 2, # fanDescr 3, # fanSpeed ]), + 'group' : 'hw_fans_perc', } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9638b68..faf693b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7055,7 +7055,7 @@ register_check_parameters( ), ( "upper", Tuple( - help = _("Upper levels for the Fan speed of a hardware device"), + help = _("Upper levels for the fan speed of a hardware device"), title = _("Upper levels"), elements = [ Integer(title = _("warning at"), unit = u"rpm", default_value = 8000), @@ -7072,6 +7072,36 @@ register_check_parameters( ) register_check_parameters( + subgroup_environment, + "hw_fans_perc", + _("Fan speed of hardware devices (in percent)"), + Dictionary( + elements = [ + ( "levels", + Tuple( + title = _("Upper fan speed levels"), + elements = [ + Percentage(title = _("warning if at")), + Percentage(title = _("critical if at")), + ] + )), + ( "levels_lower", + Tuple( + title = _("Lower fan speed levels"), + elements = [ + Percentage(title = _("warning if below")), + Percentage(title = _("critical if below")), + ] + )), + ] + ), + TextAscii( + title = _("Fan Name"), + help = _("The identifier of the fan.")), + "dict", +) + +register_check_parameters( subgroup_os, "pf_used_states", _("Number of used states of OpenBSD PF engine"),

9 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2341

by Mathias Kettner

Module: check_mk Branch: master Commit: c3e25ac6df576ca14b05738e739c01bf6067683e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3e25ac6df576c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 7 13:57:22 2015 +0200 Updated bug entries #2341 --- .bugs/2341 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2341 b/.bugs/2341 new file mode 100644 index 0000000..dc7fd7f --- /dev/null +++ b/.bugs/2341 @@ -0,0 +1,8 @@ +Title: Add missing X for disabling of active checks in WATO +Component: wato +State: open +Date: 2015-09-07 13:56:44 +Targetversion: 1.2.7 +Class: nastiness + +Active checks *can* be disable via "Disabled Services" and should get the red cross.

9 years, 2 months

Check_MK Git: check_mk: tcp_conn_stats: fix fatal exeption with Nagios as core

by Mathias Kettner

Module: check_mk Branch: master Commit: 20b0ed91d840b2b5dcdbd1de30ee0ce8b723a1f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b0ed91d840b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 7 16:40:13 2015 +0200 tcp_conn_stats: fix fatal exeption with Nagios as core include was declared incorrectly --- checks/tcp_conn_stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 6d5a7eb..c846177 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -55,5 +55,5 @@ check_info["tcp_conn_stats"] = { 'service_description' : 'TCP Connections', 'has_perfdata' : True, 'group' : 'tcp_conn_stats', - 'includes' : [ "tcp_connections.includes" ], + 'includes' : [ "tcp_connections.include" ], }

9 years, 2 months

Check_MK Git: check_mk: sap.value-groups: renamed manpage

by Bastian Kuhn

Module: check_mk Branch: master Commit: ef10efe047e3a334683297619a16378814938b72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef10efe047e3a3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 7 16:22:31 2015 +0200 sap.value-groups: renamed manpage --- checkman/{sap.value_groups => sap.value-groups} | 0 doc/missing-manpage | 1 - 2 files changed, 1 deletion(-) diff --git a/checkman/sap.value_groups b/checkman/sap.value-groups similarity index 100% rename from checkman/sap.value_groups rename to checkman/sap.value-groups diff --git a/doc/missing-manpage b/doc/missing-manpage index 06594c9..1c0ba8d 100644 --- a/doc/missing-manpage +++ b/doc/missing-manpage @@ -17,7 +17,6 @@ oracle_longactivesessions oracle_processes oracle_recovery_area postgres_version -sap.value-groups siemens_plc.counter ucs_bladecenter_psu.switch_power ups_modulys_battery.temp

9 years, 2 months

Check_MK Git: check_mk: #1292 FIX hitachi_hus_status: Internal Name of Check changed

by Bastian Kuhn

Module: check_mk Branch: master Commit: b7280645fa7e55a91af1c8815cdd4a07024454da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7280645fa7e55… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 7 16:12:14 2015 +0200 #1292 FIX hitachi_hus_status: Internal Name of Check changed The internal name of the check changed. You will not loose any history data, but it is needed to make rediscovery. --- .werks/1292 | 10 ++++++++++ ChangeLog | 2 ++ checks/hitachi_hus_status | 2 +- doc/missing-manpage | 1 - 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1292 b/.werks/1292 new file mode 100644 index 0000000..2f7d502 --- /dev/null +++ b/.werks/1292 @@ -0,0 +1,10 @@ +Title: hitachi_hus_status: Internal Name of Check changed +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i3 +Date: 1441635061 +Class: fix + +The internal name of the check changed. You will not loose any history data, but it is needed to make rediscovery. + diff --git a/ChangeLog b/ChangeLog index 3c0dd72..c113bff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -172,6 +172,8 @@ * 2571 FIX: local: improved reporting of bad local check output * 1291 FIX: alcatel_fans: The internal name of the Check changed... NOTE: Please refer to the migration notes! + * 1292 FIX: hitachi_hus_status: Internal Name of Check changed... + NOTE: Please refer to the migration notes! Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status index ef387d6..c39a419 100644 --- a/checks/hitachi_hus_status +++ b/checks/hitachi_hus_status @@ -58,7 +58,7 @@ def check_hitatchi_hus_status2(_no_item, _no_params, info): if status & int(info[0][0]): yield state, message -check_info["hitatchi_hus_status2"] = { +check_info["hitatchi_hus_status"] = { "check_function" : check_hitatchi_hus_status2, "inventory_function" : inventory_hitatchi_hus_status2, "service_description" : "Status", diff --git a/doc/missing-manpage b/doc/missing-manpage index b6c20ef..06594c9 100644 --- a/doc/missing-manpage +++ b/doc/missing-manpage @@ -5,7 +5,6 @@ docsis_channels_upstream fortigate_cpu_base fortigate_sessions_base ftp -hitatchi_hus_status2 ibm_svc_disks icom_repeater.ps_volt mail

9 years, 2 months

Check_MK Git: check_mk: bluecat_command_server: Renamed manpage to match checkname

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2d57cf2993c17c023c5c1b0ec36af2225bf6ddaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d57cf2993c17c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 7 16:07:58 2015 +0200 bluecat_command_server: Renamed manpage to match checkname --- checkman/{bluecat_commandserver => bluecat_command_server} | 0 doc/missing-manpage | 1 - 2 files changed, 1 deletion(-) diff --git a/checkman/bluecat_commandserver b/checkman/bluecat_command_server similarity index 100% rename from checkman/bluecat_commandserver rename to checkman/bluecat_command_server diff --git a/doc/missing-manpage b/doc/missing-manpage index b3969da..b6c20ef 100644 --- a/doc/missing-manpage +++ b/doc/missing-manpage @@ -1,5 +1,4 @@ bi_aggr -bluecat_command_server bluecat_threads cmk_inv docsis_channels_upstream

9 years, 2 months

Check_MK Git: check_mk: #1291 FIX alcatel_fans: The internal name of the Check changed

by Bastian Kuhn

Module: check_mk Branch: master Commit: acc3bf54f61f36116152248ccb6813d46611e9d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acc3bf54f61f36… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 7 16:05:06 2015 +0200 #1291 FIX alcatel_fans: The internal name of the Check changed The internal name of the check was wrong. This is corrected now, but it is needed to make a rediscovery after update. You will not lost any history data since the service description remains. --- .werks/1291 | 11 +++++++++++ ChangeLog | 2 ++ checks/alcatel_fans | 10 +++++----- doc/missing-manpage | 1 - 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/1291 b/.werks/1291 new file mode 100644 index 0000000..ab896b0 --- /dev/null +++ b/.werks/1291 @@ -0,0 +1,11 @@ +Title: alcatel_fans: The internal name of the Check changed +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i3 +Date: 1441634604 +Class: fix + +The internal name of the check was wrong. This is corrected now, but it is needed to make a rediscovery after update. +You will not lost any history data since the service description remains. + diff --git a/ChangeLog b/ChangeLog index 8e27100..3c0dd72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -170,6 +170,8 @@ * 2570 FIX: winperf_msx_queues: fixed crash when winperf data is missing... * 2593 FIX: cisco_wlc, cisco_wlc_clients: Fix discovery so that Cisco Virtual Wireless Controller are detected... * 2571 FIX: local: improved reporting of bad local check output + * 1291 FIX: alcatel_fans: The internal name of the Check changed... + NOTE: Please refer to the migration notes! Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/alcatel_fans b/checks/alcatel_fans index 623f53b..4a3bb97 100644 --- a/checks/alcatel_fans +++ b/checks/alcatel_fans @@ -24,12 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def inventory_alcatel_fan(info): +def inventory_alcatel_fans(info): # parameter start in enumerate only works since python 2.6 for nr, value in enumerate(info): yield nr+1, None -def check_alcatel_fan(item, _no_params, info): +def check_alcatel_fans(item, _no_params, info): fan_states = { 0 : "has no status", 1 : "not running", @@ -43,9 +43,9 @@ def check_alcatel_fan(item, _no_params, info): state = 2 return state, "Fan " + fan_states[fan_state] -check_info["alcatel_fan"] = { - "check_function" : check_alcatel_fan, - "inventory_function" : inventory_alcatel_fan, +check_info["alcatel_fans"] = { + "check_function" : check_alcatel_fans, + "inventory_function" : inventory_alcatel_fans, "service_description" : "Fan %s", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"), "snmp_info" : (".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.11.1", [ 2 ]), diff --git a/doc/missing-manpage b/doc/missing-manpage index e19c684..b3969da 100644 --- a/doc/missing-manpage +++ b/doc/missing-manpage @@ -1,4 +1,3 @@ -alcatel_fan bi_aggr bluecat_command_server bluecat_threads

9 years, 2 months

Check_MK Git: check_mk: permissive attrencode: allow <h2> tag

by Lars Michelsen

Module: check_mk Branch: master Commit: 24b43fed9fed1a7a5c29a00247f48ab6ccbd89f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24b43fed9fed1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 7 13:41:21 2015 +0200 permissive attrencode: allow <h2> tag --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 664ae20..ebd1663 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1360,7 +1360,7 @@ class html: # for messages where we still want to have formating options. def permissive_attrencode(self, obj): msg = self.attrencode(obj) - msg = re.sub(r'<(/?)(b|tt|i|br(?: /)?|pre|a|sup|p|li|ul|ol)>', r'<\1\2>', msg) + msg = re.sub(r'<(/?)(h2|b|tt|i|br(?: /)?|pre|a|sup|p|li|ul|ol)>', r'<\1\2>', msg) # Also repair link definitions return re.sub(r'<a href="(.*)">', r'<a href="\1">', msg)

9 years, 2 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015