Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

View editor: Prefix painter/sorter choices with related info titles

by Lars Michelsen

Module: check_mk Branch: master Commit: 76d8095cb399144fe1c10444314c6e596d478000 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76d8095cb39914… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 17 11:21:47 2017 +0200 View editor: Prefix painter/sorter choices with related info titles Change-Id: Id69407125a6af2146579c3a5159cdf135d3e1629 --- web/htdocs/views.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4ca2962..934bd6a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1215,7 +1215,7 @@ def view_editor_specs(ds_name, general_properties=True): elements = [ DropdownChoice( title = _('Column'), - choices = [ (name, p["title"]) for name, p + choices = [ (name, get_painter_title_for_choices(p)) for name, p in sorters_of_datasource(ds_name).items() ], sorted = True, no_preselect = True, @@ -2411,13 +2411,20 @@ def allowed_for_datasource(collection, datasourcename): allowed = {} for name, item in collection.items(): - columns = get_painter_columns(item) - infos_needed = set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) + infos_needed = infos_needed_by_painter(item, add_columns) if len(infos_needed.difference(infos_available)) == 0: allowed[name] = item return allowed +def infos_needed_by_painter(painter, add_columns=None): + if add_columns is None: + add_columns = [] + + columns = get_painter_columns(painter) + return set([ c.split("_", 1)[0] for c in columns if c != "site" and c not in add_columns]) + + # Returns either the valuespec of the painter parameters or None def get_painter_params_valuespec(painter): if "params" not in painter: @@ -2433,16 +2440,29 @@ def painter_choices(painters, add_params=False): choices = [] for name, painter in painters.items(): + title = get_painter_title_for_choices(painter) + # Add the optional valuespec for painter parameters if add_params and "params" in painter: vs_params = get_painter_params_valuespec(painter) - choices.append((name, painter["title"], vs_params)) + choices.append((name, title, vs_params)) else: - choices.append((name, painter["title"])) + choices.append((name, title)) return sorted(choices, key=lambda x: x[1]) +def get_painter_title_for_choices(painter): + info_title = "/".join([ visuals.infos[info_name]["title_plural"] for info_name + in sorted(infos_needed_by_painter(painter)) ]) + + # TODO: Cleanup the special case for sites. How? Add an info for it? + if painter["columns"] == ["site"]: + info_title = _("Site") + + return "%s: %s" % (info_title, painter["title"]) + + def painter_choices_with_params(painters): return painter_choices(painters, add_params=True)

6 years, 11 months

Invtable sorters: Added missing column declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 66c7adbf2057f240eb99fb5d4090623cb275947f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66c7adbf2057f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 17 12:59:13 2017 +0200 Invtable sorters: Added missing column declaration Change-Id: Iba9ae77df49f9b13faa1d48f32ed9cbc4556116f --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index d9018f7..dca55b4 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1055,7 +1055,7 @@ def declare_invtable_column(infoname, name, topic, title, short_title, } multisite_sorters[column] = { "title" : _("Inventory") + ": " + title, - "columns" : [], + "columns" : [ column ], "cmp" : lambda a, b: sortfunc(a.get(column), b.get(column)) }

6 years, 11 months

added comment in check_mk.example.ini

by Andreas Boesl

Module: check_mk Branch: master Commit: 24fe8613712197feb624923ef24207e99b36211f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24fe8613712197… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 17 11:09:03 2017 +0200 added comment in check_mk.example.ini Change-Id: If20047feefd979351ce75a20a31994d4279efd0d --- agents/windows/check_mk.example.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index eec9a51..94c01a8 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -141,6 +141,10 @@ # Run classical monitoring plugins. The word before the command # line is the service description for the monitoring. Use backslashes # in Windows-paths. + # Note: The windows agent will prefix all commands without an absolute + # path with the agents executable dir. So if you want to use + # system wide commands like cscript or ping, you need to specify + # them with an absolute path # check = Dummy mrpe\check_crit # check = IP_Configuration mrpe\check_ipconfig 1.2.3.4 # check = Whatever c:\myplugins\check_whatever -w 10 -c 20

6 years, 11 months

4976 FIX wmi_cpuload: Fixed UNKNOWN service state due to werk #4742

by Simon Betz

Module: check_mk Branch: master Commit: cde5384212d70d2b1647ba3a4de3ac0101f0e171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cde5384212d70d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 17 11:02:28 2017 +0200 4976 FIX wmi_cpuload: Fixed UNKNOWN service state due to werk #4742 Some agent outputs do not include required sections 'computer_system' and 'system_perf' and werk #4742 fixed that. But if required tables are specified the wmi.include lib performed an intersection of these tables. In case of wmi_cpuload check plugin 'system_perf' section has only counters and comes together with 'computer_system' which has table names and intersection of these tables would be empty. Thus no service is discovered. Change-Id: I537810883c67f23849e0971b33d4371b65c2ba20 --- .werks/4976 | 17 +++++++++++++++++ checks/wmi.include | 36 +++++++++++++++++++++++------------- checks/wmi_cpuload | 3 ++- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.werks/4976 b/.werks/4976 new file mode 100644 index 0000000..ae8aafc --- /dev/null +++ b/.werks/4976 @@ -0,0 +1,17 @@ +Title: wmi_cpuload: Fixed UNKNOWN service state due to werk #4742 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1500281231 + +Some agent outputs do not include required sections 'computer_system' +and 'system_perf' and werk #4742 fixed that. But if required tables +are specified the wmi.include lib performed an intersection of these +tables. In case of wmi_cpuload check plugin 'system_perf' section +has only counters and comes together with 'computer_system' which has +table names and intersection of these tables would be empty. +Thus no service is discovered. diff --git a/checks/wmi.include b/checks/wmi.include index da4c2e1..a87672c 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -207,20 +207,30 @@ def inventory_wmi_table(tables, **kwargs): potential_instances = None if isinstance(tables, dict): - table_names = kwargs.get('required_tables', tables.keys()) - - for table_name in table_names: - if table_name not in tables: - # if table is missing, nothing gets inventorized. This can - # only happen if required_tables was set - return [] - + required_tables = kwargs.get('required_tables', tables.keys()) + if not set(required_tables) <= set(tables.keys()): + # if table is missing, nothing gets inventorized. This can + # only happen if required_tables was set + return [] + + if kwargs.get("skip_intersection", False): + # Unfortunately there are tables which do NOT provide any + # names. In this case we fallback to old behaviour. + # + # Eg. wmi_cpuload check plugin: + # 'system_perf' section has only counters and comes together + # with 'computer_system' which has table names and intersection + # of these tables would be empty. Thus no service is discovered. + potential_instances = [""] + + else: # inventarize one item per instance that exists in all tables - table_rows = tables[table_name].row_labels() - if potential_instances is None: - potential_instances = set(table_rows) - else: - potential_instances &= set(table_rows) + for required_table in required_tables: + table_rows = tables[required_table].row_labels() + if potential_instances is None: + potential_instances = set(table_rows) + else: + potential_instances &= set(table_rows) else: potential_instances = tables.row_labels() diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index 954dce7..0a96466 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -27,7 +27,8 @@ def inventory_wmi_cpuload(parsed): return inventory_wmi_table(parsed, \ - required_tables = [ "computer_system", "system_perf" ]) + required_tables = [ "computer_system", "system_perf" ], + skip_intersection=True) def check_wmi_cpuload(item, params, parsed):

6 years, 11 months

4997 FIX Fixed visibility of metric toggle switch in graph designer

by Lars Michelsen

Module: check_mk Branch: master Commit: 201780817ac470b9779a697daed09d9404ff74fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=201780817ac470… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 17 09:26:21 2017 +0200 4997 FIX Fixed visibility of metric toggle switch in graph designer Change-Id: I90aa16f5c12c63fc6360be987559065f05715dee --- .werks/4997 | 11 +++++++++++ web/htdocs/check_mk.css | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/.werks/4997 b/.werks/4997 new file mode 100644 index 0000000..673d097 --- /dev/null +++ b/.werks/4997 @@ -0,0 +1,11 @@ +Title: Fixed visibility of metric toggle switch in graph designer +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1500276368 + + diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index b58abfd..bfa3ed4 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -260,6 +260,13 @@ input.button.hot:active { filter: alpha(opacity=50); /* For IE8 and earlier */ } +table.data .toggle_switch a { + color: #fff; +} + +table.data .toggle_switch { + background-color: #999; +} /* pattern / regex input styling */

6 years, 11 months

Updated bug entries #2907

by Lars Michelsen

Module: check_mk Branch: master Commit: ceb29ec8dd30bcba3a2d3bb673a8c7de8fc6ea9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceb29ec8dd30bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 17 08:14:40 2017 +0200 Updated bug entries #2907 Change-Id: Ic5cfec89dce408ec6e9255ecb2df2615a7f0d94c --- .bugs/2907 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2907 b/.bugs/2907 index 41c6200..1044931 100644 --- a/.bugs/2907 +++ b/.bugs/2907 @@ -1,10 +1,13 @@ Title: Slave sites: Save site specific global settings in sitespecific.mk Component: wato -State: open +Class: bug +State: done Date: 2017-06-14 10:00:17 Targetversion: 1.5.0 -Class: bug This is an inconsistency between the master and the slave site. The slave site receives a sitespecfic.mk in the sync snapshot and writes the config to the globals.mk. Instead it should save it in the sitespecific.mk and show the site specific global settings button on the distributed monitoring page, just like on the master. + +2017-07-17 08:14:37: changed state open -> done +Fixed.

6 years, 11 months

Cleanup: Site specific globals are now stored in sitespecific.mk on slaves

by Lars Michelsen

Module: check_mk Branch: master Commit: 391df69d27f90cab56a84a439f22e4eadc092676 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=391df69d27f90c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 17 08:14:41 2017 +0200 Cleanup: Site specific globals are now stored in sitespecific.mk on slaves Change-Id: I90bd75235cd4f420d7a07702d9e5b20ba7553d83 --- web/htdocs/wato.py | 27 +++++++++++++++++---------- web/htdocs/watolib.py | 19 ++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c458be0..08bdca7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9597,7 +9597,9 @@ class ModeDistributedMonitoring(ModeSites): delete_url = html.makeactionuri([("_delete", site_id)]) html.icon_button(delete_url, _("Delete"), "delete") - if has_wato_slave_sites() and (site.get("replication") or config.site_is_local(site_id)): + if (has_wato_slave_sites() + and (site.get("replication") or config.site_is_local(site_id))) \ + or is_wato_slave_site(): globals_url = folder_preserving_link([("mode", "edit_site_globals"), ("site", site_id)]) html.icon_button(globals_url, _("Site specific global configuration"), "configuration") @@ -9681,7 +9683,11 @@ class ModeEditSiteGlobals(ModeSites): # The site's default values are the current global settings self._default_values = check_mk_local_automation("get-configuration", [], get_check_mk_config_var_names()) self._default_values.update(load_configuration_settings()) - self._current_settings = self._site.get("globals", {}) + + if is_wato_slave_site(): + self._current_settings = load_configuration_settings(site_specific=True) + else: + self._current_settings = self._site.get("globals", {}) def title(self): @@ -9754,15 +9760,16 @@ class ModeEditSiteGlobals(ModeSites): "on that site. <b>Note</b>: this only makes sense if the site " "is part of a distributed setup.")) - if not has_wato_slave_sites(): - html.show_error(_("You can not configure site specific global settings " - "in non distributed setups.")) - return + if not is_wato_slave_site(): + if not has_wato_slave_sites(): + html.show_error(_("You can not configure site specific global settings " + "in non distributed setups.")) + return - if not self._site.get("replication") and not config.site_is_local(self._site_id): - html.show_error(_("This site is not the master site nor a replication slave. " - "You cannot configure specific settings for it.")) - return + if not self._site.get("replication") and not config.site_is_local(self._site_id): + html.show_error(_("This site is not the master site nor a replication slave. " + "You cannot configure specific settings for it.")) + return group_names = global_config_variable_groups(show_all=True) render_global_configuration_variables(group_names, self._default_values, diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ea9116a..49150b5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -313,8 +313,8 @@ class ConfigDomain(object): raise MKGeneralException(_("The domain \"%s\" does not support activation.") % self.ident) - def load(self): - filename = self.config_file(site_specific=False) + def load(self, site_specific=False): + filename = self.config_file(site_specific) settings = {} if not os.path.exists(filename): @@ -333,6 +333,10 @@ class ConfigDomain(object): (filename, e)) + def load_site_globals(self): + return self.load(site_specific=True) + + def save(self, settings, site_specific=False): filename = self.config_file(site_specific) @@ -3408,10 +3412,13 @@ def register_configvar_group(title, order=None): # - --> Wir machen eine automation, die alle Konfigurationsvariablen # ausgibt -def load_configuration_settings(): +def load_configuration_settings(site_specific=False): settings = {} for domain in ConfigDomain.enabled_domains(): - settings.update(domain().load()) + if site_specific: + settings.update(domain().load_site_globals()) + else: + settings.update(domain().load()) return settings @@ -4167,9 +4174,7 @@ def save_site_globals_on_slave_site(tarcontent): multitar.extract_from_buffer(tarcontent, [ ("dir", "sitespecific", tmp_dir) ]) site_globals = store.load_data_from_file(tmp_dir + "/sitespecific.mk", {}) - current_settings = load_configuration_settings() - current_settings.update(site_globals) - save_global_settings(current_settings) + save_site_global_settings(site_globals) finally: shutil.rmtree(tmp_dir)

6 years, 11 months

Revert "liveproxyd large number of sites test: now connecting with 3 channels to 600 sites"

by Lars Michelsen

Module: check_mk Branch: master Commit: 9754e052e857171efd92372cdda6384cf7f50eff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9754e052e85717… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 15:59:53 2017 +0200 Revert "liveproxyd large number of sites test: now connecting with 3 channels to 600 sites" Needs to be reverted because prlimit is not available on all needed platforms. This reverts commit 42649e25c1e0fac1771d1c00d74f3fc320423007. Change-Id: Iad36d95c575241a8dfdd2970f1f275905fd8315b --- tests/livestatus/test_liveproxyd.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index c131dba..39bfbf5 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -130,16 +130,21 @@ def test_large_number_of_sites(default_cfg, site): _toggle_liveproxyd(site, use_liveproxyd=True) # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits - exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() - assert exit_code == 0 + #exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() + #assert exit_code == 0 - site_sockets, num_sites, num_channels = {}, 600, 3 + site_sockets, num_sites, num_channels = {}, 200, 3 for site_num in range(num_sites): # Currently connect to local site site_id = "site%03d" % site_num + #if site_num % 2 == 0: + to_livestatus = None + #else: + # to_livestatus = ('127.0.0.1', 6999) + site_sockets[site_id] = { - "to_livestatus" : None, + "to_livestatus" : to_livestatus, "to_proxy" : "unix:%s/tmp/run/liveproxy/%s" % (site.root, site_id), }

6 years, 11 months

liveproxyd large number of sites test: now connecting with 3 channels to 600 sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 42649e25c1e0fac1771d1c00d74f3fc320423007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42649e25c1e0fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 14 15:16:24 2017 +0200 liveproxyd large number of sites test: now connecting with 3 channels to 600 sites Change-Id: I0744282e1d9bee10e9396ae6555183966850e1f4 --- tests/livestatus/test_liveproxyd.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/livestatus/test_liveproxyd.py b/tests/livestatus/test_liveproxyd.py index 39bfbf5..c131dba 100644 --- a/tests/livestatus/test_liveproxyd.py +++ b/tests/livestatus/test_liveproxyd.py @@ -130,21 +130,16 @@ def test_large_number_of_sites(default_cfg, site): _toggle_liveproxyd(site, use_liveproxyd=True) # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits - #exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() - #assert exit_code == 0 + exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() + assert exit_code == 0 - site_sockets, num_sites, num_channels = {}, 200, 3 + site_sockets, num_sites, num_channels = {}, 600, 3 for site_num in range(num_sites): # Currently connect to local site site_id = "site%03d" % site_num - #if site_num % 2 == 0: - to_livestatus = None - #else: - # to_livestatus = ('127.0.0.1', 6999) - site_sockets[site_id] = { - "to_livestatus" : to_livestatus, + "to_livestatus" : None, "to_proxy" : "unix:%s/tmp/run/liveproxy/%s" % (site.root, site_id), }

6 years, 11 months

4970 Reporting: Added the option "A heading for this graph element" to all graph elements

by Simon Betz

Module: check_mk Branch: master Commit: 90529727ad13c59ee15fdcc86844f25df295a32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90529727ad13c5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 12 16:15:52 2017 +0200 4970 Reporting: Added the option "A heading for this graph element" to all graph elements Change-Id: Ic67bc4bc138fd74665211d9f20846ff98c0455f1 --- .werks/4970 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4970 b/.werks/4970 new file mode 100644 index 0000000..b674f1a --- /dev/null +++ b/.werks/4970 @@ -0,0 +1,11 @@ +Title: Reporting: Heading of graph elements can now be customized +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1499868737 +Class: feature + +There are two options: Either a title is customized for all graphs +of this element or per graph the related title is used as a header.

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017