Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

3709 FIX cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces

by Simon Betz

Module: check_mk Branch: master Commit: 39152f3272f6236159b16f1fedaaf251819733b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39152f3272f623… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 14 14:34:26 2016 +0200 3709 FIX cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces --- .werks/3709 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_wlc | 13 ++++++++----- checks/cisco_wlc_clients | 11 +++++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.werks/3709 b/.werks/3709 new file mode 100644 index 0000000..25ba20a --- /dev/null +++ b/.werks/3709 @@ -0,0 +1,10 @@ +Title: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468499605 + + diff --git a/ChangeLog b/ChangeLog index e8e9d8c..8516c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,6 +308,7 @@ * 3707 FIX: oracle_tablespaces: cleanup... * 3708 FIX: cisco_vpn_tunnel: fixed missing phase 2 data * 3556 FIX: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate + * 3709 FIX: cisco_wlc, cisco_wlc_clients: fixed scan function and incomplete listing of interfaces Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 2da74cc..0242693 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -74,11 +74,14 @@ check_info["cisco_wlc"] = { "group" : "cisco_wlc", "service_description" : "AP %s", "node_info" : True, - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", - ".1.3.6.1.4.1.14179.1.1.4.3", - ".1.3.6.1.4.1.9.1.1645", - ".1.3.6.1.4.1.9.1.1631", - ".1.3.6.1.4.1.9.1.1279"], + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ + ".1.3.6.1.4.1.9.1.1069", + ".1.3.6.1.4.1.14179.1.1.4.3", + ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.9.1.1631", + ".1.3.6.1.4.1.9.1.1279", + ".1.3.6.1.4.1.9.1.1293", + ], "snmp_info" : [( ".1.3.6.1.4.1.14179.2.2.1.1.3", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.1", [ OID_END, '' ]), ( ".1.3.6.1.4.1.14179.2.2.1.1.6", [ OID_END, '' ]), diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index 6af9257..23e2400 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -46,8 +46,14 @@ def parse_cisco_wlc_clients(info): parsed = {} sum_clients = 0 for name, interface, num_clients in info: - sum_clients += int(num_clients) - parsed[name] = (int(num_clients), interface) + sum_clients_name = int(num_clients) + sum_clients += sum_clients_name + + if name in parsed: + sum_clients_name += parsed[name][0] + interface = parsed[name][1] + ", " + interface + + parsed[name] = (sum_clients_name, "%s: %s" % (interface, num_clients)) parsed["Summary"] = (sum_clients, "") return parsed @@ -66,6 +72,7 @@ check_info["cisco_wlc_clients"] = { ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279", + ".1.3.6.1.4.1.9.1.1293", ], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ "2",

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 79e50601a141cd4738f0b8644bb449812f9293c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e50601a141cd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 14 11:45:29 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Renderer.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/livestatus/src/Renderer.cc b/livestatus/src/Renderer.cc index cce4029..07c7af9 100644 --- a/livestatus/src/Renderer.cc +++ b/livestatus/src/Renderer.cc @@ -34,7 +34,6 @@ extern int g_data_encoding; extern int g_debug_level; -using std::isnan; using std::move; using std::size_t; using std::string; @@ -128,7 +127,7 @@ void Renderer::outputUnsignedLong(unsigned long value) { void Renderer::outputCounter(counter_t value) { add(to_string(value)); } void Renderer::outputDouble(double value) { - if (isnan(value)) { + if (std::isnan(value)) { outputNull(); } else { char buf[64];

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 603adffd819783c21f36320d226ec3dbb53b2d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=603adffd819783… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 14 11:28:11 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Aggregator.h | 21 ++++++++++----- livestatus/src/AttributelistColumn.cc | 10 +++---- livestatus/src/AttributelistColumn.h | 23 ++++++++++------ livestatus/src/Column.h | 13 ++++++++- livestatus/src/CountAggregator.cc | 10 ++++--- livestatus/src/CountAggregator.h | 19 ++++++++----- livestatus/src/CustomTimeperiodColumn.cc | 9 +++---- livestatus/src/CustomTimeperiodColumn.h | 3 +-- livestatus/src/DoubleAggregator.cc | 20 +++++++------- livestatus/src/DoubleAggregator.h | 23 +++++++++++----- livestatus/src/DoubleColumn.cc | 4 +-- livestatus/src/DoubleColumn.h | 8 +++++- livestatus/src/FixedIntColumn.h | 9 ++++--- livestatus/src/HostSpecialIntColumn.cc | 5 ++-- livestatus/src/HostSpecialIntColumn.h | 4 +-- livestatus/src/HostlistStateColumn.cc | 10 +++---- livestatus/src/HostlistStateColumn.h | 3 +-- livestatus/src/IntAggregator.cc | 22 +++++++-------- livestatus/src/IntAggregator.h | 24 ++++++++++++----- livestatus/src/IntColumn.cc | 6 ++--- livestatus/src/IntColumn.h | 15 +++++++++-- livestatus/src/IntFilter.cc | 3 ++- livestatus/src/IntPointerColumn.h | 9 ++++--- livestatus/src/OffsetIntColumn.cc | 4 +-- livestatus/src/OffsetIntColumn.h | 16 ++++++----- livestatus/src/OffsetStringMacroColumn.cc | 11 ++++---- livestatus/src/OffsetStringMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.cc | 2 +- livestatus/src/OffsetTimeColumn.h | 6 ++--- livestatus/src/OffsetTimeperiodColumn.cc | 4 +-- livestatus/src/OffsetTimeperiodColumn.h | 9 +++++-- livestatus/src/PerfdataAggregator.cc | 16 +++++------ livestatus/src/PerfdataAggregator.h | 22 ++++++++------- livestatus/src/Query.cc | 4 +-- livestatus/src/ServiceSpecialIntColumn.cc | 5 ++-- livestatus/src/ServiceSpecialIntColumn.h | 4 +-- livestatus/src/ServicelistStateColumn.cc | 9 +++---- livestatus/src/ServicelistStateColumn.h | 6 ++--- livestatus/src/StatsColumn.cc | 10 +++---- livestatus/src/StatusSpecialIntColumn.cc | 4 +-- livestatus/src/StatusSpecialIntColumn.h | 9 +++++-- livestatus/src/StringColumn.h | 10 +++++-- livestatus/src/TableEventConsole.h | 42 +++++++++++++---------------- livestatus/src/TimePointerColumn.cc | 2 +- 44 files changed, 281 insertions(+), 189 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=603adffd81…

8 years, 2 months

Conditions for selecting alert handler notifications in RBN

by Mathias Kettner

Module: check_mk Branch: master Commit: 3bf09dc35e6d3b26b0c88512540446856b35a64e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bf09dc35e6d3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 14 11:28:48 2016 +0200 Conditions for selecting alert handler notifications in RBN --- modules/notify.py | 6 ++++++ web/htdocs/wato.py | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 5407020..6003435 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -649,6 +649,12 @@ def rbn_match_event(context, state, last_state, events, allowed_events): event = 's' elif notification_type == "ACKNOWLEDGEMENT": event = 'x' + elif notification_type.startswith("ALERTHANDLER ("): + handler_state = notification_type[14:-1] + if handler_state == "OK": + event = 'as' + else: + event = 'af' else: event = events.get(last_state, '?') + events.get(state, '?') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 02d53f8..8418191 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7464,8 +7464,10 @@ def event_rule_match_conditions(flavour): ( 'f', _("Start or end of flapping state")), ( 's', _("Start or end of a scheduled downtime")), ( 'x', _("Acknowledgement of problem")), + ( 'as', _("Alert handler execution, successful")), + ( 'af', _("Alert handler execution, failed")), ] - add_default = [ 'f', 's', 'x' ] + add_default = [ 'f', 's', 'x', 'as', 'af' ] else: add_choices = [] add_default = []

8 years, 2 months

WK3557: Web API: get_host/ get_all_hosts action now also returns the nodes of cluster host

by Andreas Boesl

Module: check_mk Branch: master Commit: ed782b3400f8195953d9ad19a04498b05a9335e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed782b3400f819… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 14 11:22:43 2016 +0200 WK3557: Web API: get_host/get_all_hosts action now also returns the nodes of cluster host --- .werks/3557 | 9 +++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3557 b/.werks/3557 new file mode 100644 index 0000000..195fa89 --- /dev/null +++ b/.werks/3557 @@ -0,0 +1,9 @@ +Title: Web API: get_host/get_all_hosts action now also returns the nodes of cluster host +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1468487596 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index afaaf7a..e8e9d8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -490,6 +490,7 @@ * 3547 FIX: Deleting a subfolder now generates a correct audit message... * 3661 FIX: Service discovery is now possible with only "modify services" permission... * 3152 FIX: lvm_vgs: fixed exception in host-specific settings if rule for LVM groups is set + * 3557 FIX: Web API: get_host/get_all_hosts action now also returns the nodes of cluster host Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 19c952a..1684438 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -175,7 +175,10 @@ def action_get_host(request): else: attributes = host.attributes() - return { "attributes": attributes, "path": host.folder().path(), "hostname": host.name() } + response = { "attributes": attributes, "path": host.folder().path(), "hostname": host.name() } + if host.is_cluster(): + response["nodes"] = host.cluster_nodes() + return response api_actions["get_host"] = { "handler" : action_get_host, @@ -200,6 +203,8 @@ def action_get_all_hosts(request): else: attributes = host.attributes() response[hostname] = { "attributes": attributes, "path": host.folder().path(), "hostname": host.name() } + if host.is_cluster(): + response[hostname]["nodes"] = host.cluster_nodes() return response

8 years, 2 months

View of host/service events now also show alert handler executions

by Mathias Kettner

Module: check_mk Branch: master Commit: f0cbc11eb6dce322976ce4acc199b6bc1ddea2b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0cbc11eb6dce3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 14 11:17:06 2016 +0200 View of host/service events now also show alert handler executions --- web/plugins/views/datasources.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 676e6d8..465b9b6 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -212,7 +212,7 @@ multisite_datasources["log"] = { multisite_datasources["log_events"] = { "title" : _("Host and Service Events"), "table" : "log", - "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nFilter: class = 8\nOr: 3\n", "infos" : [ "log", "host", "service" ], "keys" : [], "idkeys" : [ "log_lineno" ], @@ -222,7 +222,7 @@ multisite_datasources["log_events"] = { multisite_datasources["log_host_events"] = { "title" : _("Host Events"), "table" : "log", - "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\nFilter: service_description = \n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nFilter: class = 8\nOr: 3\nFilter: service_description = \n", "infos" : [ "log", "host" ], "keys" : [], "idkeys" : [ "log_lineno" ],

8 years, 2 months

Alert handler notifications via Email now work,

by Mathias Kettner

Module: check_mk Branch: master Commit: fb76236d11787c6e882015ec2b334b7fb3aa7150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb76236d11787c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 14 11:12:22 2016 +0200 Alert handler notifications via Email now work, also notifcation view and new view of alert handler executions --- notifications/asciimail | 15 ++++- notifications/mail | 74 +++++++++++++-------- web/htdocs/images/alert_alert_handler_failed.png | Bin 0 -> 4309 bytes web/htdocs/images/alert_alert_handler_started.png | Bin 0 -> 3672 bytes web/htdocs/images/alert_alert_handler_stopped.png | Bin 0 -> 3654 bytes web/plugins/views/builtin.py | 69 +++++++++++++++++++ web/plugins/views/painters.py | 17 ++++- web/plugins/visuals/filters.py | 12 +++- 8 files changed, 153 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fb76236d11…

8 years, 2 months

3556 FIX agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate

by Andreas Boesl

Module: check_mk Branch: master Commit: 1b2f414ac36a5297a72121e92e563f8291c1dc88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b2f414ac36a52… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jul 14 10:47:38 2016 +0200 3556 FIX agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate --- .werks/3556 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere.pysphere | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/3556 b/.werks/3556 new file mode 100644 index 0000000..4651f11 --- /dev/null +++ b/.werks/3556 @@ -0,0 +1,9 @@ +Title: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1468485885 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 11548af..afaaf7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -307,6 +307,7 @@ * 3692 FIX: f5_bigip_conns: fixed empty data handling * 3707 FIX: oracle_tablespaces: cleanup... * 3708 FIX: cisco_vpn_tunnel: fixed missing phase 2 data + * 3556 FIX: agent_vsphere.pysphere: The ESX 4.1 compatible agent version no longer validates the ssl certificate Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 6fb1847..66c1e36 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -224,6 +224,10 @@ try: if opt_debug: sys.stderr.write("Connecting to %s%s..." % (host_address, port)) sys.stderr.flush() + + # Disable ssl certificate validation + import ssl + ssl._create_default_https_context = ssl._create_unverified_context host.connect(host_address+port, user, secret, sock_timeout=opt_timeout) if opt_debug: sys.stderr.write("Connected.\n")

8 years, 2 months

password store is now pretty-printed and uses the file extension .json to avoid confusion

by Sebastian Herbord

Module: check_mk Branch: master Commit: ec8a3f7b7cc1c76fcaa0f8495d6c1ef62e5b6110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec8a3f7b7cc1c7… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jul 14 10:23:08 2016 +0200 password store is now pretty-printed and uses the file extension .json to avoid confusion --- lib/passwordstore.py | 2 +- web/htdocs/valuespec.py | 2 +- web/plugins/userdb/hook_auth.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/passwordstore.py b/lib/passwordstore.py index 40a6b57..a1b27c8 100644 --- a/lib/passwordstore.py +++ b/lib/passwordstore.py @@ -334,7 +334,7 @@ class ChangeContext(object): if 'secrets' not in self.__data: self.__data['secrets'] = {} with NamedTemporaryFile(dir=os.path.dirname(self.__filename), delete=False) as f: - json.dump(self.__data, f) + json.dump(self.__data, f, indent=4) os.rename(f.name, self.__filename) fcntl.flock(self.__fd, fcntl.LOCK_UN) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f74df9c..7a2aba8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3384,7 +3384,7 @@ class PasswordFromStore(Alternative): # TODO: we can't limit the view to only the passwords accessible by the user because at # this point the user_id has not been set yet - with PasswordStore(defaults.var_dir + "/passwords.mk", backend) as store: + with PasswordStore(defaults.var_dir + "/passwords.json", backend) as store: return store.list(with_details=True) def matching_alternative(self, value): diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 0f779f5..6d9479d 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -66,7 +66,7 @@ import errno g_auth_base_dir = defaults.var_dir + '/wato/auth' g_keys_dir = defaults.var_dir + '/private_keys' -g_passwords_file = defaults.var_dir + '/passwords.mk' +g_passwords_file = defaults.var_dir + '/passwords.json' def format_php(data, lvl = 1):

8 years, 2 months

tests: Fixed wrong mixup of import paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bd2e83b7480b5e8b76d84e086319904cb368981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd2e83b7480b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 14 10:14:55 2016 +0200 tests: Fixed wrong mixup of import paths --- tests/conftest.py | 10 ++++++++++ tests/testlib/pylint_cmk.py | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d6e1e9f..0b7af07 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,7 @@ # This file initializes the py.test environment import os import sys +import glob import pytest def cmk_path(): @@ -12,10 +13,19 @@ def cmc_path(): def add_python_paths(): + # make python modules needed by Check_MK available. Hope it is sufficient to use + # the OMD default version here. Otherwise we would need to get cmk-omd git and + # load the modules from there. + # Maybe add a check for a default version matching the current branch. + sys.path = glob.glob("/omd/versions/default/lib/python/*.egg") \ + + [ "/omd/versions/default/lib/python" ] \ + + sys.path + # make the testlib available to the test modules sys.path.insert(0, os.path.dirname(__file__)) # make the repo directory available (cmk lib) sys.path.insert(0, cmk_path()) + print("Import path: %s" % " ".join(sys.path)) diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 0ffec46..40e55c2 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -234,9 +234,5 @@ def verify_pylint_version(): def register(linter): verify_pylint_version() - sys.path = glob.glob("/omd/versions/default/lib/python/*.egg") \ - + [ "/omd/versions/default/lib/python" ] \ - + sys.path - linter.register_reporter(CMKColorizedTextReporter) linter.register_reporter(CMKParseableTextReporter)

8 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016