Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 423aae94a09178d0a2dcbabbeb44a24230b92bdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=423aae94a09178… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 22 14:52:07 2017 +0100 werks aftermath Change-Id: I2366b0978dc07b6d1816eeb6de955fbe5c50cd49 --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 86b2870..8ffe774 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,6 @@ cme-$(VERSION).tar.gz: managed/werks managed/ChangeLog cp -pr managed cme-$(VERSION)/managed mv cme-$(VERSION)/managed/ChangeLog cme-$(VERSION)/ChangeLog-cme mv cme-$(VERSION)/managed/Makefile.omd cme-$(VERSION)/Makefile - cd cme-$(VERSION) \ && tar czf ../cme-$(VERSION).tar.gz $(TAROPTS) * rm -rf cme-$(VERSION) @@ -421,11 +420,7 @@ mrproper: --exclude='\.bugs/.last' \ --exclude='\.bugs/.my_ids' \ --exclude='\.werks/.last' \ - --exclude='\.werks/.my_ids' \ - --exclude='enterprise/\.bugs/.last' \ - --exclude='enterprise/\.bugs/.my_ids' \ - --exclude='enterprise/\.werks/.last' \ - --exclude='enterprise/\.werks/.my_ids' + --exclude='\.werks/.my_ids' setup: sudo apt-get install \

7 years, 6 months

Removed debug output.

by Sven Panne

Module: check_mk Branch: master Commit: 93e1295d9c337309ed202709fdbddd5016b947f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93e1295d9c3373… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 22 15:58:47 2017 +0100 Removed debug output. Change-Id: Ia0032e220cf5ac0be98790ff6517b46e79f4eb89 --- livestatus/src/TableEventConsole.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/livestatus/src/TableEventConsole.cc b/livestatus/src/TableEventConsole.cc index 82db1c0..2f76661 100644 --- a/livestatus/src/TableEventConsole.cc +++ b/livestatus/src/TableEventConsole.cc @@ -142,26 +142,23 @@ bool TableEventConsole::isAuthorizedForEventViaContactGroups( auto col = static_pointer_cast<ListEventConsoleColumn>( column("event_contact_groups")); if (col->isNone(row)) { - Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 1"; return false; } for (const auto &name : col->getValue(row)) { if (_core->is_contact_member_of_contactgroup( _core->find_contactgroup(name), ctc)) { - Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 2"; return (result = true, true); } } - Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaContactGroups 3"; + Error(_core->loggerLivestatus()) + << "isAuthorizedForEventViaContactGroups 3"; return (result = false, true); } bool TableEventConsole::isAuthorizedForEventViaHost( MonitoringCore::Contact *ctc, Row *row, bool &result) { if (MonitoringCore::Host *hst = row->_host) { - Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaHost 1"; return (result = _core->host_has_contact(hst, ctc), true); } - Error(_core->loggerLivestatus()) << "isAuthorizedForEventViaHost 2"; return false; }

7 years, 6 months

4032 smart agent plugin: disable megacli logging output

by Andreas Boesl

Module: check_mk Branch: master Commit: d88c9aba695fedd75b4fa7f13b60dadd1d78c81c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d88c9aba695fed… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 22 16:49:36 2017 +0100 4032 smart agent plugin: disable megacli logging output MegaCLI by default writes output to MegaSAS.log in the same directory. With the smart plugin being called every 60 seconds this file can become several GiB large. Disable logging similar to what is done in the main agent. Change-Id: I068d2d7da800d74d72194c3066cfdce6acef2c63 --- .werks/4032 | 13 +++++++++++++ agents/plugins/smart | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/4032 b/.werks/4032 new file mode 100644 index 0000000..1f67a0f --- /dev/null +++ b/.werks/4032 @@ -0,0 +1,13 @@ +Title: smart agent plugin: disable megacli logging output +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487778525 +Class: feature + +MegaCLI by default writes output to MegaSAS.log in the same directory. +With the smart plugin being called every 60 seconds this file can become +several GiB large. Disable logging similar to what is done in the main +agent. diff --git a/agents/plugins/smart b/agents/plugins/smart index 404403f..0779c49 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -34,9 +34,9 @@ megaraid_info() #PDINFO=$(MegaCli -PDlist -a0) if [ -z "$1" ]; then - PDINFO=$(megacli -PDlist -a0) + PDINFO=$(megacli -PDlist -a0 -NoLog) else - PDINFO=$($1 -PDlist -a0) + PDINFO=$($1 -PDlist -a0 -NoLog) fi echo "$PDINFO" | \

7 years, 6 months

FIX LVM Volume Groups: fixed broken WATO configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: 7aae2def06fdc7faa46e93e06148acd7322a4098 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aae2def06fdc7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 22 16:15:50 2017 +0100 FIX LVM Volume Groups: fixed broken WATO configuration Change-Id: I6145fda2e5da35d5353337ba784c3856beb74f5f --- .werks/4031 | 14 ++++++++++++++ web/plugins/wato/check_parameters.py | 30 +++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.werks/4031 b/.werks/4031 new file mode 100644 index 0000000..3cff2a1 --- /dev/null +++ b/.werks/4031 @@ -0,0 +1,14 @@ +Title: LVM Volume Groups: fixed broken WATO configuration +Level: 1 +Component: wato +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1487776356 + +The WATO rule "Volume Groups (LVM)" created incorrect levels, which never applied. +This has been fixed. You need to reconfigure all LVM Volume Groups rules from scratch, because +their format has changed. + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 15efd7a..9671271 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6429,20 +6429,32 @@ register_check_parameters( subgroup_storage, "volume_groups", _("Volume Groups (LVM)"), - Alternative( - title = _("Levels for volume group"), - show_alternative_title = True, - default_value = (80.0, 90.0), - match = match_dual_level_type, + Dictionary( elements = [ - get_free_used_dynamic_valuespec("used", "volume group"), - get_free_used_dynamic_valuespec("free", "volume group", default_value = (20.0, 10.0)), - ] + ("levels", + Alternative( + title = _("Levels for volume group"), + show_alternative_title = True, + default_value = (80.0, 90.0), + match = match_dual_level_type, + elements = [ + get_free_used_dynamic_valuespec("used", "volume group"), + Transform( + get_free_used_dynamic_valuespec("free", "volume group", default_value = (20.0, 10.0)), + title = _("Levels for volume group free space"), + allow_empty = False, + forth = transform_filesystem_free, + back = transform_filesystem_free + ) + ] + )), + ], + optional_keys = False ), TextAscii( title = _("Volume Group"), allow_empty = False), - "first" + "dict" ) register_check_parameters(

7 years, 6 months

8750 FIX checkpoint_packets: fixed parameters handling if none are set

by Simon Betz

Module: check_mk Branch: master Commit: 112917107972be6d0db6ad2e46eac92f41789d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=112917107972be… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 16:06:26 2017 +0100 8750 FIX checkpoint_packets: fixed parameters handling if none are set Change-Id: I08c25da3e369becc829df916bd82e6a6c64f2d83 --- .werks/8750 | 9 +++++++++ checks/checkpoint_packets | 32 +++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.werks/8750 b/.werks/8750 new file mode 100644 index 0000000..162a828 --- /dev/null +++ b/.werks/8750 @@ -0,0 +1,9 @@ +Title: checkpoint_packets: fixed parameters handling if none are set +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.8p18 +Date: 1487775888 +Class: fix + + diff --git a/checks/checkpoint_packets b/checks/checkpoint_packets index 298fca7..53eb099 100644 --- a/checks/checkpoint_packets +++ b/checks/checkpoint_packets @@ -44,24 +44,30 @@ def inventory_checkpoint_packets(info): def check_checkpoint_packets(_no_item, params, info): if info: value = {} - value["accepted"] = int(info[0][0]) - value["rejected"] = int(info[0][1]) - value["dropped"] = int(info[0][2]) - value["logged"] = int(info[0][3]) + value["Accepted"] = int(info[0][0]) + value["Rejected"] = int(info[0][1]) + value["Dropped"] = int(info[0][2]) + value["Logged"] = int(info[0][3]) this_time = time.time() - state = 0 - for name in value.keys(): - warn, crit = params.get(name, (None, None)) - rate = get_rate(name, this_time, value[name]) + key = name.lower() + if params.get(key) is None: + warn, crit = (None, None) + else: + warn, crit = params[key] + + rate = get_rate(key, this_time, value[name]) infotext = "%s: %.1f pkts/s" % ( name, rate ) - if rate >= crit: + state = 0 + if crit is not None and rate >= crit: state = 2 - elif rate >= warn: + elif warn is not None and rate >= warn: state = 1 - perfdata = [ (name, rate, warn, crit, 0) ] - yield state, infotext, perfdata + if state: + infotext += " (warn/crit at %s/%s pkts/s)" % (warn, crit) + + yield state, infotext, [ (key, rate, warn, crit, 0) ] check_info["checkpoint_packets"] = { @@ -72,7 +78,7 @@ check_info["checkpoint_packets"] = { "group" : "checkpoint_packets", "snmp_scan_function" : scan_checkpoint, "default_levels_variable" : "checkpoint_packets_default_levels", - "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1", + "snmp_info" : ( ".1.3.6.1.4.1.2620.1.1", [ 4, # fwAccepted 5, # fwRejected 6, # fwDropped

7 years, 6 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 13f99e3d1582f98811d1e5d75646b1383c83bc86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13f99e3d1582f9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 16:03:56 2017 +0100 Reserved 10 Werk IDS Change-Id: Ie745f5c130e2b6fd9c48c0276049da7c98e5a247 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2eb88b6..56c2a0b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -8780 +8760

7 years, 6 months

4030 FIX cmk-update-agent: fixed two bugs related to curl download and certificate validation

by Andreas Boesl

Module: check_mk Branch: master Commit: 425dbf2a15a56e4b88adf9da776328ed98bad7ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=425dbf2a15a56e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 22 15:06:33 2017 +0100 4030 FIX cmk-update-agent: fixed two bugs related to curl download and certificate validation Agent files greater than 65kb could not get downloaded by curl. The agent got stuck. Some older distributions had problems in the python requests module, when verifying SSL certificates. Change-Id: Ie9548413bcb9e63dffefbeab1a07c6d3df0f64fb --- .werks/4030 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4030 b/.werks/4030 new file mode 100644 index 0000000..6f00980 --- /dev/null +++ b/.werks/4030 @@ -0,0 +1,13 @@ +Title: cmk-update-agent: fixed two bugs related to curl download and certificate validation +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1487772143 +Class: fix + +Agent files greater than 65kb could not get downloaded by curl. The agent got stuck. + +Some older distributions had problems in the python requests module, when verifying +SSL certificates.

7 years, 6 months

Reserved 30 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: d6af725259eefa4418897583dfe56f2cb1b32142 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6af725259eefa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 22 15:02:01 2017 +0100 Reserved 30 Werk IDS Change-Id: I02260babd0dea20d366038a0ff9fa0cb4446aff2 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 468d6fb..2eb88b6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4416 +8780

7 years, 6 months

Moved enterprise bug

by Lars Michelsen

Module: check_mk Branch: master Commit: b7698523ed462f30d0153bd0f440de6c24ff51cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7698523ed462f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 14:42:34 2017 +0100 Moved enterprise bug Change-Id: I20765a5673da84d1f8d2e79b049756b3cd936efa --- .bugs/2844 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2844 b/.bugs/2844 new file mode 100644 index 0000000..e11a637 --- /dev/null +++ b/.bugs/2844 @@ -0,0 +1,9 @@ +Title: Translation of "Line" is problematic +Component: web +State: open +Date: 2017-02-21 10:33:50 +Targetversion: 1.2.8 +Class: bug + +"Line" needs to be translated into "Zeile" and into "Linie" (Graphing) +at the same time. Find some solution with gettext.

7 years, 6 months

removed pprint

by Simon Betz

Module: check_mk Branch: master Commit: 40617f2bf72b7fac8b596d5112bedeea61138df1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40617f2bf72b7f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 14:28:25 2017 +0100 removed pprint Change-Id: I78573a6fd0b6b95ef714ab3de05fe9503549f8fe --- checks/blade_bays | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/checks/blade_bays b/checks/blade_bays index e41e786..76f4398 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -53,20 +53,19 @@ def parse_blade_bays(info): power = 0 parsed.setdefault(itemname, { - "_type_" : ty.split("(")[0], - "_id_" : identifier, - "_power_max_" : power_max, + "type" : ty.split("(")[0], + "id" : identifier, + "power_max" : power_max, "device_state" : map_states.get(state, (3, "unhandled[%s]" % state)), "power" : power, }) - pprint.pprint(parsed) return parsed def inventory_blade_bays(parsed): for entry, attrs in parsed.items(): - if attrs["_device_state_"][1] in [ "standby", "on" ]: + if attrs["device_state"][1] in [ "standby", "on" ]: yield entry, {} @@ -75,12 +74,16 @@ def check_blade_bays(item, params, parsed): yield 3, "No data for '%s' in SNMP info" % item return + data = parsed[item] + state, state_readable = data["device_state"] + yield state, "Status: %s" % state_readable + for res in check_elphase(item, params, parsed): yield res data = parsed[item] yield 0, "Max. power: %s W, Type: %s, ID: %s" % \ - (data["_power_max_"], data["_type_"], data["_id_"]) + (data["power_max"], data["type"], data["id"]) check_info["blade_bays"] = {

7 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017