Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: f860c25b3867e329a05193247684ec4f43aec32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f860c25b3867e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 13:32:57 2017 +0100 Add missing titles for 3 agent plugins Change-Id: If054db218031cc823523964896cb5231096293c8 --- agents/plugins/.f12 | 2 +- agents/plugins/hpux_lunstats | 1 + agents/plugins/isc_dhcpd | 1 + agents/plugins/websphere_mq | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/plugins/.f12 b/agents/plugins/.f12 index a6cfba2..4a156e9 100755 --- a/agents/plugins/.f12 +++ b/agents/plugins/.f12 @@ -3,4 +3,4 @@ SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} # sudo mkdir -p /usr/lib/check_mk_agent/plugins # sudo install -m 755 * /usr/lib/check_mk_agent/plugins || true -sudo rsync -va ./ /omd/sites/$SITE/share/check_mk/agents/plugins/ +sudo rsync -va --exclude=.f12 ./ /omd/sites/$SITE/share/check_mk/agents/plugins/ diff --git a/agents/plugins/hpux_lunstats b/agents/plugins/hpux_lunstats index a06c3f6..9391e91 100755 --- a/agents/plugins/hpux_lunstats +++ b/agents/plugins/hpux_lunstats @@ -1,4 +1,5 @@ #!/usr/bin/ksh +# Monitor status of LUNs on HP-UX # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / | diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index 7334858..fb29eb4 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -1,4 +1,5 @@ #!/usr/bin/python +# Monitor leases if ISC-DHCPD import os, sys, time, re, calendar diff --git a/agents/plugins/websphere_mq b/agents/plugins/websphere_mq index c7cbcf7..1f2dc62 100755 --- a/agents/plugins/websphere_mq +++ b/agents/plugins/websphere_mq @@ -1,4 +1,5 @@ #!/bin/sh +# Monitor Websphere MQ # WWI Version 18.05.2016 # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

7 years, 7 months

Updated expected sizes.

by Sven Panne

Module: check_mk Branch: master Commit: 4de8f2e990ef5c8514f6e0b3aa4ac8a72cde3236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4de8f2e990ef5c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 17 13:19:03 2017 +0100 Updated expected sizes. Change-Id: Ia5520d8e49c5d7a41a292c7aff9a956d497cf58c --- tests/packaging/test_files.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 1b6bc83..02b6249 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -25,9 +25,9 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 95*1024*1024, 160*1024*1024), - ("deb", 80*1024*1024, 160*1024*1024), - ("cma", 150*1024*1024, 160*1024*1024), + ("rpm", 95*1024*1024, 160*1024*1024), # all: 24MB - 153MB + ("deb", 80*1024*1024, 160*1024*1024), # all: 22MB - 146MB + ("cma", 150*1024*1024, 180*1024*1024), # all: 46MB - 166MB ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

7 years, 7 months

4377 FIX Services of host: Fixed styling of WARN states

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d37c065ca61fecd7d3f52e8a439085c027d8379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d37c065ca61fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 11:29:55 2017 +0100 4377 FIX Services of host: Fixed styling of WARN states Change-Id: Ib7cc5719b3a94079194d19217273e25477e3f8b0 --- .werks/4377 | 10 ++++++++++ web/htdocs/js/wato.js | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4377 b/.werks/4377 new file mode 100644 index 0000000..e219f2b --- /dev/null +++ b/.werks/4377 @@ -0,0 +1,10 @@ +Title: Services of host: Fixed styling of WARN states +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487327371 + + diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 0ef347a..3415c0d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -1084,7 +1084,7 @@ function handle_execute_active_check(oDiv, response_json) add_class(oTr, "odd" + state); var oTdState = oTr.getElementsByClassName("state")[0]; - console.log(oTdState); + remove_class(oTdState, "statep"); add_class(oTdState, "state" + state); oTdState.innerHTML = statename;

7 years, 7 months

Updated bug entries #2470

by Lars Michelsen

Module: check_mk Branch: master Commit: 9dd86a72d57fb32164a4353e7e53b774365e4d88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd86a72d57fb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 12:06:13 2017 +0100 Updated bug entries #2470 Change-Id: I0624e26c14d2558aa1c62686978978777955bbae --- .bugs/2470 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2470 b/.bugs/2470 index 10f7d78..9d512a1 100644 --- a/.bugs/2470 +++ b/.bugs/2470 @@ -1,7 +1,10 @@ Title: BI fetching of parents not working? See get_status_info_filtered() Component: bi -State: open +Class: bug +State: done Date: 2016-09-28 09:03:40 Targetversion: 1.2.8 -Class: bug + +2017-02-17 12:06:02: changed state open -> done +Has now been fixed

7 years, 7 months

Updated bug entries #2522, #2524, #2519

by Lars Michelsen

Module: check_mk Branch: master Commit: f2646f7bb6a170e845dd731881aadfcc3cc70cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2646f7bb6a170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 11:30:17 2017 +0100 Updated bug entries #2522, #2524, #2519 Change-Id: Ie6eca10515923eda8c56c3c397bc565c2adf8497 --- .bugs/2519 | 10 ++++++++-- .bugs/2522 | 8 ++++++-- .bugs/2524 | 10 ++++++++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.bugs/2519 b/.bugs/2519 index 1f7b49c..b1dcba3 100644 --- a/.bugs/2519 +++ b/.bugs/2519 @@ -1,10 +1,16 @@ Title: Input field of hostname is not a regex input field in configuration rules Component: wato -State: open +Class: bug +State: done Date: 2016-08-17 19:23:41 Targetversion: 1.2.8 -Class: bug If you create a new rule in WATO for configuration and want to use regex to match hostnames you have to add the ~(tilde) in front of the hostname to get regex matching. This inout field should be a regex input field as default. + +2017-02-17 11:11:32: changed state open -> done +This is impossible for us to change. What we are planning to do for the 1.5 release +is to visualize the type of the fields better to make the user know which kind of +field he has to fill and to give the user an option to switch the mechanics from +exact host name matching to regex matching by clicking an icon on that field. diff --git a/.bugs/2522 b/.bugs/2522 index 1722aca..8c30412 100644 --- a/.bugs/2522 +++ b/.bugs/2522 @@ -1,9 +1,9 @@ Title: Distributed Monitoring: User action breaks configuration Component: multisite -State: open +Class: bug +State: done Date: 2016-10-25 12:10:19 Targetversion: 1.2.8 -Class: bug The user is using a distributed monitoring setup with central WATO configuration. The slave sites are only monitoring a part of the hosts configured on the master and @@ -24,3 +24,7 @@ Workaround: Please modify global settings of affected slave sites. Edit and save without any change. After the activation, all slave sites will be updated to the correct configuration. If the duplicated hosts does not disappear, please login to the slave and do a cmk -R as site user. + +2017-02-17 11:05:19: changed state open -> done +This has already been fixed by dealing correctly with the hosts that are not assigned to that +site. These hosts will not be monitored by the slave site anymore. diff --git a/.bugs/2524 b/.bugs/2524 index 7332c5c..8e9fa22 100644 --- a/.bugs/2524 +++ b/.bugs/2524 @@ -1,9 +1,9 @@ Title: Distributed Monitoring: Micro Core does need a restart instead of reload to activate the changes Component: core -State: open +Class: bug +State: works4me Date: 2016-10-25 12:29:16 Targetversion: 1.2.8 -Class: bug The user is using a distributed monitoring setup with central WATO configuration. The slave sites are only monitoring a part of the hosts configured on the master and @@ -17,3 +17,9 @@ Master and two slave sites. Add some hosts on the Mater site and put add those h Make some changes on the slave site. Those hosts will be duplicated in the global monitoring. If you edit the global site settings and make the activation, the hosts does not disappear. Only a cmk -R on the slave site will fix it. The correct configuration is applied, but will not be actived for monitoring. + +2017-02-17 11:09:59: changed state open -> works4me +Can not reproduce this with current 1.2.8. Would need more detailed information +on which changes have been made in which step. For it works as expected. The +host that has been configured on the slave site is removed from the sites config +during sync and replaced by the config received from the master.

7 years, 7 months

4378 FIX BI: Hostname aggregations were missing parent information

by Lars Michelsen

Module: check_mk Branch: master Commit: 35202d330092c467e65604c907db2b084f979c29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35202d330092c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 12:05:46 2017 +0100 4378 FIX BI: Hostname aggregations were missing parent information Change-Id: Ia17d91714c28ac06804a3c3a138d1d5200371bd9 --- .werks/4378 | 10 ++++++++++ web/htdocs/bi.py | 13 +++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/4378 b/.werks/4378 new file mode 100644 index 0000000..3ed16b4 --- /dev/null +++ b/.werks/4378 @@ -0,0 +1,10 @@ +Title: BI: Hostname aggregations were missing parent information +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487329510 + + diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 370cebe..b7d6941 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2571,7 +2571,7 @@ def get_status_info(required_hosts): # This variant of the function is configured not with a list of # hosts but with a livestatus filter header and a list of columns # that need to be fetched in any case -def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True, bygroup=False): +def get_status_info_filtered(filter_header, only_sites, limit, add_columns, precompile_on_demand, bygroup): columns = [ "name", "host_name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth", "host_in_service_period", "acknowledged", "services_with_fullstate", "parents" ] + add_columns @@ -2596,15 +2596,16 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc # on demand compile: if parents have been found, also fetch data of the parents. # This is needed to allow cluster hosts (which have the nodes as parents) in the # host_aggregation construct. - if fetch_parents: - # TODO: WTF? This code is not working as intended. parent_filter_txt is not used! + if precompile_on_demand: parent_filter = [] for row in rows: - parent_filter += [ 'Filter: name = %s\n' % p for p in row["services_with_fullstate"] ] - parent_filter_txt = ''.join(parent_filter) + parent_filter += [ 'Filter: host_name = %s\n' % p for p in row["parents"] ] + + parent_filter_txt = ''.join(parent_filter) parent_filter_txt += 'Or: %d\n' % len(parent_filter) - for row in get_status_info_filtered(filter_header, only_sites, limit, add_columns, False, bygroup): + for row in get_status_info_filtered(parent_filter_txt, only_sites, + limit, add_columns, False, bygroup): if row['name'] not in hostnames: rows.append(row)

7 years, 7 months

Updated bug entries #2523

by Lars Michelsen

Module: check_mk Branch: master Commit: 39ce9c96506e6f294b90d1356fb6fe6199810bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ce9c96506e6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 11:03:51 2017 +0100 Updated bug entries #2523 Change-Id: I77a284041a24a40f6353f215d7ff77963625d587 --- .bugs/2523 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2523 b/.bugs/2523 index c5265e3..24f0bbd 100644 --- a/.bugs/2523 +++ b/.bugs/2523 @@ -1,9 +1,9 @@ Title: Distributed Monitoring: Not blocked automatic updates for slave sites Component: wato -State: open +Class: bug +State: done Date: 2016-10-25 12:23:06 Targetversion: 1.2.8 -Class: bug The user is using a distributed monitoring setup with central WATO configuration. The slave sites are only monitoring a part of the hosts configured on the master and @@ -17,3 +17,6 @@ global configuration on a later time. Workaround: Only do those automatic changes on the Master site. Never do it on the slave site. Take care about, that all of the scripts are using the Master site for those configurations. + +2017-02-17 11:03:48: changed state open -> done +Has just been fixed.

7 years, 7 months

updated werk 4358

by Simon Betz

Module: check_mk Branch: master Commit: 58f36e4567e0f492e8826880cc98be2dc96c733e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f36e4567e0f4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 17 11:29:27 2017 +0100 updated werk 4358 Change-Id: I6fbe3663477363a2dd541bc856d7253c672e912d --- checks/wmi_cpuload | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index bac9089..3c90a6c 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -43,7 +43,7 @@ def check_wmi_cpuload(item, params, parsed): try: cores = int(computer_system.get(0, "NumberOfLogicalProcessors")) - except (ValueError, MKGeneralException): + except (ValueError, KeyError, MKGeneralException): # NumberOfLogicalProcessors can be an empty string, not sure why cores = int(computer_system.get(0, "NumberOfProcessors"))

7 years, 7 months

4204 FIX Prevent password completion for all WATO rule where passwords are being specified

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b28b7fabb3eec74627cd193a02e807d4aa8f1fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b28b7fabb3eec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 11:10:18 2017 +0100 4204 FIX Prevent password completion for all WATO rule where passwords are being specified Most browsers try to autofill password input fields in forms. While this is useful in most times it is very nasty in WATO rules where passwords are being configured. This not only destroys existing passwords when loading and saving a rule. It also renders the {{view in plaintext}} button useless. This has been fixed for all browsers. Change-Id: Idcc0debe1926e931aca85d1e47e230b8dd55e7bd --- .werks/4204 | 16 ++++++++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 17 insertions(+) diff --git a/.werks/4204 b/.werks/4204 new file mode 100644 index 0000000..2776d62 --- /dev/null +++ b/.werks/4204 @@ -0,0 +1,16 @@ +Title: Prevent password completion for all WATO rule where passwords are being specified +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487326105 + +Most browsers try to autofill password input fields in forms. +While this is useful in most times it is very nasty in WATO +rules where passwords are being configured. This not only +destroys existing passwords when loading and saving a rule. It +also renders the {{view in plaintext}} button useless. + +This has been fixed for all browsers. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 37a65f8..9932440 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13327,6 +13327,7 @@ class ModeEditRule(WatoMode): if valuespec: forms.header(valuespec.title() or _("Value")) forms.section() + html.prevent_password_auto_completion() try: valuespec.validate_datatype(self._rule.value, "ve") valuespec.render_input("ve", self._rule.value)

7 years, 7 months

Better error message when plain text is seen while agent encryption is enforced

by Mathias Kettner

Module: check_mk Branch: master Commit: 4c36fc968b9f4975c80dfa86bf5e237506409b8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c36fc968b9f49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 11:08:13 2017 +0100 Better error message when plain text is seen while agent encryption is enforced Change-Id: Id2c4d2efd24aa7fc710f78fe8ff1a9bb66ef648a --- modules/check_mk_base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9fc1546..0fbe62a 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -824,6 +824,10 @@ def get_agent_info_tcp(hostname, ipaddress, port = None): if len(output) == 0: # may be caused by xinetd not allowing our address raise MKAgentError("Empty output from agent at TCP port %d" % port) + if encryption_settings["use_regular"] == "enforce" and \ + output.startswith("<<<check_mk>>>"): + raise MKGeneralException("Agent output is plaintext but encryption is enforced by configuration") + if encryption_settings["use_regular"] != "disabled": try: # currently ignoring version and timestamp

7 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
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