Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4376 FIX WATO Web-API: Is now disabled when WATO is disabled on a site ( e.g. slave sites)

by Lars Michelsen

Module: check_mk Branch: master Commit: e1bb2cb34649366567ab0d3193aada1a8560336c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1bb2cb3464936… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 11:02:24 2017 +0100 4376 FIX WATO Web-API: Is now disabled when WATO is disabled on a site (e.g. slave sites) Change-Id: I7934c4ea0cca1b7858735c6121d4ab5e14812be1 --- .werks/4376 | 10 ++++++++++ web/htdocs/webapi.py | 3 +++ 2 files changed, 13 insertions(+) diff --git a/.werks/4376 b/.werks/4376 new file mode 100644 index 0000000..9f970a0 --- /dev/null +++ b/.werks/4376 @@ -0,0 +1,10 @@ +Title: WATO Web-API: Is now disabled when WATO is disabled on a site (e.g. slave sites) +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487325643 + + diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index d109c9e..a8cfd03 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -71,6 +71,9 @@ def page_api(): if not config.user.get_attribute("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") + if not config.wato_enabled: + raise MKUserError(None, _("WATO is disabled on this site.")) + config.user.need_permission("wato.use") config.user.need_permission("wato.api_allowed")

7 years, 7 months

check_sql: Fixed wrong function call

by Lars Michelsen

Module: check_mk Branch: master Commit: dcf19f8832a11aa0604bf96cd7ee048aa446f482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcf19f8832a11a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 10:41:02 2017 +0100 check_sql: Fixed wrong function call Change-Id: Ia64dda9af1af2637ddf7f21ffbf2cbf42237e920 --- active_checks/check_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index daa74aa..cb2425f 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -92,7 +92,7 @@ long_options = [ try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, e: - bail_out("Error in command options: %s" % e) + bail_out(3, "Error in command options: %s" % e) opt_debug = False

7 years, 7 months

Better text for password cleartext warning

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d9fc68cbe9724385e7d14bb502da374524bd423 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d9fc68cbe9724… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 10:30:42 2017 +0100 Better text for password cleartext warning Also avoid copy&paste here Change-Id: I4fe3bf52827c4cf55558eafb41671a473effc409 --- web/htdocs/valuespec.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index c9dff2a..df33621 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3815,9 +3815,13 @@ class Password(TextAscii): kwargs["autocomplete"] = "new-password" html.password_input(varprefix, str(value), **kwargs) + + + def password_plaintext_warning(self): if self._is_stored_plain: - html.span(_(" Please note that this password needs to be " - "stored in plain text on the Check_MK server.")) + html.span(_(" Please note that Check_MK needs this password in clear" + " text during normal operation and thus stores it unencrypted" + " on the Check_MK server.")) def value_to_text(self, value): @@ -3845,9 +3849,8 @@ class PasswordSpec(Password): if self._hidden: html.icon_button("#", _(u"Show/Hide password"), "showhide", onclick="vs_toggle_hidden(this);") - if self._is_stored_plain: - html.span(_(" Please note that this password needs to be " - "stored in plain text on the Check_MK server.")) + + self.password_plaintext_warning()

7 years, 7 months

Better styling of Passwort entry and agent encryption configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: 0584308e40236dba3037aecb6a3a06fac340ed77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0584308e40236d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 10:27:56 2017 +0100 Better styling of Passwort entry and agent encryption configuration Change-Id: If6df3d9ae685a0f322cce040725d3db11becaa52 --- web/htdocs/valuespec.py | 7 ++++--- web/plugins/wato/check_mk_configuration.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ba5cf36..c9dff2a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3816,8 +3816,8 @@ class Password(TextAscii): html.password_input(varprefix, str(value), **kwargs) if self._is_stored_plain: - html.write(" %s" % _("Please note that this password is stored in plain " - "text.")) + html.span(_(" Please note that this password needs to be " + "stored in plain text on the Check_MK server.")) def value_to_text(self, value): @@ -3846,7 +3846,8 @@ class PasswordSpec(Password): html.icon_button("#", _(u"Show/Hide password"), "showhide", onclick="vs_toggle_hidden(this);") if self._is_stored_plain: - html.span(_("Please note that this password is stored in plain text.")) + html.span(_(" Please note that this password needs to be " + "stored in plain text on the Check_MK server.")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d9f261c..2e0322e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2258,7 +2258,7 @@ register_rule(group, Dictionary( elements = [ ( "passphrase", PasswordSpec(title = _("Encryption secret"), allow_empty = False, hidden = True) ), - ( "use_regular", RadioChoice(title = _("Encryption for Agent"), + ( "use_regular", DropdownChoice(title = _("Encryption for Agent"), help = _("Choose if the agent agents encrypt packages. This controls whether " "baked agents encrypt their output and whether check_mk expects " "encrypted output. " @@ -2273,7 +2273,7 @@ register_rule(group, ( "disable", _("Disable (drop encrypted data)") ) ]) ), - ( "use_realtime", RadioChoice(title = _("Encryption for Realtime Updates"), + ( "use_realtime", DropdownChoice(title = _("Encryption for Realtime Updates"), help = _("Choose if realtime updates are sent/expected encrypted"), default_value = "enforce", choices = [

7 years, 7 months

Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 168ee4c3fd857bb561466b077409e1489beff10f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=168ee4c3fd857b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 17 10:08:30 2017 +0100 Updated Werk description Change-Id: I331d7b865af841f98d2e639d8a6abcdd18084007 --- .werks/3114 | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/.werks/3114 b/.werks/3114 index bae3523..410f39d 100644 --- a/.werks/3114 +++ b/.werks/3114 @@ -1,23 +1,30 @@ -Title: linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default) +Title: Linux and Windows agent can now encrypt their output Level: 2 Component: core +Class: feature Compatible: compat -Version: 1.4.0i1 +State: unknown +Version: 1.5.0i1 Date: 1459867428 -Class: feature -This feature can be configured through Host&Service Parameters -> Access to agents -> Encryption. -When "Encryption for Agents" is set to "enforce" or "enable", two things will happen: -a) Baked windows or linux agents will be configured to encrypt their output -b) check_mk will be configured to try to decrypt output from agents. In case of "enable" it will -also accept unencrypted output, in case of "enforce" it won't. +This feature can be configured through +{{Host & Service Parameters|Access to agents|Encryption}}. +When {{Encryption for Agents}} is set to {{enforce}} +or {{enable}}, two things will happen: + +LI:Baked Windows or Linux agents will be configured to encrypt their output +LI:Check_mk will be configured to try to decrypt output from agents. + +In case of {{enable}} it will also accept +unencrypted output, in case of {{enforce}} it won't. This change also affects real-time updates as these were already encrypted. -The passphrase configured for real-time updates will now only serve as a default, agents with -"Encryption" configured will use the same passphrase for rt and regular updates. -Finally, it is now also possible to configure real-time updates to be unencrypted. +The passphrase configured for real-time updates will now only serve as a +default, agents with "Encryption" configured will use the same passphrase +for rt and regular updates. Finally, it is now also possible to configure +real-time updates to be unencrypted. -All encryption happens with AES using 256bit keys and cbc. +All encryption happens with AES using 256 bit keys and CBC. -The above is completely optional, the default behaviour for everything (including real-time updates) -is compatible with previous versions. +The new encryption feature is completely optional, the default behaviour for +everything (including real-time updates) is compatible with previous versions.

7 years, 7 months

added missing metric_info for veeam client graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: 440ed9c7771390b569d77d28c7308934f6599851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=440ed9c7771390… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Feb 17 09:43:21 2017 +0100 added missing metric_info for veeam client graphs Change-Id: I2985f4921d717bfe74365848a50455faa88b4524 --- web/plugins/metrics/check_mk.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 8775e85..c055198 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2638,6 +2638,18 @@ metric_info["backup_duration"] = { "color" : "33/a", } +metric_info["readsize"] = { + "title" : _("Readsize"), + "unit" : "bytes", + "color" : "12/a", +} + +metric_info["transferredsize"] = { + "title" : _("Transferredsize"), + "unit" : "bytes", + "color" : "12/a", +} + metric_info["job_duration"] = { "title" : _("Job duration"), "unit" : "s",

7 years, 7 months

Updated bug entries #2464, #2495

by Lars Michelsen

Module: check_mk Branch: master Commit: 65fb76e8d1ce9b615137dcf980bf6317b49067fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65fb76e8d1ce9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 17:48:41 2017 +0100 Updated bug entries #2464, #2495 Change-Id: I02413f8f44a2487b707f53b29f531803ecfe49a4 --- .bugs/2464 | 7 +++++-- .bugs/2495 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/2464 b/.bugs/2464 index 4d89954..db84107 100644 --- a/.bugs/2464 +++ b/.bugs/2464 @@ -1,10 +1,13 @@ Title: Hosts configured for a multisite only site are monitored on master Component: wato -State: open +Class: bug +State: done Date: 2016-08-03 11:12:16 Targetversion: 1.2.8 -Class: bug When having the master site connected with another site only in the status world, without distributed WATO and assigning a host to that site, the host is still monitored by the master site. The host should simply not be monitored instead. + +2017-02-16 17:48:39: changed state open -> done +has already been fixed. diff --git a/.bugs/2495 b/.bugs/2495 index c1d1676..d0e7260 100644 --- a/.bugs/2495 +++ b/.bugs/2495 @@ -1,8 +1,11 @@ Title: --cache not working on -I with explicity hosts Component: core -State: open +Class: bug +State: done Date: 2016-05-27 12:13:19 Targetversion: 1.2.8 -Class: bug This option seems to be without function. + +2017-02-16 17:45:42: changed state open -> done +Works.

7 years, 7 months

Updated bug entries #2520

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ea792b61e09c5d22952401a381655379cba024e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea792b61e09c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 17:42:41 2017 +0100 Updated bug entries #2520 Change-Id: I4944be450410a5f184cebc75bfd175c954c396f4 --- .bugs/2520 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/2520 b/.bugs/2520 index 521ffb5..684c17e 100644 --- a/.bugs/2520 +++ b/.bugs/2520 @@ -1,9 +1,9 @@ Title: WATO mass host tags remove does not work Component: wato -State: open +Class: bug +State: closed Date: 2016-09-22 17:03:35 Targetversion: 1.2.8 -Class: bug If hosts tags are assigned to hosts and you want to remove a specific host tag in mass edit action of hosts, it will be not removed. The host tag is stiull assigned to the hosts. @@ -17,3 +17,5 @@ dialog can not be used for removing set attributes. You need to use the dialog "bulk cleanup" to remove attributes from hosts in bulk. I improved the description on top of the bulk edit page. + +2017-02-16 17:42:38: changed state open -> closed

7 years, 7 months

4373 FIX Timeperiods: iCal events with multiple days can now be imported

by Lars Michelsen

Module: check_mk Branch: master Commit: 19d0e58dad5554e0ce76d986c741d8bb3637d5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19d0e58dad5554… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 17 08:48:31 2017 +0100 4373 FIX Timeperiods: iCal events with multiple days can now be imported Change-Id: I485a7dc08251e84cce8cad5d33f77f5da255986b --- .werks/4373 | 10 ++++++++++ web/htdocs/wato.py | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/.werks/4373 b/.werks/4373 new file mode 100644 index 0000000..d32380e --- /dev/null +++ b/.werks/4373 @@ -0,0 +1,10 @@ +Title: Timeperiods: iCal events with multiple days can now be imported +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487317705 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3433dcc..37a65f8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8586,6 +8586,8 @@ def validate_ical_file(value, varprefix): # Relevant format specifications: # http://tools.ietf.org/html/rfc2445 # http://tools.ietf.org/html/rfc5545 +# TODO: Let's use some sort of standard module in the future. Maybe we can then also handle +# times instead of only full day events. def parse_ical(ical_blob, horizon=10, times=(None, None, None)): ical = {'raw_events': []} @@ -8660,6 +8662,30 @@ def parse_ical(ical_blob, horizon=10, times=(None, None, None)): raise Exception('The frequency "%s" is currently not supported' % freq) return t + + def resolve_multiple_days(event, cur_start_time): + if time.strftime('%Y-%m-%d', cur_start_time) \ + == time.strftime('%Y-%m-%d', event["end"]): + # Simple case: a single day event + return [{ + 'name' : event['name'], + 'date' : time.strftime('%Y-%m-%d', cur_start_time), + }] + + # Resolve multiple days + resolved, cur_timestamp, day = [], time.mktime(cur_start_time), 1 + # day < 100 is just some plausibilty check. In case such an event + # is needed eventually remove this + while cur_timestamp < time.mktime(event["end"]) and day < 100: + resolved.append({ + "name" : "%s %s" % (event["name"], _(" (day %d)") % day), + "date" : time.strftime("%Y-%m-%d", time.localtime(cur_timestamp)), + }) + cur_timestamp += 86400 + day += 1 + + return resolved + # Now resolve recurring events starting from 01.01 of current year # Non-recurring events are simply copied resolved = [] @@ -8674,15 +8700,9 @@ def parse_ical(ical_blob, horizon=10, times=(None, None, None)): cur = now while cur < last: cur = next_occurrence(event['start'], cur, freq) - resolved.append({ - 'name' : event['name'], - 'date' : time.strftime('%Y-%m-%d', cur), - }) + resolved += resolve_multiple_days(event, cur) else: - resolved.append({ - 'name' : event['name'], - 'date' : time.strftime('%Y-%m-%d', event['start']) - }) + resolved += resolve_multiple_days(event, event["start"]) ical['events'] = sorted(resolved)

7 years, 7 months

4372 FIX Timeperiods: Fixed broken import of iCal files

by Lars Michelsen

Module: check_mk Branch: master Commit: 56ec29c38d5177f001de19631b977b6838e16e06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56ec29c38d5177… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 16 18:29:49 2017 +0100 4372 FIX Timeperiods: Fixed broken import of iCal files Change-Id: I85db092465c8cb455713f007763fac105c25a11f --- .werks/4372 | 10 ++++++++++ web/htdocs/wato.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4372 b/.werks/4372 new file mode 100644 index 0000000..3dc108d --- /dev/null +++ b/.werks/4372 @@ -0,0 +1,10 @@ +Title: Timeperiods: Fixed broken import of iCal files +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487266167 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9783755..3433dcc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8757,11 +8757,11 @@ def mode_timeperiod_import_ical(phase): html.set_var('%s_0_from' % day, '') html.set_var('%s_0_until' % day, '') - html.set_var('except_count', len(data['events'])) + html.set_var('except_count', "%d" % len(data['events'])) for index, event in enumerate(data['events']): index += 1 html.set_var('except_%d_0' % index, event['date']) - html.set_var('except_indexof_%d' % index, index) + html.set_var('except_indexof_%d' % index, "%d" % index) if ical['times']: for n in range(3): if ical['times'][n]:

7 years, 7 months

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