Checkmk git commits April 2017

checkmk-commits@lists.checkmk.com

11 participants
159 discussions

Added API methods to add default javascript/css files

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fd899952f6ea4b604622d4bf695aebb8977b82a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fd899952f6ea4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 12 19:20:45 2017 +0200 Added API methods to add default javascript/css files Change-Id: Ieac4de0ac232d2d057bcb255eb79efd0f41319e7 --- web/htdocs/htmllib.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 547e0e6..ce74e02 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1506,6 +1506,16 @@ class html(HTMLGenerator, Encoder, RequestHandler): self.browser_redirect = url + def add_default_stylesheet(self, name): + if name not in self._default_stylesheets: + self._default_stylesheets.append(name) + + + def add_default_javascript(self, name): + if name not in self._default_javascripts: + self._default_javascripts.append(name) + + def immediate_browser_redirect(self, secs, url): self.javascript("set_reload(%s, '%s');" % (secs, url))

7 years, 5 months

Finally fixed GUI crawl test after starting with CME

by Lars Michelsen

Module: check_mk Branch: master Commit: 822522b53f6fd1d5ad9cc3440b273d50db26e203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=822522b53f6fd1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 12 20:51:53 2017 +0200 Finally fixed GUI crawl test after starting with CME Change-Id: Id431395b5bf1ad6ef298ddc078f1e6c9cf27d515 --- tests/testlib/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2a26a3a..6160dfa 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -345,7 +345,11 @@ class Site(object): execute("sudo chrpath -r %s/lib %s/bin/python" % (self.root, self.version.version_path())) - execute("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " \ + self._add_version_path_to_index_py() + + + def _add_version_path_to_index_py(self): + os.system("sudo sed -i '0,/^$/s|^$|import sys ; sys.path.insert(0, \"%s/lib/python\")\\n|' " \ "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) @@ -399,6 +403,8 @@ class Site(object): print("Executing .f12 in \"%s\" DONE" % path) sys.stdout.flush() + self._add_version_path_to_index_py() + def _enable_mod_python_debug(self): path = "etc/check_mk/apache.conf" @@ -741,7 +747,7 @@ class WebSession(requests.Session): if allow_errors and matches: print "Found error message, but it's allowed: %s" % matches.groups() else: - assert not matches, "Found error message(s): %s" % "\n".join(matches.groups()) + assert not matches, "Found error message: %s" % matches.groups() def _check_html_page_resources(self, response):

7 years, 5 months

4617 FIX 3par: several fixes for 3PAR Storage Services

by Marcel Arentz

Module: check_mk Branch: master Commit: 7d0ddcdcc6b1b0f17dc85102ac119948d4320fc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d0ddcdcc6b1b0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Apr 12 17:07:54 2017 +0200 4617 FIX 3par: several fixes for 3PAR Storage Services This werk includes several fixes for 3par checkplugins. Details are listed below: - 3par_cpgs: CPGs are only discovered if their have at least one VV - 3par_ports: Ports are only discoverd if not marked as free - 3par_hosts: Checks do not crash anymore if the OS type is not delivered in output - 3par_volumes: Checks to not crash anymore if there is no information about efficiency at all This Bugfix is compatible although it is recommended to rediscover your host to get rid of some useless Services. Change-Id: Iefe71a63abe54807968a99ffe7979765965e936a --- .werks/4617 | 18 ++++++++++++++++++ checks/3par_cpgs | 13 ++++++++----- checks/3par_hosts | 4 +++- checks/3par_ports | 13 ++++++++----- checks/3par_volumes | 12 +++++++----- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/.werks/4617 b/.werks/4617 new file mode 100644 index 0000000..046b7fc --- /dev/null +++ b/.werks/4617 @@ -0,0 +1,18 @@ +Title: 3par: several fixes for 3PAR Storage Services +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1492008730 +Class: fix + +This werk includes several fixes for 3par checkplugins. Details are listed below: +- 3par_cpgs: CPGs are only discovered if their have at least one VV +- 3par_ports: Ports are only discoverd if not marked as free +- 3par_hosts: Checks do not crash anymore if the OS type is not delivered in output +- 3par_volumes: Checks to not crash anymore if there is no information about efficiency at all + +This Bugfix is compatible although it is recommended to rediscover your host +to get rid of some useless Services. + diff --git a/checks/3par_cpgs b/checks/3par_cpgs index 95ba516..7bc9fde 100644 --- a/checks/3par_cpgs +++ b/checks/3par_cpgs @@ -24,10 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def count_3par_vvs(line): + return line['numFPVVs'] + line['numTDVVs'] + line['numTPVVs'] def inventory_3par_cpgs(parsed): for entry in parsed['members']: - if "name" in entry: + if "name" in entry and count_3par_vvs(entry) > 0: yield (entry['name'], {}) @@ -44,8 +46,8 @@ def check_3par_cpgs(item, params, parsed): if entry['name'] == item: state, state_readable = states[entry['state']] - yield state, "%s, %s VVs" % (state_readable, \ - entry['numFPVVs'] + entry['numTDVVs'] + entry['numTPVVs']) + yield state, "%s, %s VVs" % (state_readable, + count_3par_vvs(entry)) check_info['3par_cpgs'] = { @@ -59,8 +61,9 @@ check_info['3par_cpgs'] = { def inventory_3par_cpgs_usage(parsed): for entry in parsed['members']: - for fs in ["SAUsage", "SDUsage", "UsrUsage"]: - yield ("%s %s" % (entry['name'], fs), {}) + if count_3par_vvs(entry) > 0: + for fs in ["SAUsage", "SDUsage", "UsrUsage"]: + yield ("%s %s" % (entry['name'], fs), {}) def check_3par_cpgs_usage(item, params, parsed): for entry in parsed['members']: diff --git a/checks/3par_hosts b/checks/3par_hosts index 36f0675..c851674 100644 --- a/checks/3par_hosts +++ b/checks/3par_hosts @@ -37,7 +37,9 @@ def check_3par_hosts(item, _no_params, parsed): continue if item == entry['name']: - yield 0, "ID: %s, OS: %s" % (entry['id'], entry['descriptors']['os']) + yield 0, "ID: %s" % entry['id'] + if "descriptors" in entry: + yield 0, "OS: %s" % entry['descriptors']['os'] if len(entry['FCPaths']) > 0: yield 0, "FC Paths: %s" % len(entry['FCPaths']) elif len(entry['iSCSIPaths']) > 0: diff --git a/checks/3par_ports b/checks/3par_ports index fddc894..e24e8a0 100644 --- a/checks/3par_ports +++ b/checks/3par_ports @@ -63,11 +63,14 @@ def translate_protocol_3par_ports(number): def inventory_3par_ports(parsed): for entry in parsed['members']: - item = "%s Node %s Slot %s Port %s" % (translate_protocol_3par_ports(entry['protocol']), \ - entry['portPos']['node'], - entry['portPos']['slot'], - entry['portPos']['cardPort']) - yield (item, {}) + # Only create an item if not "FREE" (type = 3) + if not entry['type'] == 3: + item = "%s Node %s Slot %s Port %s" % \ + (translate_protocol_3par_ports(entry['protocol']), \ + entry['portPos']['node'], + entry['portPos']['slot'], + entry['portPos']['cardPort']) + yield (item, {}) def check_3par_ports(item, params, parsed): diff --git a/checks/3par_volumes b/checks/3par_volumes index 698f08c..04a941f 100644 --- a/checks/3par_volumes +++ b/checks/3par_volumes @@ -59,11 +59,13 @@ def check_3par_volumes(item, params, parsed): usr_free = total - entry['userSpace']['usedMiB'] yield df_check_filesystem_list(item, params, [ (item, total, usr_free, 0) ]) - # These sections are not always existend. Only add them if available. - if "deduplication" in entry['capacityEfficiency']: - yield 0, "Dedup: %s" % entry['capacityEfficiency']['deduplication'] - if "compaction" in entry['capacityEfficiency']: - yield 0, "Compact: %s" % entry['capacityEfficiency']['compaction'] + # This section seems not always to be present... + if "capacityEfficiency" in entry: + # Even these sections are not always existend. Only add them if available. + if "deduplication" in entry['capacityEfficiency']: + yield 0, "Dedup: %s" % entry['capacityEfficiency']['deduplication'] + if "compaction" in entry['capacityEfficiency']: + yield 0, "Compact: %s" % entry['capacityEfficiency']['compaction'] # Add some additional information and the performance data about Provisioning provisioning = entry['userSpace']['rawReservedMiB'] * 1024 * 1024

7 years, 5 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 572ebedee58f336dff7d09d65a80505106ebaaf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=572ebedee58f33… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 12 15:22:16 2017 +0200 Minor cleanup Change-Id: I90aad5ff4f24fe5a6b1bccfd196ec482e174bedf --- checks/juniper_trpz_aps_sessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/juniper_trpz_aps_sessions b/checks/juniper_trpz_aps_sessions index 097bb5f..aac0cdf 100644 --- a/checks/juniper_trpz_aps_sessions +++ b/checks/juniper_trpz_aps_sessions @@ -126,8 +126,8 @@ def check_juniper_trpz_aps_sessions(item, _no_params, parsed): radio_rates.append(radio_rate) ap_rates[nr] += radio_rate - infotext = "Radio %s: input: %s/s, output: %s/s, \ - %d errors, %d resets, %d retries, %d sessions, noise: %d dBm" % \ + infotext = ("Radio %s: Input: %s/s, Output: %s/s, " + \ + "%d errors, %d resets, %d retries, %d sessions, noise: %d dBm") % \ ( radio_number, get_bytes_human_readable(radio_rates[5]), get_bytes_human_readable(radio_rates[1] + radio_rates[3]),

7 years, 5 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: ab05798f43abed2604ac76face5bcede19faa361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab05798f43abed… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 12 15:06:17 2017 +0200 Minor cleanup Change-Id: I7b54778d9216addf37d96c6595bb1d2a5fcf0f4d --- web/htdocs/wato.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f07c15a..55e6ef5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9321,10 +9321,9 @@ class ModeDistributedMonitoring(ModeSites): secret = do_site_login(login_id, name, passwd) site["secret"] = secret save_sites(configured_sites) - log_audit(None, "edit-site", _("Successfully logged into remote site %s") % \ - html.render_tt(site["alias"])) - return None, _("Successfully logged into remote site %s!") % \ - html.render_tt(site["alias"]) + message = _("Successfully logged into remote site %s.") % html.render_tt(site["alias"]) + log_audit(None, "edit-site", message) + return None, message except MKAutomationException, e: error = _("Cannot connect to remote site: %s") % e

7 years, 5 months

Fixed build issues caused by missing am--refresh target in top level makefile

by Lars Michelsen

Module: check_mk Branch: master Commit: 3de22d9c58f832bd9fba9e789029e20a93071a3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3de22d9c58f832… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 12:55:02 2017 +0200 Fixed build issues caused by missing am--refresh target in top level makefile Change-Id: I2c8400c5d04df3b2978a598673ed5e335fa0c474 --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b34268..707ba99 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,8 @@ PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs .PHONY: all analyze build check check-binaries check-permissions check-spaces \ check-version clean cppcheck dist documentation format \ GTAGS headers healspaces help install iwyu mrproper \ - optimize-images packages setup setversion tidy version + optimize-images packages setup setversion tidy version \ + am--refresh all: dist packages @@ -433,6 +434,7 @@ setup: librrd-dev \ pngcrush \ slimit + ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 @@ -547,3 +549,10 @@ documentation: config.h ifeq ($(ENTERPRISE),yes) cd enterprise && $(DOXYGEN) doc/Doxyfile endif + +# This dummy rule is called from subdirectories whenever one of the +# top-level Makefile's dependencies must be updated. It does not +# need to depend on %MAKEFILE% because GNU make will always make sure +# %MAKEFILE% is updated before considering the am--refresh target. +am--refresh: + @:

7 years, 5 months

fixed some invalid parameters

by Simon Betz

Module: check_mk Branch: master Commit: c0616d70968cb908b08dc2f86cec185483ca336b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0616d70968cb9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 11 12:14:19 2017 +0200 fixed some invalid parameters Change-Id: Iffb605a21b95e0273d1321cd3233571f8db0d871 --- checks/esx_vsphere_vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index c6e49b6..128a637 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -233,7 +233,7 @@ check_info['esx_vsphere_vm.datastores'] = { def inventory_esx_vsphere_vm_guest_tools(info): data = esx_vsphere_vm_convert(info) if 'guest.toolsVersionStatus' in data: - return [(None, None)] + return [(None, {})] def check_esx_vsphere_vm_guest_tools(_no_item, params, info): data = esx_vsphere_vm_convert(info) @@ -283,7 +283,7 @@ check_info['esx_vsphere_vm.guest_tools'] = { def inventory_esx_vsphere_vm_hb_status(info): data = esx_vsphere_vm_convert(info) if 'guestHeartbeatStatus' in data: - return [(None, None)] + return [(None, {})] def check_esx_vsphere_vm_hb_status(_no_item, params, info): data = esx_vsphere_vm_convert(info)

7 years, 5 months

More logging during test version copying

by Lars Michelsen

Module: check_mk Branch: master Commit: 527969938d6c57a5ee15ebec97ccce794b6eaa3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527969938d6c57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 11:53:48 2017 +0200 More logging during test version copying Change-Id: Id1682eec33352190b0278e35fcf239c4ed03eb0a --- tests/testlib/__init__.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3f7cf81..2a26a3a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -331,22 +331,22 @@ class Site(object): assert not os.path.exists(self.version.version_path()), \ "New version path '%s' already exists" % self.version.version_path() - cmd = "sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path()) - if os.system(cmd) >> 8 != 0: - raise Exception("Failed to copy Check_MK: %s" % cmd) + def execute(cmd): + print("Executing: %s" % cmd) + rc = os.system(cmd) >> 8 + if rc != 0: + raise Exception("Failed to execute '%s'. Exit code: %d" % (cmd, rc)) + + execute("sudo /bin/cp -pr %s %s" % (src_path, self.version.version_path())) - if os.system("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % - (src_version, new_version_name, self.version.version_path())) >> 8 != 0: - raise Exception("Failed to set new version to bin/omd") + execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % + (src_version, new_version_name, self.version.version_path())) - if os.system("sudo chrpath -r %s/lib %s/bin/python" % - (self.root, self.version.version_path())) >> 8 != 0: - raise Exception("Failed to set new version to bin/python") + execute("sudo chrpath -r %s/lib %s/bin/python" % + (self.root, self.version.version_path())) - if os.system("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " - "%s/share/check_mk/web/htdocs/index.py" % - (self.version.version_path(), self.version.version_path())) >> 8 != 0: - raise Exception("Failed to add python module path of fake version") + execute("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " \ + "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) def _update_with_f12_files(self):

7 years, 5 months

Fixed quoting issue in recent change

by Lars Michelsen

Module: check_mk Branch: master Commit: 51007dba21e1d05dd97e33cd98398a52d63c0990 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51007dba21e1d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 11 11:36:21 2017 +0200 Fixed quoting issue in recent change Change-Id: I30628236ba5a3e2b86f9d967d3e715bfcef4cd95 --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index c93d16d..3f7cf81 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -343,7 +343,7 @@ class Site(object): (self.root, self.version.version_path())) >> 8 != 0: raise Exception("Failed to set new version to bin/python") - if os.system("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\ninitialize()|g' " + if os.system("sudo sed -i 's|^initialize()$|sys.path.insert(0, \"%s/lib/python\")\\ninitialize()|g' " "%s/share/check_mk/web/htdocs/index.py" % (self.version.version_path(), self.version.version_path())) >> 8 != 0: raise Exception("Failed to add python module path of fake version")

7 years, 5 months

4584 FIX mssql_counters.pageactivity: Raised always a MKCounterWrapped which resulted in PENDING service state; Fixed that.

by Simon Betz

Module: check_mk Branch: master Commit: 9001c70a333fa8c3daf7901b91c68b7b644dabbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9001c70a333fa8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 11 11:31:11 2017 +0200 4584 FIX mssql_counters.pageactivity: Raised always a MKCounterWrapped which resulted in PENDING service state; Fixed that. Change-Id: Icb776f75d67a497cb1df09a343c5cf0917118764 --- .werks/4584 | 11 +++++++++++ checks/mssql_counters | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.werks/4584 b/.werks/4584 new file mode 100644 index 0000000..e87db0e --- /dev/null +++ b/.werks/4584 @@ -0,0 +1,11 @@ +Title: mssql_counters.pageactivity: Raised always a MKCounterWrapped which resulted in PENDING service state; Fixed that. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1491902865 + + diff --git a/checks/mssql_counters b/checks/mssql_counters index b6edd79..acab476 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -309,17 +309,19 @@ def check_mssql_counters_pageactivity(item, params, info): if now is None: now = time.time() + found = False for line in info: if mssql_counters_item(line, False) != item: continue for counter, label in mssql_pageactivity_counters: if line[1] == counter: - reading = float(line[-1]) + found = True + reading = float(line[-1]) countername = "mssql_counters_pageactivity.%s.%s" % (item, counter) - rate = get_rate(countername, now, reading) - state = 0 - infotext = "%s %.1f/sec" % (label, rate) + rate = get_rate(countername, now, reading) + state = 0 + infotext = "%s %.1f/sec" % (label, rate) if params.get(counter): warn, crit = params[counter] @@ -334,12 +336,12 @@ def check_mssql_counters_pageactivity(item, params, info): else: perfdata = [ (counter, rate) ] - yield state, infotext, perfdata - # Assume general connection problem to the database, which is reported - # by the "X Instance" service and skip this check. - raise MKCounterWrapped("Failed to connect to database") + if not found: + # Assume general connection problem to the database, which is reported + # by the "X Instance" service and skip this check. + raise MKCounterWrapped("Failed to connect to database") check_info['mssql_counters.pageactivity'] = {

7 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2017