Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

LDAP query: Do not retry queries when implicit_connect is disabled

by Lars Michelsen

Module: check_mk Branch: master Commit: cc88eeeb0fc26708327ea6338c06d80669625c3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc88eeeb0fc267… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 29 08:49:53 2017 +0200 LDAP query: Do not retry queries when implicit_connect is disabled Change-Id: I3ec7aa440793cf7b5f3ba32f192c9c70c11b3822 --- web/plugins/userdb/ldap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 35ff1ad..8973be6 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -566,7 +566,8 @@ class LDAPUserConnector(UserConnector): # In some environments, the connection to the LDAP server does not seem to # be as stable as it is needed. So we try to repeat the query for three times. - tries_left = 2 + # -> Don't retry when implicit connect is disabled + tries_left = 2 if implicit_connect else 0 success = False last_exc = None while not success:

6 years, 10 months

Reserved 30 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 2be88daf0b68a5ca63a54c49a4b48fc0ec424b9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2be88daf0b68a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 28 17:17:20 2017 +0200 Reserved 30 Werk IDS Change-Id: I5170689f1d333040f3b4cc81c72ff3d73008da66 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e10a919..6f8556c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5138 +5168

6 years, 10 months

4859 FIX MSSQL: plugin detects 32bit and 64bit instances now

by Marcel Schulte

Module: check_mk Branch: master Commit: 703d76f8b3422d19d090145745859793c8f1b5e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=703d76f8b3422d… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Aug 28 15:30:46 2017 +0200 4859 FIX MSSQL: plugin detects 32bit and 64bit instances now Previously the plugin did not detect 32bit instances on 64bit OS. This has been fixed now. Change-Id: Iae24b05e6ea16a2b6de957509eb86f847698cfe8 --- .werks/4859 | 19 +++++++ agents/windows/plugins/mssql.vbs | 119 ++++++++++++++++++++++----------------- 2 files changed, 86 insertions(+), 52 deletions(-) diff --git a/.werks/4859 b/.werks/4859 new file mode 100644 index 0000000..1f92dfb --- /dev/null +++ b/.werks/4859 @@ -0,0 +1,19 @@ +Title: MSSQL: plugin detects 32bit and 64bit instances now +Level: 2 +Component: checks +<<<<<<< HEAD +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1503906598 +======= +Compatible: compat +Edition: cre +Version: 1.4.0p10 +Date: 1503906598 +Class: fix +>>>>>>> bf0efbc... 4859 FIX MSSQL: plugin detects 32bit and 64bit instances now + +Previously the plugin did not detect 32bit instances on 64bit OS. This has been fixed now. diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 0b592d1..738caef 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -81,18 +81,6 @@ Set sources = CreateObject("Scripting.Dictionary") Dim service, i, version, edition, value_types, value_names, value_raw, cluster_name Set WMI = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") -' -' Gather instances on this host, store instance in instances and output version section for it -' -registry.EnumValues HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL", _ - value_names, value_types - -If Not IsArray(value_names) Then - addOutput("<<<mssql_instance:sep(124)>>>") - addOutput("ERROR: Failed to gather SQL server instances") - wscript.quit(1) -End If - ' Make sure that always all sections are present, even in case of an error. ' Note: the section <<<mssql_instance>>> section shows the general state ' of a database instance. If that section fails for an instance then all @@ -118,56 +106,83 @@ For Each section_id In sections.Keys addOutput(sections(section_id)) Next -For i = LBound(value_names) To UBound(value_names) - instance_id = value_names(i) +addOutput(sections("instance")) - registry.GetStringValue HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\" & _ - "Instance Names\SQL", _ - instance_id, instance_name +' +' Gather instances on this host, store instance in instances and output version section for it +' - ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\MSSQLServer\CurrentVersion - registry.GetStringValue HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\" & _ - instance_name & "\MSSQLServer\CurrentVersion", _ - "CurrentVersion", version +Dim regkeys, rk +regkeys = Array( "", "Wow6432Node") ' gather all instances, also 32bit ones on 64bit Windows - ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\Setup - registry.GetStringValue HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\" & _ - instance_name & "\Setup", _ - "Edition", edition +For Each rk In regkeys + Do + registry.EnumValues HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\Instance Names\SQL", _ + value_names, value_types - ' Check whether or not this instance is clustered - registry.GetStringValue HKLM, "SOFTWARE\Microsoft\Microsoft SQL Server\" & _ - instance_name & "\Cluster", "ClusterName", cluster_name + If Not IsArray(value_names) Then + 'addOutput("ERROR: Failed to gather SQL server instances: " & rk) + 'wscript.quit(1) + Exit Do + End If - If IsNull(cluster_name) Then - cluster_name = "" + For i = LBound(value_names) To UBound(value_names) + instance_id = value_names(i) - ' In case of instance name "MSSQLSERVER" always use (local) as connect string - If instance_id = "MSSQLSERVER" Then - sources.add instance_id, "(local)" - Else - sources.add instance_id, hostname & "\" & instance_id - End If - Else - ' In case the instance name is "MSSQLSERVER" always use the virtual server name - If instance_id = "MSSQLSERVER" Then - sources.add instance_id, cluster_name - Else - sources.add instance_id, cluster_name & "\" & instance_id - End If - End If + registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ + "Instance Names\SQL", _ + instance_id, instance_name - addOutput(sections("instance")) - addOutput("MSSQL_" & instance_id & "|config|" & version & "|" & edition & "|" & cluster_name) + ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\MSSQLServer\CurrentVersion + registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ + instance_name & "\MSSQLServer\CurrentVersion", _ + "CurrentVersion", version - ' 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'") - If Not IsNull(service) Then - instances.add instance_id, cluster_name - End If + ' HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\Setup + registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ + instance_name & "\Setup", _ + "Edition", edition + + ' Check whether or not this instance is clustered + registry.GetStringValue HKLM, "SOFTWARE\" & rk & "\Microsoft\Microsoft SQL Server\" & _ + instance_name & "\Cluster", "ClusterName", cluster_name + + If IsNull(cluster_name) Then + cluster_name = "" + + ' In case of instance name "MSSQLSERVER" always use (local) as connect string + If instance_id = "MSSQLSERVER" Then + sources.add instance_id, "(local)" + Else + sources.add instance_id, hostname & "\" & instance_id + End If + Else + ' In case the instance name is "MSSQLSERVER" always use the virtual server name + If instance_id = "MSSQLSERVER" Then + sources.add instance_id, cluster_name + Else + sources.add instance_id, cluster_name & "\" & instance_id + End If + End If + + addOutput(sections("instance")) + addOutput("MSSQL_" & instance_id & "|config|" & version & "|" & edition & "|" & cluster_name) + + ' 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'") + If Not IsNull(service) Then + instances.add instance_id, cluster_name + End If + Next + Loop While False Next +If instances.Count = 0 Then + addOutput("ERROR: Failed to gather SQL server instances") + wscript.quit(1) +End IF + Set service = Nothing Set WMI = Nothing Set registry = Nothing

6 years, 10 months

Fixed description of werk 4859

by Marcel Schulte

Module: check_mk Branch: master Commit: 2eb494b92b44de562438128313a2af49ca8aae05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eb494b92b44de… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Aug 28 15:34:26 2017 +0200 Fixed description of werk 4859 Change-Id: Ica1b14f41d628f2a838331a2ce2380a69a052197 --- .werks/4859 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.werks/4859 b/.werks/4859 index 1f92dfb..171dfc6 100644 --- a/.werks/4859 +++ b/.werks/4859 @@ -1,19 +1,11 @@ Title: MSSQL: plugin detects 32bit and 64bit instances now Level: 2 Component: checks -<<<<<<< HEAD Class: fix Compatible: compat Edition: cre State: unknown Version: 1.5.0i1 Date: 1503906598 -======= -Compatible: compat -Edition: cre -Version: 1.4.0p10 -Date: 1503906598 -Class: fix ->>>>>>> bf0efbc... 4859 FIX MSSQL: plugin detects 32bit and 64bit instances now Previously the plugin did not detect 32bit instances on 64bit OS. This has been fixed now.

6 years, 10 months

Added missing SSH client build dependency ( needed for check_by_ssh active check)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d336cd05b312d1bee588a5203283545be9f02c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d336cd05b312d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 13:58:27 2017 +0200 Added missing SSH client build dependency (needed for check_by_ssh active check) Change-Id: Ifb24301a3640cac5410e2af91f83f121053d49d1 --- omd/distros/CENTOS_5.mk | 1 + omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + omd/distros/DEBIAN_5.mk | 1 + omd/distros/DEBIAN_6.mk | 1 + omd/distros/DEBIAN_7.mk | 1 + omd/distros/DEBIAN_8.mk | 1 + omd/distros/DEBIAN_9.mk | 1 + omd/distros/SLES_11.mk | 1 + omd/distros/SLES_11SP1.mk | 1 + omd/distros/SLES_11SP2.mk | 1 + omd/distros/SLES_11SP3.mk | 1 + omd/distros/SLES_11SP4.mk | 1 + omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + omd/distros/SLES_12SP2.mk | 1 + omd/distros/UBUNTU_10.04.mk | 1 + omd/distros/UBUNTU_10.10.mk | 1 + omd/distros/UBUNTU_11.04.mk | 1 + omd/distros/UBUNTU_11.10.mk | 1 + omd/distros/UBUNTU_12.04.mk | 1 + omd/distros/UBUNTU_12.10.mk | 1 + omd/distros/UBUNTU_13.04.mk | 1 + omd/distros/UBUNTU_13.10.mk | 1 + omd/distros/UBUNTU_14.04.mk | 1 + omd/distros/UBUNTU_14.10.mk | 1 + omd/distros/UBUNTU_15.04.mk | 1 + omd/distros/UBUNTU_15.10.mk | 1 + omd/distros/UBUNTU_16.04.mk | 1 + omd/distros/UBUNTU_16.10.mk | 1 + omd/distros/UBUNTU_17.04.mk | 1 + 31 files changed, 31 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d336cd05b…

6 years, 10 months

Ignore sorting of autochecks in test_automation_set_autochecks

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e60fafa72432a9918b1f9f29726106ba5ca254c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e60fafa72432a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 14:02:57 2017 +0200 Ignore sorting of autochecks in test_automation_set_autochecks Change-Id: I780b1759524efdc4335c217afd97a7a5ff62b7c0 --- tests/cmk_base/test_automations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmk_base/test_automations.py b/tests/cmk_base/test_automations.py index 3d03988..720b245 100644 --- a/tests/cmk_base/test_automations.py +++ b/tests/cmk_base/test_automations.py @@ -282,10 +282,10 @@ def test_automation_set_autochecks(test_cfg, site): data = _execute_automation(site, "get-autochecks", args=["blablahost"]) - assert data == [ + assert sorted(data) == sorted([ ('df', u'xxx', 'bla', "'bla'"), ('uptime', None, None, 'None') - ] + ]) def test_automation_update_dns_cache(test_cfg, site, web):

6 years, 10 months

4857 FIX esx_vsphere_vm.datastores: this check always reported only one datastore information

by Andreas Boesl

Module: check_mk Branch: master Commit: dce4736af3e9c429ea52c88f7dcd212b689f120d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dce4736af3e9c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 28 13:31:08 2017 +0200 4857 FIX esx_vsphere_vm.datastores: this check always reported only one datastore information This check now reports all datastores information for this VM. Change-Id: Iaf63289a53159ed0c49c6e7e1814e0304a15a0cb --- .werks/4857 | 12 ++++++++++++ agents/special/agent_vsphere | 2 +- checks/esx_vsphere_vm | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4857 b/.werks/4857 new file mode 100644 index 0000000..be44139 --- /dev/null +++ b/.werks/4857 @@ -0,0 +1,12 @@ +Title: esx_vsphere_vm.datastores: this check always reported only one datastore information +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1503919723 + +This check now reports all datastores information for this VM. + diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 2916b4a..8bfdc88 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1571,7 +1571,7 @@ if not error: else: # No matching datastore was found. At least add the name response.append("name %s" % name) - return "\t".join(response) + return "@@".join(response) transform_functions = { "snapshot.rootSnapshotList" : eval_snapshot_list, diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 128a637..d5492b5 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -183,7 +183,7 @@ def check_esx_vsphere_vm_datastores(no_item, no_params, info): return 3, "Datastore information is missing" output = [] - for datastore_url in " ".join(datastore_urls).split("\t"): + for datastore_url in " ".join(datastore_urls).split("@@"): datastore_url = datastore_url.split("|") output_store = []

6 years, 10 months

Fixed new test with sites using numbers in the name

by Lars Michelsen

Module: check_mk Branch: master Commit: 031cef01dd00e36fabebdcf85f4ccecea4036ef9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=031cef01dd00e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 13:19:08 2017 +0200 Fixed new test with sites using numbers in the name Change-Id: Iccd467a3c64566c6dc2262e08493655ae04eead4 --- tests/bin/test_mkbackup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/bin/test_mkbackup.py b/tests/bin/test_mkbackup.py index 7ce64f2..70c6016 100644 --- a/tests/bin/test_mkbackup.py +++ b/tests/bin/test_mkbackup.py @@ -94,7 +94,8 @@ def _execute_backup(site, job_id="testjob"): assert "C0:4E:D4:4B:B4:AB:8B:3F:B4:09:32:CE:7D:A6:CF:76" in stdout # Extract and return backup id - matches = re.search("Backup-ID:\s+(Check_MK-[a-zA-Z_+\.-]+-%s-complete)" % job_id.replace("-", "\+"), stdout) + print stdout + matches = re.search("Backup-ID:\s+(Check_MK-[a-zA-Z0-9_+\.-]+-%s-complete)" % job_id.replace("-", "\+"), stdout) assert matches is not None backup_id = matches.groups()[0]

6 years, 10 months

Fixed new backup test on hosts with dots/dashes in name

by Lars Michelsen

Module: check_mk Branch: master Commit: 338c2ba811eed18f5b7376fef255ad422b3eb7de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=338c2ba811eed1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 12:45:17 2017 +0200 Fixed new backup test on hosts with dots/dashes in name Change-Id: Ia2ec4e25126d4694023ca0bd2e55f1ea4c2c02e8 --- tests/bin/test_mkbackup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bin/test_mkbackup.py b/tests/bin/test_mkbackup.py index 202b72c..7ce64f2 100644 --- a/tests/bin/test_mkbackup.py +++ b/tests/bin/test_mkbackup.py @@ -94,7 +94,7 @@ def _execute_backup(site, job_id="testjob"): assert "C0:4E:D4:4B:B4:AB:8B:3F:B4:09:32:CE:7D:A6:CF:76" in stdout # Extract and return backup id - matches = re.search("Backup-ID:\s+(Check_MK-[a-zA-Z_-]+-%s-complete)" % job_id.replace("-", "\+"), stdout) + matches = re.search("Backup-ID:\s+(Check_MK-[a-zA-Z_+\.-]+-%s-complete)" % job_id.replace("-", "\+"), stdout) assert matches is not None backup_id = matches.groups()[0]

6 years, 10 months

read_cache_file: Removed ancient read with size limitation

by Lars Michelsen

Module: check_mk Branch: master Commit: 82dd9ee09e96548770627b420e32faefb0d2fe60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82dd9ee09e9654… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Aug 28 12:32:59 2017 +0200 read_cache_file: Removed ancient read with size limitation Change-Id: Ia03860932c4039ae0bb0d0304bab03e0f9e98973 --- cmk_base/agent_data.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmk_base/agent_data.py b/cmk_base/agent_data.py index 8b7806b..5d6ffb5 100644 --- a/cmk_base/agent_data.py +++ b/cmk_base/agent_data.py @@ -565,10 +565,8 @@ def read_cache_file(relpath, max_cache_age): (opt_use_cachefile and ( not _no_cache ) ) or (config.simulation_mode and not _no_cache) ): if cmk_base.utils.cachefile_age(cachefile) <= max_cache_age or config.simulation_mode: - f = open(cachefile, "r") - result = f.read(100000000) - f.close() - if len(result) > 0: + result = open(cachefile).read() + if result: console.verbose("Using data from cachefile %s.\n" % cachefile) return result else:

6 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017