Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4491 FIX logwatch.groups: Fixed inconsistency of service description which now begins with 'Log' instead of 'LOG'

by Simon Betz

Module: check_mk Branch: master Commit: 49e4ca689ea70f15f6e75db9602e0ca985faa6cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49e4ca689ea70f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 10 12:41:00 2017 +0100 4491 FIX logwatch.groups: Fixed inconsistency of service description which now begins with 'Log' instead of 'LOG' Change-Id: Ibb53f07024cc5fe5c0d00223aba6feff249ffc4a --- .werks/4491 | 13 +++++++++++++ checks/logwatch | 2 +- modules/check_mk.py | 1 + web/htdocs/wato.py | 1 + web/plugins/wato/check_mk_configuration.py | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4491 b/.werks/4491 new file mode 100644 index 0000000..6686424 --- /dev/null +++ b/.werks/4491 @@ -0,0 +1,13 @@ +Title: logwatch.groups: Fixed inconsistency of service description which now begins with 'Log' instead of 'LOG' +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489145596 + +In order to use the new service desciption please enable configuration option +below {{Global Settings > Execution of checks > Use new service descriptions}} +for logfile groups. diff --git a/checks/logwatch b/checks/logwatch index 3dbfeb7..473a712 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -413,7 +413,7 @@ def check_logwatch_groups(item, params, info): check_info['logwatch.groups'] = { 'check_function' : check_logwatch_groups, 'inventory_function' : inventory_logwatch_groups, - 'service_description' : "LOG %s", + 'service_description' : "Log %s", 'node_info' : True, 'group' : 'logwatch', } diff --git a/modules/check_mk.py b/modules/check_mk.py index 5b41a29..53b40a0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -204,6 +204,7 @@ old_service_descriptions = { "wmic_process" : "proc_%s", "services" : "service_%s", "logwatch" : "LOG %s", + "logwatch.groups" : "LOG %s", "hyperv_vm" : "hyperv_vms", "ibm_svc_mdiskgrp" : "MDiskGrp %s", "ibm_svc_system" : "IBM SVC Info", diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b6825d1..83bd489 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14548,6 +14548,7 @@ def create_sample_config(): "wmic_process", "services", "logwatch", + "logwatch.groups", "cmk-inventory", "hyperv_vms", "ibm_svc_mdiskgrp", diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 3091258..efe6774 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1197,6 +1197,7 @@ register_configvar(group, ( "wmic_process", _("Resource consumption of windows processes")), ( "services", _("Windows Services")), ( "logwatch", _("Check logfiles for relevant new messages")), + ( "logwatch.groups", _("Check logfile groups")), ( "cmk-inventory", _("Monitor hosts for unchecked services (Check_MK Discovery)")), ( "hyperv_vms", _("Hyper-V Server: State of VMs")), ( "ibm_svc_mdiskgrp", _("IBM SVC / Storwize V3700 / V7000: Status and Usage of MDisksGrps")),

7 years, 6 months

Fixed issue after rewrite

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c3acae8d3971690b75c80e1927bc2ee655c433f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c3acae8d39716… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 10 12:27:43 2017 +0100 Fixed issue after rewrite Change-Id: I035d13654a4a7cad7d7d84817ca56b516052b85b --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 69c0099..b6825d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7080,7 +7080,7 @@ class ModeEditGroup(WatoMode): self.group["customer"] = self._vs_customer.from_html_vars("customer") self._vs_customer.validate_value(self.group["customer"], "customer") - if customer == "provider": + if self.group["customer"] == "provider": del self.group["customer"] if self._new:

7 years, 6 months

CME: Handle missing customer case for users, groups and ldap connections

by Lars Michelsen

Module: check_mk Branch: master Commit: 13d08f14015727e52de052955f487451986cc598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13d08f14015727… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 10 11:13:04 2017 +0100 CME: Handle missing customer case for users, groups and ldap connections Change-Id: I3e5c501e8f9eeb9cd7377033b5764cb2df71d7f6 --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 64a0749..69c0099 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7077,11 +7077,11 @@ class ModeEditGroup(WatoMode): self._edit_nagvis_map_permissions() if cmk.is_managed_edition(): - customer = self._vs_customer.from_html_vars("customer") - self._vs_customer.validate_value(customer, "customer") + self.group["customer"] = self._vs_customer.from_html_vars("customer") + self._vs_customer.validate_value(self.group["customer"], "customer") - if customer != "provider": - self.group["customer"] = customer + if customer == "provider": + del self.group["customer"] if self._new: self.name = html.var("name").strip()

7 years, 6 months

Better wording of AV option log_rowlimit

by Mathias Kettner

Module: check_mk Branch: master Commit: 67cb3181b0f47916865cc964ca6a7c723095aa07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67cb3181b0f479… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 10 12:11:11 2017 +0100 Better wording of AV option log_rowlimit Change-Id: I918bb1c4642d977a25670e97d6b9b27a64324530 --- web/htdocs/availability.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 7af709d..c018866 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -494,11 +494,17 @@ def get_avoption_entries(what): "single", True, Integer( - title = _("Log row limit"), - help = _("Limit the fetched rows of logfile in order to avoid " - "a hanging system. A value of zero means no limit."), + title = _("Limit processed data"), + help = _("The availability is computed by processing entries from a data table " + "of historic events and state phases. In order to avoid a hanging system " + "in cases where your time range and filtering would accept a vast amount " + "of data entries, the number of processed entries is limited. You can raise " + "this limit here if you really need to process a huge amount of data. Set this " + "to zero in order to disable the limit."), + label = _("process at most"), + unit = _("status entries"), + minvalue = 1, default_value = 5000, - minvalue = 0, )), ]

7 years, 6 months

4351 FIX jolokia_generic: Add missing bakery functionality

by Konstantin Büttner

Module: check_mk Branch: master Commit: abbe907d9db6abedcbc961770434f94b73ba601c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abbe907d9db6ab… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Mar 9 15:36:00 2017 +0100 4351 FIX jolokia_generic: Add missing bakery functionality The configuration for mk_jolokia necessary to make use of the jolokia_generic checks had not been properly integrated into the agent bakery. This has been fixed. Change-Id: I9fdda212ce9d936c68d292cce8fc16d4f5af3119 --- .werks/4351 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/4351 b/.werks/4351 new file mode 100644 index 0000000..874c9cc --- /dev/null +++ b/.werks/4351 @@ -0,0 +1,13 @@ +Title: jolokia_generic: Add missing bakery functionality +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1489069930 + +The configuration for mk_jolokia necessary to make use of the +jolokia_generic checks had not been properly integrated into +the agent bakery. This has been fixed.

7 years, 6 months

Prepared WATO site modes and introduced WATO site mode for customers

by Simon Betz

Module: check_mk Branch: master Commit: 0b067776870a104078cad58f638d5162d328d625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b067776870a10… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 3 19:38:35 2017 +0100 Prepared WATO site modes and introduced WATO site mode for customers Change-Id: I260ccdcdad232d2a8988905abf91badffaf1942a (cherry picked from commit cbb8f0b92a81d4347f154648a35b6cada5703fb7) --- web/htdocs/wato.py | 1257 ++++++++++++++++++++++++++++------------------------ 1 file changed, 690 insertions(+), 567 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0b06777687…

7 years, 6 months

Fixed indentation of AV options

by Mathias Kettner

Module: check_mk Branch: master Commit: ecad1590e68a2984bcf9b73e3a90378562c65fd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecad1590e68a29… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 10 11:42:10 2017 +0100 Fixed indentation of AV options Change-Id: I4c3ef8622f401384c71bcf27fe1f8f3c5d2a7aa3 --- web/htdocs/availability.py | 769 ++++++++++++++++++++++----------------------- 1 file changed, 375 insertions(+), 394 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ecad1590e6…

7 years, 6 months

Slight fix for styling of context buttons

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c6eb185c3da31024df23e58ac29c17028b3a5aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c6eb185c3da31… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 10 11:29:52 2017 +0100 Slight fix for styling of context buttons Change-Id: Ie40f13e998e8ab285e780e7fa99438e8fa9f761b --- web/htdocs/pages.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f46a6d6..0fa1320 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -309,6 +309,7 @@ div.togglebutton.off a:active { border-style: solid; border-color: #86a9b8 #22404d #22414d #86a9b8; border-radius: 5px 5px 5px 5px; + box-shadow: 1px 1px 1.5px rgba(0, 0, 0, 0.2); } div.togglebutton.off a {

7 years, 6 months

Fix layout problem in availabiliy options due to too long words

by Mathias Kettner

Module: check_mk Branch: master Commit: 7770824205240564bfe3fef0eb7c8c9f5da857e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77708242052405… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 10 11:37:13 2017 +0100 Fix layout problem in availabiliy options due to too long words Change-Id: I77875bdfa9c31f0b800e87f07493d3eb45182423 --- web/htdocs/availability.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 54dbbdc..e2f843f 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -300,9 +300,9 @@ def get_avoption_entries(what): ListChoice( title = _("Aggregations"), choices = [ - ( "min", _("minimum duration" )), - ( "max", _("maximum duration" )), - ( "avg", _("average duration" )), + ( "min", _("min. duration" )), + ( "max", _("max. duration" )), + ( "avg", _("avg. duration" )), ( "cnt", _("count" )), ] ),

7 years, 6 months

CME: Groups can now be assigned with customers

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e41756191452b380569ea62881a717c94c8c0a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e41756191452b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 9 13:14:28 2017 +0100 CME: Groups can now be assigned with customers Change-Id: I385b7fc805ba6626c682307133e5c8960fd92678 --- web/htdocs/wato.py | 62 ++++++++++++++++++++++++++++++++++++++------------- web/htdocs/watolib.py | 2 +- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 204289b..a6ec2d9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6993,6 +6993,9 @@ def mode_groups(phase, what): table.cell(_("Name"), name) table.cell(_("Alias"), group['alias']) + if cmk.is_managed_edition(): + table.cell(_("Customer"), managed.get_customer_name(group)) + if what == "contact": table.cell(_("Members")) html.write_html(HTML(", ").join( @@ -7024,6 +7027,9 @@ def mode_edit_group(phase, group_type): name = html.var("edit") # missing -> new group new = name == None + if cmk.is_managed_edition(): + vs_customer = managed.vs_customer() + if phase == "title": if new: if group_type == "host": @@ -7047,10 +7053,29 @@ def mode_edit_group(phase, group_type): all_groups = userdb.load_group_information() groups = all_groups.setdefault(group_type, {}) + if new: + clone_group = html.var("clone") + if clone_group: + name = clone_group + + try: + group = groups[name] + except KeyError: + raise MKUserError("clone", _("This group does not exist.")) + else: + group = {} + else: + try: + group = groups[name] + except KeyError: + raise MKUserError("edit", _("This group does not exist.")) + + group.setdefault("alias", name) + edit_nagvis_map_permissions = group_type == 'contact' if edit_nagvis_map_permissions: if not new: - permitted_maps = groups[name].get('nagvis_maps', []) + permitted_maps = group.get('nagvis_maps', []) else: permitted_maps = [] @@ -7060,19 +7085,29 @@ def mode_edit_group(phase, group_type): if not alias: raise MKUserError("alias", _("Please specify an alias name.")) - extra_info = {"alias": alias} + group = { + "alias": alias + } + if edit_nagvis_map_permissions: vs_nagvis_maps = get_nagvis_maps_valuespec() permitted_maps = vs_nagvis_maps.from_html_vars('nagvis_maps') vs_nagvis_maps.validate_value(permitted_maps, 'nagvis_maps') if permitted_maps: - extra_info['nagvis_maps'] = permitted_maps + group["nagvis_maps"] = permitted_maps + + if cmk.is_managed_edition(): + customer = vs_customer.from_html_vars("customer") + vs_customer.validate_value(customer, "customer") + + if customer != "provider": + group["customer"] = customer if new: name = html.var("name").strip() - add_group(name, group_type, extra_info) + add_group(name, group_type, group) else: - edit_group(name, group_type, extra_info) + edit_group(name, group_type, group) return group_type + "_groups" @@ -7083,23 +7118,20 @@ def mode_edit_group(phase, group_type): html.help(_("The name of the group is used as an internal key. It cannot be " "changed later. It is also visible in the status GUI.")) if new: - clone_group = html.var("clone") - html.text_input("name", clone_group or "") + html.text_input("name", name) html.set_focus("name") else: - clone_group = None html.write_text(name) html.set_focus("alias") forms.section(_("Alias")) html.help(_("An Alias or description of this group.")) - alias = groups.get(name, {}).get('alias', '') - if not alias: - if clone_group: - alias = groups.get(clone_group, {}).get('alias', '') - else: - alias = name - html.text_input("alias", alias) + html.text_input("alias", group["alias"]) + + if cmk.is_managed_edition(): + forms.section(vs_customer.title()) + vs_customer.render_input("customer", managed.get_customer_id(group)) + html.help(vs_customer.help()) # Show permissions for NagVis maps if any of those exist if edit_nagvis_map_permissions and get_nagvis_maps(): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index c3f9521..de2dff9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7214,7 +7214,7 @@ def _set_group(all_groups, group_type, name, extra_info): all_groups.setdefault(group_type, {}) all_groups[group_type].setdefault(name, {}) - all_groups[group_type][name].update(extra_info) + all_groups[group_type][name] = extra_info save_group_information(all_groups) if group_type == "contact":

7 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
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