Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 100401c39177b06c59f2887fad6ed40de3d3687a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=100401c39177b0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 11:09:22 2018 +0200 Updated werk 6000 Change-Id: Id04e99dbee65607a127bfbbbe4aceeb15a58a811 --- checks/statgrab_mem | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/statgrab_mem b/checks/statgrab_mem index ba8dc19..f181283 100644 --- a/checks/statgrab_mem +++ b/checks/statgrab_mem @@ -56,7 +56,8 @@ def parse_statgrab_mem(info): def inventory_statgrab_mem(parsed): - return [(None, 'memused_default_levels')] + if parsed: + return [(None, 'memused_default_levels')] def check_statgrab_mem(_no_item, params, parsed):

6 years, 4 months

6000 FIX statgrab_mem: Missing data caused UnboundLocalError

by Simon Betz

Module: check_mk Branch: master Commit: 4e7e20681bc73d79570b2687590f67d30bd5a4e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e7e20681bc73d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 8 11:05:36 2018 +0200 6000 FIX statgrab_mem: Missing data caused UnboundLocalError Change-Id: I45830cc7e8d4d22f4c9a97d6fab83bb09eea9a20 --- .werks/6000 | 10 ++++++++++ checks/statgrab_mem | 38 +++++++++++++++++++++++++------------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/.werks/6000 b/.werks/6000 new file mode 100644 index 0000000..27a3162 --- /dev/null +++ b/.werks/6000 @@ -0,0 +1,10 @@ +Title: statgrab_mem: Missing data caused UnboundLocalError +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525770293 +Class: fix + + diff --git a/checks/statgrab_mem b/checks/statgrab_mem index e171359..ba8dc19 100644 --- a/checks/statgrab_mem +++ b/checks/statgrab_mem @@ -24,23 +24,35 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + memused_default_levels = (150.0, 200.0) + def parse_statgrab_mem(info): + parsed = {} for var, value in info: - if var == 'mem.used': memused_kb = int(value) / 1024 - elif var == 'mem.total': totalmem_kb = int(value) / 1024 - elif var == 'swap.used': swapused_kb = int(value) / 1024 - elif var == 'swap.total': totalswap_kb = int(value) / 1024 - elif var == 'mem.cache': caches_kb = int(value) / 1024 - - return { - "MemTotal" : totalmem_kb, - "MemFree" : totalmem_kb - memused_kb, - "SwapTotal" : totalswap_kb, - "SwapFree" : totalswap_kb - swapused_kb, - "Cached" : caches_kb, - } + try: + parsed.setdefault(var, int(value) / 1024) + except ValueError: + pass + + try: + totalmem_kb = parsed['mem.total'] + memused_kb = parsed['mem.used'] + totalswap_kb = parsed['swap.total'] + swapused_kb = parsed['swap.used'] + instance = { + "MemTotal" : totalmem_kb, + "MemFree" : totalmem_kb - memused_kb, + "SwapTotal" : totalswap_kb, + "SwapFree" : totalswap_kb - swapused_kb, + } + if 'mem.cache' in parsed: + instance.setdefault("Cached", parsed['mem.cache']) + return instance + + except KeyError: + return {} def inventory_statgrab_mem(parsed):

6 years, 4 months

Fixed creating directories after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 00a43bf70bf63eaa3f518193c84ccd33fcb3bb5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00a43bf70bf63e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 8 10:23:19 2018 +0200 Fixed creating directories after refactoring Change-Id: I8d067e634fe1882640d97eb0dcaf06dbfa4ef18b --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 97e2bd8..af012d5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -370,7 +370,7 @@ class ConfigDomain(object): for varname, value in settings.items(): output += "%s = %s\n" % (varname, pprint.pformat(value)) - store.mkdir(os.path.dirname(filename)) + store.makedirs(os.path.dirname(filename)) store.save_file(filename, output)

6 years, 4 months

Jenkins now loads packages from local path instead of download portal

by Lars Michelsen

Module: check_mk Branch: master Commit: 445d5c0e83b08c46b433eaf9eb8cb0c79c94d54d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=445d5c0e83b08c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 8 09:23:34 2018 +0200 Jenkins now loads packages from local path instead of download portal Change-Id: I759138e7fca22e37d502208d2befd9c59d456eb5 --- tests/testlib/__init__.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 675689f..ecfb6ca 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -162,6 +162,10 @@ class CMKVersion(object): return "https://mathias-kettner.de/support/%s/%s" % (self.version, self.package_name()) + def _build_system_package_path(self): + return os.path.join("/bauwelt/download", self.version, self.package_name()) + + def version_directory(self): return self.omd_version() @@ -182,11 +186,28 @@ class CMKVersion(object): if self.is_installed(): return True + # Use directly from build server in case the tests are executed there + if os.path.exists(self._build_system_package_path()): + return True + response = requests.head(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) return response.status_code == 200 def install(self): + if os.path.exists(self._build_system_package_path()): + print "Install from build system package (%s)" % self._build_system_package_path() + package_path = self._build_system_package_path() + self._install_package(package_path) + + else: + print "Install from download portal" + package_path = self._download_package() + self._install_package(package_path) + os.unlink(package_path) + + + def _download_package(self): temp_package_path = "/tmp/%s" % self.package_name() print(self.package_url()) @@ -194,7 +215,10 @@ class CMKVersion(object): if response.status_code != 200: raise Exception("Failed to load package: %s" % self.package_url()) file(temp_package_path, "w").write(response.content) + return temp_package_path + + def _install_package(self, package_path): # The following gdebi call will fail in case there is another package # manager task being active. Try to wait for other task to finish. Sure # this is not race free, but hope it's sufficient. @@ -206,13 +230,11 @@ class CMKVersion(object): print("Getting install file lock (/tmp/cmk-test-install-version.lock)...") with lockfile.FileLock("/tmp/cmk-test-install-version"): print("Have install file lock") - cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path + cmd = "sudo /usr/bin/gdebi --non-interactive %s" % package_path print(cmd) sys.stdout.flush() if os.system(cmd) >> 8 != 0: - raise Exception("Failed to install package: %s" % temp_package_path) - - os.unlink(temp_package_path) + raise Exception("Failed to install package: %s" % package_path) assert self.is_installed()

6 years, 4 months

6058 Escaping of HTML in plugin output can now be configured individually

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a285bedccfefa13ab40e225bf2e092d988d1db8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a285bedccfefa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 8 08:47:29 2018 +0200 6058 Escaping of HTML in plugin output can now be configured individually Using the global setting "Escape HTML codes in plugin output" you can configure whether or not HTML contained in the status output of hosts / services is interpreted by the GUI globally. In case you need the HTML of a specific check interpreted by the GUI, it is better to use the new rulesets "Escape HTML codes in host output" or "Escape HTML codes in service output". Using these rulesets you can selectively disable the escaping for specific hosts / services. Change-Id: I50984bdaa2ceef26d27a1a0d4a2a25d356d233d5 --- .werks/6058 | 18 ++++++++ web/htdocs/views.py | 14 +++++- web/plugins/views/painters.py | 16 +++---- web/plugins/wato/check_mk_configuration.py | 74 +++++++++++++++++++++++++++--- 4 files changed, 105 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a285bedcc…

6 years, 4 months

5997 FIX brocade_sys: Fixed missing data handling which caused IndexError

by Simon Betz

Module: check_mk Branch: master Commit: 1849ab9b3704ccc59f5da865c5b10479e1838a42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1849ab9b3704cc… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 7 11:00:20 2018 +0200 5997 FIX brocade_sys: Fixed missing data handling which caused IndexError Change-Id: I53f3fe93badb3d7758824dc5097363280614bdcc --- .werks/5997 | 10 ++++++++++ checks/brocade_sys | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/5997 b/.werks/5997 new file mode 100644 index 0000000..d0ca7b6 --- /dev/null +++ b/.werks/5997 @@ -0,0 +1,10 @@ +Title: brocade_sys: Fixed missing data handling which caused IndexError +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1525683538 +Class: fix + + diff --git a/checks/brocade_sys b/checks/brocade_sys index b7a2262..ecb06ad 100644 --- a/checks/brocade_sys +++ b/checks/brocade_sys @@ -26,10 +26,13 @@ def parse_brocade_sys(info): - return { - "cpu_util" : int(info[0][0]), - "mem_used_percent" : int(info[0][1]), - } + try: + return { + "cpu_util" : int(info[0][0]), + "mem_used_percent" : int(info[0][1]), + } + except IndexError, ValueError: + return {} # .--Memory--------------------------------------------------------------.

6 years, 4 months

6057 Changed GUI internal API functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a65ba09a9d11233340fae9c06eb848b393579ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a65ba09a9d112… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 7 20:02:03 2018 +0200 6057 Changed GUI internal API functions Change-Id: I57c8303ca9b421756d9ecccd0e6aade815e71fa5 --- .werks/6057 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/.werks/6057 b/.werks/6057 new file mode 100644 index 0000000..9eb267c --- /dev/null +++ b/.werks/6057 @@ -0,0 +1,96 @@ +Title: Changed GUI internal API functions +Level: 2 +Component: multisite +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1525714596 +Class: feature + +During development of version 1.6 we have made a lot of internal changes +to the GUI internal code. In case you developed you own GUI extensions, you +may likely be affected by this. The following table tries to summarize the +most relevant changes to make it easier for you to port your custom code: + +<h3>Moved exceptions to <tt>gui_exceptions</tt> module</h3> + +Use <tt>from gui_exceptions import ..</tt> to import the exception objects +you need. Available are: MKAuthException, MKUnauthenticatedException, MKGeneralException, MKUserError, MKInternalError. + +<h3>Moved lqencode() to livestatus module</h3> + +Use <tt>import livestatus</tt> and <tt>livestatus.lqencode()</tt>. + +<h3>Moved format_plugin_output() to views</h3> + +Use <tt>import view</tt> and <tt>views.format_plugin_output()</tt>. + +<h3>Moved make_nagios_directory() and make_nagios_directories() to cmk.store</h3> + +Use <tt>import cmk.store</tt> and <tt>cmk.store.mkdir()</tt> or <tt>cmk.store.makedirs()</tt>. + +<h3>Dropped create_user_file()</h3> + +Use <tt>cmk.store.save_file()</tt> instead. + +<h3>Dropped bytes_human_readable()</h3> + +Use <tt>cmk.render.bytes()</tt> instead. + +<h3>Dropped date_human_readable()</h3> + +Use <tt>cmk.render.date()</tt> instead. + +<h3>Dropped percent_human_redable()</h3> + +Use <tt>cmk.render.percent()</tt> instead. + +<h3>Moved make_utf8() to cmk.utils</h3> + +Use <tt>cmk.utils.make_utf8()</tt>. + +<h3>Moved quote_shell_string() to cmk.utils</h3> + +Use <tt>cmk.utils.quote_shell_string()</tt>. + +<h3>Moved pnp_cleanup() to cmk.utils</h3> + +Use <tt>cmk.utils.pnp_cleanup()</tt>. + +<h3>Moved aquire_lock(), release_all_locks(), have_lock() and release_lock() to cmk.store</h3> + +Use e.g. <tt>cmk.store.aquire_lock()</tt>. + +<h3>Dropped age_human_readable()</h3> + +Use <tt>cmk.render.approx_age()</tt> instead. + +<h3>Moved render_scientific() to cmk.render</h3> + +Use <tt>cmk.render.scientific()</tt>. + +<h3>Moved render_scientific() to cmk.render</h3> + +Use <tt>cmk.render.physical_precision()</tt>. + +<h3>Moved several functions to new utils module</h3> + +Use e.g. <tt>utils.drop_dotzero()</tt>. + +These have moved been moved: + +<ul> +<li><tt>drop_dotzero()</tt></li> +<li><tt>cmp_version()</tt></li> +<li><tt>num_split()</tt></li> +<li><tt>saveint()</tt></li> +<li><tt>savefloat()</tt></li> +<li><tt>get_random_string()</tt></li> +<li><tt>gen_id()</tt></li> +<li><tt>load_web_plugins()</tt></li> +</ul> + +<h3>Dropped tryint()</h3> + +This has totally been dropped. Implement it on your own in case +you really need this.

6 years, 4 months

Finally removed lib.py

by Lars Michelsen

Module: check_mk Branch: master Commit: 602bd07a547f8cbd8a7650c384aa842c08b60bcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=602bd07a547f8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 10:21:03 2018 +0100 Finally removed lib.py Change-Id: I09c80ec80ea4e7232e79037d485d8b91630e6c84 --- web/htdocs/availability.py | 2 -- web/htdocs/bi.py | 18 ++++++++++++------ web/htdocs/config.py | 2 +- web/htdocs/crash_reporting.py | 1 - web/htdocs/cron.py | 3 ++- web/htdocs/dashboard.py | 3 +-- web/htdocs/forms.py | 1 - web/htdocs/gui_background_job.py | 7 +++---- web/htdocs/guitester.py | 8 +++++--- web/htdocs/index.py | 1 - web/htdocs/lib.py | 31 ------------------------------- web/htdocs/login.py | 1 - web/htdocs/logwatch.py | 1 - web/htdocs/metrics.py | 1 - web/htdocs/mkeventd.py | 3 ++- web/htdocs/mobile.py | 1 - web/htdocs/modules.py | 5 ++++- web/htdocs/multitar.py | 1 - web/htdocs/notifications.py | 1 - web/htdocs/pagetypes.py | 1 - web/htdocs/prediction.py | 1 - web/htdocs/sidebar.py | 8 +++++--- web/htdocs/userdb.py | 1 - web/htdocs/utils.py | 3 +++ web/htdocs/valuespec.py | 19 +++++++++++++------ web/htdocs/views.py | 1 - web/htdocs/visuals.py | 2 +- web/htdocs/wato.py | 18 ++++++++---------- web/htdocs/watolib.py | 32 ++++++++++++++++++++------------ web/htdocs/webapi.py | 7 +++---- web/htdocs/werks.py | 1 - web/plugins/cron/gui_background_job.py | 3 ++- web/plugins/sidebar/shipped.py | 1 - web/plugins/userdb/ldap.py | 2 -- web/plugins/views/painters.py | 1 - 35 files changed, 85 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=602bd07a54…

6 years, 4 months

Moved load_web_plugins() to utils

by Lars Michelsen

Module: check_mk Branch: master Commit: c31435a2a7180f74d76c44afb6e764fa72efd350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c31435a2a7180f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 09:33:09 2018 +0100 Moved load_web_plugins() to utils Change-Id: I016ab0d015843dd4091931f3ec972c81eea35282 --- web/htdocs/config.py | 3 ++- web/htdocs/cron.py | 3 ++- web/htdocs/dashboard.py | 4 +++- web/htdocs/lib.py | 23 ----------------------- web/htdocs/metrics.py | 6 +++++- web/htdocs/modules.py | 4 ++-- web/htdocs/sidebar.py | 3 ++- web/htdocs/userdb.py | 2 +- web/htdocs/utils.py | 24 ++++++++++++++++++++++++ web/htdocs/views.py | 2 +- web/htdocs/visuals.py | 3 ++- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 +- web/htdocs/webapi.py | 3 ++- web/plugins/views/painters.py | 3 ++- web/plugins/views/perfometer.py | 3 ++- 16 files changed, 52 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c31435a2a7…

6 years, 4 months

Removed unused render_float_with_precision()

by Lars Michelsen

Module: check_mk Branch: master Commit: 009cfa953fead8eb5bde7aacb20fc931ad23fe4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=009cfa953fead8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 16 17:10:48 2018 +0100 Removed unused render_float_with_precision() Change-Id: Ib093724116888b79136d1d105700692113f01441 --- web/htdocs/lib.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e8620c5..984aeff 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -337,36 +337,6 @@ def drop_dotzero(v, digits=2): return t -# Renders a floating point number with the given number -# of non-zero digits. Example if precision is 3: -# 12.40349034 -> 12.4 -# 1.23894859348563478 -> 1.24 -# 0.00001239898568978 -> 0.0000124 -# 12400000.00230923 -> 12400000 - -def render_float_with_precision(value, precision): - if value == 0: - return "0" - - elif value < 0: - return "-" + render_float_with_precision(-value, precision) - - mantissa, exponent = frexp10(float(value)) - # exponent + 1 is the number of digits left of the . - - # Digits left of . are more than precision -> no fraction. - if exponent + 1 >= precision: - return "%.0f" % value - - # Allow so many digits after comma that we have at least 'precision' - # valid non-zero digits - else: - digits = precision - exponent - 1 - return "%%.%df" % digits % value - - - - def number_human_readable(n, precision=1, unit="B"): base = 1024.0 if unit == "Bit":

6 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018