Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 92c37d51e1f55047149d0a7d287121736901134c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92c37d51e1f550… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 14 09:55:27 2017 +0200 Fixed and unified .f12 scripts. Previously, some scripts did not find or even used the wrong (obsolete) .site file, this has been fixed. Furthermore, *all* .f12 scripts now start with the same (modulo path) few lines, calculating SITE and ROOT. Change-Id: I159ab92b60fe03c557cdb70bf4945297dd1704df --- .f12 | 14 +++++++++----- .werks/.f12 | 14 +++++++++----- active_checks/.f12 | 12 ++++++++---- agents/.f12 | 9 ++++++--- agents/plugins/.f12 | 6 +++++- agents/special/.f12 | 8 ++++++-- agents/windows/.f12 | 6 +++++- agents/windows/msibuild/.f12 | 8 ++++++-- agents/windows/plugins/.f12 | 6 +++++- bin/.f12 | 14 ++++++++------ checkman/.f12 | 8 ++++++-- checks/.f12 | 7 +++++-- cmk_base/.f12 | 10 ++++++---- doc/.f12 | 9 +++++---- doc/helpers/.f12 | 6 +++++- doc/predictive/.f12 | 10 ++++++---- doc/treasures/checks/.f12 | 8 ++++++-- inventory/.f12 | 8 ++++++-- lib/.f12 | 10 ++++++---- livestatus/.f12 | 3 ++- livestatus/api/c++/.f12 | 7 +++++++ livestatus/api/python/.f12 | 5 ++++- notifications/.f12 | 10 +++++++--- omd/packages/maintenance/.f12 | 15 ++++++++++----- omd/packages/mod_python/.f12 | 7 +++++-- omd/packages/msitools/.f12 | 4 ++++ omd/packages/nagios/.f12 | 8 +++++++- omd/packages/nagvis/.f12 | 5 +++++ omd/packages/net-snmp/.f12 | 19 ++++++++++++------- omd/packages/omd/.f12 | 35 +++++++++++++++++++---------------- omd/packages/python-modules/.f12 | 7 +++++++ omd/packages/python/.f12 | 7 +++++++ omd/packages/rrdtool/.f12 | 9 ++++++--- pnp-templates/.f12 | 8 ++++++-- web/.f12 | 12 ++++++++---- 35 files changed, 234 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=92c37d51e1…

6 years, 9 months

5126 FIX Service discovery dialog: Fixed moving services to "

by Simon Betz

Disabled services" for remote sites Message-ID: <59ba352a.ymqR9zpb1ApqwpkL%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 243cebeeda8cc99bed0c9451c48a5f4efd0f79a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=243cebeeda8cc9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 13 14:50:31 2017 +0200 5126 FIX Service discovery dialog: Fixed moving services to "Disabled services" for remote sites Change-Id: Idce604462a3f0a81834d26bf8d371b3745763bdc --- .werks/5126 | 12 ++++++++++++ web/htdocs/wato.py | 10 ++++++---- web/htdocs/watolib.py | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/5126 b/.werks/5126 new file mode 100644 index 0000000..f68c7e3 --- /dev/null +++ b/.werks/5126 @@ -0,0 +1,12 @@ +Title: Service discovery dialog: Fixed moving services to "Disabled services" for remote sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505306976 + +Previously moving services to table "Disabled services" was broken. +This concerned only hosts belonging to remote sites and has been fixed. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ce93230..243c617 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2870,9 +2870,11 @@ class ModeDiscovery(WatoMode): services_to_save[(check_type, item)] = paramstring if apply_changes: - self._save_services(services_to_save) + need_sync = False if remove_disabled_rule or add_disabled_rule: self._save_host_service_enable_disable_rules(remove_disabled_rule, add_disabled_rule) + need_sync = True + self._save_services(services_to_save, need_sync) def page(self): @@ -2932,13 +2934,13 @@ class ModeDiscovery(WatoMode): # .--action helper-------------------------------------------------------. - def _save_services(self, checks): + def _save_services(self, checks, need_sync): host = self._host hostname = host.name() - check_mk_automation(host.site_id(), "set-autochecks", [hostname], checks) message = _("Saved check configuration of host '%s' with %d services") % \ (hostname, len(checks)) - add_service_change(host, "set-autochecks", message) + add_service_change(host, "set-autochecks", message, need_sync=need_sync) + check_mk_automation(host.site_id(), "set-autochecks", [hostname], checks) def _save_host_service_enable_disable_rules(self, to_enable, to_disable): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index edc933c..c498b0f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -245,8 +245,8 @@ def add_change(action_name, text, obj=None, add_user=True, need_sync=None, need_sync, need_restart, domains, sites) -def add_service_change(host, action_name, text): - add_change(action_name, text, obj=host, sites=[host.site_id()], need_sync=False) +def add_service_change(host, action_name, text, need_sync=False): + add_change(action_name, text, obj=host, sites=[host.site_id()], need_sync=need_sync) def get_number_of_pending_changes():

6 years, 9 months

Fix notification cancelling when no notification is present

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 728f745e28644e975db4fb4f8c392d061f371d54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=728f745e28644e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Sep 13 18:10:49 2017 +0200 Fix notification cancelling when no notification is present Change-Id: I753e09200be714200776ca355ada6027aab07b9c --- cmk_base/notify.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 692898e..bfe4073 100644 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -447,13 +447,14 @@ def notify_rulebased(raw_context, analyse=False): plugintxt = plugin or "plain email" key = contacts, plugin - if plugin_parameters is None and key in notifications: # cancelling - locked, plugin_parameters, bulk = notifications[key] - if locked and "contact" in rule: - notify_log(" - cannot cancel notification of %s via %s: it is locked" % (contactstxt, plugintxt)) - else: - notify_log(" - cancelling notification of %s via %s" % (contactstxt, plugintxt)) - del notifications[key] + if plugin_parameters is None: # cancelling + if key in notifications: + locked, plugin_parameters, bulk = notifications[key] + if locked and "contact" in rule: + notify_log(" - cannot cancel notification of %s via %s: it is locked" % (contactstxt, plugintxt)) + else: + notify_log(" - cancelling notification of %s via %s" % (contactstxt, plugintxt)) + del notifications[key] elif contacts: if key in notifications: locked = notifications[key][0]

6 years, 9 months

5207 FIX Bulk discovery: Fixed "Maximum number of retries reached" error during bulk discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 8f7e37b8e8f959718774ac3d178cc3e9bfd866cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f7e37b8e8f959… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 13 15:54:23 2017 +0200 5207 FIX Bulk discovery: Fixed "Maximum number of retries reached" error during bulk discovery When performing a bulk discovery on more than 40 hosts an error with this message could occur: "Error during discovery: Maximum number of retries reached. You need to restart the bulk service discovery" After this fix you should be able to perform bulk discoveries with a lot larger number of hosts. The limitating factor (limited number of transaction ids) has been removed. Change-Id: I1788e48fa30eb9f4ff9f00d0a7c24b064d8f0922 --- .werks/5207 | 18 ++++++++++++++++++ web/htdocs/js/wato.js | 10 ++++------ web/htdocs/wato.py | 29 +++++++++++++---------------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/.werks/5207 b/.werks/5207 new file mode 100644 index 0000000..61378f1 --- /dev/null +++ b/.werks/5207 @@ -0,0 +1,18 @@ +Title: Bulk discovery: Fixed "Maximum number of retries reached" error during bulk discovery +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505307556 + +When performing a bulk discovery on more than 40 hosts an error with +this message could occur: + +"Error during discovery: Maximum number of retries reached. You need to restart the bulk service discovery" + +After this fix you should be able to perform bulk discoveries with a lot +larger number of hosts. The limitating factor (limited number of transaction ids) +has been removed. diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 45ee9e2..44e47fb 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -371,7 +371,7 @@ function progress_retry() { // Note: no bulksize limit is applied here progress_items = failed_items; failed_items = Array(); - progress_scheduler(progress_mode, progress_url, progress_timeout, [], "", ""); + progress_scheduler(progress_mode, progress_url, progress_timeout, [], ""); } @@ -453,13 +453,12 @@ function progress_clean_log() { log.scrollTop = 0; } -function progress_scheduler(mode, url_prefix, timeout, items, transids, end_url, success_stats, fail_stats, term_url, finished_txt) { +function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_stats, fail_stats, term_url, finished_txt) { // Initialize if (progress_items === null) { total_num_items = items.length; progress_items = items; failed_items = Array(); - progress_transids = transids; progress_total_num = items.length; progress_end_url = end_url; progress_term_url = term_url; @@ -487,8 +486,7 @@ function progress_scheduler(mode, url_prefix, timeout, items, transids, end_url, // Remove leading pipe signs (when having no folder set) // update_progress_title(percentage + "%"); update_progress_title(title); - use_transid = progress_transids.shift(); - get_url(url_prefix + '&_transid=' + use_transid + '&_item=' + encodeURIComponent(progress_items[0]), + get_url(url_prefix + '&_transid=-1&_item=' + encodeURIComponent(progress_items[0]), progress_handle_response, // regular handler (http code 200) [ mode, progress_items[0] ], // data to hand over to handlers progress_handle_error // error handler @@ -499,7 +497,7 @@ function progress_scheduler(mode, url_prefix, timeout, items, transids, end_url, } } - setTimeout(function() { progress_scheduler(mode, url_prefix, timeout, [], "", ""); }, timeout); + setTimeout(function() { progress_scheduler(mode, url_prefix, timeout, [], ""); }, timeout); } function update_bulk_moveto(val) { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b2c8d91..ce93230 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3905,15 +3905,10 @@ class ModeBulkDiscovery(WatoMode): def action(self): + config.user.need_permission("wato.services") if not self._item: return - if not html.check_transaction(): - html.write(json.dumps([ 'failed', 0, 0, 0, 0, 0, 0, ]) + "\n") - html.write_text(_("Error during discovery: Maximum number of retries reached. " - "You need to restart the bulk service discovery")) - return "" - try: site_id, folderpath, hostnamesstring = self._item.split("|") hostnames = hostnamesstring.split(";") @@ -3921,6 +3916,16 @@ class ModeBulkDiscovery(WatoMode): num_skipped_hosts = 0 num_failed_hosts = 0 folder = Folder.folder(folderpath) + + if site_id not in config.sitenames(): + raise MKGeneralException(_("The requested site does not exist")) + + for host_name in hostnames: + host = folder.host(host_name) + if host is None: + raise MKGeneralException(_("The requested host does not exist")) + host.need_permission("write") + arguments = [self._mode,] + hostnames if self._use_cache: @@ -5698,16 +5703,8 @@ def interactive_progress(items, title, stats, finishvars, timewait, finish_url = folder_preserving_link([("mode", "folder")] + finishvars) term_url = folder_preserving_link([("mode", "folder")] + termvars) - # Reserve a certain amount of transids for the progress scheduler - # Each json item requires one transid. Additionally, each "Retry failed hosts" eats - # up another one. We reserve 20 additional transids for the retry function - # Note: The "retry option" ignores the bulk size - transids = [] - for i in range(len(items) + 20): - transids.append(html.fresh_transid()) - - html.javascript(('progress_scheduler("%s", "%s", 50, %s, %s, "%s", %s, %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json.dumps(items), json.dumps(transids), finish_url, + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, %s, "%s", "' + _("FINISHED.") + '");') % + (html.var('mode'), base_url, json.dumps(items), finish_url, json.dumps(success_stats), json.dumps(fail_stats), term_url))

6 years, 9 months

5189 FIX Fixed scheduling of checks after a start/reload of the Micro Core

by Sven Panne

Module: check_mk Branch: master Commit: 9775f85854ee596c609b591fb7dc15387fc6412a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9775f85854ee59… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Sep 13 13:57:28 2017 +0200 5189 FIX Fixed scheduling of checks after a start/reload of the Micro Core After a start/reload the Check_MK Micro Core did not always schedule checks early enough to avoid their staleness, which was especially visible for checks with a long check interval, e.g. discovery or HW/SW inventory. This has been fixed. Change-Id: Idf8505595b95fa2c48a1a523fc4544c08d7b138f --- .werks/5189 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5189 b/.werks/5189 new file mode 100644 index 0000000..df595e4 --- /dev/null +++ b/.werks/5189 @@ -0,0 +1,14 @@ +Title: Fixed scheduling of checks after a start/reload of the Micro Core +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1505303429 + +After a start/reload the Check_MK Micro Core did not always schedule checks +early enough to avoid their staleness, which was especially visible for +checks with a long check interval, e.g. discovery or HW/SW inventory. This +has been fixed.

6 years, 9 months

Updated werk 5123

by Simon Betz

Module: check_mk Branch: master Commit: 4b9f6a4de4527aba18c8a000ed7d82cd1b487e49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b9f6a4de4527a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 13 13:44:52 2017 +0200 Updated werk 5123 Change-Id: I60bb413649dda08ff012cbb0fed762d8675792c6 --- web/htdocs/wato.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8d61fe3..b2c8d91 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3021,10 +3021,10 @@ class ModeDiscovery(WatoMode): def _get_table_target(self, table_source, check_type, item): if self._fixall: - if table_source == self.SERVICE_UNDECIDED: - return self.SERVICE_MONITORED - elif table_source == self.SERVICE_VANISHED: + if table_source == self.SERVICE_VANISHED: return self.SERVICE_REMOVED + else: + return self.SERVICE_MONITORED else: bulk_target = None for target in [self.SERVICE_MONITORED, self.SERVICE_UNDECIDED,

6 years, 9 months

Fixed wrong issue with new default deprecated ruleset exclusion

by Lars Michelsen

Module: check_mk Branch: master Commit: b7d113e19eb97c3460de2ba6a26d68ba5c95496f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7d113e19eb97c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 13 13:37:30 2017 +0200 Fixed wrong issue with new default deprecated ruleset exclusion Change-Id: I3f7f1c4160e7cc095fb77ce53e928c5e845c5ab9 --- web/htdocs/wato.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c1511d7..8d61fe3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12378,7 +12378,7 @@ class ModeRulesets(WatoMode): # Explicitly hide deprecated rulesets by default if not html.has_var("search_p_ruleset_deprecated"): - html.set_var("search_p_ruleset_deprecated", "1"), + html.set_var("search_p_ruleset_deprecated", DropdownChoice.option_id(False)), html.set_var("search_p_ruleset_deprecated_USE", "on") # Transform group argument to the "rule search arguments" @@ -12553,11 +12553,13 @@ def rule_search_button(search_options=None, mode="rulesets"): # Don't highlight the button on "standard page" searches. Meaning the page calls # that are no searches from the users point of view because he did not fill the # search form, but clicked a link in the GUI - if search_options and (search_options.keys() == ["ruleset_group"] - or search_options.keys() == ["ruleset_deprecated"] - or search_options.keys() == ["rule_ineffective"] - or search_options.keys() == ["ruleset_used"]): - is_searching = False + if is_searching: + search_keys = sorted(search_options.keys()) + if search_keys == ["ruleset_deprecated", "ruleset_group"] \ + or search_keys == ["ruleset_deprecated"] \ + or search_keys == ["rule_ineffective"] \ + or search_keys == ["ruleset_used"]: + is_searching = False if is_searching: title = _("Refine search")

6 years, 9 months

Reserved 20 Werk IDS

by Andreas Umbreit

Module: check_mk Branch: master Commit: 2c9b966e1a574017e56ea065b3a9b1824878eb11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c9b966e1a5740… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Sep 13 12:37:19 2017 +0200 Reserved 20 Werk IDS Change-Id: I4dde1ec6173698c57cff38c46e69a8cb42d2e3a4 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 76bc56d..8d3ce56 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5258 +5278

6 years, 9 months

Updated werk text

by Simon Betz

Module: check_mk Branch: master Commit: b1fd963f8e50003f739038748afbceeb4a97639f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1fd963f8e5000… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 13 11:41:48 2017 +0200 Updated werk text Change-Id: I7c2904ac142ef748fc546ad01d3a320c2e970272 --- .werks/5125 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5125 b/.werks/5125 index 3c46b4e..d34981e 100644 --- a/.werks/5125 +++ b/.werks/5125 @@ -1,4 +1,4 @@ -Title: brocade_mlx_power: Fixed wrong index usage which leads to undetected power supplies +Title: brocade_mlx_power: Fixed wrong index usage which led to undetected power supplies Level: 1 Component: checks Class: fix

6 years, 9 months

5125 FIX brocade_mlx_power: Fixed wrong index usage which leads to undetected power supplies

by Simon Betz

Module: check_mk Branch: master Commit: 0d249901cf1177ea153e1736b340db91a4d6b02b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d249901cf1177… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 13 11:40:40 2017 +0200 5125 FIX brocade_mlx_power: Fixed wrong index usage which leads to undetected power supplies Change-Id: I3b656235ba07e361e06013716eff3541ff570047 --- .werks/5125 | 11 +++++++++++ checks/brocade_mlx_power | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/5125 b/.werks/5125 new file mode 100644 index 0000000..3c46b4e --- /dev/null +++ b/.werks/5125 @@ -0,0 +1,11 @@ +Title: brocade_mlx_power: Fixed wrong index usage which leads to undetected power supplies +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505295350 + + diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index f9a7d7d..65c95b5 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -29,9 +29,9 @@ def parse_brocade_mlx_power(info): if len(info[1]) > 0: # .1.3.6.1.4.1.1991.1.1.1.2.2.1 - for power_unit, power_id, power_desc, power_state in info[1]: + for power_id, power_desc, power_state in info[1]: if power_state != "1": - parsed[power_unit] = { 'desc' : power_desc, + parsed[power_id] = { 'desc' : power_desc, 'state' : power_state } else: # .1.3.6.1.4.1.1991.1.1.1.2.1.1 @@ -77,7 +77,6 @@ check_info["brocade_mlx_power"] = { 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupplyOperStatus ]), ('.1.3.6.1.4.1.1991.1.1.1.2.2.1', [ - 1, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Unit 2, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Index 3, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2Description 4, # FOUNDRY-SN-AGENT-MIB::snChasPwrSupply2OperStatus

6 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017