Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

Win-agent: test eventlog followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: 50c56dc299f092ee72741f223cb457474be10746 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c56dc299f092… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test eventlog followed by systemtime Check that the eventlog section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the eventlog section. Change-Id: I7057d4aea8e42d27f633a0957beffff43d813294 --- agents/windows/it/test_section_eventlog.py | 57 +++++++++++++++++++----------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/agents/windows/it/test_section_eventlog.py b/agents/windows/it/test_section_eventlog.py index d28192f..55feef7 100644 --- a/agents/windows/it/test_section_eventlog.py +++ b/agents/windows/it/test_section_eventlog.py @@ -25,6 +25,7 @@ class Globals: local_statefile = 'eventstate.txt' state_pattern = re.compile(r'^(?P<logtype>[^\|]+)\|(?P<record>\d+)$') section = 'logwatch' + alone = True statedir = os.path.join(remotedir, 'state') statefile = 'eventstate___1.txt' testlog = 'Application' @@ -104,42 +105,56 @@ def testfile(): return os.path.basename(__file__) +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig_sections(request, config): + Globals.alone = request.param == 'alone' + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) + return config + + @pytest.fixture(params=['yes', 'no'], ids=['vista_api=yes', 'vista_api=no']) -def testconfig(request, config): - config.set('global', 'sections', Globals.section) - config.set('global', 'crash_debug', 'yes') - config.add_section(Globals.section) - config.set(Globals.section, 'vista_api', request.param) - config.set(Globals.section, 'logfile %s' % Globals.testlog, 'warn') +def testconfig(request, testconfig_sections): + testconfig_sections.set('global', 'crash_debug', 'yes') + testconfig_sections.add_section(Globals.section) + testconfig_sections.set(Globals.section, 'vista_api', request.param) + testconfig_sections.set(Globals.section, 'logfile %s' % Globals.testlog, + 'warn') # Ignore security and system logs as SSH agent and COM may emit something # there while tests run - config.set(Globals.section, 'logfile Security', 'off') - config.set(Globals.section, 'logfile System', 'off') + testconfig_sections.set(Globals.section, 'logfile Security', 'off') + testconfig_sections.set(Globals.section, 'logfile System', 'off') - return config + return testconfig_sections @pytest.fixture def expected_output_no_events(): if platform.system() == 'Windows': - return [re.escape(r'<<<%s>>>' % Globals.section) - ] + [logtitle(l) for l in logs] + expected = [re.escape(r'<<<%s>>>' % Globals.section) + ] + [logtitle(l) for l in logs] + if not Globals.alone: + expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] + return expected @pytest.fixture def expected_output_application_events(): if platform.system() == 'Windows': split_index = logs.index('Application') + 1 - return chain( - [re.escape(r'<<<%s>>>' % Globals.section)], - [logtitle(l) for l in logs[:split_index]], [ - r'W \w{3} \d{2} \d{2}\:\d{2}:\d{2} 0\.%d %s %s' % - (i, Globals.testsource.replace(' ', '_'), - Globals.testdescription) for i in Globals.testids - ], - repeat(r'|'.join( - [logtitle(l) for l in logs[split_index:]] + - [r'[CWOu\.] \w{3} \d{2} \d{2}\:\d{2}:\d{2} \d+\.\d+ .+ .+']))) + re_str = r'|'.join( + [logtitle(l) for l in logs[split_index:]] + + [r'[CWOu\.] \w{3} \d{2} \d{2}\:\d{2}:\d{2} \d+\.\d+ .+ .+']) + if not Globals.alone: + re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + return chain([re.escape(r'<<<%s>>>' % Globals.section)], + [logtitle(l) for l in logs[:split_index]], [ + r'W \w{3} \d{2} \d{2}\:\d{2}:\d{2} 0\.%d %s %s' % + (i, Globals.testsource.replace(' ', '_'), + Globals.testdescription) for i in Globals.testids + ], repeat(re_str)) def last_records():

6 years, 4 months

Win-agent: test dotnet_clrmemory followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: a1c029e53ee0a1f2531d12804587400e609fd276 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1c029e53ee0a1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test dotnet_clrmemory followed by systemtime Check that the dotnet_clrmemory section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the dotnet_clrmemory section. Change-Id: I6dbac788f092a48ebb090089f27cefa996b9aa68 --- agents/windows/it/test_section_dotnet_clrmemory.py | 42 ++++++++++++++-------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index 2a34c56..d9c353c 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -7,23 +7,31 @@ import re from remote import actual_output, config, remotetest, wait_agent, write_config +class Globals(object): + section = 'dotnet_clrmemory' + alone = True + + @pytest.fixture def testfile(): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): - section = 'dotnet_clrmemory' - config.set('global', 'sections', section) +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig(request, config): + Globals.alone = request.param == 'alone' + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) config.set('global', 'crash_debug', 'yes') return config @pytest.fixture def expected_output(): - return chain([ - re.escape(r'<<<dotnet_clrmemory:sep(44)>>>'), + base = [ + re.escape(r'<<<%s:sep(44)>>>' % Globals.section), (r'AllocatedBytesPersec,Caption,Description,FinalizationSurvivors,' r'Frequency_Object,Frequency_PerfTime,Frequency_Sys100NS,Gen0heapsize,' r'Gen0PromotedBytesPerSec,Gen1heapsize,Gen1PromotedBytesPerSec,' @@ -35,12 +43,16 @@ def expected_output(): r'ProcessID,PromotedFinalizationMemoryfromGen0,PromotedMemoryfromGen0,' r'PromotedMemoryfromGen1,Timestamp_Object,Timestamp_PerfTime,' r'Timestamp_Sys100NS') - ], - repeat(r'\d+,,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+')) - - -def test_section_dotnet_clrmemory(testconfig, expected_output, actual_output, - testfile): - remotetest(expected_output, actual_output, testfile) + ] + re_str = (r'\d+,,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' + r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+') + if not Globals.alone: + re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + return chain(base, repeat(re_str)) + + +def test_section_dotnet_clrmemory(request, testconfig, expected_output, + actual_output, testfile): + # request.node.name gives test name + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 4 months

Updated a few Python packages.

by Sven Panne

Module: check_mk Branch: master Commit: bb013c4bbb8b8eed19f86d9eef4c1e901528568b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb013c4bbb8b8e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 22 11:49:32 2018 +0200 Updated a few Python packages. netifaces-0.10.6 => netifaces-0.10.7 pathlib2-2.3.0 => pathlib2-2.3.2 pip-9.0.1 => pip-10.0.1 ply-3.10 => ply-3.11 pysmi-0.2.2 => pysmi-0.3.0 setuptools-38.4.0 => setuptools-39.2.0 simplejson-3.13.2 => simplejson-3.15.0 They contain quite a few bug fixes, and looking at their repositories and changes, the risk of updating them should be relatively low. Change-Id: I1c75086b8a3495ed5c74f7679afd7ca99324d20e --- omd/packages/python-modules/Makefile | 14 +++++++------- .../python-modules/src/netifaces-0.10.6.tar.gz | Bin 25166 -> 0 bytes .../python-modules/src/netifaces-0.10.7.tar.gz | Bin 0 -> 29330 bytes .../python-modules/src/pathlib2-2.3.0.tar.gz | Bin 34291 -> 0 bytes .../python-modules/src/pathlib2-2.3.2.tar.gz | Bin 0 -> 33764 bytes omd/packages/python-modules/src/pip-10.0.1.tar.gz | Bin 0 -> 1246072 bytes omd/packages/python-modules/src/pip-9.0.1.tar.gz | Bin 1197370 -> 0 bytes omd/packages/python-modules/src/ply-3.10.tar.gz | Bin 150926 -> 0 bytes omd/packages/python-modules/src/ply-3.11.tar.gz | Bin 0 -> 159130 bytes omd/packages/python-modules/src/pysmi-0.2.2.tar.gz | Bin 90568 -> 0 bytes omd/packages/python-modules/src/pysmi-0.3.0.tar.gz | Bin 0 -> 92850 bytes ...setuptools-38.4.0.zip => setuptools-39.2.0.zip} | Bin 737603 -> 851112 bytes .../python-modules/src/simplejson-3.13.2.tar.gz | Bin 79735 -> 0 bytes .../python-modules/src/simplejson-3.15.0.tar.gz | Bin 0 -> 80963 bytes 14 files changed, 7 insertions(+), 7 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 3969d7d..4f3a369 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -9,15 +9,15 @@ PATCHES := $(wildcard patches/*.dif) MODULES = # Modules needed because of own packed python (would be available in OS) -MODULES += setuptools-38.4.0.zip # needed by rrdtool bindings +MODULES += setuptools-39.2.0.zip # needed by rrdtool bindings # Modules really needed on all platforms MODULES += pysphere-0.1.7.zip MODULES += pyasn1-0.4.2.tar.gz MODULES += pycryptodomex-3.4.7.tar.gz MODULES += ordereddict-1.1.tar.gz # needed by pysmi -MODULES += ply-3.10.tar.gz # needed by pysmi -MODULES += pysmi-0.2.2.tar.gz # needed by EC (for trap translation) +MODULES += ply-3.11.tar.gz # needed by pysmi +MODULES += pysmi-0.3.0.tar.gz # needed by EC (for trap translation) MODULES += pysnmp-4.4.4.tar.gz # needed by EC (for trap translation) MODULES += setuptools-git-1.2.tar.gz # needed for pymssql @@ -36,7 +36,7 @@ else endif # Check_MK Edition specific -MODULES += simplejson-3.13.2.tar.gz +MODULES += simplejson-3.15.0.tar.gz MODULES += MySQL-python-1.2.5.zip # needed by check_sql MODULES += psycopg2-2.6.2.tar.gz # needed by check_sql MODULES += dicttoxml-1.7.4.tar.gz # needed by inventory XML export @@ -44,7 +44,7 @@ MODULES += pycparser-2.18.tar.gz # needed for cffi MODULES += enum34-1.1.6.tar.gz # needed for cffi MODULES += cffi-1.11.5.tar.gz # needed by e.g. Pillow MODULES += Pillow-5.0.0.tar.gz # needed by reportlab (pillow>=2.4.0) -MODULES += pip-9.0.1.tar.gz # needed by reportlab (pip>=1.4.1) +MODULES += pip-10.0.1.tar.gz # needed by reportlab (pip>=1.4.1) MODULES += reportlab-3.4.0.tar.gz # needed by reporting MODULES += PyPDF2-1.26.0.tar.gz # needed by reporting @@ -84,7 +84,7 @@ MODULES += psutil-5.4.3.tar.gz # needed for mkbench MODULES += six-1.11.0.tar.gz MODULES += ipaddress-1.0.22.tar.gz -MODULES += netifaces-0.10.6.tar.gz # needed for LDAP (nearest DC detection) +MODULES += netifaces-0.10.7.tar.gz # needed for LDAP (nearest DC detection) MODULES += dnspython-1.15.0.zip # needed for LDAP (nearest DC detection) MODULES += python-ad-0.9.tar.gz # needed for LDAP (nearest DC detection) @@ -122,7 +122,7 @@ MODULES += pyghmi-1.0.38.tar.gz MODULES += typing-3.6.4.tar.gz MODULES += scandir-1.7.tar.gz -MODULES += pathlib2-2.3.0.tar.gz +MODULES += pathlib2-2.3.2.tar.gz # Added for scheduling (cmk/schedule.py) MODULES += python-dateutil-2.6.1.tar.gz diff --git a/omd/packages/python-modules/src/netifaces-0.10.6.tar.gz b/omd/packages/python-modules/src/netifaces-0.10.6.tar.gz deleted file mode 100644 index 0cee125..0000000 Binary files a/omd/packages/python-modules/src/netifaces-0.10.6.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/netifaces-0.10.7.tar.gz b/omd/packages/python-modules/src/netifaces-0.10.7.tar.gz new file mode 100644 index 0000000..8cc5d8d Binary files /dev/null and b/omd/packages/python-modules/src/netifaces-0.10.7.tar.gz differ diff --git a/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz b/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz deleted file mode 100644 index 06366cd..0000000 Binary files a/omd/packages/python-modules/src/pathlib2-2.3.0.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/pathlib2-2.3.2.tar.gz b/omd/packages/python-modules/src/pathlib2-2.3.2.tar.gz new file mode 100644 index 0000000..86e784d Binary files /dev/null and b/omd/packages/python-modules/src/pathlib2-2.3.2.tar.gz differ diff --git a/omd/packages/python-modules/src/pip-10.0.1.tar.gz b/omd/packages/python-modules/src/pip-10.0.1.tar.gz new file mode 100644 index 0000000..f5a1d24 Binary files /dev/null and b/omd/packages/python-modules/src/pip-10.0.1.tar.gz differ diff --git a/omd/packages/python-modules/src/pip-9.0.1.tar.gz b/omd/packages/python-modules/src/pip-9.0.1.tar.gz deleted file mode 100644 index 5416b0d..0000000 Binary files a/omd/packages/python-modules/src/pip-9.0.1.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/ply-3.10.tar.gz b/omd/packages/python-modules/src/ply-3.10.tar.gz deleted file mode 100644 index 85bb032..0000000 Binary files a/omd/packages/python-modules/src/ply-3.10.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/ply-3.11.tar.gz b/omd/packages/python-modules/src/ply-3.11.tar.gz new file mode 100644 index 0000000..abb995c Binary files /dev/null and b/omd/packages/python-modules/src/ply-3.11.tar.gz differ diff --git a/omd/packages/python-modules/src/pysmi-0.2.2.tar.gz b/omd/packages/python-modules/src/pysmi-0.2.2.tar.gz deleted file mode 100644 index 66c7a8e..0000000 Binary files a/omd/packages/python-modules/src/pysmi-0.2.2.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/pysmi-0.3.0.tar.gz b/omd/packages/python-modules/src/pysmi-0.3.0.tar.gz new file mode 100644 index 0000000..f81e9dc Binary files /dev/null and b/omd/packages/python-modules/src/pysmi-0.3.0.tar.gz differ diff --git a/omd/packages/python-modules/src/setuptools-38.4.0.zip b/omd/packages/python-modules/src/setuptools-39.2.0.zip similarity index 50% rename from omd/packages/python-modules/src/setuptools-38.4.0.zip rename to omd/packages/python-modules/src/setuptools-39.2.0.zip index 7deaddc..c7e388b 100644 Binary files a/omd/packages/python-modules/src/setuptools-38.4.0.zip and b/omd/packages/python-modules/src/setuptools-39.2.0.zip differ diff --git a/omd/packages/python-modules/src/simplejson-3.13.2.tar.gz b/omd/packages/python-modules/src/simplejson-3.13.2.tar.gz deleted file mode 100644 index 4d9f92a..0000000 Binary files a/omd/packages/python-modules/src/simplejson-3.13.2.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/simplejson-3.15.0.tar.gz b/omd/packages/python-modules/src/simplejson-3.15.0.tar.gz new file mode 100644 index 0000000..b599b3c Binary files /dev/null and b/omd/packages/python-modules/src/simplejson-3.15.0.tar.gz differ

6 years, 4 months

Revert "6077 FIX ps: Using number of cores sent by Linux agent is now configurable"

by Lars Michelsen

Module: check_mk Branch: master Commit: 216c0528ed97bf5a605dd0203996b795114991d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=216c0528ed97bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:44:08 2018 +0200 Revert "6077 FIX ps: Using number of cores sent by Linux agent is now configurable" This reverts commit e8cdc365bc57ef65455ddff71fb5203a18812909. Change-Id: Iee44c5ef7d6cbd1c5e62d291d8ec2fbde4e27cf8 --- .werks/6077 | 11 ----------- checks/ps | 2 +- web/plugins/wato/check_parameters.py | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.werks/6077 b/.werks/6077 deleted file mode 100644 index ecd0ba9..0000000 --- a/.werks/6077 +++ /dev/null @@ -1,11 +0,0 @@ -Title: ps: Using number of cores sent by Linux agent is now configurable -Level: 1 -Component: checks -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0b4 -Date: 1526028276 - - diff --git a/checks/ps b/checks/ps index 52eec64..9489fc7 100644 --- a/checks/ps +++ b/checks/ps @@ -242,7 +242,7 @@ def inventory_ps(info): def check_ps(item, params, info): (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info - if cpu_info and len(cpu_info[0]) == 6 and params.get('use_linux_cpu_cores'): + if cpu_info and len(cpu_info[0]) == 6: cpu_cores = int(cpu_info[0][5]) if mem_info: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 875b364..2092288 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1345,10 +1345,6 @@ process_level_elements = [ ), ], )), - ("use_linux_cpu_cores", Checkbox( - title=_("Use number of cores sent by agent (Linux)"), - label=_("Enable") - )), ('process_info', DropdownChoice( title = _("Enable per-process details in long-output"), label = _("Enable per-process details"),

6 years, 4 months

Revert " Fixed forgotten ps.include file regarding cpu utilization of processes in Linux "

by Lars Michelsen

Module: check_mk Branch: master Commit: 1145d00d8ab101d701a018895a88ff6e120dc5ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1145d00d8ab101… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:44:10 2018 +0200 Revert "Fixed forgotten ps.include file regarding cpu utilization of processes in Linux" This reverts commit fc0a8c85fab0ee67393ccbb9d36344e59068e581. --- checks/ps.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 4a5f40c..78475b7 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -439,10 +439,10 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" except MKCounterWrapped, e: cputime = 0 - pcpu = cputime * 100 / cpu_cores + pcpu = cputime * 100 process.append(("pid", (pid, ""))) else: - pcpu = savefloat(process_info[3]) / cpu_cores + pcpu = savefloat(process_info[3]) percent_cpu += pcpu process.append(("cpu usage", (pcpu, "%")))

6 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 80d1578255aad19308c47bff42ab19ac2d8311d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80d1578255aad1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:45:41 2018 +0200 Reserved 20 Werk IDS Change-Id: I46320be7fb74a9dde800818112a8aaee03eee2f7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 762a1ac..2ddfb3e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6149 +6169

6 years, 4 months

Revert "Fix CPU utilization regarding Linux processes in ps check"

by Lars Michelsen

Module: check_mk Branch: master Commit: 6cef608aec33ea7490e2e62e569fe20cb3177876 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cef608aec33ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:44:12 2018 +0200 Revert "Fix CPU utilization regarding Linux processes in ps check" This reverts commit 82add2dd8741a16bfa46a330e940382dc9cdd6e4. --- checks/ps | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/checks/ps b/checks/ps index 9489fc7..74f97f9 100644 --- a/checks/ps +++ b/checks/ps @@ -236,15 +236,12 @@ def parse_ps(info): def inventory_ps(info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info return inventory_ps_common(inventory_processes, inventory_processes_rules, parsed) def check_ps(item, params, info): - (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info, cpu_info = info - if cpu_info and len(cpu_info[0]) == 6: - cpu_cores = int(cpu_info[0][5]) - + (cpu_cores, parsed), mem_info, solaris_mem_info, statgrab_mem_info, aix_memory_info = info if mem_info: total_ram = parse_proc_meminfo_bytes(mem_info).get("MemTotal") elif solaris_mem_info: @@ -269,7 +266,7 @@ check_info['ps'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], } # NOTE: This check is deprecated and will be removed any decade now. ps now @@ -282,5 +279,5 @@ check_info['ps.perf'] = { "node_info" : True, # add first column with actual host name "group" : "ps", "default_levels_variable" : "ps_default_levels", - "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory", "cpu" ], + "extra_sections" : [ "mem", "solaris_mem", "statgrab_mem", "aix_memory" ], }

6 years, 4 months

6081 FIX Fixed info extension by node name of cluster-aware checks if host if not part of a cluster

by Simon Betz

Module: check_mk Branch: master Commit: 2398473b7d11f96edd3db2ac349f2fa3493f7b40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2398473b7d11f9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 17 09:28:50 2018 +0200 6081 FIX Fixed info extension by node name of cluster-aware checks if host if not part of a cluster Change-Id: I3a9ee6eddb3743a1f4c832fadb862496ecf60dd2 --- .werks/6081 | 10 ++++++++++ cmk_base/data_sources/host_sections.py | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.werks/6081 b/.werks/6081 new file mode 100644 index 0000000..5767a7d --- /dev/null +++ b/.werks/6081 @@ -0,0 +1,10 @@ +Title: Fixed info extension by node name of cluster-aware checks if host if not part of a cluster +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526541876 +Class: fix + + diff --git a/cmk_base/data_sources/host_sections.py b/cmk_base/data_sources/host_sections.py index 93eb386..ad0c662 100644 --- a/cmk_base/data_sources/host_sections.py +++ b/cmk_base/data_sources/host_sections.py @@ -194,9 +194,8 @@ class MultiHostSections(object): if check_plugin_name not in checks.check_info or not checks.check_info[check_plugin_name]["node_info"]: return section_content # unknown check_plugin_name or does not want node info -> do nothing - if for_discovery: - node_name = None - else: + node_name = None + if not for_discovery and config.clusters_of(hostname): node_name = hostname return self._add_node_column(section_content, node_name)

6 years, 4 months

6108 FIX Raw Edition: Don' t show enterprise specific graph export links in context menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 24810645723f220c6f62c39184f3e76588c9941f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24810645723f22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 09:02:11 2018 +0200 6108 FIX Raw Edition: Don't show enterprise specific graph export links in context menu Change-Id: I938571cfa38eb94758685564b1a38683cf928bd5 --- .werks/6108 | 11 +++++++++++ web/htdocs/visuals.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/6108 b/.werks/6108 new file mode 100644 index 0000000..05bab76 --- /dev/null +++ b/.werks/6108 @@ -0,0 +1,11 @@ +Title: Raw Edition: Don't show enterprise specific graph export links in context menu +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526972508 + + diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 8a20415..5f1aa99 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -35,6 +35,7 @@ from valuespec import * import config, table, userdb import pagetypes # That will replace visuals.py one day import cmk.store as store +import metrics # .--Plugins-------------------------------------------------------------. # | ____ _ _ | @@ -1604,7 +1605,7 @@ def ajax_popup_add(): html.close_li() # TODO: Find a good place for this special case. This needs to be modularized. - if add_type == "pnpgraph": + if add_type == "pnpgraph" and metrics.cmk_graphs_possible(): html.open_li() html.open_span() html.write("%s:" % _("Export"))

6 years, 4 months

Made active history period a member of History.

by Sven Panne

Module: check_mk Branch: master Commit: 665a731c17a9ae26c0fe12d684b73f947c14f20d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=665a731c17a9ae… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 22 08:32:58 2018 +0200 Made active history period a member of History. Change-Id: Ic7a43e814055daa02e173d5e1731c9c318941dfd --- cmk/ec/actions.py | 14 ++--- cmk/ec/history.py | 9 ++-- cmk/ec/main.py | 68 +++++++++++------------- tests/integration/cmk/ec/test_mkeventd_status.py | 17 +++--- 4 files changed, 50 insertions(+), 58 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=665a731c17…

6 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018