Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

small styling fix of "several host groups" view filter

by Lars Michelsen

Module: check_mk Branch: master Commit: f58f4f3ec1392671bd5bef3220b05add62b128d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f58f4f3ec13926… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 26 14:06:39 2016 +0200 small styling fix of "several host groups" view filter --- web/plugins/visuals/filters.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 3eaf307..7ca957c 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -275,7 +275,11 @@ class FilterMultigroup(Filter): return True def valuespec(self): - return DualListChoice(choices = all_groups(self.what), rows=2, autoheight=False, enlarge_active=True) + return DualListChoice( + choices = all_groups(self.what), + rows=3 if self.negateable else 4, + enlarge_active=True + ) def selection(self): current = html.var(self.htmlvar, "").strip().split("|")

7 years, 11 months

Added tests for store file locking functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 62195f7a4186d34b3be9a5f0c3f8accbb2bb8f25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62195f7a4186d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 26 12:22:22 2016 +0200 Added tests for store file locking functions --- tests/lib/test_store.py | 143 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/tests/lib/test_store.py b/tests/lib/test_store.py new file mode 100644 index 0000000..03d658c --- /dev/null +++ b/tests/lib/test_store.py @@ -0,0 +1,143 @@ +import cmk.store as store +import imp +import sys +import threading +import time + + +def test_acquire_lock_not_existing(tmpdir): + store.aquire_lock("%s/asd" % tmpdir) + + +def test_acquire_lock(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("") + + path = "%s" % locked_file + + assert store.have_lock(path) == False + store.aquire_lock(path) + assert store.have_lock(path) == True + + +def test_acquire_lock_twice(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("") + + path = "%s" % locked_file + + assert store.have_lock(path) == False + store.aquire_lock(path) + assert store.have_lock(path) == True + store.aquire_lock(path) + assert store.have_lock(path) == True + + +def test_release_lock_not_locked(): + store.release_lock("/asdasd/aasdasd") + + +def test_release_lock(tmpdir): + locked_file = tmpdir.join("locked_file") + locked_file.write("") + + path = "%s" % locked_file + + assert store.have_lock(path) == False + store.aquire_lock(path) + assert store.have_lock(path) == True + store.release_lock(path) + assert store.have_lock(path) == False + + +def test_release_all_locks(tmpdir): + locked_file1 = tmpdir.join("locked_file1") + locked_file1.write("") + locked_file2 = tmpdir.join("locked_file2") + locked_file2.write("") + + path1 = "%s" % locked_file1 + path2 = "%s" % locked_file2 + + assert store.have_lock(path1) == False + store.aquire_lock(path1) + assert store.have_lock(path1) == True + + assert store.have_lock(path2) == False + store.aquire_lock(path2) + assert store.have_lock(path2) == True + + store.release_all_locks() + assert store.have_lock(path1) == False + assert store.have_lock(path2) == False + + + +class LockTestThread(threading.Thread): + def __init__(self, store, path): + self.store = store + self.path = path + self.do = None + self.is_locked = False + super(LockTestThread, self).__init__() + self.daemon = True + + + def run(self): + while True: + if self.do == "lock": + assert self.store.have_lock(self.path) == False + self.store.aquire_lock(self.path) + assert self.store.have_lock(self.path) == True + self.do = None + + elif self.do == "unlock": + assert self.store.have_lock(self.path) == True + self.store.release_lock(self.path) + assert self.store.have_lock(self.path) == False + self.do = None + + else: + time.sleep(0.1) + + + +def test_locking(tmpdir): + store1 = sys.modules["cmk.store"] + del sys.modules["cmk.store"] + import cmk.store as store + store2 = sys.modules["cmk.store"] + + assert store1 != store2 + + locked_file = tmpdir.join("locked_file") + locked_file.write("") + path = "%s" % locked_file + + t1 = LockTestThread(store1, path) + t1.start() + t2 = LockTestThread(store2, path) + t2.start() + + # Take lock with store1 + t1.do = "lock" + while range(20): + if store1.have_lock(path): + break + time.sleep(0.01) + assert store1.have_lock(path) == True + + # Now try to get lock with store2 + t2.do = "lock" + time.sleep(0.2) + assert store1.have_lock(path) == True + assert store2.have_lock(path) == False + + # And now unlock store1 and check whether store2 has the lock now + t1.do = "unlock" + while range(20): + if not store1.have_lock(path): + break + time.sleep(0.01) + assert store1.have_lock(path) == False + assert store2.have_lock(path) == True

7 years, 11 months

Add some debugging output

by Sven Panne

Module: check_mk Branch: master Commit: 43311358ebc5829107d23561fb6fd9818c021fcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43311358ebc582… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 26 12:03:31 2016 +0200 Add some debugging output Our Makefile dependencies are not fully correct due to autoconf being a bit clever about config.h, so let's add some debugging output to some neuralgic targets. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 70ffc1e..34f573d 100644 --- a/Makefile +++ b/Makefile @@ -273,16 +273,20 @@ setup: sudo apt-get install figlet pngcrush slimit bear dietlibc-dev $(addprefix %/,$(LIVESTATUS_AUTO)): $(addprefix %/,configure.ac m4/* Makefile.am src/Makefile.am) + @echo "making $@: $? is newer" cd livestatus && autoreconf --install --include=m4 livestatus/config.h: livestatus/configure livestatus/config.h.in + @echo "making $@: $? is newer" cd livestatus && ./configure CXXFLAGS="$(CXX_FLAGS)" GTAGS: livestatus/config.h + @echo "making $@: $? is newer" $(MAKE) -C livestatus distclean-tags $(MAKE) -C livestatus GTAGS compile_commands.json: livestatus/config.h $(FILES_TO_FORMAT) + @echo "making $@: $? is newer" $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8

7 years, 11 months

Minor styling fix of network interface type selection filter

by Lars Michelsen

Module: check_mk Branch: master Commit: 36303ce1dacb09386389e80479894eaa3bd87ab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36303ce1dacb09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 26 11:39:31 2016 +0200 Minor styling fix of network interface type selection filter --- web/plugins/visuals/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/inventory.py b/web/plugins/visuals/inventory.py index 438cee9..aa9d8a9 100644 --- a/web/plugins/visuals/inventory.py +++ b/web/plugins/visuals/inventory.py @@ -253,7 +253,7 @@ class FilterInvtableInterfaceType(Filter): def valuespec(self): return DualListChoice( choices = interface_port_type_choices, - autoheight = False, + rows = 4, enlarge_active = True, custom_order = True)

7 years, 11 months

Minor cleanup and note update

by Lars Michelsen

Module: check_mk Branch: master Commit: a553c83cc3ac5a031ba6633fdf5276e5af2da19d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a553c83cc3ac5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 26 11:30:09 2016 +0200 Minor cleanup and note update --- web/htdocs/index.py | 4 ++-- web/htdocs/modules.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index abfddc8..76ea094 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -112,13 +112,13 @@ def handler(req, fields = None, is_profiling = False): # Initialize the multiste i18n. This will be replaced by # language settings stored in the user profile after the user # has been initialized - previous_language = current_language + previous_language = i18n.get_current_language() i18n.localize(html.var("lang", config.get_language())) # All plugins might have to be reloaded due to a language change. Only trigger # a second plugin loading when the user is really using a custom localized GUI. # Otherwise the load_all_plugins() at the beginning of the request is sufficient. - if current_language != previous_language: + if i18n.get_current_language() != previous_language: modules.load_all_plugins() # User allowed to login at all? diff --git a/web/htdocs/modules.py b/web/htdocs/modules.py index 6096433..6113883 100644 --- a/web/htdocs/modules.py +++ b/web/htdocs/modules.py @@ -86,7 +86,7 @@ def init_modules(): # Load the list of internal hard coded modules for module_name in internal_module_names: - # FIXME: use __import__ + # TODO: use __import__ modules.append(import_module(module_name)) # Load all multisite pages which will also perform imports of the needed modules @@ -102,7 +102,7 @@ g_all_modules_loaded = False def load_all_plugins(): global g_all_modules_loaded - # CLEANUP: Move this to the pagehandlers if this concept works out. + # TODO: CLEANUP: Move this to the pagehandlers if this concept works out. if html.myfile == "ajax_graph" and g_all_modules_loaded: only_modules = ["metrics"] else:

7 years, 11 months

3892 FIX CSV export of views: Joined columns have now a title

by Lars Michelsen

Module: check_mk Branch: master Commit: 98367ba686a058c740b4d393e0c75d62680044d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98367ba686a058… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 15:43:56 2016 +0200 3892 FIX CSV export of views: Joined columns have now a title The title cells of joined columns (service columns in host views) had no title in CSV exports of views. Now, the titles have been added and are computed as follows: [painter_name].[service_description_of_join_service] For example: perfometer.CPU load --- .werks/3892 | 16 ++++++++++++++++ ChangeLog | 1 + web/htdocs/views.py | 9 +++++++++ web/plugins/views/webservice.py | 6 +++--- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/3892 b/.werks/3892 new file mode 100644 index 0000000..9e35ffb --- /dev/null +++ b/.werks/3892 @@ -0,0 +1,16 @@ +Title: CSV export of views: Joined columns have now a title +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1474638125 +Class: fix + +The title cells of joined columns (service columns in host views) had no title in +CSV exports of views. Now, the titles have been added and are computed as follows: + +[painter_name].[service_description_of_join_service] + +For example: + +perfometer.CPU load diff --git a/ChangeLog b/ChangeLog index e1ca282..c9c0568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -520,6 +520,7 @@ * 3871 FIX: stale services view: excluded services in downtime per default * 3874 FIX: fixed graphs displaying wrong labels * 3885 FIX: Fixed sorting of version in werk list (1.2.8p10 and 1.2.8p11 were not listed on top) + * 3892 FIX: CSV export of views: Joined columns have now a title... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7c5c601..08c4797 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -704,6 +704,10 @@ class Cell(object): return self._painter_name + def export_title(self): + return self._painter_name + + def painter_options(self): return self.painter().get("options", []) @@ -982,6 +986,11 @@ class JoinCell(Cell): return self._join_service_descr + def export_title(self): + return "%s.%s" % (self._painter_name, self.join_service()) + + + class EmptyCell(Cell): def __init__(self, view): diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 5fa0f9d..32cbaa8 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -41,7 +41,7 @@ multisite_layouts["python-raw"] = { def render_python(rows, view, group_cells, cells, num_columns, show_checkboxes): html.write("[\n") - html.write(repr([cell.painter_name() for cell in cells])) + html.write(repr([cell.export_title() for cell in cells])) html.write(",\n") for row in rows: html.write("[") @@ -71,7 +71,7 @@ def render_json(rows, view, group_cells, cells, num_columns, show_checkboxes, ex header_row = [] for cell in cells: - header_row.append(html.strip_tags(cell.painter_name())) + header_row.append(html.strip_tags(cell.export_title())) painted_rows.append(header_row) for row in rows: @@ -135,7 +135,7 @@ def render_csv(rows, view, group_cells, cells, num_columns, show_checkboxes, exp first = False else: html.write(csv_separator) - content = cell.painter_name() + content = cell.export_title() content = type(content) in [ int, float ] and str(content) or content stripped = html.strip_tags(content).replace('\n', '').replace('"', '""') html.write('"%s"' % stripped.encode("utf-8"))

7 years, 12 months

Fixed management board on "no agent" hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: c3dcbdf28b0090b2c6323fae58d98123466b693b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3dcbdf28b0090… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 15:34:12 2016 +0200 Fixed management board on "no agent" hosts --- modules/check_mk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9d54ffe..f7d8e53 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -499,7 +499,10 @@ def is_tcp_host(hostname): return in_binary_hostlist(hostname, tcp_hosts) def is_ping_host(hostname): - return not is_snmp_host(hostname) and not is_tcp_host(hostname) and not has_piggyback_info(hostname) + return not is_snmp_host(hostname) \ + and not is_tcp_host(hostname) \ + and not has_piggyback_info(hostname) \ + and not has_management_board(hostname) def is_dual_host(hostname): return is_tcp_host(hostname) and is_snmp_host(hostname)

7 years, 12 months

3891 Changed graph time range choices

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b706f6bf0a874863a28ce4ac66445a91cffe321 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b706f6bf0a874… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 15:19:23 2016 +0200 3891 Changed graph time range choices It seems more practical to have slightly wider time ranges, e.g. 8 days instead of 7 days to have a little more context. We also extended the "month" and "year" time ranges. You have now the following available: The last 4 hours The last 25 hours The last 8 days The last 35 days The last 400 days --- .werks/3891 | 18 ++++++++++++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 14 +++++++------- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/3891 b/.werks/3891 new file mode 100644 index 0000000..4e40ce3 --- /dev/null +++ b/.werks/3891 @@ -0,0 +1,18 @@ +Title: Changed graph time range choices +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1474636659 +Class: feature + +It seems more practical to have slightly wider time ranges, e.g. 8 days instead of 7 days +to have a little more context. We also extended the "month" and "year" time ranges. + +You have now the following available: + +The last 4 hours +The last 25 hours +The last 8 days +The last 35 days +The last 400 days diff --git a/ChangeLog b/ChangeLog index 3311e42..e1ca282 100644 --- a/ChangeLog +++ b/ChangeLog @@ -436,6 +436,7 @@ * 3847 Painter options can now be reset to defaults... * 3856 Improved handling of Check_MK GUI request timeouts... * 3876 New filter option: negation for several service and host groups + * 3891 Changed graph time range choices... * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 699629d..c8ac050 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2460,9 +2460,9 @@ class Timerange(CascadingDropdown): kwargs['choices'] += [ ( "4h", _("The last 4 hours")), ( "25h", _("The last 25 hours")), - ( "7d", _("The last 7 days")), - ( "31d", _("The last 31 days")), - ( "365d", _("The last 365 days")), + ( "8d", _("The last 8 days")), + ( "35d", _("The last 35 days")), + ( "400d", _("The last 400 days")), ( "d0", _("Today") ), ( "d1", _("Yesterday") ), @@ -2520,9 +2520,9 @@ class Timerange(CascadingDropdown): rangespec = { 1: "4h", 2: "25h", - 3: "7d", - 4: "31d", - 5: "365d" + 3: "8d", + 4: "35d", + 5: "400d" }.get(rangespec[1], "4h") now = time.time() @@ -2547,7 +2547,7 @@ class Timerange(CascadingDropdown): else: until_time = now - if rangespec[0].isdigit(): # 4h, 365d + if rangespec[0].isdigit(): # 4h, 400d count = int(rangespec[:-1]) from_time = TimeHelper.add(now, count * -1, rangespec[-1]) unit_name = {

7 years, 12 months

3890 FIX check_mk_agent.openbsd: Fixed broken MRPE checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ac92d4badf56f5ee2b5e6d6d1bd6f4557b03759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ac92d4badf56f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 14:31:40 2016 +0200 3890 FIX check_mk_agent.openbsd: Fixed broken MRPE checks --- .werks/3890 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.openbsd | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3890 b/.werks/3890 new file mode 100644 index 0000000..040792e --- /dev/null +++ b/.werks/3890 @@ -0,0 +1,10 @@ +Title: check_mk_agent.openbsd: Fixed broken MRPE checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1474633809 + + diff --git a/ChangeLog b/ChangeLog index d4c0235..3311e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -408,6 +408,7 @@ * 3813 FIX: check_mail: fixed missing base64 decoding on multipart mails * 3888 FIX: df checks: Fixed invalid displayed WARN / CRIT lines in graphs when using "bytes left" thresholds * 3840 FIX: cisco_qos: Fixed wrong units in graphs... + * 3890 FIX: check_mk_agent.openbsd: Fixed broken MRPE checks Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 0bcfbd0..b055814 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -204,7 +204,7 @@ for IF in $(jot $NI) done # reset IFS to default -IFW=$OFS +IFS=$OFS # IPMI-Data (Fans, CPU, temperature, etc) # needs the sysutils/ipmitool and kldload ipmi.ko

7 years, 12 months

Removed internal and undocumented Check_MK call "--list-man"

by Lars Michelsen

Module: check_mk Branch: master Commit: cc23f066ea04b5610b3bd5c898d910737a38f2ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc23f066ea04b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 23 13:58:22 2016 +0200 Removed internal and undocumented Check_MK call "--list-man" --- modules/check_mk.py | 5 +---- tests/checkman/test_manpages.py | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 795d156..9d54ffe 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4610,7 +4610,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "man", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", "checks=", "inventory", "inventory-as-check=", "hw-changes=", "sw-changes=", "sw-missing=", - "inv-fail-status=", "cmc-file=", "browse-man", "list-man", "update-dns-cache", "cap", "real-time-checks", + "inv-fail-status=", "cmc-file=", "browse-man", "update-dns-cache", "cap", "real-time-checks", "log-to-stdout"] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', @@ -4781,9 +4781,6 @@ try: else: man_pages.print_man_page_table() done = True - elif o in [ '--list-man' ]: - pprint.pprint(man_pages.load_man_page_catalog()) - done = True elif o in [ '-m', '--browse-man' ]: man_pages.print_man_page_browser() done = True diff --git a/tests/checkman/test_manpages.py b/tests/checkman/test_manpages.py index 1437f73..4e639c3 100644 --- a/tests/checkman/test_manpages.py +++ b/tests/checkman/test_manpages.py @@ -29,16 +29,6 @@ def _check_manpage(name): assert found_catalog, "Did not find \"catalog:\" header in manpage \"%s\"" % name -def test_manpage_list(site): - p = site.execute(["check_mk", "--list-man"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - result = p.communicate()[0] - - assert p.returncode == 0 - assert result != "" - assert not "ERROR" in result, "Manpage list broken \"check_mk --list-man\": %s\"" % result - assert type(eval(result)) == dict - - def test_missing_manpage(site): missing = []

7 years, 12 months

← Newer
1
...
7
8
9
10
11
12
13
...
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