Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6366 FIX User and profile edit dialogs show wrong language when 'en' is configured

by Lars Michelsen

Module: check_mk Branch: master Commit: dcf180d91e54e8a6755cf57879447a5e3187e32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcf180d91e54e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 25 09:35:49 2018 +0200 6366 FIX User and profile edit dialogs show wrong language when 'en' is configured When a user has a legacy value 'en' configured as it's language the value was not transformed to the correct value making the form show up "German" as selected language instead of "English". After saving the user language was switched to German accidentally. Change-Id: I5ddcce482659046e82f7ce33854689910d31859c --- .werks/6366 | 14 ++++++++++++++ cmk/gui/wato/__init__.py | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/.werks/6366 b/.werks/6366 new file mode 100644 index 0000000..239de4d --- /dev/null +++ b/.werks/6366 @@ -0,0 +1,14 @@ +Title: User and profile edit dialogs show wrong language when 'en' is configured +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1532503987 + +When a user has a legacy value 'en' configured as it's language the value was not +transformed to the correct value making the form show up "German" as selected +language instead of "English". After saving the user language was switched to +German accidentally. diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 6712841..47f034e 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -13690,6 +13690,11 @@ def select_language(user): html.open_div(id_="attr_entry_language", style="display: none" if not active else "") language = user.get('language') if user.get('language') != None else '' + + # Transform 'en' configured language to empty string for compatibility reasons + if language == "en": + language = "" + html.dropdown("language", languages, deflt=language) html.close_div() html.help(_('Configure the default language '

6 years, 1 month

Tiny simplifactions related to host/servicegroups.

by Sven Panne

Module: check_mk Branch: master Commit: 71b8af91973fb7efc929f73ec10399190c5730cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71b8af91973fb7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 25 10:31:54 2018 +0200 Tiny simplifactions related to host/servicegroups. Change-Id: Idc981bb5f837487905490432fd60840bacf4cae9 --- cmk/gui/userdb.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 07d04cf..33919b8 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1065,8 +1065,6 @@ def _load_cmk_base_groups(): "define_servicegroups": {}, "define_contactgroups": {}, } - for what in ["host", "service", "contact" ]: - group_specs["define_%sgroups" % what] = {} return store.load_mk_file(root_dir + "groups.mk", default=group_specs)

6 years, 1 month

6139 mssql_instance: Displays more detailed information of instance version and edition

by Simon Betz

Module: check_mk Branch: master Commit: 0d14337fd4e02b53144344addb6c0f393bf07734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d14337fd4e02b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 15:00:20 2018 +0200 6139 mssql_instance: Displays more detailed information of instance version and edition In order to use this feature please install the newest version of the {{mssql.vbs}} agent plugin. Change-Id: I0261f4e6f95bd143eb18f8b09f1183e6430791e7 --- .werks/6139 | 11 +++++++++ agents/windows/plugins/mssql.vbs | 8 +++++++ checks/mssql_instance | 51 +++++++++++++++++++++++++++++++++------- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/.werks/6139 b/.werks/6139 new file mode 100644 index 0000000..e570f74 --- /dev/null +++ b/.werks/6139 @@ -0,0 +1,11 @@ +Title: mssql_instance: Displays more detailed information of instance version and edition +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529931499 +Class: feature + +In order to use this feature please install the newest +version of the {{mssql.vbs}} agent plugin. diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index ef30a2d..f7e7921 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -271,6 +271,14 @@ For Each instance_id In instances.Keys: Do ' Continue trick Exit Do End If + ' add detailed information about version and patchrelease + RS.Open "SELECT SERVERPROPERTY('productversion') as prodversion," & _ + "SERVERPROPERTY ('productlevel') as prodlevel," & _ + "SERVERPROPERTY ('edition') as prodedition", CONN + addOutput("MSSQL_" & instance_id & "|details|" & RS("prodversion") & "|" & _ + RS("prodlevel") & "|" & RS("prodedition")) + RS.Close + ' Get counter data for the whole instance addOutput(sections("counters")) RS.Open "SELECT GETUTCDATE() as utc_date", CONN diff --git a/checks/mssql_instance b/checks/mssql_instance index 4aaa042..31feeb7 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -40,9 +40,31 @@ # <<<mssql_instance:sep(124)>>> # ERROR: Failed to gather SQL server instances + +def _parse_prod_version(entry): + if entry.startswith("8."): + version = "2000" + elif entry.startswith("9."): + version = "2005" + elif entry.startswith("10.0"): + version = "2008" + elif entry.startswith("10.50"): + version = "2008R2" + elif entry.startswith("11."): + version = "2012" + elif entry.startswith("12."): + version = "2014" + elif entry.startswith("13."): + version = "2016" + elif entry.startswith("14."): + version = "2017" + else: + return "UNKNOWN" + return "Microsoft SQL Server %s" % version + + def parse_mssql_instance(info): parsed = {} - for line in info: if line[0].startswith("ERROR:"): continue @@ -60,21 +82,28 @@ def parse_mssql_instance(info): if line[1] == "config": instance.update({ - "version" : line[2], - "edition" : line[3], + "version_info" : "%s - %s" % (line[2], line[3]), "cluster_name" : line[4], }) elif line[1] == "state": instance.update({ - "state" : line[2], - "error_msg" : "|".join(line[3:]), + "state" : line[2], + "error_msg" : "|".join(line[3:]), + }) + + elif line[1] == "details": + _parse_prod_version(line[2]) + instance.update({ + "prod_version_info": "%s (%s) (%s) - %s" % ( + _parse_prod_version(line[2]), line[3], line[2], line[4] + ) }) return parsed def inventory_mssql_instance(parsed): - for instance_id, instance in parsed.items(): + for instance_id in parsed.iterkeys(): yield instance_id, {} @@ -91,10 +120,16 @@ def check_mssql_instance(item, params, parsed): if instance["state"] == "0": yield state, "Failed to connect to database (%s)" % instance["error_msg"] - yield 0, "Server is running version %s, %s" % (instance["version"], instance["edition"]) + if "prod_version_info" in instance: + # Newer output of version info + version_info = instance["prod_version_info"] + else: + # Fallback, is always reported by agent plugin + version_info = instance["version_info"] + yield 0, "Version: %s" % version_info if instance["cluster_name"] != "": - yield 0, "clustered as %s" % instance["cluster_name"] + yield 0, "Clustered as %s" % instance["cluster_name"] check_info["mssql_instance"] = {

6 years, 1 month

6138 FIX mssql_instance: Fixed displaying wrong version

by Simon Betz

Module: check_mk Branch: master Commit: f5bcd78e32c873f6b0f5c503d31ce05ab732f99e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5bcd78e32c873… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 14:33:06 2018 +0200 6138 FIX mssql_instance: Fixed displaying wrong version Change-Id: I39cbadcfceeaab0071a72c84139a97d1f22b3788 --- .werks/6138 | 13 +++++++++++++ agents/windows/plugins/mssql.vbs | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/6138 b/.werks/6138 new file mode 100644 index 0000000..334b08b --- /dev/null +++ b/.werks/6138 @@ -0,0 +1,13 @@ +Title: mssql_instance: Fixed displaying wrong version +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529929899 +Class: fix + +Before the version info came from +{{Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\MSSQLServer\CurrentVersion}}. +Now we get the version info from {{Microsoft SQL Server\Setup}}. + diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index fe7888e..ef30a2d 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -134,10 +134,10 @@ For Each rk In regkeys "Instance Names\SQL", _ instance_id, instance_name - ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\MSSQLServer\CurrentVersion + ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\Setup registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ - instance_name & "\MSSQLServer\CurrentVersion", _ - "CurrentVersion", version + instance_name & "\Setup", _ + "Version", version ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\Setup registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ @@ -185,7 +185,7 @@ For Each rk In regkeys ' Only collect results for instances which services are currently running Set service = WMI.ExecQuery("SELECT State FROM Win32_Service " & _ "WHERE Name = 'MSSQL$" & instance_id & "' AND State = 'Running' OR Name = 'MSSQLSERVER' AND State = 'Running'") - If Not IsNull(service) Then + If service.count > 0 Then instances.add instance_id, cluster_name End If Next

6 years, 1 month

6316 mssql_counters.file_sizes, mssql_tablespaces: Added upper percentage thresholds

by Simon Betz

Module: check_mk Branch: master Commit: 06a0b4ce2305eb3645c0e0ab06135a98fd1d3040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a0b4ce2305eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jul 23 08:41:04 2018 +0200 6316 mssql_counters.file_sizes, mssql_tablespaces: Added upper percentage thresholds Change-Id: I14b95e014c7dd41678db797c2dc63faf8f18b94f --- .werks/6316 | 10 ++ checks/mssql_counters | 31 +++++- checks/mssql_tablespaces | 176 ++++++++++++++++++++----------- cmk/gui/plugins/wato/check_parameters.py | 131 ++++++++++++++--------- 4 files changed, 237 insertions(+), 111 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=06a0b4ce23…

6 years, 1 month

Fixed another 'return' with argument inside generator

by Simon Betz

Module: check_mk Branch: master Commit: 717c2bc5b36b807649d5a2acc750d8f1fba1bcfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=717c2bc5b36b80… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 25 09:41:15 2018 +0200 Fixed another 'return' with argument inside generator Change-Id: Id26b1578cedd8d1d312cc82eeb6b0782abb32d34 --- checks/fileinfo | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 8c2f639..030e0c9 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -238,8 +238,7 @@ def check_fileinfo_groups(item, params, info): try: reftime = int(info[0][0]) except (IndexError, ValueError): - yield 3, "Missing reference timestamp" - return + return 3, "Missing reference timestamp" # Start counting values on all files for line in info[1:]:

6 years, 1 month

Fixed another 'return' with argument inside generator

by Simon Betz

Module: check_mk Branch: master Commit: d157139ea0112ddcfe6fa2d9768125fe81cab69c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d157139ea0112d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 25 09:44:17 2018 +0200 Fixed another 'return' with argument inside generator Change-Id: I2ac3a821e6ae81c54e397883719801d731481041 --- checks/fileinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/fileinfo b/checks/fileinfo index 030e0c9..8c2f639 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -238,7 +238,8 @@ def check_fileinfo_groups(item, params, info): try: reftime = int(info[0][0]) except (IndexError, ValueError): - return 3, "Missing reference timestamp" + yield 3, "Missing reference timestamp" + return # Start counting values on all files for line in info[1:]:

6 years, 1 month

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: ef2f4021c1c317937692d49507394ff5c72ede7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef2f4021c1c317… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 25 09:29:45 2018 +0200 Updated werk Change-Id: Id40332de7213272d7d9dcfec64cb6e4fd487c634 --- .werks/6380 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/6380 b/.werks/6380 index 837f39e..41aa92c 100644 --- a/.werks/6380 +++ b/.werks/6380 @@ -1,7 +1,7 @@ Title: oracle_jobs: Bugfix for auto_drop=TRUE jobs Level: 1 Component: checks -Compatible: compat +Compatible: incomp Edition: cre Version: 1.6.0i1 Date: 1532503439

6 years, 1 month

CMK-611: Fixed line break in new theme

by Marcel Arentz

Module: check_mk Branch: master Commit: 50d12584c4a36802ed01d48ec2bab8eab8bb376d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50d12584c4a368… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jul 24 15:48:25 2018 +0200 CMK-611: Fixed line break in new theme Change-Id: Id8f4becd053ba2c4df1ac0de10b71f5829581025 --- cmk/gui/wato/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index d598586..6712841 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -15746,7 +15746,7 @@ class ModeDownloadAgents(WatoMode): html.a(title, href="agents/%s" % relpath) html.span("." * 100, class_="dots") html.close_div() - html.div(render.bytes(file_size), style="width:50px;", class_="rulecount") + html.div(render.bytes(file_size), style="width:60px;", class_="rulecount") html.close_div() html.close_div() forms.end()

6 years, 1 month

Fixed issue caused by recent plugin refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: ca444481810a8b2e2c9cc43bb27453047e97560f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca444481810a8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 24 17:26:42 2018 +0200 Fixed issue caused by recent plugin refactoring Change-Id: I830f3351a7c97d1dc75192562d51d802eeadaedb --- cmk/gui/plugins/userdb/user_attributes.py | 3 ++- cmk/gui/plugins/userdb/utils.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/userdb/user_attributes.py b/cmk/gui/plugins/userdb/user_attributes.py index 728f318..db08f37 100644 --- a/cmk/gui/plugins/userdb/user_attributes.py +++ b/cmk/gui/plugins/userdb/user_attributes.py @@ -156,7 +156,8 @@ class StartURLUserAttribute(UserAttribute): @user_attribute_registry.register class UIThemeUserAttribute(UserAttribute): - def name(self): + @classmethod + def name(cls): return "ui_theme" diff --git a/cmk/gui/plugins/userdb/utils.py b/cmk/gui/plugins/userdb/utils.py index f64f139..5872229 100644 --- a/cmk/gui/plugins/userdb/utils.py +++ b/cmk/gui/plugins/userdb/utils.py @@ -139,8 +139,9 @@ class UserAttribute(object): __metaclass__ = abc.ABCMeta + @classmethod @abc.abstractmethod - def name(self): + def name(cls): # type: () -> bytes raise NotImplementedError()

6 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018