Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5692ab88785971ac5a992fece643439c0184f820 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5692ab88785971… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Mar 8 15:51:17 2018 +0100 5747 FIX fix daylight saving time error When the actual time was inside/outside the daylight saving time and a report was outside/inside the daylight saving time the calculated time for the last or next scheduled reports was off by 1h. This is fixed now by using the dateutil library internally. Change-Id: I51bfcc9d38833435379e13c7d12d0b126c78dbdf --- .werks/5747 | 13 ++++ cmk/schedule.py | 190 +++++++++++++++++++++++++++++---------------- tests/cmk/test_schedule.py | 142 +++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5692ab8878…

6 years, 3 months

5749 FIX tcp_conn_stats: use ss by default if present otherwise fall back to cat /proc/net/tcp

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 63171b5d3f488d7d2b4ad0c34e3c07ae3a4d92fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63171b5d3f488d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 9 15:44:02 2018 +0100 5749 FIX tcp_conn_stats: use ss by default if present otherwise fall back to cat /proc/net/tcp Change-Id: I7c34ea6e80e69499c45e7de72d90e16fee8ad1a7 --- .werks/5749 | 10 ++++++++++ agents/check_mk_agent.linux | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/5749 b/.werks/5749 new file mode 100644 index 0000000..3b4dd8f --- /dev/null +++ b/.werks/5749 @@ -0,0 +1,10 @@ +Title: tcp_conn_stats: use ss by default if present otherwise fall back to cat /proc/net/tcp +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520606516 +Class: fix + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2d7a048..a0dbd70 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -420,12 +420,12 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -if type waitmax >/dev/null ; then +if type ss > /dev/null ; then + ss -ant |grep -v ^State | awk ' /:/ { c[$1]++; } END { for (x in c) { print x, c[x]; } }' |sed -e 's/^ESTAB/01/g;s/^SYN-SENT/02/g;s/^SYN-RECV/03/g;s/^FIN-WAIT-1/04/g;s/^FIN-WAIT-2/05/g;s/^TIME-WAIT/06/g;s/^CLOSED/07/g;s/^CLOSE-WAIT/08/g;s/^LAST-ACK/09/g;s/^LISTEN/0A/g;s/^CLOSING/0B/g;' +elif type waitmax >/dev/null ; then THIS=$(waitmax -s 1 10 cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }') if [ $? == 0 ] ; then - echo "$THIS" - else - ss -ant |grep -v ^State | awk ' /:/ { c[$1]++; } END { for (x in c) { print x, c[x]; } }' |sed -e 's/^ESTAB/01/g;s/^SYN-SENT/02/g;s/^SYN-RECV/03/g;s/^FIN-WAIT-1/04/g;s/^FIN-WAIT-2/05/g;s/^TIME-WAIT/06/g;s/^CLOSED/07/g;s/^CLOSE-WAIT/08/g;s/^LAST-ACK/09/g;s/^LISTEN/0A/g;s/^CLOSING/0B/g;' + echo "$THIS" fi fi

6 years, 3 months

Honor dependency to six for python-dateutil

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2f59022ab1c15b2b62022394320b3e6e95362be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f59022ab1c15b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 9 16:11:55 2018 +0100 Honor dependency to six for python-dateutil Change-Id: Ic99132d608401b8bacc31590264163a8021de929 --- omd/packages/python-modules/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 29180c6..96417fe 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -47,7 +47,6 @@ 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 += reportlab-3.4.0.tar.gz # needed by reporting MODULES += PyPDF2-1.26.0.tar.gz # needed by reporting -MODULES += python-dateutil-2.6.1.tar.gz # Added for scheduling (cmk/schedule.py) MODULES += npyscreen-4.10.5.tar.gz # needed for mkbench MODULES += psutil-5.4.3.tar.gz # needed for mkbench @@ -117,6 +116,8 @@ 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 +# Added for scheduling (cmk/schedule.py) +MODULES += python-dateutil-2.6.1.tar.gz .PHONY: build check-freetds install skel clean

6 years, 3 months

Make collections moduel available in the Check API

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 32455629e33222d31da88907d3049915ea52f29c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32455629e33222… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Feb 28 14:29:36 2018 +0100 Make collections moduel available in the Check API Change-Id: I7ba745b74aaeef92bd0d27fc029897628670ef63 --- cmk_base/check_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/check_api.py b/cmk_base/check_api.py index e8f4935..bb70f15 100644 --- a/cmk_base/check_api.py +++ b/cmk_base/check_api.py @@ -119,6 +119,7 @@ def _get_check_context(): # '----------------------------------------------------------------------' # TODO: Move imports directly to checks? +import collections import fnmatch import math import re

6 years, 4 months

5748 FIX cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions

by Tom Baerwinkel

Module: check_mk Branch: master Commit: efff5b417da80bc7be122483b09b0a96e1da174e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efff5b417da80b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 9 11:28:17 2018 +0100 5748 FIX cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions Exclude "NX-OS" systems explicitly in cisco_cpu and remove the check for 1.3.6.1.4.1.9.9.109.1.1.1.1.* in cisco_nexus_cpu. Thanks to Ricardo Fribeiro for the patch. Change-Id: Ib49ace43fca41a65f07a82d8c158665f7667f3cd --- .werks/5748 | 13 +++++++++++++ checks/cisco_cpu | 1 + checks/cisco_nexus_cpu | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5748 b/.werks/5748 new file mode 100644 index 0000000..3e5b26d --- /dev/null +++ b/.werks/5748 @@ -0,0 +1,13 @@ +Title: cisco_cpu, cisco_nexus_cpu: improve snmp_scan_functions +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i4 +Date: 1520592742 +Class: fix + +Exclude "NX-OS" systems explicitly in cisco_cpu and remove the +check for 1.3.6.1.4.1.9.9.109.1.1.1.1.* in cisco_nexus_cpu. + +Thanks to Ricardo Fribeiro for the patch. diff --git a/checks/cisco_cpu b/checks/cisco_cpu index bc56745..823efa5 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -70,6 +70,7 @@ check_info["cisco_cpu"] = { "has_perfdata" : True, "group" : "cpu_utilization", "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and "nx-os" not in oid(".1.3.6.1.2.1.1.1.0").lower() \ and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), } diff --git a/checks/cisco_nexus_cpu b/checks/cisco_nexus_cpu index ca078d0..06822f2 100644 --- a/checks/cisco_nexus_cpu +++ b/checks/cisco_nexus_cpu @@ -48,7 +48,6 @@ check_info['cisco_nexus_cpu'] = { 'snmp_info' : (".1.3.6.1.4.1.9.9.305.1.1.1.0", [ "" ]), 'snmp_scan_function' : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ and "nx-os" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and not oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*") \ and oid(".1.3.6.1.4.1.9.9.305.1.1.1.0"), 'group' : "cpu_utilization", 'includes' : [ "cpu_util.include" ],

6 years, 4 months

Adapted test

by Simon Betz

Module: check_mk Branch: master Commit: 5030981586e601b52d774c8add699baf6880e767 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5030981586e601… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 9 12:39:14 2018 +0100 Adapted test Change-Id: I07e1738c958cbcc568d79ae45aa31d4e3f2b647e --- tests/checks/test_if_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checks/test_if_check.py b/tests/checks/test_if_check.py index 9cc5e30..90ffd8d 100644 --- a/tests/checks/test_if_check.py +++ b/tests/checks/test_if_check.py @@ -40,7 +40,7 @@ pytestmark = pytest.mark.checks ([["1", "EINS", "6", "10", "2"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"]], [], 0), ([["1", "EINS", "00000", "10", "1"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"]], [], 0), ([["1", "EINS", "6", "10", "1"] + 13*["0"] + ["EINS-ALIAS", "00:00:00:00:00:00"], - ["1", "EINS-DUPLICATE", "6", "10", "1"] + 13*["0",] + ["EINS-ALIAS-DUPLICATE", "00:00:00:00:00:00"]], [], 2), + ["1", "EINS-DUPLICATE", "6", "10", "1"] + 13*["0",] + ["EINS-ALIAS-DUPLICATE", "00:00:00:00:00:00"]], [], 1), ]) def test_if_inventory_if_common_count_interfaces(check_manager, monkeypatch, info, inventory_if_rules, result): check = check_manager.get_check("if")

6 years, 4 months

5774 FIX if.include: Wrong items were discovered which led to vanished/ undecided(unknown) services

by Simon Betz

Module: check_mk Branch: master Commit: 8cd8929735b01a6531e96b8bc2a41646a9887c85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cd8929735b01a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 9 12:09:51 2018 +0100 5774 FIX if.include: Wrong items were discovered which led to vanished/undecided(unknown) services Change-Id: I87e979697a52c937d462c470239d5306044d000e --- .werks/5774 | 10 ++++++++++ checks/if.include | 9 +++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.werks/5774 b/.werks/5774 new file mode 100644 index 0000000..92027d1 --- /dev/null +++ b/.werks/5774 @@ -0,0 +1,10 @@ +Title: if.include: Wrong items were discovered which led to vanished/undecided(unknown) services +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520593714 +Class: fix + + diff --git a/checks/if.include b/checks/if.include index 42312af..a50fc7f 100644 --- a/checks/if.include +++ b/checks/if.include @@ -288,7 +288,7 @@ def inventory_if_common(info, has_nodeinfo = False): return [] settings_sets = host_extra_conf(host_name(), inventory_if_rules) - global_seen = set() + seen_indicies = set() pre_inventory = [] if not settings_sets: @@ -318,7 +318,6 @@ def inventory_if_common(info, has_nodeinfo = False): # Allow main check to set no port type (e.g. hitachi_hnas_fc_if) porttypes.append("") pre_inventory_groups = [] - local_seen = set() have_groups = {} # Determine whether single, grouped or both @@ -412,7 +411,7 @@ def inventory_if_common(info, has_nodeinfo = False): is_only_in_group = True # Prepare single interfaces - if not is_only_in_group and ifIndex not in global_seen and \ + if not is_only_in_group and ifIndex not in seen_indicies and \ ifType in porttypes and ifOperStatus in portstates and \ port_match(ifAlias, match_alias) and port_match(ifDescr, match_desc): params = {} @@ -421,11 +420,9 @@ def inventory_if_common(info, has_nodeinfo = False): if ifSpeed != "" and if_inventory_monitor_speed: params["speed"] = int(ifSpeed) - local_seen.add(ifIndex) + seen_indicies.add(ifIndex) pre_inventory.append((item, "%r" % params, int(ifIndex))) - global_seen = global_seen.union(local_seen) - # Create pseudo interfaces out of groups # On cluster groups we have no 'interfaces' key for group_name, attrs in have_groups.items():

6 years, 4 months

Win-agent: refactor tests for section logfiles

by Jukka Aro

Module: check_mk Branch: master Commit: d9518662dd5f885b41e32be0b920d5bfc85f2215 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9518662dd5f88… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 9 10:46:01 2018 +0100 Win-agent: refactor tests for section logfiles Put global variables in Globals class. --- agents/windows/it/test_section_logfiles.py | 102 +++++++++++++++++------------ 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/agents/windows/it/test_section_logfiles.py b/agents/windows/it/test_section_logfiles.py index c809cc8..617f729 100644 --- a/agents/windows/it/test_section_logfiles.py +++ b/agents/windows/it/test_section_logfiles.py @@ -8,25 +8,24 @@ import pytest from remote import (actual_output, config, remotedir, remotetest, run_subprocess, wait_agent, write_config) -section = 'logfiles' -testlog1 = os.path.join(remotedir, 'test1.log') -testlog2 = os.path.join(remotedir, 'test2.log') -testentry1 = 'foobar' -testentry2 = 'error' -state_pattern = re.compile( - r'^(?P<logfile>[^\|]+)\|(?P<inode>\d+)\|(?P<size>\d+)\|(?P<offset>\d+)') -fileid_pattern = re.compile(r'^.*\:\s*(?P<fileid>0x[0-9a-fA-F]+)') # ugly hacks to get to know the config param and utf encoding in use: - - class Globals(object): config_param_in_use = None utf_encoding = None + section = 'logfiles' + testlog1 = os.path.join(remotedir, 'test1.log') + testlog2 = os.path.join(remotedir, 'test2.log') + testentry1 = 'foobar' + testentry2 = 'error' + state_pattern = re.compile( + r'^(?P<logfile>[^\|]+)\|(?P<inode>\d+)\|(?P<size>\d+)\|(?P<offset>\d+)' + ) + fileid_pattern = re.compile(r'^.*\:\s*(?P<fileid>0x[0-9a-fA-F]+)') def get_log_state(line): - m = state_pattern.match(line) + m = Globals.state_pattern.match(line) if m is None: return None, (None, None, None) return m.group('logfile'), (int(m.group('inode')), int(m.group('size')), @@ -42,7 +41,7 @@ def get_fileid(filename): if stderr: sys.stderr.write(stderr) assert exit_code == 0, "'%s' failed" % ' '.join(cmd) - m = fileid_pattern.match(stdout) + m = Globals.fileid_pattern.match(stdout) assert m is not None, "'%s' does not match fileid pattern" % stdout return int(m.group('fileid'), base=16) @@ -64,13 +63,13 @@ def testfile(): @pytest.fixture(params=['default', 'from_start', 'rotated', 'nocontext']) def testconfig(request, config): - config.set("global", "sections", section) + config.set("global", "sections", Globals.section) config.set("global", "crash_debug", "yes") - config.add_section(section) + config.add_section(Globals.section) Globals.config_param_in_use = request.param tag = '' if request.param == 'default' else '%s ' % request.param - config.set(section, "textfile", "%s%s|%s%s" % (tag, testlog1, tag, - testlog2)) + config.set(Globals.section, "textfile", + "%s%s|%s%s" % (tag, Globals.testlog1, tag, Globals.testlog2)) return config @@ -80,38 +79,54 @@ def testconfig(request, config): ]) def testconfig_glob(request, testconfig): entry = { - 'no_glob': testentry2, - 'star_begin': '*' + testentry2[2:], - 'star_end': testentry2[:3] + '*', - 'star_middle': testentry2[:2] + '*' + testentry2[-1:], - 'question_begin': '?' + testentry2[1:], - 'question_end': testentry2[:-1] + '?', - 'question_middle': testentry2[:2] + '?' + testentry2[3:] + 'no_glob': Globals.testentry2, + 'star_begin': '*' + Globals.testentry2[2:], + 'star_end': Globals.testentry2[:3] + '*', + 'star_middle': Globals.testentry2[:2] + '*' + Globals.testentry2[-1:], + 'question_begin': '?' + Globals.testentry2[1:], + 'question_end': Globals.testentry2[:-1] + '?', + 'question_middle': + Globals.testentry2[:2] + '?' + Globals.testentry2[3:] }[request.param] - testconfig.set(section, "crit", entry) + testconfig.set(Globals.section, "crit", entry) return testconfig @pytest.fixture def expected_output_no_statefile(): - expected_output = [re.escape(r'<<<logwatch>>>'), logtitle(testlog1)] + expected_output = [ + re.escape(r'<<<logwatch>>>'), + logtitle(Globals.testlog1) + ] if Globals.config_param_in_use == 'from_start': - expected_output += [r'\. %s' % testentry1, r'C %s' % testentry2] - expected_output.append(logtitle(testlog2)) + expected_output += [ + r'\. %s' % Globals.testentry1, + r'C %s' % Globals.testentry2 + ] + expected_output.append(logtitle(Globals.testlog2)) if Globals.config_param_in_use == 'from_start': - expected_output += [r'\. %s' % testentry1, r'C %s' % testentry2] + expected_output += [ + r'\. %s' % Globals.testentry1, + r'C %s' % Globals.testentry2 + ] return expected_output @pytest.fixture def expected_output_with_statefile(): - expected_output = [re.escape(r'<<<logwatch>>>'), logtitle(testlog1)] + expected_output = [ + re.escape(r'<<<logwatch>>>'), + logtitle(Globals.testlog1) + ] if Globals.config_param_in_use != 'nocontext': - expected_output.append(r'\. %s' % testentry1) - expected_output += [r'C %s' % testentry2, logtitle(testlog2)] + expected_output.append(r'\. %s' % Globals.testentry1) + expected_output += [ + r'C %s' % Globals.testentry2, + logtitle(Globals.testlog2) + ] if Globals.config_param_in_use != 'nocontext': - expected_output.append(r'\. %s' % testentry1) - expected_output.append(r'C %s' % testentry2) + expected_output.append(r'\. %s' % Globals.testentry1) + expected_output.append(r'C %s' % Globals.testentry2) return expected_output @@ -134,7 +149,7 @@ def with_statefile(): filesize = 2 if Globals.utf_encoding == 'utf-16' else 0 with open(os.path.join(remotedir, 'state', 'logstate.txt'), 'w') as statefile: - for logfile in [testlog1, testlog2]: + for logfile in [Globals.testlog1, Globals.testlog2]: fileid = get_fileid(logfile) file_state = [ str(item) @@ -150,7 +165,7 @@ def verify_logstate(): if platform.system() == 'Windows': expected_logstate = { logfile: get_file_state(logfile) - for logfile in [testlog1, testlog2] + for logfile in [Globals.testlog1, Globals.testlog2] } with open(os.path.join(remotedir, 'state', 'logstate.txt')) as statefile: @@ -174,13 +189,16 @@ def verify_logstate(): def manage_logfiles(request): Globals.utf_encoding = request.param if platform.system() == 'Windows': - for log in [testlog1, testlog2]: + for log in [Globals.testlog1, Globals.testlog2]: with io.open(log, 'w', encoding=request.param) as logfile: - for entry in [unicode(testentry1), unicode(testentry2)]: + for entry in [ + unicode(Globals.testentry1), + unicode(Globals.testentry2) + ]: logfile.write('%s\r\n' % entry) yield if platform.system() == 'Windows': - for log in [testlog1, testlog2]: + for log in [Globals.testlog1, Globals.testlog2]: os.unlink(log) @@ -189,8 +207,8 @@ def test_section_logfiles__new_file(request, testconfig_glob, expected_output_no_statefile, actual_output, testfile): # request.node.name gives test name - remotetest(expected_output_no_statefile, actual_output, - testfile, request.node.name) + remotetest(expected_output_no_statefile, actual_output, testfile, + request.node.name) @pytest.mark.usefixtures("with_statefile") @@ -198,5 +216,5 @@ def test_section_logfiles__new_entries_in_log(request, testconfig_glob, expected_output_with_statefile, actual_output, testfile): # request.node.name gives test name - remotetest(expected_output_with_statefile, actual_output, - testfile, request.node.name) + remotetest(expected_output_with_statefile, actual_output, testfile, + request.node.name)

6 years, 4 months

Updated werk 5624

by Simon Betz

Module: check_mk Branch: master Commit: fec7e6813bef2865751ab80bb1130b0048161a31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fec7e6813bef28… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Mar 9 09:46:40 2018 +0100 Updated werk 5624 Change-Id: I8ae5524d087ea8f14beb536896bb27aadb6b4ad0 --- .werks/5624 | 2 +- inventory/oracle_instance | 13 ++++++++++--- inventory/oracle_performance | 22 +++++++++++++++++----- web/plugins/views/inventory.py | 33 +++++++++++++++++++++++++-------- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/.werks/5624 b/.werks/5624 index 02ea7d2..0da9e6d 100644 --- a/.werks/5624 +++ b/.werks/5624 @@ -1,4 +1,4 @@ -Title: oracle_performance, oracle_tablespaces: Inventory plugins provide status data +Title: oracle_instance, oracle_performance, oracle_tablespaces: Inventory plugins provide status data Level: 1 Component: inv Compatible: compat diff --git a/inventory/oracle_instance b/inventory/oracle_instance index 4cdf041..a8f8873 100644 --- a/inventory/oracle_instance +++ b/inventory/oracle_instance @@ -30,8 +30,10 @@ # last entry: db creation time 'ddmmyyyyhh24mi' -def inv_oracle_instance(info): - node = inv_tree_list("software.applications.oracle.instance:") +def inv_oracle_instance(info, inventory_tree, status_data_tree): + path = "software.applications.oracle.instance:" + inv_node = inventory_tree.get_list(path) + status_node = status_data_tree.get_list(path) for line in info: db_creation_time = None if len(line) == 6: @@ -49,7 +51,7 @@ def inv_oracle_instance(info): else: continue - node.append({ + inv_node.append({ "sid" : sid, "version" : version, "openmode" : openmode, @@ -58,6 +60,11 @@ def inv_oracle_instance(info): "db_creation_time" : db_creation_time, }) + status_node.append({ + "sid" : sid, + "db_uptime" : up_seconds, + }) + inv_info['oracle_instance'] = { 'inv_function' : inv_oracle_instance, diff --git a/inventory/oracle_performance b/inventory/oracle_performance index 94b4ae4..3799dd2 100644 --- a/inventory/oracle_performance +++ b/inventory/oracle_performance @@ -30,14 +30,26 @@ def inv_oracle_performance(parsed, status_data_tree): - status_node = status_data_tree.get_list("software.applications.oracle.performance:") + status_node = status_data_tree.get_list("software.applications.oracle.sga:") for entry, entryinfo in parsed.items(): if "SGA_info" in entryinfo: - sga_info, sga_size = entryinfo["SGA_info"].items()[0] + sga_data = entryinfo["SGA_info"] status_node.append({ - "sid" : entry, - "sga_info" : sga_info, - "sga_size" : sga_size, + "sid" : entry, + "fixed_size" : sga_data.get("Fixed SGA Size"), + "max_size" : sga_data.get("Maximum SGA Size"), + "redo_buffer" : sga_data.get("Redo Buffers"), + "buf_cache_size" : sga_data.get("Buffer Cache Size"), + "in_mem_area_size" : sga_data.get("In-Memory Area Size"), + "shared_pool_size" : sga_data.get("Shared Pool Size"), + "large_pool_size" : sga_data.get("Large Pool Size"), + "java_pool_size" : sga_data.get("Java Pool Size"), + "streams_pool_size" : sga_data.get("Streams Pool Size"), + "shared_io_pool_size" : sga_data.get("Shared IO Pool Size"), + "data_trans_cache_size" : sga_data.get("Data Transfer Cache Size"), + "granule_size" : sga_data.get("Granule Size"), + "start_oh_shared_pool" : sga_data.get("Startup overhead in Shared Pool"), + "free_mem_avail" : sga_data.get("Free SGA Memory Available"), }) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a0005b4..4f64ae0 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -698,13 +698,14 @@ inventory_displayhints.update({ ".software.applications.oracle.instance:" : { "title" : _("Instances"), "keyorder" : [ "sid", "version", "openmode", "logmode", - "logins", "db_creation_time" ], + "logins", "db_uptime", "db_creation_time" ], "view" : "invorainstance_of_host" }, ".software.applications.oracle.instance:*.sid" : { "title" : _("SID"), }, ".software.applications.oracle.instance:*.version" : { "title" : _("Version"), }, ".software.applications.oracle.instance:*.openmode" : { "title" : _("Open mode"), }, ".software.applications.oracle.instance:*.logmode" : { "title" : _("Log mode"), }, ".software.applications.oracle.instance:*.logins" : { "title" : _("Logins"), }, + ".software.applications.oracle.instance:*.db_uptime" : { "title" : _("Uptime"), "paint" : "age" }, ".software.applications.oracle.instance:*.db_creation_time" : { "title" : _("Creation time"), "paint" : "date_and_time" }, ".software.applications.oracle.dataguard_stats:" : { "title" : _("Dataguard statistics"), @@ -721,12 +722,28 @@ inventory_displayhints.update({ ".software.applications.oracle.recovery_area:*.sid" : { "title" : _("SID"), }, ".software.applications.oracle.recovery_area:*.flashback" : { "title" : _("Flashback"), }, - ".software.applications.oracle.performance:" : { "title" : _("Performance"), - "keyorder" : [ "sid", "sga_info", "sga_size" ], - "view": "invoraperformance_of_host"}, - ".software.applications.oracle.performance:*.sid" : { "title" : _("SID"), }, - ".software.applications.oracle.performance:*.sga_info" : { "title" : _("SGA info"), }, - ".software.applications.oracle.performance:*.sga_size" : { "title" : _("SGA size"), "paint" : "size" }, + ".software.applications.oracle.sga:" : { "title" : _("SGA Info"), + "keyorder" : [ "sid", "fixed_size", "redo_buffer", "buf_cache_size", + "in_mem_area_size", "shared_pool_size", "large_pool_size", + "java_pool_size", "streams_pool_size", "shared_io_pool_size", + "data_trans_cache_size", "granule_size", "max_size", + "start_oh_shared_pool", "free_mem_avail" ], + "view" : "invorasga_of_host" }, + ".software.applications.oracle.sga:*.sid" : { "title" : _("SID"), }, + ".software.applications.oracle.sga:*.fixed_size" : { "title" : _("Fixed size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.max_size" : { "title" : _("Maximum size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.redo_buffer" : { "title" : _("Redo buffers"), "paint" : "size" }, + ".software.applications.oracle.sga:*.buf_cache_size" : { "title" : _("Buffer cache size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.in_mem_area_size" : { "title" : _("In-memory area"), "paint" : "size" }, + ".software.applications.oracle.sga:*.shared_pool_size" : { "title" : _("Shared pool size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.large_pool_size" : { "title" : _("Large pool size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.java_pool_size" : { "title" : _("Java pool size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.streams_pool_size" : { "title" : _("Streams pool size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.shared_io_pool_size" : { "title" : _("Shared pool size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.data_trans_cache_size" : { "title" : _("Data transfer cache size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.granule_size" : { "title" : _("Granule size"), "paint" : "size" }, + ".software.applications.oracle.sga:*.start_oh_shared_pool" : { "title" : _("Startup overhead in shared pool"), "paint" : "size" }, + ".software.applications.oracle.sga:*.free_mem_avail" : { "title" : _("Free SGA memory available"), "paint" : "size" }, ".software.applications.oracle.tablespaces:" : { "title" : _("Tablespaces"), "keyorder" : ["sid", "name", "version", "type", "autoextensible", @@ -1095,7 +1112,7 @@ declare_invtable_view("invorainstance", ".software.applications.oracle.ins declare_invtable_view("invorarecoveryarea", ".software.applications.oracle.recovery_area:", _("Oracle recovery area"), _("Oracle recovery areas")) declare_invtable_view("invoradataguardstats", ".software.applications.oracle.dataguard_stats:", _("Oracle dataguard statistic"), _("Oracle dataguard statistics")) declare_invtable_view("invoratablespace", ".software.applications.oracle.tablespaces:", _("Oracle tablespace"), _("Oracle tablespaces")) -declare_invtable_view("invoraperformance", ".software.applications.oracle.performance:", _("Oracle performance"), _("Oracle performance")) +declare_invtable_view("invorasga", ".software.applications.oracle.sga:", _("Oracle performance"), _("Oracle performance")) # This would also be possible. But we muss a couple of display and filter hints.

6 years, 4 months

Add dateutil module for better relative time calculations

by Lars Michelsen

Module: check_mk Branch: master Commit: 2064c5e9972f9ab49dc15c94be2b4cc45d51c825 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2064c5e9972f9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 9 08:28:14 2018 +0100 Add dateutil module for better relative time calculations Change-Id: I247c894ca6267ad342510d8e0e6abae8fb896f57 --- omd/packages/python-modules/Makefile | 1 + .../python-modules/src/python-dateutil-2.6.1.tar.gz | Bin 0 -> 241428 bytes 2 files changed, 1 insertion(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index c2c5a58..29180c6 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -47,6 +47,7 @@ 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 += reportlab-3.4.0.tar.gz # needed by reporting MODULES += PyPDF2-1.26.0.tar.gz # needed by reporting +MODULES += python-dateutil-2.6.1.tar.gz # Added for scheduling (cmk/schedule.py) MODULES += npyscreen-4.10.5.tar.gz # needed for mkbench MODULES += psutil-5.4.3.tar.gz # needed for mkbench diff --git a/omd/packages/python-modules/src/python-dateutil-2.6.1.tar.gz b/omd/packages/python-modules/src/python-dateutil-2.6.1.tar.gz new file mode 100644 index 0000000..6b86c6d Binary files /dev/null and b/omd/packages/python-modules/src/python-dateutil-2.6.1.tar.gz differ

6 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018