Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Added some todos about localized texts in global context

by Lars Michelsen

Module: check_mk Branch: master Commit: b6be2bf9b8464d7f8ed91ef9daaccecae7bcde60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6be2bf9b8464d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 18:46:21 2016 +0200 Added some todos about localized texts in global context --- web/htdocs/lib.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 0fef22a..9edf887 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -35,6 +35,7 @@ try: except: pass +# TODO: Remove this! The texts will not be correctly localized core_state_names = { -1: _("NODATA"), 0: _("OK"), 1: _("WARNING"), 2: _("CRITICAL"), 3: _("UNKNOWN")} nagios_short_state_names = { -1: _("PEND"), 0: _("OK"), 1: _("WARN"), 2: _("CRIT"), 3: _("UNKN") } nagios_short_host_state_names = { 0: _("UP"), 1: _("DOWN"), 2: _("UNREACH") } @@ -50,6 +51,7 @@ LOG_INFO = 6 # informational LOG_DEBUG = 7 # debug-level messages class MKAuthException(MKException): + # TODO: Remove this! The texts will not be correctly localized title = _("Permission denied") plain_title = _("Authentication error") def __init__(self, reason): @@ -58,14 +60,17 @@ class MKAuthException(MKException): return self.reason class MKUnauthenticatedException(MKGeneralException): + # TODO: Remove this! The texts will not be correctly localized title = _("Not authenticated") plain_title = _("Missing authentication credentials") class MKConfigError(MKException): + # TODO: Remove this! The texts will not be correctly localized title = _("Configuration error") plain_title = _("Configuration error") class MKUserError(MKException): + # TODO: Remove this! The texts will not be correctly localized title = _("Invalid User Input") plain_title = _("User error") def __init__(self, varname, message): @@ -853,6 +858,7 @@ except ImportError: seconds_per_day = 86400 +# TODO: Remove this! The texts will not be correctly localized weekdays = { 0: _("Monday"), 1: _("Tuesday"), @@ -863,6 +869,7 @@ weekdays = { 6: _("Sunday"), } +# TODO: Remove this! The texts will not be correctly localized interface_oper_states = { 1: _("up"), 2: _("down"),

8 years, 2 months

Slightly improved site / web tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 513ca12d83f407da58bfc4e7f30e8bb8b97c92ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=513ca12d83f407… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 18:23:25 2016 +0200 Slightly improved site / web tests --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9555e1a..b8f0467 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -13,7 +13,7 @@ import pipes import subprocess from urlparse import urlparse -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup # Disable insecure requests warning message during SSL testing from requests.packages.urllib3.exceptions import InsecureRequestWarning @@ -271,6 +271,8 @@ class Site(object): # Not free of races, but should be sufficient. def open_livestatus_tcp(self): if self.is_running(): + assert self.get_config("LIVESTATUS_TCP") == "on", \ + "Livestatus-TCP disabled (Site is running, so could not enable it)" return self.set_config("LIVESTATUS_TCP", "on") @@ -406,7 +408,7 @@ class WebSession(requests.Session): def _check_html_page_resources(self, response): - soup = BeautifulSoup(response.text) + soup = BeautifulSoup(response.text, "lxml") parsed_url = urlparse(response.url)

8 years, 2 months

Moved similar functions together

by Lars Michelsen

Module: check_mk Branch: master Commit: 058ada7e777bf2b6dcf9e441f6d47722d2caaddb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=058ada7e777bf2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 16:32:01 2016 +0200 Moved similar functions together --- web/htdocs/wato.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c3cead..d1f221f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -871,7 +871,7 @@ def delete_host_files(site_id, hostname): # TODO: See bug #2414 check_mk_automation(site_id, "delete-host", [hostname]) if not config.site_is_local(site_id): - # Delete inventory data from remote sites (not the archive) + # Delete inventory data received from remote sites (not the archive) for filename in [ "%s/inventory/%s" % (defaults.var_dir, hostname), "%s/inventory/%s.gz" % (defaults.var_dir, hostname) ]: if os.path.exists(filename): @@ -879,6 +879,19 @@ def delete_host_files(site_id, hostname): log_pending(AFFECTED, hostname, "delete-host", _("Deleted host %s") % hostname) +def delete_host_after_confirm(delname): + c = wato_confirm(_("Confirm host deletion"), + _("Do you really want to delete the host <tt>%s</tt>?") % delname) + if c: + Folder.current().delete_hosts([delname]) + # Delete host files + return "folder" + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload + + def delete_hosts_after_confirm(host_names): c = wato_confirm(_("Confirm deletion of %d hosts") % len(host_names), _("Do you really want to delete the %d selected hosts?") % len(host_names)) @@ -1409,18 +1422,6 @@ def validate_host_uniqueness(host_name): (host_name, host.folder().url(), host.folder().alias_path())) -def delete_host_after_confirm(delname): - c = wato_confirm(_("Confirm host deletion"), - _("Do you really want to delete the host <tt>%s</tt>?") % delname) - if c: - Folder.current().delete_hosts([delname]) - return "folder" - elif c == False: # not yet confirmed - return "" - else: - return None # browser reload - - def check_new_host_name(varname, host_name): if not host_name: raise MKUserError(varname, _("Please specify a host name."))

8 years, 2 months

added compiled files..

by Andreas Boesl

Module: check_mk Branch: master Commit: 625aef4b6415333d18c50cf80fd64431961e26e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=625aef4b641533… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 15:50:13 2016 +0200 added compiled files.. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15356357 -> 15356869 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent.exe | Bin 1297920 -> 1297920 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13279745 -> 13279233 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297920 -> 1297920 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 584396 -> 584444 bytes agents/windows/install_agent.exe | Bin 581013 -> 581134 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes 11 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a9a6e2f..a9c7a68 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2049 +2078 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b5816dc..e4f5a20 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 5fe4dce..9299e8a 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 35fd1ec..6800c6e 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 316edfb..a7b42a3 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 9f355f1..1439a3c 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 f98b7c7..93452df 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 5402584..b6e3580 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index c992333..86e78fc 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 7379bc6..61c2294 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 3dbbe12..d11bfa2 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

8 years, 2 months

windows agent: fixed crash when open hardware monitor namespace was unavailable

by Andreas Boesl

Module: check_mk Branch: master Commit: 554cda30438d52661ecb471eaac3e9858c835cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=554cda30438d52… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 15:46:43 2016 +0200 windows agent: fixed crash when open hardware monitor namespace was unavailable --- agents/windows/sections/SectionOHM.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/agents/windows/sections/SectionOHM.cc b/agents/windows/sections/SectionOHM.cc index 1008665..cf53082 100644 --- a/agents/windows/sections/SectionOHM.cc +++ b/agents/windows/sections/SectionOHM.cc @@ -43,7 +43,12 @@ void SectionOHM::startIfAsync() { } bool SectionOHM::produceOutputInner(std::ostream &out, const Environment &env) { - bool res = SectionWMI::produceOutputInner(out, env); + bool res = false; + try { + res = SectionWMI::produceOutputInner(out, env); + } catch (const wmi::ComException &e) { + res = false; + } if (!res && !_ohm_monitor->checkAvailabe()) { crash_log("ohm not installed or not runnable -> section disabled"); suspend(3600);

8 years, 2 months

recompiled windows files

by Andreas Boesl

Module: check_mk Branch: master Commit: 3eba561d34729a462fd78a88e04d0d9d0b8b477d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3eba561d34729a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 15:03:56 2016 +0200 recompiled windows files --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15017412 -> 15356357 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 1297920 -> 1297920 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13279745 -> 13279745 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297920 -> 1297920 bytes agents/windows/install_agent-64.exe | Bin 584396 -> 584396 bytes agents/windows/install_agent.exe | Bin 581013 -> 581013 bytes 10 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index b6ac305..a9a6e2f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2047 +2049 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 21ffb72..b5816dc 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 adbe73c..5fe4dce 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 389a187..35fd1ec 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.cc b/agents/windows/check_mk_agent.cc index bf07e35..68f7710 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -93,7 +93,7 @@ // | |____/ \___|\___|_|\__,_|_| \__,_|\__|_|\___/|_| |_|___/ | // | | // +----------------------------------------------------------------------+ -// | Declarations of macrosk, structs and function prototypes | +// | Declarations of macros, structs and function prototypes | // '----------------------------------------------------------------------' const char *check_mk_version = CHECK_MK_VERSION; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c154820..316edfb 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 992fb4e..9f355f1 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 3b0873c..f98b7c7 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 518c5f2..c992333 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 2cd294f..7379bc6 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 2 months

3870 elphase.include: more robust against none type params

by Simon Betz

Module: check_mk Branch: master Commit: 7456ecdf3e0fa8b526281cc7d96dc0a53a64479d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7456ecdf3e0fa8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 8 15:01:14 2016 +0200 3870 elphase.include: more robust against none type params --- .werks/3870 | 10 ++++++++++ ChangeLog | 1 + checks/elphase.include | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/3870 b/.werks/3870 new file mode 100644 index 0000000..f55c043 --- /dev/null +++ b/.werks/3870 @@ -0,0 +1,10 @@ +Title: elphase.include: more robust against none type params +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1473338482 + + diff --git a/ChangeLog b/ChangeLog index 6748b8c..c51f044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -377,6 +377,7 @@ * 3836 FIX: Fixed perfometer in kentix multisensor rack... * 3848 FIX: megaraid_pdisks: Handle "rebuild" state as WARNING instead of UNKNOWN * 3849 FIX: check_cpu_peaks: Fixed broken active check + * 3870 FIX: elphase.include: more robust against none type params Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/elphase.include b/checks/elphase.include index 2d6495b..fe450ab 100644 --- a/checks/elphase.include +++ b/checks/elphase.include @@ -49,6 +49,9 @@ def check_elphase(item, params, parsed): class Bounds: Lower, Upper, Both = range(3) + if params is None: + params = {} + for what, title, unit, bound, factor in [ ( "voltage", "Voltage", " V", Bounds.Lower, 1), ( "current", "Current", " A", Bounds.Upper, 1),

8 years, 2 months

Remove bogus debug output of previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: b297d4a9d9591b3f5a3d813dbbf8920a43e6068c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b297d4a9d9591b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 14:18:14 2016 +0200 Remove bogus debug output of previous commit --- web/htdocs/userdb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 71ecaa7..91ea497 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -295,7 +295,6 @@ def need_to_change_pw(username): def on_failed_login(username): users = load_users(lock = True) if username in users: - html.log(users[username]) if "num_failed_logins" in users[username]: users[username]["num_failed_logins"] += 1 else:

8 years, 2 months

recompiled bin files, again..

by Andreas Boesl

Module: check_mk Branch: master Commit: 25a6ba8802914f3873a047578e9068858115cee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a6ba8802914f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 8 14:17:21 2016 +0200 recompiled bin files, again.. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15356357 -> 15017412 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323520 -> 1323520 bytes agents/windows/check_mk_agent.exe | Bin 1297920 -> 1297920 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13279745 -> 13279745 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297920 -> 1297920 bytes agents/windows/install_agent-64.exe | Bin 582999 -> 584396 bytes agents/windows/install_agent.exe | Bin 581250 -> 581013 bytes 9 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 5e67d31..b6ac305 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2044 +2047 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 9177522..21ffb72 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 8d4438a..adbe73c 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 b9df312..389a187 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 56b8fab..c154820 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 2795356..992fb4e 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 15f589a..3b0873c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 98e6623..518c5f2 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6af0c2a..2cd294f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 2 months

Better help text for locking of accounts after login failures

by Mathias Kettner

Module: check_mk Branch: master Commit: abbe387cc53102ba5c75ab5e13ec3982d4ca1cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abbe387cc53102… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 14:17:07 2016 +0200 Better help text for locking of accounts after login failures --- web/plugins/wato/check_mk_configuration.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5bc87f4..9472072 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -849,8 +849,12 @@ register_configvar(group, none_value = False, title = _("Lock user accounts after N logon failures"), label = _("Activate automatic locking of user accounts"), - help = _("This options enables automatic locking of user account after " - "N logon failures. One successful login resets the failure counter.") + help = _("This options enables automatic locking of user accounts after " + "the configured number of consecutive invalid login attempts. " + "Once the account is locked only an admin user can unlock it. " + "Beware: Also the admin users will be locked that way. You need " + "to manually edit <tt>etc/htpasswd</tt> and remove the <tt>!</tt> " + "in case you are locked out completely."), ), domain = "multisite" )

8 years, 2 months

← Newer
1
...
20
21
22
23
24
25
26
...
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