Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Sven Panne

Module: check_mk Branch: master Commit: fee303e13d18c49b1154d4f59edadf9fa93fda8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fee303e13d18c4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 28 11:13:35 2017 +0100 Fix for IWYU buglet. Change-Id: I1bb643488bca902236d13b185724556e639a75d4 --- livestatus/src/Column.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 232f9f9..f55e626 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -31,7 +31,7 @@ #include <functional> #include <memory> #include <string> -#include "Aggregator.h" +#include "Aggregator.h" // IWYU pragma: keep #include "Row.h" #include "contact_fwd.h" #include "opids.h"

6 years, 7 months

Removed a few using-declarations. Reduced a scope. A few tweaks for newer compilers.

by Sven Panne

Module: check_mk Branch: master Commit: 18d110ee90588019c1b1f16ba795998255646001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d110ee905880… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 28 08:52:56 2017 +0100 Removed a few using-declarations. Reduced a scope. A few tweaks for newer compilers. Change-Id: I2e71e664438dc4705f7c86db413baf2036e8469e --- .clang-tidy | 3 ++- tests/check_mk.imp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index d48b522..6aa4984 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -19,13 +19,14 @@ # * cppcoreguidelines-pro-type-member-init ("uninitialized record type: 'foo'") # * cppcoreguidelines-pro-type-reinterpret-cast ("do not use reinterpret_cast") # * cppcoreguidelines-pro-type-vararg ("do not call c-style vararg functions") +# * hicpp-member-init: alias for cppcoreguidelines-pro-type-member-init # # * desirable checks, but some places need to be suppressed: # * cppcoreguidelines-pro-type-const-cast ("do not use const_cast") # * cppcoreguidelines-pro-type-union-access ("do not access members of unions; use (boost::)variant instead") # * modernize-use-bool-literals ("converting integer literal to bool, use bool literal instead") Incorrectly triggered by e.g. FD_ZERO # -Checks: '*,-cert-env33-c,-cert-err34-c,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-google-runtime-references,-llvm-include-order,-modernize-use-bool-literals' +Checks: '*,-cert-env33-c,-cert-err34-c,-cert-err58-cpp,-clang-analyzer-alpha*,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-member-init,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-google-runtime-int,-google-runtime-references,-hicpp-member-init,-llvm-include-order,-modernize-use-bool-literals' CheckOptions: - key: google-readability-namespace-comments.SpacesBeforeComments value: '1' diff --git a/tests/check_mk.imp b/tests/check_mk.imp index e38c461..ea9fdc1 100644 --- a/tests/check_mk.imp +++ b/tests/check_mk.imp @@ -7,6 +7,7 @@ { include: ["<bits/std_function.h>", private, "<functional>", public ] }, { include: ["<bits/stdint-intn.h>", private, "<cstdint>", public ] }, { include: ["<bits/stdint-uintn.h>", private, "<cstdint>", public ] }, + { include: ["<bits/types/struct_tm.h>", private, "<ctime>", public ] }, { include: ["<bits/types/time_t.h>", private, "<ctime>", public ] }, { include: ["<experimental/bits/fs_ops.h>", private, "<experimental/filesystem>", public ] }, { include: ["<experimental/fs_ops.h>", private, "<experimental/filesystem>", public ] },

6 years, 7 months

Refactoring: Replace conditional with polymorphism.

by Sven Panne

Module: check_mk Branch: master Commit: 3e95438201a7b15db7ffa77a42ceacf6b7776e96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e95438201a7b1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 27 08:47:39 2017 +0100 Refactoring: Replace conditional with polymorphism. This kills yet another enum/switch combo, making things more "OO" and moving things where they belong, see: https://refactoring.com/catalog/replaceConditionalWithPolymorphism.html Change-Id: Ibff6276cf7a27f1018f19b5fe43425c26f624a04 --- livestatus/src/Aggregator.h | 68 ++---------------- livestatus/src/BlobColumn.cc | 2 +- livestatus/src/BlobColumn.h | 3 +- livestatus/src/Column.h | 7 +- livestatus/src/CustomVarsDictColumn.cc | 3 +- livestatus/src/CustomVarsDictColumn.h | 3 +- livestatus/src/DoubleAggregator.h | 10 +-- livestatus/src/DoubleColumn.cc | 4 +- livestatus/src/DoubleColumn.h | 3 +- livestatus/src/IntAggregator.h | 10 +-- livestatus/src/IntColumn.cc | 4 +- livestatus/src/IntColumn.h | 3 +- livestatus/src/ListColumn.cc | 2 +- livestatus/src/ListColumn.h | 3 +- livestatus/src/NullColumn.cc | 2 +- livestatus/src/NullColumn.h | 3 +- livestatus/src/OffsetPerfdataColumn.cc | 4 +- livestatus/src/OffsetPerfdataColumn.h | 4 +- livestatus/src/PerfdataAggregator.cc | 7 +- livestatus/src/PerfdataAggregator.h | 11 +-- livestatus/src/Query.cc | 127 ++++++++++++++++++++++++++++++--- livestatus/src/StatsColumn.cc | 6 +- livestatus/src/StatsColumn.h | 8 +-- livestatus/src/StringColumn.cc | 2 +- livestatus/src/StringColumn.h | 3 +- livestatus/src/TimeAggregator.h | 10 +-- livestatus/src/TimeColumn.cc | 4 +- livestatus/src/TimeColumn.h | 3 +- tests/check_mk.imp | 1 + 29 files changed, 184 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e95438201…

6 years, 7 months

df test for functionality ignoring tmpfs

by Konstantin Büttner

Module: check_mk Branch: master Commit: ab3e78b6b41b8a99623fee1112a701d83a3d0aad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab3e78b6b41b8a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Nov 28 09:46:42 2017 +0100 df test for functionality ignoring tmpfs Change-Id: I54b8d1b160e9c1c616dad4344c578c7f5eab23db --- tests/checks/test_df_check.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index bd8208a..3f66fd2 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -41,6 +41,23 @@ info_df_win = [[u'C:\\', u'NTFS', u'8192620', u'7724268', u'468352', u'95%', u'C u'41%', u'F:\\']] +info_df_lnx_tmpfs = [[u'tmpfs', + u'tmpfs', + u'8152820', + u'76', + u'8152744', + u'1%', + u'/opt/omd/sites/heute/tmp'], + [u'[df_inodes_start]'], + [u'tmpfs', + u'tmpfs', + u'2038205', + u'48', + u'2038157', + u'1%', + u'/opt/omd/sites/heute/tmp'], + [u'[df_inodes_end]']] + # NOTE: This gargantuan test info section is uncritically used data from an archived agent output. # I suspect that our handling of btrfs is not really adequate, test cases using this data # serve the sole purpose of not inadvertenty breaking the status quo. Thus: @@ -205,6 +222,8 @@ info_df_btrfs = \ (info_df_lnx, [(u'/dev/sda4 /', {})], True), (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], False), (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], True), + (info_df_lnx_tmpfs, [], False), + (info_df_lnx_tmpfs, [], True), (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), ])

6 years, 7 months

Fixed monitoring using special agents

by Lars Michelsen

Module: check_mk Branch: master Commit: 0aa2ba927e328eb54cc3bd5c80d8bdd3ddb542e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0aa2ba927e328e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 28 08:48:15 2017 +0100 Fixed monitoring using special agents Change-Id: I6b07edf8158bc23e64102ba1767ee2da822f115e --- cmk_base/data_sources/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 760f617..d9f028f 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -160,7 +160,7 @@ class DataSources(object): if not ignore_special_agents: special_agents = self._get_special_agent_data_sources() if special_agents: - return special_agents[0][1] + return special_agents[0] programs = rulesets.host_extra_conf(self._hostname, config.datasource_programs) if programs: @@ -181,8 +181,7 @@ class DataSources(object): for agentname, ruleset in sorted(config.special_agents.items()): params = rulesets.host_extra_conf(self._hostname, ruleset) if params: - source = SpecialAgentDataSource(agentname, params[0]) - special_agents[source.id()] = source + special_agents.append(SpecialAgentDataSource(agentname, params[0])) return special_agents

6 years, 7 months

Refactored more WATO pages to WatoModes

by Lars Michelsen

Module: check_mk Branch: master Commit: e5ad78213b4aa28a21f566ad5d37922b4b747d33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5ad78213b4aa2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 16:55:57 2017 +0100 Refactored more WATO pages to WatoModes Change-Id: I2d074ed4caf06223c95c2572adc7ddf5976dbbc3 --- web/htdocs/wato.py | 949 +++++++++++++++++++++++++++-------------------------- 1 file changed, 487 insertions(+), 462 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5ad78213b…

6 years, 7 months

Always handle the piggyback data source last

by Lars Michelsen

Module: check_mk Branch: master Commit: b2a36dcc83f36d4f6b2657723a96f24a251b5f41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a36dcc83f36d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 28 08:52:10 2017 +0100 Always handle the piggyback data source last Change-Id: I9bce9d2ff79f533d6f929f0ce4f133cb652c6563 --- cmk_base/data_sources/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index d9f028f..b48eeaf 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -207,7 +207,8 @@ class DataSources(object): def get_data_sources(self): - return sorted(self._sources.values(), key=lambda s: s.id()) + # Always execute piggyback at the end + return sorted(self._sources.values(), key=lambda s: (isinstance(s, PiggyBackDataSource), s.id())) def set_max_cachefile_age(self, max_cachefile_age):

6 years, 7 months

Add test for host data source selection

by Lars Michelsen

Module: check_mk Branch: master Commit: e39b7ab31c0a59dd16fd0554de51e448a90f8a8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e39b7ab31c0a59… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 28 08:55:15 2017 +0100 Add test for host data source selection Change-Id: I3e86b8bd355d602f69b0cc30d778aea8062baf0a --- .bugs/3015 | 18 +++++++ .werks/5546 | 11 ++++ tests/cmk_base/test_data_sources.py | 101 ++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/.bugs/3015 b/.bugs/3015 new file mode 100644 index 0000000..26f59f8 --- /dev/null +++ b/.bugs/3015 @@ -0,0 +1,18 @@ +Title: Site condition for EC rules / rule packs +Component: ec +State: open +Date: 2017-11-28 09:06:39 +Targetversion: future +Class: feature + +we currently have some trouble with the „Expect regular messages” option in Event Console rules. + +We have implemented the active Check_Email check to forward mails to the Event Console. For most of the mails everything is working fine. We get notifications out of the EC when a mail is sent there. + +For selfmonitoring purpose we have implemented also a regular sent Mail. Now we wanted to use the “Expect regular messages“ option to get an alarm when the regular Mail was missing. Sadly the EC rule for that is running on all of our distributed monitoring sites, but the Mail is just forwarded to one of them. This leads to massive number of false alarms on all other sites. + + + +To solve this issue it would be very helpful if the EC rules can be applied to single sites. Like there is the check box “do not apply this rule” it would be perfect to have additional checkboxes per monitoring site, where to apply a rule or rule pack. + +This would also increase the performance of the EC if you have lots of EC rules which are configured to run just on the sites where they are needed. diff --git a/.werks/5546 b/.werks/5546 new file mode 100644 index 0000000..d4cf466 --- /dev/null +++ b/.werks/5546 @@ -0,0 +1,11 @@ +Title: Count, size and age of files (Linux, Windows): Increased input fields of paths +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i2 +Date: 1511858385 + + diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index 3e35394..bf2af67 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -11,6 +11,10 @@ import cmk_base.config as config import cmk_base.modes import cmk_base.automations +# +# INTEGRATION TESTS +# + @pytest.fixture(scope="module") def test_cfg(web, site): print "Applying default config" @@ -380,3 +384,100 @@ def test_automation_diag_host_caching(test_cfg, monkeypatch): # Keepalive check # Keepalive discovery # TODO: Check the caching age for cluster hosts + +# +# UNIT TESTS +# + +# Automatically refresh caches for each test +(a)pytest.fixture(scope="function") +def clear_config_caches(monkeypatch): + import cmk_base + import cmk_base.caching + monkeypatch.setattr(cmk_base, "config_cache", cmk_base.caching.CacheManager()) + monkeypatch.setattr(cmk_base, "runtime_cache", cmk_base.caching.CacheManager()) + + +def test_data_sources_of_hosts(clear_config_caches, monkeypatch): + hosts = [ + # Configs from 1.4 + ("agent-host-14", { + "tags": "lan|cmk-agent|ip-v4|tcp|ip-v4-only|prod", + "sources": ['TCPDataSource', 'PiggyBackDataSource'], + }), + ("ds-host-14", { + "tags": "lan|cmk-agent|ip-v4|tcp|ip-v4-only|prod", + "sources": ['DSProgramDataSource', 'PiggyBackDataSource'], + }), + ("special-host-14", { + "tags": "lan|cmk-agent|ip-v4|tcp|ip-v4-only|prod", + "sources": ['SpecialAgentDataSource', 'PiggyBackDataSource'], + }), + ("ping-host-14", { + "tags": "lan|ip-v4|ping|ip-v4-only|prod", + "sources": ['PiggyBackDataSource'], + }), + ("snmp-host-14", { + "tags": "lan|ip-v4|snmp|snmp-only|ip-v4-only|prod", + "sources": ['SNMPDataSource', 'PiggyBackDataSource'], + }), + ("snmpv1-host-14", { + "tags": "lan|ip-v4|snmp|snmp-v1|ip-v4-only|prod", + "sources": ['SNMPDataSource', 'PiggyBackDataSource'], + }), + ("dual-host-14", { + "tags": "lan|ip-v4|snmp|tcp|ip-v4-only|prod|snmp-tcp", + "sources": ['TCPDataSource', 'SNMPDataSource', 'PiggyBackDataSource'], + }), + # From current WATO + ("agent-host", { + "tags": "lan|ip-v4|cmk-agent|no-snmp|tcp|ip-v4-only|prod", + "sources": ['TCPDataSource', 'PiggyBackDataSource'], + }), + ("ping-host", { + "tags": "lan|ip-v4|ping|no-snmp|ip-v4-only|no-agent|prod", + "sources": ['PiggyBackDataSource'], + }), + ("snmp-host", { + "tags": "lan|ip-v4|snmp|snmp-v2|ip-v4-only|no-agent|prod", + "sources": ['SNMPDataSource', 'PiggyBackDataSource'], + }), + ("snmpv1-host", { + "tags": "lan|ip-v4|snmp|snmp-v1|ip-v4-only|no-agent|prod", + "sources": ['SNMPDataSource', 'PiggyBackDataSource'], + }), + ("dual-host", { + "tags": "lan|ip-v4|cmk-agent|snmp|snmp-v2|ip-v4-only|tcp|prod", + "sources": ['TCPDataSource', 'SNMPDataSource', 'PiggyBackDataSource'], + }), + ("all-agents-host", { + "tags": "lan|all-agents|ip-v4|no-snmp|tcp|ip-v4-only|prod", + "sources": ['DSProgramDataSource', 'SpecialAgentDataSource', 'PiggyBackDataSource'], + }), + ("all-special-host", { + "tags": "lan|ip-v4|no-snmp|tcp|ip-v4-only|special-agents|prod", + "sources": ['SpecialAgentDataSource', 'PiggyBackDataSource'], + }), + ] + + import cmk_base.data_sources + import cmk_base.config as config + + all_hosts = [ ("%s|%s" % (name, h["tags"])) for name, h in hosts ] + monkeypatch.setattr(config, "all_hosts", all_hosts) + + monkeypatch.setattr(config, "datasource_programs", [ + ( 'echo 1', [], ['ds-host-14', 'all-agents-host', 'all-special-host' ], {} ), + ]) + + monkeypatch.setitem(config.special_agents, "jolokia", [ + ( {}, [], ['special-host-14', 'all-agents-host', 'all-special-host', ], {} ), + ]) + + config.collect_hosttags() + + for hostname, host_attrs in hosts: + sources = cmk_base.data_sources.DataSources(hostname) + source_names = [ s.__class__.__name__ for s in sources.get_data_sources() ] + assert host_attrs["sources"] == source_names, \ + "Wrong sources for %s" % hostname

6 years, 7 months

5522 FIX mkbackup: Fix crash in case of multiple backup jobs

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7e93bf8c09b48141955b7bb64eb08a6cf6c0705b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e93bf8c09b481… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 27 17:51:04 2017 +0100 5522 FIX mkbackup: Fix crash in case of multiple backup jobs Previously, this check would not work (neither discovery nor checking) if more than one backup job was configured. This has been fixed. Change-Id: I28b4c0a76b98e97834ca6463a15ae0ec3f8a273a --- .werks/5522 | 11 +++ checks/mkbackup | 2 + tests/checks/test_mkbackup_check.py | 167 ++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+) diff --git a/.werks/5522 b/.werks/5522 new file mode 100644 index 0000000..9434029 --- /dev/null +++ b/.werks/5522 @@ -0,0 +1,11 @@ +Title: mkbackup: Fix crash in case of multiple backup jobs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511801399 +Class: fix + +Previously, this check would not work (neither discovery nor checking) if more than one +backup job was configured. This has been fixed. diff --git a/checks/mkbackup b/checks/mkbackup index 2ff4449..b38c49a 100644 --- a/checks/mkbackup +++ b/checks/mkbackup @@ -51,6 +51,7 @@ # "success": true # } +# TODO: Refactor this. def parse_mkbackup(info): try: import simplejson as json @@ -78,6 +79,7 @@ def parse_mkbackup(info): json_data += line if line == "}": job.update(json.loads(json_data)) + json_data = "" return parsed diff --git a/tests/checks/test_mkbackup_check.py b/tests/checks/test_mkbackup_check.py new file mode 100644 index 0000000..11e33d8 --- /dev/null +++ b/tests/checks/test_mkbackup_check.py @@ -0,0 +1,167 @@ +import pytest +import pprint +import sys + +pytestmark = pytest.mark.checks + +info_1 = [[u'[[[site:heute:test]]]'], + [u'{'], + [u'"bytes_per_second":', u'1578215.4167199447,'], + [u'"finished":', u'1511788263.410466,'], + [u'"next_schedule":', u'1511874660.0,'], + [u'"output":', + u'"2017-11-27', + u'14:11:02', + u'---', + u'Starting', + u'backup', + u'(Check_MK-klappfel-heute-test', + u'to', + u'testtgt)', + u'---\\n2017-11-27', + u'14:11:03', + u'Verifying', + u'backup', + u'consistency\\n2017-11-27', + u'14:11:03', + u'---', + u'Backup', + u'completed', + u'(Duration:', + u'0:00:01,', + u'Size:', + u'1.80', + u'MB,', + u'IO:', + u'1.51', + u'MB/s)', + u'---\\n",'], + [u'"pid":', u'20963,'], + [u'"size":', u'1883330,'], + [u'"started":', u'1511788262.20002,'], + [u'"state":', u'"finished",'], + [u'"success":', u'true'], + [u'}']] + +info_2 = [[u'[[[site:heute:test]]]'], + [u'{'], + [u'"bytes_per_second":', u'1578215.4167199447,'], + [u'"finished":', u'1511788263.410466,'], + [u'"next_schedule":', u'1511874660.0,'], + [u'"output":', + u'"2017-11-27', + u'14:11:02', + u'---', + u'Starting', + u'backup', + u'(Check_MK-klappfel-heute-test', + u'to', + u'testtgt)', + u'---\\n2017-11-27', + u'14:11:03', + u'Verifying', + u'backup', + u'consistency\\n2017-11-27', + u'14:11:03', + u'---', + u'Backup', + u'completed', + u'(Duration:', + u'0:00:01,', + u'Size:', + u'1.80', + u'MB,', + u'IO:', + u'1.51', + u'MB/s)', + u'---\\n",'], + [u'"pid":', u'20963,'], + [u'"size":', u'1883330,'], + [u'"started":', u'1511788262.20002,'], + [u'"state":', u'"finished",'], + [u'"success":', u'true'], + [u'}'], + [u'[[[site:heute:test2]]]'], + [u'{'], + [u'"bytes_per_second":', u'0,'], + [u'"finished":', u'1511788748.77112,'], + [u'"next_schedule":', u'null,'], + [u'"output":', + u'"2017-11-27', + u'14:19:07', + u'---', + u'Starting', + u'backup', + u'(Check_MK-klappfel-heute-test2', + u'to', + u'testtgt2)', + u'---\\n2017-11-27', + u'14:19:08', + u'Verifying', + u'backup', + u'consistency\\n2017-11-27', + u'14:19:08', + u'---', + u'Backup', + u'completed', + u'(Duration:', + u'0:00:00,', + u'Size:', + u'87.07', + u'MB,', + u'IO:', + u'0.00', + u'B/s)', + u'---\\n",'], + [u'"pid":', u'24201,'], + [u'"size":', u'91299840,'], + [u'"started":', u'1511788747.898509,'], + [u'"state":', u'"finished",'], + [u'"success":', u'true'], + [u'}']] + +info_3 = [[u'[[[system:test1]]]'], + [u'{'], + [u'"bytes_per_second":', u'0,'], + [u'"finished":', u'1474547810.309871,'], + [u'"next_schedule":', u'null,'], + [u'"output":', + u'"2016-09-22', + u'14:36:50', + u'---', + u'Starting', + u'backup', + u'(Check_MK_Appliance-luss028-test1', + u'to', + u'test1)', + u'---\\nFailed', + u'to', + u'create', + u'the', + u'backup', + u'directory:', + u'[Errno', + u'13]', + u'Permission', + u'denied:', + u'\'/mnt/auto/DIDK7838/Anwendungen/Check_MK_Appliance-luss028-test1-incomplete\'\\n",'], + [u'"pid":', u'29567,'], + [u'"started":', u'1474547810.30425,'], + [u'"state":', u'"finished",'], + [u'"success":', u'false'], + [u'}']] + +# This only tests whether the parse function crashes or not +(a)pytest.mark.parametrize("info", [ + [], + info_1, + info_2, + info_3, + ]) +def test_mkbackup_parse(check_manager, monkeypatch, info): + import cmk_base.checks + import cmk_base + + check = check_manager.get_check("mkbackup") + check.run_parse(info) + cmk_base.config_cache.clear_all()

6 years, 7 months

Windows agent: clear relative include paths

by Jukka Aro

Module: check_mk Branch: master Commit: 7d648be4f5388c7d56d7f1415e6fb43748a572e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d648be4f5388c… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Nov 27 16:33:31 2017 +0100 Windows agent: clear relative include paths Rely on compiler flags instead of ugly parent directory paths in sections subdirectory. Change-Id: I60ef7e8551e2018364ed595ad6a7e1a6d4f53406 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionCheckMK.cc | 6 +++--- agents/windows/sections/SectionCheckMK.h | 4 ++-- agents/windows/sections/SectionDF.cc | 6 +++--- agents/windows/sections/SectionDF.h | 2 +- agents/windows/sections/SectionEventlog.cc | 8 ++++---- agents/windows/sections/SectionEventlog.h | 10 +++++----- agents/windows/sections/SectionFileinfo.cc | 2 +- agents/windows/sections/SectionFileinfo.h | 4 ++-- agents/windows/sections/SectionGroup.cc | 2 +- agents/windows/sections/SectionGroup.h | 2 +- agents/windows/sections/SectionLogwatch.cc | 8 ++++---- agents/windows/sections/SectionLogwatch.h | 6 +++--- agents/windows/sections/SectionMRPE.cc | 6 +++--- agents/windows/sections/SectionMRPE.h | 4 ++-- agents/windows/sections/SectionMem.cc | 4 ++-- agents/windows/sections/SectionMem.h | 2 +- agents/windows/sections/SectionOHM.cc | 8 ++++---- agents/windows/sections/SectionOHM.h | 4 ++-- agents/windows/sections/SectionPS.cc | 10 +++++----- agents/windows/sections/SectionPS.h | 6 +++--- agents/windows/sections/SectionPerfcounter.cc | 10 +++++----- agents/windows/sections/SectionPerfcounter.h | 2 +- agents/windows/sections/SectionPluginGroup.cc | 8 ++++---- agents/windows/sections/SectionPluginGroup.h | 6 +++--- agents/windows/sections/SectionServices.cc | 6 +++--- agents/windows/sections/SectionServices.h | 2 +- agents/windows/sections/SectionSkype.cc | 8 ++++---- agents/windows/sections/SectionSkype.h | 2 +- agents/windows/sections/SectionSpool.cc | 6 +++--- agents/windows/sections/SectionSpool.h | 2 +- agents/windows/sections/SectionSystemtime.cc | 2 +- agents/windows/sections/SectionSystemtime.h | 2 +- agents/windows/sections/SectionUptime.cc | 6 +++--- agents/windows/sections/SectionUptime.h | 4 ++-- agents/windows/sections/SectionWMI.cc | 6 +++--- agents/windows/sections/SectionWMI.h | 4 ++-- agents/windows/sections/SectionWinperf.cc | 8 ++++---- agents/windows/sections/SectionWinperf.h | 2 +- 39 files changed, 96 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d648be4f5…

6 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017