Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Fixed spelling errors in inline comments

by Mathias Kettner

Module: check_mk Branch: master Commit: 6135e7db799495349e91752f1c0bc2368d879131 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6135e7db799495… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 11 11:23:17 2016 +0100 Fixed spelling errors in inline comments --- modules/notify.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index bd32de0..203efa0 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -29,12 +29,12 @@ # # There are two types of contexts: # 1. Raw contexts (purple) -# -> These come out from the monitoring core. They are not yet +# => These come right out of the monitoring core. They are not yet # assinged to a certain plugin. In case of rule based notifictions # they are not even assigned to a certain contact. # # 2. Plugin contexts (cyan) -# -> These already bear all information about the contact, the plugin +# => These already bear all information about the contact, the plugin # to call and its parameters. from cmk.regex import regex @@ -1246,7 +1246,7 @@ def create_spoolfile(data): # There are three types of spool files: # 1. Notifications to be forwarded. Contain key "forward" # 2. Notifications for async local delivery. Contain key "plugin" -# 3. Notifications to *got* forwarded. Contain neither of both. +# 3. Notifications that *were* forwarded (e.g. received from a slave). Contain neither of both. # Spool files of type 1 are not handled here! def handle_spoolfile(spoolfile): notif_uuid = spoolfile.rsplit("/", 1)[-1]

7 years, 10 months

3983 FIX mssql_instance: Be more robust agains missing instance info in case of connection issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f63b216d8c3951465aee7f5fcadea979b8aa505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f63b216d8c395… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 11 11:21:23 2016 +0100 3983 FIX mssql_instance: Be more robust agains missing instance info in case of connection issues --- .werks/3983 | 9 +++++++++ ChangeLog | 1 + checks/mssql_instance | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3983 b/.werks/3983 new file mode 100644 index 0000000..79f2c7d --- /dev/null +++ b/.werks/3983 @@ -0,0 +1,9 @@ +Title: mssql_instance: Be more robust agains missing instance info in case of connection issues +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1478859667 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 238612c..0d7db06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 3939 FIX: f5_bigip_conns: readded performance data and graphs... * 3979 FIX: vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded * 3750 FIX: cmc_temp: Check now also works when using Nagios core + * 3983 FIX: mssql_instance: Be more robust agains missing instance info in case of connection issues Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/mssql_instance b/checks/mssql_instance index dcf87d1..aa584de 100644 --- a/checks/mssql_instance +++ b/checks/mssql_instance @@ -47,7 +47,11 @@ def parse_mssql_instance(info): else: instance_id = line[0] - instance = parsed.setdefault(instance_id, {}) + instance = parsed.setdefault(instance_id, { + # it may happen that the state line is missing, add some fallback as default here + "state" : "0", + "error_msg" : "Unable to connect to database (Agent reported no state)", + }) if line[1] == "config": instance.update({ @@ -74,6 +78,8 @@ def check_mssql_instance(item, _unused, parsed): if not instance: return + print instance + if instance["state"] == "0": yield 2, "Failed to connect to database (%s)" % instance["error_msg"]

7 years, 10 months

added missing context info in wk3990

by Andreas Boesl

Module: check_mk Branch: master Commit: 13ed085f42e275acb53bd7a839c1da8d409dc515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13ed085f42e275… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 11 09:38:40 2016 +0100 added missing context info in wk3990 --- .werks/3990 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/3990 b/.werks/3990 index 3c1fc11..954898e 100644 --- a/.werks/3990 +++ b/.werks/3990 @@ -1,4 +1,4 @@ -Title: now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections +Title: agent_netapp: now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections Level: 1 Component: checks Compatible: compat

7 years, 10 months

Updated iwyu_tool from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 45336790fee3c060a9e27163755a4d735db2fe74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45336790fee3c0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 11 09:32:33 2016 +0100 Updated iwyu_tool from upstream. --- Makefile | 2 +- tests/iwyu_tool_jenkins.py | 35 ++++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 75b5b78..11e9a68 100644 --- a/Makefile +++ b/Makefile @@ -297,7 +297,7 @@ tidy: compile_commands.json # Not really perfect rules, but better than nothing iwyu: compile_commands.json - @$(IWYU_TOOL) --clang-style -p . + @$(IWYU_TOOL) --output-format=clang -p . # Not really perfect rules, but better than nothing analyze: livestatus/config.h diff --git a/tests/iwyu_tool_jenkins.py b/tests/iwyu_tool_jenkins.py index ef42b65..69d2d17 100755 --- a/tests/iwyu_tool_jenkins.py +++ b/tests/iwyu_tool_jenkins.py @@ -28,6 +28,11 @@ import subprocess import re +def iwyu_formatter(output): + """ Process iwyu's output, basically a no-op. """ + print('\n'.join(output)) + + CORRECT_RE = re.compile(r'^$(.*?) has correct #includes/fwd-decls$$') SHOULD_ADD_RE = re.compile(r'^(.*?) should add these lines:$') SHOULD_REMOVE_RE = re.compile(r'^(.*?) should remove these lines:$') @@ -39,7 +44,7 @@ LINES_RE = re.compile(r'.*// lines ([0-9]+)-[0-9]+$') GENERAL, ADD, REMOVE, LIST = range(4) -def process_output(output): +def clang_formatter(output): """ Process iwyu's output into something clang-like. """ state = (GENERAL, None) for line in output: @@ -75,6 +80,12 @@ def process_output(output): print(line) +DEFAULT_FORMAT = 'iwyu' +FORMATTERS = { + 'iwyu': iwyu_formatter, + 'clang': clang_formatter +} + def get_output(cwd, command): """ Run the given command and return its output as a string. """ process = subprocess.Popen(command, @@ -85,7 +96,7 @@ def get_output(cwd, command): return process.communicate()[0].decode("utf-8").splitlines() -def run_iwyu(cwd, compile_command, iwyu_args, verbose, clang_style): +def run_iwyu(cwd, compile_command, iwyu_args, verbose, formatter): """ Rewrite compile_command to an IWYU command, and run it. """ compiler, _, args = compile_command.partition(' ') if compiler.endswith('cl.exe'): @@ -101,14 +112,10 @@ def run_iwyu(cwd, compile_command, iwyu_args, verbose, clang_style): if verbose: print('%s:' % command) - output = get_output(cwd, command) - if clang_style: - process_output(output) - else: - print('\n'.join(output)) + formatter(get_output(cwd, command)) -def main(compilation_db_path, source_files, verbose, clang_style, iwyu_args): +def main(compilation_db_path, source_files, verbose, formatter, iwyu_args): """ Entry point. """ # Canonicalize compilation database path if os.path.isdir(compilation_db_path): @@ -149,7 +156,7 @@ def main(compilation_db_path, source_files, verbose, clang_style, iwyu_args): try: for entry in entries: cwd, compile_command = entry['directory'], entry['command'] - run_iwyu(cwd, compile_command, iwyu_args, verbose, clang_style) + run_iwyu(cwd, compile_command, iwyu_args, verbose, formatter) except OSError as why: print('ERROR: Failed to launch include-what-you-use: %s' % why) return 1 @@ -189,8 +196,9 @@ def _bootstrap(): parser.add_argument('-v', '--verbose', action='store_true', help='Print IWYU commands') - parser.add_argument('-c', '--clang-style', action='store_true', - help='Use clang-style output format') + parser.add_argument('-o', '--output-format', type=str, + choices=FORMATTERS.keys(), default=DEFAULT_FORMAT, + help='Output format (default: %s)' % DEFAULT_FORMAT) parser.add_argument('-p', metavar='<build-path>', required=True, help='Compilation database path', dest='dbpath') parser.add_argument('source', nargs='*', @@ -204,10 +212,11 @@ def _bootstrap(): return argv[:double_dash], argv[double_dash+1:] except ValueError: return argv, [] - argv, iwyu_args = partition_args(sys.argv[1:]) args = parser.parse_args(argv) - sys.exit(main(args.dbpath, args.source, args.verbose, args.clang_style, iwyu_args)) + + sys.exit(main(args.dbpath, args.source, args.verbose, + FORMATTERS[args.output_format], iwyu_args)) if __name__ == '__main__':

7 years, 10 months

minor fix. not werk worthy

by Andreas Boesl

Module: check_mk Branch: master Commit: 0af2546d520a3da01e639439dcc9db59b790cdf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0af2546d520a3d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 10 11:24:03 2016 +0100 minor fix. not werk worthy --- checks/netapp_api_fcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/netapp_api_fcp b/checks/netapp_api_fcp index 2eeccb3..24807ba 100644 --- a/checks/netapp_api_fcp +++ b/checks/netapp_api_fcp @@ -139,7 +139,7 @@ def parse_netapp_api_fcp(info): "state": values.get("state"), "address": values.get("port_wwpn") } - speed = int(values.get("data-link-rate")) * 1000**3 + speed = int(values.get("data-link-rate", 0)) * 1000**3 if speed: fcp_data["speed"] = speed

7 years, 10 months

fixed Changelog

by Andreas Boesl

Module: check_mk Branch: master Commit: ff4bd226137c31cefeacfb703bb40028a4741017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff4bd226137c31… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 10 12:17:34 2016 +0100 fixed Changelog --- ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c773da9..238612c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,12 +54,9 @@ * 3949 ucd_cpu_load: Genugate devices are now displaying CPU load... * 3950 openbsd_sensors: Genugate devices are now handling hardware sensors... * 3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility -<<<<<<< 0af2546d520a3da01e639439dcc9db59b790cdf7 -======= * 3988 Windows agent: new global option disabled_sections... * 3989 Logwatch patterns: now able to change state of context lines... * 3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections... ->>>>>>> 3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe...

7 years, 10 months

3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections

by Andreas Boesl

Module: check_mk Branch: master Commit: 3af44a90deadc9c5ff387ea077cfff2125a249be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af44a90deadc9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 10 11:48:20 2016 +0100 3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections Now uses xml instead of lxml. Unfortunaly lxml is not available in all distributions, so we had to switch back to xml which is considerably slower in parsing xml messages. You can try to install the python module lxml with the command "pip install lxml". Now able to query counters smaller chunks. There were some bigger netapp clusters which raised an out of memory error while answering the call. The reason was that the answer grew too big. We now query smaller chunks and merge them together. Now only queries relevant sections. Right at the beginning, the agent queries the available licenses on the system skips sections, which's licenses is specifically not enabled. This feature is currently only implemented for a few section and will possibly improved later on. --- .werks/3990 | 21 +++ ChangeLog | 6 + agents/special/agent_netapp | 391 ++++++++++++++++++++++++++++---------------- 3 files changed, 281 insertions(+), 137 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3af44a90de…

7 years, 10 months

Removed some more dead code.

by Sven Panne

Module: check_mk Branch: master Commit: 44e40ca316f0cb215880d528e3b61531ca8c7bb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44e40ca316f0cb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 10 10:57:01 2016 +0100 Removed some more dead code. --- web/htdocs/js/checkmk.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index cf66a52..141e903 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -316,14 +316,6 @@ var browser = navigator.userAgent.toLowerCase(); var weAreOpera = browser.indexOf("opera") != -1; var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; -function isFirefox() { - return navigator.userAgent.indexOf("Firefox") > -1; -} - -function isWebkit() { - return navigator.userAgent.indexOf("WebKit") > -1; -} - function is_ie_below_9() { return document.all && !document.addEventListener; } @@ -1573,9 +1565,6 @@ function toggle_group_rows(checkbox) { } toggle_all_rows(group_rows); group_rows = null; - - tbody = null; - this_tr = null; } // Is used to select/deselect all rows in the current view. This can optionally

7 years, 10 months

Removed useless assignments.

by Sven Panne

Module: check_mk Branch: master Commit: a7427c105e69905dca570763bdf585bd1d870bf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7427c105e6990… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 10 11:12:18 2016 +0100 Removed useless assignments. Zeroing parameters or local variables doesn't really make sense, unless we capture the current environment in a closure and store that away somehow. This is quite rare, and more often than not, a better solution is to lift out the closure. Setting something to null/undefined doesn't even speed up GC, because every GC implementation worth its salt doesn't to naive reference counting, anyway, and smears/delays its execution. So we are left with 2 scenarios: * The JIT/interpreter is stupid and actually executes the assignment: Then we do useless work and confuse the human reader. * The JIT/interpreter does its job: The assignment will be nuked by dead code elimination, but we still confuse the human reader. --- web/htdocs/js/checkmk.js | 37 ------------------------------------- web/htdocs/js/dashboard.js | 6 ------ web/htdocs/js/search.js | 6 ------ web/htdocs/js/sidebar.js | 21 --------------------- web/htdocs/js/wato.js | 14 -------------- 5 files changed, 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a7427c105e…

7 years, 10 months

3750 FIX cmc_temp: Check now also works when using Nagios core

by Konstantin Büttner

Module: check_mk Branch: master Commit: b2cc6fef7b5a720874bc8b9d30965026258ee2e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2cc6fef7b5a72… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Nov 10 11:49:50 2016 +0100 3750 FIX cmc_temp: Check now also works when using Nagios core --- .werks/3750 | 10 ++++++++++ ChangeLog | 1 + checks/cmc_temp | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3750 b/.werks/3750 new file mode 100644 index 0000000..664211e --- /dev/null +++ b/.werks/3750 @@ -0,0 +1,10 @@ +Title: cmc_temp: Check now also works when using Nagios core +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1478774954 + + diff --git a/ChangeLog b/ChangeLog index a55c995..883e612 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... * 3979 FIX: vbox_guest: Only try to fetch VBox state in case the vboxguest module is loaded + * 3750 FIX: cmc_temp: Check now also works when using Nagios core Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/cmc_temp b/checks/cmc_temp index 39e7a15..3dd3165 100644 --- a/checks/cmc_temp +++ b/checks/cmc_temp @@ -47,6 +47,7 @@ check_info['cmc_temp'] = { "check_function" : check_cmc_temp, "has_perfdata" : True, "group" : "temperature", + "includes" : [ "temperature.include" ], "default_levels_variable": "cmc_temp_default_levels", "service_description" : "Temperature Sensor %s", "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.2606.1" in oid(".1.3.6.1.2.1.1.2.0"),

7 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016