Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5951 kernel: Disabled in docker container contexts

by Lars Michelsen

Module: check_mk Branch: master Commit: 5cfdefed7c76cb49dffa8bdad9d37466ca8c8d8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cfdefed7c76cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 13:49:19 2018 +0200 5951 kernel: Disabled in docker container contexts These checks do not make sense in the context of a docker container. The agent is now skipping this section when executed in a container. Change-Id: I9811054b1c9ab559fa934c9fd8798db793d55f43 --- .werks/5951 | 11 +++++++++++ agents/check_mk_agent.linux | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/5951 b/.werks/5951 new file mode 100644 index 0000000..b29c480 --- /dev/null +++ b/.werks/5951 @@ -0,0 +1,11 @@ +Title: kernel: Disabled in docker container contexts +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1523015219 +Class: feature + +These checks do not make sense in the context of a docker container. +The agent is now skipping this section when executed in a container. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 28e3005..cc437c2 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -478,9 +478,11 @@ fi # Performancecounter Kernel -echo '<<<kernel>>>' -date +%s -cat /proc/vmstat /proc/stat +if [ -z "$MK_IN_CONTAINER" ]; then + echo '<<<kernel>>>' + date +%s + cat /proc/vmstat /proc/stat +fi # Hardware sensors via IPMI (need ipmitool) if type ipmitool > /dev/null

6 years, 5 months

5948 docker_container_mem: Docker container specific memory checking

by Lars Michelsen

Module: check_mk Branch: master Commit: f35b8038cd506346f216d5c850bc16429244fd35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f35b8038cd5063… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 11:47:38 2018 +0200 5948 docker_container_mem: Docker container specific memory checking Instead of using the default linux memory check (mem), Check_MK is now using the container specific memory check. The main reason is that the memory information in the container is not available through <tt>/proc/meminfo</tt> as usual. The memory data is available through the kernels cgroup interface which is available in the containers context below <tt>/sys/fs/cgroup/memory/memory.stat</tt> The features of both checks are exactly the same. Change-Id: I3e7b229cfb550fd1b6c82105c449f8a648fed59e --- .werks/5948 | 18 ++++++++++++++++++ agents/check_mk_agent.linux | 9 +++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/5948 b/.werks/5948 new file mode 100644 index 0000000..ebf66be --- /dev/null +++ b/.werks/5948 @@ -0,0 +1,18 @@ +Title: docker_container_mem: Docker container specific memory checking +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1523007246 +Class: feature + +Instead of using the default linux memory check (mem), Check_MK is now +using the container specific memory check. + +The main reason is that the memory information in the container is not +available through <tt>/proc/meminfo</tt> as usual. The memory data is available +through the kernels cgroup interface which is available in the containers +context below <tt>/sys/fs/cgroup/memory/memory.stat</tt> + +The features of both checks are exactly the same. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 7db4db9..672fb3f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -109,8 +109,13 @@ fi function section_mem() { - echo '<<<mem>>>' - egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo + if [ -z "$MK_IN_CONTAINER" ]; then + echo '<<<mem>>>' + grep -E -v '^Swap:|^Mem:|total:' < /proc/meminfo + else + echo '<<docker_container_mem>>>' + echo "$(</sys/fs/cgroup/memory/memory.stat)" + fi } function section_cpu()

6 years, 5 months

Preparing linux agent for docker monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 488135e80e84ffdc996068045286d654b288c852 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=488135e80e84ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 10:09:29 2018 +0200 Preparing linux agent for docker monitoring * The agent now detects whether or not it is being executed in a docker container context. * The Agent can be told to leave stdin open. This is useful when the docker nodes agent shal be executed in the context of a container. Change-Id: Id110745605a7af94e02c15f6e080ed2df666115f --- agents/check_mk_agent.linux | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a0dbd70..22bd49f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -57,14 +57,26 @@ LOCALDIR=$MK_LIBDIR/local # output if they are not outdated (see below) SPOOLDIR=$MK_VARDIR/spool -# close standard input (for security reasons) and stderr +# close standard input (for security reasons) and stderr when not +# explicitly in debug mode. +# When the nodes agent is executed by a e.g. docker node in a container, +# then don't close stdin, because the agent is piped through it in this +# case. if [ "$1" = -d ] then set -xv -else +elif [ -z "$MK_FROM_NODE" ]; then exec </dev/null 2>/dev/null fi +# Detect whether or not the agent is being executed in a container +# environment. +if [ -f /.dockerenv ]; then + MK_IN_CONTAINER=1 +else + unset MK_IN_CONTAINER +fi + # Prefer (relatively) new /usr/bin/timeout from coreutils against # our shipped waitmax. waitmax is statically linked and crashes on # some Ubuntu versions recently.

6 years, 5 months

Use already existing instance attributes instead of threading things around.

by Sven Panne

Module: check_mk Branch: master Commit: 78cabaa9e27aa075bb0dea5cfe1dcdc737405a61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78cabaa9e27aa0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 6 14:36:59 2018 +0200 Use already existing instance attributes instead of threading things around. Change-Id: I11484c2e35bf7bd945835e79105febb8bc29cc1a --- cmk/ec/main.py | 136 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 66 insertions(+), 70 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=78cabaa9e2…

6 years, 5 months

Win-agent: use std::cout instead of printf

by Jukka Aro

Module: check_mk Branch: master Commit: 1013db5d7500a4e4c85fe4666b137115ac9d2890 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1013db5d7500a4… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 6 14:38:14 2018 +0200 Win-agent: use std::cout instead of printf --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 70 ++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 4daa189..31bd29a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3228 +3230 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 92ac9fa..d84453d 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -377,15 +377,18 @@ void InstallService() { SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path), s_winapi}; if (service) { - printf(SERVICE_NAME " Installed Successfully\n"); + std::cout << SERVICE_NAME << " Installed Successfully" + << std::endl; } else { const DWORD lastError = s_winapi.GetLastError(); - if (lastError == ERROR_SERVICE_EXISTS) - printf(SERVICE_NAME " Already Exists.\n"); - else - printf(SERVICE_NAME - " Was not Installed Successfully. Error Code %d\n", - static_cast<int>(lastError)); + if (lastError == ERROR_SERVICE_EXISTS) { + std::cout << SERVICE_NAME << " Already Exists." + << std::endl; + } else { + std::cout << SERVICE_NAME + << " Was not Installed Successfully. Error Code " + << lastError << std::endl; + } } } } @@ -427,23 +430,26 @@ void UninstallService() { if (serviceStatus.dwCurrentState == SERVICE_STOPPED) { if (s_winapi.DeleteService(service.get())) - printf(SERVICE_NAME " Removed Successfully\n"); + std::cout << SERVICE_NAME << " Removed Successfully" + << std::endl; else { const DWORD dwError = s_winapi.GetLastError(); if (dwError == ERROR_ACCESS_DENIED) - printf( - "Access Denied While trying to " - "Remove " SERVICE_NAME " \n"); + std::cout << "Access Denied While trying to " + "Remove " + << SERVICE_NAME << std::endl; else if (dwError == ERROR_INVALID_HANDLE) - printf( - "Handle invalid while trying to " - "Remove " SERVICE_NAME " \n"); + std::cout << "Handle invalid while trying to " + "Remove " + << SERVICE_NAME << std::endl; else if (dwError == ERROR_SERVICE_MARKED_FOR_DELETE) - printf(SERVICE_NAME - " already marked for deletion\n"); + std::cout << SERVICE_NAME + << " already marked for deletion" + << std::endl; } } else { - printf(SERVICE_NAME " is still Running.\n"); + std::cout << SERVICE_NAME << " is still Running." + << std::endl; } } } @@ -695,17 +701,25 @@ void do_adhoc(const Environment &env) { ListenSocket sock(*s_config->port, *s_config->only_from, *s_config->support_ipv6, logger, s_winapi); - printf("Listening for TCP connections (%s) on port %d\n", - sock.supportsIPV6() - ? sock.supportsIPV4() ? "IPv4 and IPv6" : "IPv6 only" - : "IPv4 only", - *s_config->port); + std::cout << "Listening for TCP connections ("; - printf("realtime monitoring %s\n", - s_sections->useRealtimeMonitoring() ? "active" : "inactive"); + if (sock.supportsIPV6()) { + if (sock.supportsIPV4()) + std::cout << "IPv4 and IPv6"; + else + std::cout << "IPv6 only"; + } else { + std::cout << "IPv4 only"; + } + std::cout << ") on port " << *s_config->port << std::endl; - printf("Close window or press Ctrl-C to exit\n"); - fflush(stdout); + std::cout << "realtime monitoring "; + if (s_sections->useRealtimeMonitoring()) + std::cout << "active\n"; + else + std::cout << "inactive\n"; + + std::cout << "Close window or press Ctrl-C to exit" << std::endl; // Run all ASYNC scripts on startup, so that their data is available on // the first query of a client. Obviously, this slows down the agent @@ -804,7 +818,9 @@ void output_data(OutputProxy &out, const Environment &env, bool realtime, out.flush(true); } -void show_version() { printf("Check_MK_Agent version %s\n", CHECK_MK_VERSION); } +void show_version() { + std::cout << "Check_MK_Agent version " << CHECK_MK_VERSION << std::endl; +} void show_config() { s_config->parser.outputConfigurables(std::cout); }

6 years, 5 months

Removed global variable g_slave_status.

by Sven Panne

Module: check_mk Branch: master Commit: dc98ec3c000605b828b089570941b40cd6ed0836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc98ec3c000605… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 6 13:12:00 2018 +0200 Removed global variable g_slave_status. Change-Id: I0dbcc979e6da2c285c5ab020f65b5794437334a3 --- cmk/ec/main.py | 152 ++++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 16 ++- 2 files changed, 90 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc98ec3c00…

6 years, 5 months

Win-agent: use std::cerr instead of fprintf

by Jukka Aro

Module: check_mk Branch: master Commit: 5c64b547174eba483e408c7fbb0f684f532574ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c64b547174eba… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 6 14:17:04 2018 +0200 Win-agent: use std::cerr instead of fprintf --- agents/windows/SectionManager.cc | 8 ++++---- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 40 +++++++++++++++++++++------------------- agents/windows/stringutil.cc | 9 +++++---- agents/windows/types.cc | 4 ++-- 5 files changed, 33 insertions(+), 30 deletions(-) diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 0ebebfa..e215eb6 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -63,10 +63,10 @@ winperf_counter from_string<winperf_counter>(const WinApiInterface &winapi, const std::string &value) { size_t colonIdx = value.find_last_of(":"); if (colonIdx == std::string::npos) { - fprintf(stderr, - "Invalid counter '%s' in section [winperf]: need number(or " - "text) and colon, e.g. 238:processor.\n", - value.c_str()); + std::cerr << "Invalid counter '" << value + << "' in section [winperf]: need number(or " + "text) and colon, e.g. 238:processor." + << std::endl; exit(1); } diff --git a/agents/windows/build_version b/agents/windows/build_version index 5ccbba2..4daa189 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3226 +3228 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5c5608b..92ac9fa 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -467,7 +467,7 @@ void do_remove() { UninstallService(); } void wsa_startup() { WSADATA wsa; if (0 != s_winapi.WSAStartup(MAKEWORD(2, 0), &wsa)) { - fprintf(stderr, "Cannot initialize winsock.\n"); + std::cerr << "Cannot initialize winsock." << std::endl; exit(1); } } @@ -497,23 +497,24 @@ void stop_threads() { // '----------------------------------------------------------------------' void usage() { - fprintf(stderr, - "Usage: \n" - "check_mk_agent version -- show version %s and exit\n" - "check_mk_agent install -- install as Windows NT service " - "Check_Mk_Agent\n" - "check_mk_agent remove -- remove Windows NT service\n" - "check_mk_agent adhoc -- open TCP port %d and answer " - "request until killed\n" - "check_mk_agent test -- test output of plugin, do not " - "open TCP port\n" - "check_mk_agent file FILENAME -- write output of plugin into " - "file, do not open TCP port\n" - "check_mk_agent debug -- similar to test, but with lots " - "of debug output\n" - "check_mk_agent showconfig -- shows the effective " - "configuration used (currently incomplete)\n", - CHECK_MK_VERSION, *s_config->port); + std::cerr + << "Usage: \n" + << "check_mk_agent version -- show version " << CHECK_MK_VERSION + << " and exit\n" + << "check_mk_agent install -- install as Windows NT service " + << "Check_Mk_Agent\n" + << "check_mk_agent remove -- remove Windows NT service\n" + << "check_mk_agent adhoc -- open TCP port " << *s_config->port + << " and answer " + << "request until killed\n" + << "check_mk_agent test -- test output of plugin, do not " + << "open TCP port\n" + << "check_mk_agent file FILENAME -- write output of plugin into " + << "file, do not open TCP port\n" + << "check_mk_agent debug -- similar to test, but with lots " + << "of debug output\n" + << "check_mk_agent showconfig -- shows the effective " + << "configuration used (currently incomplete)" << std::endl; exit(1); } @@ -1008,7 +1009,8 @@ void RunImmediate(const char *mode, int argc, char **argv) { do_test(env); else if (!strcmp(mode, "file")) { if (argc < 1) { - fprintf(stderr, "Please specify the name of an output file.\n"); + std::cerr << "Please specify the name of an output file." + << std::endl; exit(1); } do_file(env, argv[0]); diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 615404e..8b7f9cf 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -31,8 +31,8 @@ int parse_boolean(const char *value) { else if (!strcmp(value, "no")) return 0; else - fprintf(stderr, - "Invalid boolean value. Only yes and no are allowed.\r\n"); + std::cerr << "Invalid boolean value. Only yes and no are allowed." + << std::endl; return -1; } @@ -115,7 +115,7 @@ void stringToIPv6(const char *value, uint16_t *address, unsigned long segment = strtoul(pos, &endpos, 16); if (segment > 0xFFFFu) { - fprintf(stderr, "Invalid ipv6 address %s\n", value); + std::cerr << "Invalid ipv6 address " << value << std::endl; exit(1); } else if (endpos == pos) { skip_offset = segments.size(); @@ -149,7 +149,8 @@ void stringToIPv6(const char *value, uint16_t *address, void stringToIPv4(const char *value, uint32_t &address) { unsigned a, b, c, d; if (4 != sscanf(value, "%u.%u.%u.%u", &a, &b, &c, &d)) { - fprintf(stderr, "Invalid value %s for only_hosts\n", value); + std::cerr << "Invalid value " << value << " for only_hosts" + << std::endl; exit(1); } diff --git a/agents/windows/types.cc b/agents/windows/types.cc index ab5c78c..27babc8 100644 --- a/agents/windows/types.cc +++ b/agents/windows/types.cc @@ -61,8 +61,8 @@ ipspec from_string<ipspec>(const WinApiInterface &winapi, if ((result.ip.v4.address & result.ip.v4.netmask) != result.ip.v4.address) { - fprintf(stderr, "Invalid only_hosts entry: host part not 0: %s", - value.c_str()); + std::cerr << "Invalid only_hosts entry: host part not 0: " << value + << std::endl; exit(1); } }

6 years, 5 months

Removed globale variable g_terminate_main_event.

by Sven Panne

Module: check_mk Branch: master Commit: 255c36cfadf3f006319e1173a4bdaf1e15274156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255c36cfadf3f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 6 11:57:47 2018 +0200 Removed globale variable g_terminate_main_event. Change-Id: Ib1faa23c10f178c7b8179b342e9cc56fbc2d3755 --- cmk/ec/main.py | 22 +++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 5 +++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 2c6592e..24dd80c 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -305,8 +305,8 @@ class ECServerThread(threading.Thread): raise NotImplementedError() -def terminate(event_server, status_server): - g_terminate_main_event.set() +def terminate(terminate_main_event, event_server, status_server): + terminate_main_event.set() status_server.terminate() event_server.terminate() @@ -3516,7 +3516,7 @@ class StatusTableStatus(StatusTable): # '----------------------------------------------------------------------' class StatusServer(ECServerThread): - def __init__(self, settings, config, perfcounters, event_status, event_server, table_events): + def __init__(self, settings, config, perfcounters, event_status, event_server, table_events, terminate_main_event): super(StatusServer, self).__init__(name="StatusServer", settings=settings, config=config, @@ -3534,6 +3534,7 @@ class StatusServer(ECServerThread): self._perfcounters = perfcounters self._event_status = event_status self._event_server = event_server + self._terminate_main_event = terminate_main_event self.open_unix_socket() self.open_tcp_socket() @@ -3722,7 +3723,7 @@ class StatusServer(ECServerThread): self.handle_command_reload() elif command == "SHUTDOWN": self.logger.info("Going to shut down") - terminate(self._event_server, self) + terminate(self._terminate_main_event, self._event_server, self) elif command == "REOPENLOG": self.handle_command_reopenlog() elif command == "FLUSH": @@ -3865,7 +3866,7 @@ class StatusServer(ECServerThread): # | Starten und Verwalten der beiden Threads. | # '----------------------------------------------------------------------' -def run_eventd(settings, config, perfcounters, event_status, event_server, status_server): +def run_eventd(terminate_main_event, settings, config, perfcounters, event_status, event_server, status_server): status_server.start() event_server.start() now = time.time() @@ -3874,7 +3875,7 @@ def run_eventd(settings, config, perfcounters, event_status, event_server, statu next_statistics = now + config["statistics_interval"] next_replication = 0 # force immediate replication after restart - while not g_terminate_main_event.is_set(): + while not terminate_main_event.is_set(): try: # Wait until either housekeeping or retention is due, but at # maximum 60 seconds. That way changes of the interval from a very @@ -3911,7 +3912,7 @@ def run_eventd(settings, config, perfcounters, event_status, event_server, statu reload_configuration(settings, event_status, event_server, status_server) else: logger.info("Signalled to death by signal %d" % e._signum) - terminate(event_server, status_server) + terminate(terminate_main_event, event_server, status_server) except Exception as e: logger.exception("Exception in main thread:\n%s" % e) if settings.options.debug: @@ -5031,8 +5032,6 @@ lock_eventstatus = ECLock("eventstatus") lock_configuration = ECLock("configuration") lock_logging = ECLock("history") -g_terminate_main_event = threading.Event() - def main(): os.unsetenv("LANG") @@ -5072,7 +5071,8 @@ def main(): event_status = EventStatus(settings, config, perfcounters) table_events = StatusTableEvents(event_status) event_server = EventServer(settings, config, perfcounters, event_status, table_events) - status_server = StatusServer(settings, config, perfcounters, event_status, event_server, table_events) + terminate_main_event = threading.Event() + status_server = StatusServer(settings, config, perfcounters, event_status, event_server, table_events, terminate_main_event) event_status.load_status(event_server) @@ -5094,7 +5094,7 @@ def main(): signal.signal(signal.SIGTERM, signal_handler) # Now let's go... - run_eventd(settings, config, perfcounters, event_status, event_server, status_server) + run_eventd(terminate_main_event, settings, config, perfcounters, event_status, event_server, status_server) # We reach this point, if the server has been killed by # a signal or hitting Ctrl-C (in foreground mode) diff --git a/tests/integration/cmk/ec/test_mkeventd_status.py b/tests/integration/cmk/ec/test_mkeventd_status.py index af7bd00..42b3f5c 100644 --- a/tests/integration/cmk/ec/test_mkeventd_status.py +++ b/tests/integration/cmk/ec/test_mkeventd_status.py @@ -5,8 +5,9 @@ import pytest import time import ast import pathlib2 as pathlib -from testlib import CMKEventConsole, ec, web +import threading +from testlib import CMKEventConsole, ec, web import cmk.ec.settings import cmk.paths import cmk.ec.main @@ -72,7 +73,7 @@ def event_server(settings, config, perfcounters, event_status, table_events): @pytest.fixture(scope="function") def status_server(settings, config, perfcounters, event_status, event_server, table_events): - return cmk.ec.main.StatusServer(settings, config, perfcounters, event_status, event_server, table_events) + return cmk.ec.main.StatusServer(settings, config, perfcounters, event_status, event_server, table_events, threading.Event()) def test_handle_client(status_server):

6 years, 5 months

Win-agent: avoid prefix I in own abstract base classes

by Jukka Aro

Module: check_mk Branch: master Commit: 699391f7230971f8bc0c144257808b6496df84ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=699391f7230971… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 6 11:56:26 2018 +0200 Win-agent: avoid prefix I in own abstract base classes Reserve the prefix I for Microsoft-defined types to make a distinction between MSDN and own custom types. --- agents/windows/EventLog.cc | 6 ++--- agents/windows/EventLog.h | 6 ++--- agents/windows/{IEventLog.cc => EventLogBase.cc} | 12 ++++----- agents/windows/{IEventLog.h => EventLogBase.h} | 34 ++++++++++++------------ agents/windows/EventLogVista.cc | 6 ++--- agents/windows/EventLogVista.h | 6 ++--- agents/windows/Makefile.am | 2 +- agents/windows/build_version | 2 +- agents/windows/sections/SectionEventlog.cc | 30 ++++++++++----------- agents/windows/sections/SectionEventlog.h | 6 ++--- 10 files changed, 55 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=699391f723…

6 years, 5 months

Removed global variables g_config and g_last_config_reload.

by Sven Panne

Module: check_mk Branch: master Commit: 4f2ee61ca2de1867c71f580ded4eba0b4665afdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2ee61ca2de18… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 6 10:55:03 2018 +0200 Removed global variables g_config and g_last_config_reload. Change-Id: I897a3bd271b8b3102911887800c27bf830d7eb84 --- cmk/ec/main.py | 426 ++++++++++++----------- tests/integration/cmk/ec/test_mkeventd_status.py | 11 +- 2 files changed, 224 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4f2ee61ca2…

6 years, 5 months

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018