Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Renamed state file num_failed.mk to num_failed_logins.mk

by Mathias Kettner

Module: check_mk Branch: master Commit: e39883777ca7641be0781758dd75209d36162277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e39883777ca764… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 14:03:52 2016 +0200 Renamed state file num_failed.mk to num_failed_logins.mk This makes its purpose more clear --- web/htdocs/userdb.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 8e4bc96..71ecaa7 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -265,9 +265,9 @@ def update_user_access_time(username): def on_succeeded_login(username): - num_failed = load_custom_attr(username, 'num_failed', saveint) - if num_failed != None and num_failed != 0: - save_custom_attr(username, 'num_failed', '0') + num_failed_logins = load_custom_attr(username, 'num_failed_logins', saveint) + if num_failed_logins != None and num_failed_logins != 0: + save_custom_attr(username, 'num_failed_logins', '0') update_user_access_time(username) @@ -295,13 +295,14 @@ def need_to_change_pw(username): def on_failed_login(username): users = load_users(lock = True) if username in users: - if "num_failed" in users[username]: - users[username]["num_failed"] += 1 + html.log(users[username]) + if "num_failed_logins" in users[username]: + users[username]["num_failed_logins"] += 1 else: - users[username]["num_failed"] = 1 + users[username]["num_failed_logins"] = 1 if config.lock_on_logon_failures: - if users[username]["num_failed"] >= config.lock_on_logon_failures: + if users[username]["num_failed_logins"] >= config.lock_on_logon_failures: users[username]["locked"] = True save_users(users) @@ -617,7 +618,7 @@ def load_users(lock = False): # read special values from own files if id in result: for attr, conv_func in [ - ('num_failed', saveint), + ('num_failed_logins', saveint), ('last_pw_change', saveint), ('last_seen', savefloat), ('enforce_pw_change', lambda x: bool(saveint(x))), @@ -704,7 +705,7 @@ def save_users(profiles): "language", "serial", "connector", - "num_failed", + "num_failed_logins", "enforce_pw_change", "last_pw_change", "last_seen", @@ -787,7 +788,7 @@ def save_users(profiles): # profile directory. The primary reason to have separate files, is to reduce # the amount of data to be loaded during regular page processing save_custom_attr(user_id, 'serial', str(user.get('serial', 0))) - save_custom_attr(user_id, 'num_failed', str(user.get('num_failed', 0))) + save_custom_attr(user_id, 'num_failed_logins', str(user.get('num_failed_logins', 0))) save_custom_attr(user_id, 'enforce_pw_change', str(int(user.get('enforce_pw_change', False)))) save_custom_attr(user_id, 'last_pw_change', str(user.get('last_pw_change', int(time.time()))))

8 years

fixed avoption log row limit

by Simon Betz

Module: check_mk Branch: master Commit: b8117f3c6d9682f3f508a42c2b07c4e126f36bfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8117f3c6d9682… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 8 13:37:14 2016 +0200 fixed avoption log row limit --- web/plugins/views/availability.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 98fe74c..4e7de18 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -221,8 +221,10 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) html.begin_context_buttons() togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") + if config.reporting_available(): html.context_button(_("Export as PDF"), html.makeuri([], filename="report_instant.py"), "report") + if av_mode == "table": html.context_button(_("Export as CSV"), html.makeuri([("output_format", "csv_export")]), "download_csv") @@ -230,10 +232,10 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) html.context_button(_("Availability"), html.makeuri([("av_mode", "availability"), ("av_host", ""), ("av_aggr", "")]), "availability") elif not av_object: html.context_button(_("Timeline"), html.makeuri([("av_mode", "timeline")]), "timeline") - elif av_mode == "timeline" and what != "bi": history_url = availability.history_url_of(av_object, time_range) html.context_button(_("History"), history_url, "history") + html.end_context_buttons() # Render the avoptions again to get the HTML code, because the HTML vars have changed @@ -248,7 +250,7 @@ def render_availability_page(view, datasource, filterheaders, only_sites, limit) "<b>Note:</b> The number of shown rows does not necessarily reflect the " "matched entries and the result might be incomplete. ") % avoptions["logrow_limit"] text += '<a href="%s">%s</a>' % \ - (html.makeuri([("_unset_logrow_limit", "1")]), _('Repeat query without limit.')) + (html.makeuri([("_unset_logrow_limit", "1"), ("avo_logrow_limit", 0)]), _('Repeat query without limit.')) html.show_warning(text) do_render_availability(what, av_rawdata, av_data, av_mode, av_object, avoptions)

8 years

Renamed default automation user to "automation"

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9765fc7204ea240d3ead29715ba44e512d85b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9765fc7204ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 13:16:26 2016 +0200 Renamed default automation user to "automation" --- tests/testlib/__init__.py | 4 ++-- web/htdocs/userdb.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c3a66e8..9555e1a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -541,14 +541,14 @@ class CMKWebSession(WebSession): # def _automation_credentials(self): - secret_path = "%s/var/check_mk/web/cmkautomation/automation.secret" % self.site.root + secret_path = "%s/var/check_mk/web/automation/automation.secret" % self.site.root p = self.site.execute(["cat", secret_path], stdout=subprocess.PIPE) secret = p.communicate()[0].rstrip() if secret == "": raise Exception("Failed to read secret from %s" % secret_path) return { - "_username" : "cmkautomation", + "_username" : "automation", "_secret" : secret, } diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 716adca..8e4bc96 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -845,7 +845,7 @@ def create_cmk_automation_user(): secret = gen_id() users = load_users(lock=True) - users["cmkautomation"] = { + users["automation"] = { 'alias' : u"Check_MK Automation - used for calling web services", 'contactgroups' : [], 'automation_secret' : secret,

8 years

Fixed agent file age test

by Lars Michelsen

Module: check_mk Branch: master Commit: 899af398dd97f115955507478a9d895572538807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=899af398dd97f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:31:31 2016 +0200 Fixed agent file age test --- tests/agents/windows/test_precompiled_age.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py index 8d00727..12af334 100644 --- a/tests/agents/windows/test_precompiled_age.py +++ b/tests/agents/windows/test_precompiled_age.py @@ -28,8 +28,8 @@ def test_precompiled_file_ages(): for filename in precompiled_files: path = "%s/agents/windows/%s" % (cmk_path(), filename) commit_time = last_commit_time(path) - assert newest_source_time > commit_time, \ - "%s is newer than source code file %s" % (path, newest_source_file) + assert commit_time > newest_source_time, \ + "%s is older than source code file %s" % (path, newest_source_file) def find_newest_source_file():

8 years

Cleaned up subprocess call not to use shell=True

by Lars Michelsen

Module: check_mk Branch: master Commit: a7c909a979304c3015c8e03b8b0b986301f99fe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7c909a979304c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 19:55:45 2016 +0200 Cleaned up subprocess call not to use shell=True --- web/htdocs/notify.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index f49a599..c61ce60 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import config, forms, time, lib, userdb +import subprocess from valuespec import * def get_gui_messages(user_id = None): @@ -260,7 +261,6 @@ def notify_gui_msg(user_id, msg): def notify_mail(user_id, msg): - import subprocess, time users = userdb.load_users(lock = False) user = users.get(user_id) @@ -297,8 +297,9 @@ def notify_mail(user_id, msg): ) # FIXME: Maybe use the configured mail command for Check_MK-Notify one day - command = u"mail -s '$SUBJECT$' '$CONTACTEMAIL$'" - command_utf8 = command.replace('$SUBJECT$', subject).replace('$CONTACTEMAIL$', user['email']).encode("utf-8") + # TODO: mail does not accept umlauts: "contains invalid character '\303'" in mail + # addresses. handle this correctly. + command = ["mail", "-s", "asdasd".encode("utf-8"), user['email'].encode("utf-8")] # Make sure that mail(x) is using UTF-8. Otherwise we cannot send notifications # with non-ASCII characters. Unfortunately we do not know whether C.UTF-8 is @@ -316,8 +317,9 @@ def notify_mail(user_id, msg): else: raise MKInternalError(_('No UTF-8 encoding found in your locale -a! Please provide C.UTF-8 encoding.')) - p = subprocess.Popen(command_utf8, shell=True, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, stdin=subprocess.PIPE) + p = subprocess.Popen(command, shell=False, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, stdin=subprocess.PIPE, + close_fds=True) stdout_txt, stderr_txt = p.communicate(body.encode("utf-8")) exitcode = p.returncode if exitcode != 0:

8 years

Make useful default value for setting a max age for passwords

by Mathias Kettner

Module: check_mk Branch: master Commit: c0f4c0fd65abda8f25aa9f996c2935d4a554f59f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0f4c0fd65abda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:48:22 2016 +0200 Make useful default value for setting a max age for passwords setting now suggests 365 days instead of 0 days. --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index fa3625d..5bc87f4 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -885,6 +885,7 @@ register_configvar(group, title = _("Maximum age of passwords"), minvalue = 1, display = ["days"], + default_value = 365 * 86400, )), ], ),

8 years

added compiled files for last fix

by Andreas Boesl

Module: check_mk Branch: master Commit: 845fc52baa0cfb0c4d98b1e54e5d694ab6e20608 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=845fc52baa0cfb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 11:45:27 2016 +0200 added compiled files for last fix --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1319936 -> 1323520 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 10603394 -> 15356357 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1319936 -> 1323520 bytes agents/windows/check_mk_agent.exe | Bin 1298432 -> 1297920 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 8930198 -> 13279745 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1298432 -> 1297920 bytes 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index c05d464..5e67d31 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2041 +2044 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 895d50f..9177522 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 61f2e5a..8d4438a 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 49b3e9c..b9df312 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 97f6520..56b8fab 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 92eb0da..2795356 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index bf1edf6..15f589a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ

8 years

windows agent eventlogs: fixed invalid event id and event qualifiers

by Andreas Boesl

Module: check_mk Branch: master Commit: bde0d13865309bdc767cbf09e1e55e34c670d968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bde0d13865309b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 11:34:13 2016 +0200 windows agent eventlogs: fixed invalid event id and event qualifiers --- agents/windows/EventLog.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/EventLog.cc b/agents/windows/EventLog.cc index 027377f..cf973d8 100644 --- a/agents/windows/EventLog.cc +++ b/agents/windows/EventLog.cc @@ -195,11 +195,11 @@ public: } virtual uint16_t eventId() const override { - return _record->EventID % 0xFFFFu; + return _record->EventID % 65536; } virtual uint16_t eventQualifiers() const override { - return _record->EventID / 0xFFFFu; + return _record->EventID / 65536; } virtual time_t timeGenerated() const override {

8 years

Fix title of custom attribute type in table in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f25cc1c0737ca959a777c94d11a7cb218dfc0ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f25cc1c0737ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:31:31 2016 +0200 Fix title of custom attribute type in table in WATO --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 06e1b77..7c3cead 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14835,7 +14835,7 @@ def mode_custom_attrs(phase, what): table.cell(_("Name"), attr['name']) table.cell(_("Title"), attr['title']) - table.cell(_("Type"), attr['type']) + table.cell(_("Type"), dict(custom_attr_types)[attr['type']]) table.end()

8 years

Changed description of new cmkautomation user

by Mathias Kettner

Module: check_mk Branch: master Commit: 00427c345ef414ab380f958bc59d61ce37b4bf26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00427c345ef414… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:26:51 2016 +0200 Changed description of new cmkautomation user --- web/htdocs/userdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index eb62ed6..716adca 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -846,7 +846,7 @@ def create_cmk_automation_user(): users = load_users(lock=True) users["cmkautomation"] = { - 'alias' : u'Check_MK internal - Used for site local authentication', + 'alias' : u"Check_MK Automation - used for calling web services", 'contactgroups' : [], 'automation_secret' : secret, 'password' : encrypt_password(secret),

8 years

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016