Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 43f8cd6b1072b54b9d6c9ab7d7f0ed4e85c9cff0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43f8cd6b1072b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 9 14:19:02 2017 +0100 Fixed wording in a few Werks Change-Id: Iab996a1ea8c4bd8a35e191563e12c0dbad65dc2c --- .werks/1306 | 2 +- .werks/3262 | 2 +- .werks/3539 | 2 +- .werks/3720 | 24 +++++++++++---------- .werks/3861 | 72 ++++++++++++++++++++++++++++++++++--------------------------- .werks/3971 | 2 +- .werks/4166 | 5 ++--- 7 files changed, 59 insertions(+), 50 deletions(-) diff --git a/.werks/1306 b/.werks/1306 index f04f93f..32b003f 100644 --- a/.werks/1306 +++ b/.werks/1306 @@ -1,4 +1,4 @@ -Title: mkeventd: The Recent event history can you be filtered by extended regexes +Title: mkeventd: The recent event history can now be filtered by extended regular expressions Level: 1 Component: ec Compatible: compat diff --git a/.werks/3262 b/.werks/3262 index a30f02f..b56d78f 100644 --- a/.werks/3262 +++ b/.werks/3262 @@ -1,4 +1,4 @@ -Title: Event Console: bulk delete button for custom MIBs now available +Title: Bulk delete button for custom MIBs now available Level: 1 Component: ec Compatible: compat diff --git a/.werks/3539 b/.werks/3539 index a1a2a5f..18e3bff 100644 --- a/.werks/3539 +++ b/.werks/3539 @@ -1,4 +1,4 @@ -Title: Event Console: The EC notifications are now also controlled through the master control snapin +Title: Notifications are now also controlled through the master control snapin Level: 1 Component: ec Compatible: compat diff --git a/.werks/3720 b/.werks/3720 index b6dae7a..fac8c13 100644 --- a/.werks/3720 +++ b/.werks/3720 @@ -1,19 +1,21 @@ -Title: The Event Console views are now supporting distributed setups -Level: 2 +Title: The Event Console now supports real distributed setups +Level: 3 Component: ec Compatible: compat Version: 1.4.0i1 Date: 1469428806 Class: feature -The Event Console was not really supporting distributed setups in the past. In case you have -a setup of multiple sites you always had to decide whether or not to setup a single, central, -EC or one EC per site and how to handle and configure monitoring and notifications. +The Event Console was not really supporting distributed setups in the past. In +case you have a setup of multiple sites you always had to decide whether or +not to setup a single, central, EC or one EC per site and how to handle and +configure monitoring and notifications. -The Event Console can now be integrated into distributed setups more easily. The standard -setup should now be a single Event Console per site which receives the events of all -hosts monitoringed with this site. +The Event Console can now be integrated into distributed setups more +easily. The standard setup is now a single Event Console per site, +which receives the events of all hosts monitoringed with this site. -In case you have a central view site, the Event Console views show up the events of all Event -Console instances configured in the central site. You can manage all the events of the remote -Event Console just like managing hosts and services of the remote site. +In case you have a central view site, the Event Console views show up the +events of all Event Console instances configured in the central site. You +can manage all the events of the remote Event Console just like managing +hosts and services of the remote site. diff --git a/.werks/3861 b/.werks/3861 index 5b0ea44..80fa0b5 100644 --- a/.werks/3861 +++ b/.werks/3861 @@ -1,48 +1,56 @@ Title: Introduced open event limit mechanism for protecting against message storms -Level: 3 +Level: 2 Component: ec Compatible: compat Version: 1.4.0i1 Date: 1474033893 Class: feature -The Event Console has been extended to be able to protect agains message storms which can -either result in too high load and also in out of memory situations. +The Event Console has been extended to be able to protect agains message storms +which can either result in too high load and also in out of memory situations. -Because there can be multiple kind of message storms like one device which sends a lot of messages -or many different devices sending equal messages, we introduced different limits to match them. +Because there can be multiple kind of message storms like one device which +sends a lot of messages or many different devices sending equal messages, +we introduced different limits to match them. There are the following limits: <ul> -<li>Limit by host: You can limit the number of open events created by a single host . This is meant to -prevent you from message storms created by one device. Once the limit is reached, the Event Console -will block all future incoming messages sent by this host until the number of open events has been -reduced to be below this limit. In the moment the limit is reached, the Event Console will notify -the configured contacts of the host.</li> - -<li>Limit by rule: You can limit the number of open events created by a single rule here. This is meant to -prevent you from too generous rules creating a lot of events. Once the limit is reached, the Event Console will stop the rule -creating new open events until the number of open events has been reduced to be below this limit. In the -moment the limit is reached, the Event Console will notify the configured contacts of the rule or create a notification -with empty contact information.</li> - -<li>Overall limit: To protect you against a continously growing list of open events created by -different hosts or rules, you can configure this overall limit of open events. All currently open -events are counted and once the limit is reached, no further events will be opened which means that -new incoming messages will be dropped. In the moment the limit is reached, the Event Console will -create a notification with empty contact information. -</li> + +<li>Limit by host: You can limit the number of open events created by a +single host . This is meant to prevent you from message storms created by +one device. Once the limit is reached, the Event Console will block all +future incoming messages sent by this host until the number of open events +has been reduced to be below this limit. In the moment the limit is reached, +the Event Console will notify the configured contacts of the host.</li> + +<li>Limit by rule: You can limit the number of open events created by +a single rule here. This is meant to prevent you from too generous rules +creating a lot of events. Once the limit is reached, the Event Console will +stop the rule creating new open events until the number of open events has +been reduced to be below this limit. In the moment the limit is reached, +the Event Console will notify the configured contacts of the rule or create +a notification with empty contact information.</li> + +<li>Overall limit: To protect you against a continously growing list of open +events created by different hosts or rules, you can configure this overall +limit of open events. All currently open events are counted and once the +limit is reached, no further events will be opened which means that new +incoming messages will be dropped. In the moment the limit is reached, the +Event Console will create a notification with empty contact information. </li> + </ul> -Each of those limits can be configured to different values. By default the limit is set to -1000 for the host and rule based limit and 10000 for the overall limit. Please check carefully -whether or not these defaults are OK for you. But they should be way enough for most environments -since you really should never have so many open events in the Event Console open. +Each of those limits can be configured to different values. By default the +limit is set to 1000 for the host and rule based limit and 10000 for the +overall limit. Please check carefully whether or not these defaults are +OK for you. But they should be way enough for most environments since you +really should never have so many open events in the Event Console open. -But if you need to change those limits, you can change them in the global settings of the Event -Console to fit your needs. +But if you need to change those limits, you can change them in the global +settings of the Event Console to fit your needs. -Additionally, you can configure the actions the Event Console should perform once the limit is -reached instead of the overflow event and notification creation as described above. Another action -is for example delete the oldest event (of a host, rule or overall). +Additionally, you can configure the actions the Event Console should perform +once the limit is reached instead of the overflow event and notification +creation as described above. Another action is for example delete the oldest +event (of a host, rule or overall). diff --git a/.werks/3971 b/.werks/3971 index 94e1c6b..35ecb18 100644 --- a/.werks/3971 +++ b/.werks/3971 @@ -1,4 +1,4 @@ -Title: Event Console: Event numbers are now also displayed in tactical overview snapin +Title: Event numbers are now also displayed in tactical overview snapin Level: 1 Component: ec Compatible: compat diff --git a/.werks/4166 b/.werks/4166 index 4489cfb..59c8e8e 100644 --- a/.werks/4166 +++ b/.werks/4166 @@ -6,6 +6,5 @@ Version: 1.4.0i3 Date: 1481808898 Class: feature -In hosts or services views you can now archive all events -at once by using the view command archive events below -various commands. +In hosts or services views you can now archive all events at once by using +the view command {{Archive events}} in the section {{Various commands}}.

7 years, 6 months

fixed folding...

by Marcel Arentz

Module: check_mk Branch: master Commit: 8b92a14fb9f1b4fae13923ac83afb759aa50647f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b92a14fb9f1b4… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 8 17:05:34 2017 +0100 fixed folding... Change-Id: I345edac910b6795858dcaedb9692513678c184ba --- checks/esx_vsphere_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 1063ba2..18501c4 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -360,7 +360,7 @@ check_info['esx_vsphere_vm.cpu'] = { "has_perfdata" : True, } - +#.- # .--Snapshots-----------------------------------------------------------. # | ____ _ _ | # | / ___| _ __ __ _ _ __ ___| |__ ___ | |_ ___ |

7 years, 6 months

Consistent wording of Event Console in werks

by Mathias Kettner

7 years, 6 months

Removed test code

by Lars Michelsen

Module: check_mk Branch: master Commit: 86ff474b51e137532738b632c29722474cccb4c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86ff474b51e137… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 11:32:25 2017 +0100 Removed test code Change-Id: Iaf1520e85aa42b2cd07573ecebb7f076ee11b093 --- lib/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/__init__.py b/lib/__init__.py index c0027eb..f7f28ab 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -58,7 +58,6 @@ def is_raw_edition(): def is_managed_edition(): - return True # TODO: cleanup return edition_short() == "cme"

7 years, 6 months

pylint web: Loading CME specific files now

by Lars Michelsen

Module: check_mk Branch: master Commit: 634b07c8299a052854b716c322d0c1c6e335c8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=634b07c8299a05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 10:07:26 2017 +0100 pylint web: Loading CME specific files now Change-Id: Iaf89b2c7327601e2445f64513bec1006168ddb25 --- tests/pylint/test_pylint_web.py | 11 +++++++---- tests/testlib/__init__.py | 9 +++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index 99cc5e9..fc3427f 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -7,7 +7,7 @@ import glob import tempfile import pytest -from testlib import cmk_path, cmc_path +from testlib import cmk_path, cmc_path, cme_path import testlib.pylint_cmk as pylint_cmk # Mark all tests in this file to be pylint checks @@ -15,7 +15,8 @@ pytestmark = pytest.mark.pylint def get_web_plugin_dirs(): plugin_dirs = sorted(list(set(os.listdir(cmk_path() + "/web/plugins") - + os.listdir(cmc_path() + "/web/plugins")))) + + os.listdir(cmc_path() + "/web/plugins") + + os.listdir(cme_path() + "/web/plugins")))) # icons are included from a plugin of views module. Move to the end to # make them be imported after the views plugins. Same for perfometers. @@ -30,7 +31,8 @@ def get_plugin_files(plugin_dir): files = [] for path in [ cmk_path() + "/web/plugins/" + plugin_dir, - cmc_path() + "/web/plugins/" + plugin_dir ]: + cmc_path() + "/web/plugins/" + plugin_dir, + cme_path() + "/web/plugins/" + plugin_dir ]: if os.path.exists(path): files += [ (f, path) for f in os.listdir(path) ] @@ -44,7 +46,8 @@ def test_pylint_web(): sys.path.insert(0, base_path) modules = glob.glob(cmk_path() + "/web/htdocs/*.py") \ - + glob.glob(cmc_path() + "/web/htdocs/*.py") + + glob.glob(cmc_path() + "/web/htdocs/*.py") \ + + glob.glob(cme_path() + "/web/htdocs/*.py") for module in modules: print("Copy %s to test directory" % module) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d587049..5389e43 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -37,6 +37,10 @@ def cmc_path(): return repo_path() + "/enterprise" +def cme_path(): + return repo_path() + "/managed" + + # Directory for persisting variable data produced by tests def var_dir(): if "WORKSPACE" in os.environ: @@ -320,6 +324,11 @@ class Site(object): cmc_path() + "/agents", ] + if os.path.exists(cme_path()): + paths += [ + cme_path() + "/web", + ] + for path in paths: if os.path.exists("%s/.f12" % path): print("Executing .f12 in \"%s\"..." % path)

7 years, 6 months

CME: LDAP connections can now be assigned to customers

by Lars Michelsen

Module: check_mk Branch: master Commit: ca523758f4af0237b69d29b51c3027cdd19ef29b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca523758f4af02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 10:08:29 2017 +0100 CME: LDAP connections can now be assigned to customers Change-Id: I5e9914eb1a0f79ce6a2dfba502605c2345054ac3 --- web/htdocs/wato.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 887a726..204289b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5997,6 +5997,10 @@ def mode_ldap_config(phase): html.empty_icon_button() table.cell(_("ID"), connection["id"]) + + if cmk.is_managed_edition(): + table.cell(_("Customer"), managed.get_customer_name(connection)) + table.cell(_("Description")) url = connection.get("docu_url") if url: @@ -6013,19 +6017,28 @@ def validate_ldap_connection_id(value, varprefix): def vs_ldap_connection(new, connection_id): + general_elements = [] + if new: - general_elements = [ - ("id", TextAscii( - title = _("Unique ID"), - help = _("The ID of the connection must be a unique text. It will be used as an internal key " - "when objects refer to the connection."), - allow_empty = False, - size = 12, - validate = validate_ldap_connection_id, - )) - ] + rule_option_elements() + id_element = ("id", TextAscii( + title = _("ID"), + help = _("The ID of the connection must be a unique text. It will be used as an internal key " + "when objects refer to the connection."), + allow_empty = False, + size = 12, + validate = validate_ldap_connection_id, + )) else: - general_elements = rule_option_elements() + id_element = ("id", FixedValue(connection_id, + title = _("ID"), + )) + + general_elements += [ id_element ] + + if cmk.is_managed_edition(): + general_elements += managed.customer_choice_element() + + general_elements += rule_option_elements() connection_elements = [ ("server", TextAscii( @@ -10502,7 +10515,7 @@ def mode_edit_user(phase): if cmk.is_managed_edition(): customer = vs_customer.from_html_vars("customer") - vs_customer.validate_value(value, "customer") + vs_customer.validate_value(customer, "customer") if customer != "provider": user_attrs["customer"] = customer

7 years, 6 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: da93e598a15ee2b9ea00ca65c7b0fb27a4aa9e6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da93e598a15ee2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 10:07:56 2017 +0100 Reserved 20 Werk IDS Change-Id: Iecea33436bf6438e35842dae2b5425bb36de4c94 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index eec95d2..b193f39 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4496 +4516

7 years, 6 months

CME: Users can now be assigned with customers

by Lars Michelsen

Module: check_mk Branch: master Commit: 2728b24e475394e80de2368eb3b451dfbcae59bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2728b24e475394… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 09:07:08 2017 +0100 CME: Users can now be assigned with customers Change-Id: I63397b111982a21853f275ee7f817550ed56ae8a --- web/htdocs/wato.py | 20 ++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 33 +++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 514e047..887a726 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10246,6 +10246,9 @@ def mode_users(phase): else: html.write_text(_("Never logged in")) + if cmk.is_managed_edition(): + table.cell(_("Customer"), managed.get_customer_name(user)) + # Connection if connection: table.cell(_("Connection"), '%s (%s)' % (connection.short_title(), user_connection_id)) @@ -10421,6 +10424,9 @@ def mode_edit_user(phase): timeperiods = load_timeperiods() roles = userdb.load_roles() + if cmk.is_managed_edition(): + vs_customer = managed.vs_customer() + if phase == "action": if not html.check_transaction(): return "users" @@ -10494,6 +10500,13 @@ def mode_edit_user(phase): # Pager user_attrs["pager"] = html.var("pager", '').strip() + if cmk.is_managed_edition(): + customer = vs_customer.from_html_vars("customer") + vs_customer.validate_value(value, "customer") + + if customer != "provider": + user_attrs["customer"] = customer + # Roles user_attrs["roles"] = filter(lambda role: html.get_checkbox("role_" + role), roles.keys()) @@ -10591,6 +10604,13 @@ def mode_edit_user(phase): forms.section(_("Pager address")) lockable_input('pager', '') html.help(_("The pager address is optional ")) + + if cmk.is_managed_edition(): + forms.section(vs_customer.title()) + vs_customer.render_input("customer", managed.get_customer_id(user)) + + html.help(vs_customer.help()) + custom_user_attributes('ident') forms.header(_("Security")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e6c551e..8e8f421 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -26,8 +26,11 @@ import re +import cmk import cmk.paths +import managed + # .--Global Settings-----------------------------------------------------. # | ____ _ _ _ ____ _ _ _ | # | / ___| | ___ | |__ __ _| | / ___| ___| |_| |_(_)_ __ __ _ ___ | @@ -1092,16 +1095,16 @@ def list_contactgroups(): entries.sort() return entries -register_configvar(group, - "default_user_profile", - Dictionary( - title = _("Default user profile"), - help = _("With this option you can specify the attributes a user which is created during " - "its initial login gets added. For example, the default is to add the role \"user\" " - "to all automatically created users."), - elements = [ + +def default_user_profile_elements(): + elements = [] + + if cmk.is_managed_edition(): + elements += managed.customer_choice_element() + + return elements + [ ('roles', ListChoice( - title = _('User Roles'), + title = _('User roles'), help = _('Specify the initial roles of an automatically created user.'), default_value = [ 'user' ], choices = list_roles, @@ -1112,7 +1115,17 @@ register_configvar(group, default_value = [], choices = list_contactgroups, )), - ], + ] + + +register_configvar(group, + "default_user_profile", + Dictionary( + title = _("Default user profile"), + help = _("With this option you can specify the attributes a user which is created during " + "its initial login gets added. For example, the default is to add the role \"user\" " + "to all automatically created users."), + elements = default_user_profile_elements, optional_keys = [], ), domain = "multisite",

7 years, 6 months

lib: Added method to detect managed service edition

by Lars Michelsen

Module: check_mk Branch: master Commit: d77948b4c7d0fb35363176656b0dc985594968e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d77948b4c7d0fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 09:03:33 2017 +0100 lib: Added method to detect managed service edition Change-Id: Id8319d60922e7b20220b36d34953499d5f2178d5 --- lib/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/__init__.py b/lib/__init__.py index 6372475..c0027eb 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -57,6 +57,11 @@ def is_raw_edition(): return edition_short() == "cre" +def is_managed_edition(): + return True # TODO: cleanup + return edition_short() == "cme" + + def is_demo(): parts = omd_version().split(".") return parts[-1] == "demo"

7 years, 6 months

mkbench: Terminate by high cmk latency after longer initialization time

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fafaff719d2bb8a550c13fdb50b5f26b930c398 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fafaff719d2bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 8 17:36:16 2017 +0100 mkbench: Terminate by high cmk latency after longer initialization time Change-Id: Iff45d49dfbbc1f1ff98b4ad6af475e1e94188520 --- bin/mkbench | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkbench b/bin/mkbench index 1d1ff10..4af2c3b 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -738,7 +738,7 @@ class TestRunner(threading.Thread): # Initial scheduling of the CMC spreads the service checks for a maximum of # 5 * check_interval. So we should terminate the test only after some initialization # time. - if self.test_case.duration() < 300: + if self.test_case.duration() < 450: return if m.site_stats and m.site_stats["average_latency_cmk"] > 30:

7 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017