Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

#2679 FIX hp_proliant_power: Not discoverying when host is reporting " absent" state

by Lars Michelsen

Module: check_mk Branch: master Commit: b87c7760b095680d6c87f8e115dc0dc8fdc58e44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b87c7760b09568… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 14 09:09:04 2015 +0200 #2679 FIX hp_proliant_power: Not discoverying when host is reporting "absent" state When the host is reporting a state of "absent" for power metering, this check is useless, so not discovering the service when this state is reported. --- .werks/2679 | 10 ++++++++++ ChangeLog | 1 + checks/hp_proliant_power | 14 +++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/2679 b/.werks/2679 new file mode 100644 index 0000000..00f9c39 --- /dev/null +++ b/.werks/2679 @@ -0,0 +1,10 @@ +Title: hp_proliant_power: Not discoverying when host is reporting "absent" state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444806472 +Class: fix + +When the host is reporting a state of "absent" for power metering, this check +is useless, so not discovering the service when this state is reported. diff --git a/ChangeLog b/ChangeLog index 76a482f..96903d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -220,6 +220,7 @@ * 2657 FIX: windows agent: fixed failure to resolve named performance counters... * 2676 FIX: cisco_asa_failover: Failover state is not treated as warning state anymore... * 2658 FIX: logwatch: unacknowledged messages exceeding the max size are now dropped, even if they were already stored due to a previous bug... + * 2679 FIX: hp_proliant_power: Not discoverying when host is reporting "absent" state... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power index b837ce6..eeef5fc 100644 --- a/checks/hp_proliant_power +++ b/checks/hp_proliant_power @@ -24,15 +24,23 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# .2 cpqHePowerMeterStatus +# Description: This value specifies whether Power Meter reading is supported by this Server . +# The following values are supported: +# other(1) Could not read the Power Meter status. +# present(2) The Power Meter data is available. +# absent(3) The Power Meter data is not available at this time. + hp_prolaint_power_default_levels = ( 300, 400 ) def inventory_hp_proliant_power(info): - if len(info) > 0 and info[0][0] != '0': + if len(info) > 0 and info[0][0] not in ['0', '3']: return [ ( None, 'hp_prolaint_power_default_levels') ] def check_hp_proliant_power(item, params, info): status_table = { 1 : "other", + 2 : "present", 3 : "absent", } status, reading = map(int, info[0]) @@ -43,10 +51,10 @@ def check_hp_proliant_power(item, params, info): levels = '' if reading >= crit: state = 2 - levels = '( Warning/Critical %s/%s )' % ( warn, crit ) + levels = ' (Warning/Critical %s/%s)' % ( warn, crit ) elif reading >= warn: state = 1 - levels = '( Warning/Critical %s/%s )' % ( warn, crit ) + levels = ' (Warning/Critical %s/%s)' % ( warn, crit ) perf = [ ('watt', reading, warn, crit ) ] return state, "Current reading: %d Watt" % reading + levels, perf

8 years, 11 months

oracle_diva_csm: removed stray pprint

by Sebastian Herbord

Module: check_mk Branch: master Commit: 747e4cec5675fa4ec89b79c6fdbf83bd6943685b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=747e4cec5675fa… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Oct 13 16:26:38 2015 +0200 oracle_diva_csm: removed stray pprint --- checks/oracle_diva_csm | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/oracle_diva_csm b/checks/oracle_diva_csm index febd15c..a9a791f 100644 --- a/checks/oracle_diva_csm +++ b/checks/oracle_diva_csm @@ -182,7 +182,6 @@ def inventory_oracle_diva_csm_tapes(info): def check_oracle_diva_csm_tapes(item, params, info): - pprint.pprint(info) blank_tapes = int(info[5][0][0]) warn, crit = params state = blank_tapes <= crit and 2 \

8 years, 11 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 845041b186bc00d9846441f89a5d5785f2eb7b68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=845041b186bc00… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 13 15:38:15 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index fb6ecda..807a3f9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2693 +2703

8 years, 11 months

Updated bug entries #2380

by Mathias Kettner

Module: check_mk Branch: master Commit: 29ef58dfd4c23ac5c6fad3973dc4d2eeb02cee68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29ef58dfd4c23a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 13 12:00:31 2015 +0200 Updated bug entries #2380 --- .bugs/2380 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/2380 b/.bugs/2380 new file mode 100644 index 0000000..d272700 --- /dev/null +++ b/.bugs/2380 @@ -0,0 +1,17 @@ +Title: Speedup SNMP scan by bulk fetching of OIDs +Component: core +State: open +Date: 2015-10-13 11:56:48 +Targetversion: future +Class: nastiness + +The SNMP scan needs currently a lot of round trips (> 10) because some of the checks +need to fetch non-standard OIDs. We should speed up this. Only idea is to fetch +multiple OIDs in parallel. SNMP GET can do this. In SNMP v2c the response packet +can also contain multiple error messages of type "NoSuchOID". v1 only allows *one* +error message per packet. So that legacy devices need one round trip per non-existing +OID. But since the usual case is v2c this optimization should work. + +Implemention: Check fetching non-standard-OIDs during scan need to declare them +in check_info. Check_MK prefetches all these and also the standard OIDs into the +OID cache.

8 years, 11 months

akcp_daisy_temp: remove obsolete unknown item handling

by Mathias Kettner

Module: check_mk Branch: master Commit: c18eef66bc4c187b6fe3d3dfa0b9d64cd38e7059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c18eef66bc4c18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 13 11:28:09 2015 +0200 akcp_daisy_temp: remove obsolete unknown item handling --- checks/akcp_daisy_temp | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp index d3adb50..756d9b5 100644 --- a/checks/akcp_daisy_temp +++ b/checks/akcp_daisy_temp @@ -43,8 +43,6 @@ def check_akcp_daisy_temp(item, params, info): temp = float(rawtemp) / 10 return check_temperature(temp, params) - return 3, "Sensor not found in SNMP data" - check_info["akcp_daisy_temp"] = { 'check_function': check_akcp_daisy_temp,

8 years, 11 months

windows agent now builds with all dependencies statically linked

by Sebastian Herbord

Module: check_mk Branch: master Commit: df255cdfbe8b5faefb15402d7c3938fc3eb2fedf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df255cdfbe8b5f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Oct 13 10:39:01 2015 +0200 windows agent now builds with all dependencies statically linked --- agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 210944 -> 825344 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 210944 -> 825344 bytes agents/windows/check_mk_agent.exe | Bin 206336 -> 742912 bytes agents/windows/check_mk_agent.msi | Bin 665600 -> 1825792 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 206336 -> 742912 bytes agents/windows/install_agent-64.exe | Bin 196415 -> 380300 bytes agents/windows/install_agent.exe | Bin 191727 -> 370910 bytes 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 36b3117..e6b75c9 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,7 +27,7 @@ SHELL = /bin/bash VERSION = 1.2.7i3 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -COPTIONS = -s -O2 -Wall -Werror -static -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' +COPTIONS = -s -O2 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index ff5670f..1448fd8 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -481 +483 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 5173a19..7d43778 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 7ddefd1..d0356b3 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a25cd30..fc908d4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index c188732..baf1513 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 61fd4c0..3e29ab4 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 0510833..ad08527 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6110f96..6f4c196 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 23b9d71c425e4552f509ac6b5d1f4c17a6962070 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23b9d71c425e45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 13 10:21:56 2015 +0200 Merge mathias-kettner.de:check_mk ---

8 years, 11 months

#2678 LDAP: New sync plugin: Groups to custom user attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 02fbf76f6e5446709d1a7360fcb15ea3afb2668c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02fbf76f6e5446… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 13 09:49:06 2015 +0200 #2678 LDAP: New sync plugin: Groups to custom user attributes The new LDAP sync plugin can be used to set custom user attributes based on the group memberships in LDAP. This plugin can be used to set custom user attributes to specified values for all users which are member of a group in LDAP. If a user is not a member of a group, the attribute will be left at it's default value. When a single attribute is set by multiple groups and a user is member of multiple of these groups, the later plugin in the list will override the others. --- .werks/2678 | 18 ++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 204 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 181 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=02fbf76f6e…

8 years, 11 months

Link to check man page in WATO service list moved from icon to check plugin name

by Mathias Kettner

Module: check_mk Branch: master Commit: 2f2b6887456e242b542e861e3763293e8f35e393 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f2b6887456e24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 12 18:29:41 2015 +0200 Link to check man page in WATO service list moved from icon to check plugin name --- web/htdocs/wato.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8ee74bf..451ede8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3676,8 +3676,13 @@ def show_service_table(host, firsttime): table.row(css="data", state=state) # Status, Checktype, Item, Description, Check Output + if check_source == "active": + ctype = "check_" + ct + else: + ctype = ct + manpage_url = make_link([("mode", "check_manpage"), ("check_type", ctype)]) table.cell(_("Status"), statename, css=stateclass) - table.cell(_("Checkplugin"), ct) + table.cell(_("Checkplugin"), '<a href="%s">%s</a>' % (manpage_url, ctype)) table.cell(_("Item"), item) table.cell(_("Service Description"), html.attrencode(descr)) table.cell(_("Plugin output")) @@ -3732,13 +3737,6 @@ def show_service_table(host, firsttime): ("item", mk_repr(item))]) html.icon_button(url, _("Edit and analyze the check parameters of this service"), "check_parameters") - if check_source == "active": - ctype = "check_" + ct - else: - ctype = ct - manpage_url = make_link([("mode", "check_manpage"), ("check_type", ctype)]) - html.icon_button(manpage_url, _("View the manual page of the check plugin"), "check_plugins") - if check_source == "ignored" and may_edit_ruleset("ignored_services"): url = make_link([("mode", "edit_ruleset"), ("varname", "ignored_services"),

8 years, 11 months

Fix acknowledgments of single werks

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b17da0ddad972dbbee843815fc3ea0e4f3f9bb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b17da0ddad972… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 12 17:13:12 2015 +0200 Fix acknowledgments of single werks --- web/htdocs/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 5e2881e..465d9d5 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -94,7 +94,7 @@ def page_version(): def handle_acknowledgement(): if html.var("_werk_ack") and html.check_transaction(): - werk_id = int(html.var("werk_ack")) + werk_id = int(html.var("_werk_ack")) werk = g_werks[werk_id] if werk["compatible"] == "incomp_unack": acknowledge_werk(werk)

8 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015