Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: rebuild exe files

by Andreas Boesl

Module: check_mk Branch: master Commit: 1fb16a7894d3d6423bbc542a9b796b52b41a79b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fb16a7894d3d6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 1 13:02:45 2015 +0200 rebuild exe files --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 307712 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 307712 bytes agents/windows/check_mk_agent.exe | Bin 183808 -> 190464 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 747008 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 190464 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 179107 -> 181024 bytes agents/windows/install_agent.exe | Bin 160059 -> 163072 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index cd7da05..0d38910 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -210 +212 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 4466cf3..ad4a729 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 268d767..e76e106 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index dde806f..abcdca8 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2da48d8..b2d29c7 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 72947c4..27818a3 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index cc163af..6527e43 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index baab18e..0cfb47f 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 3f0b2d1..e08b52f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 01e29c9..bc419b6 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

9 years

Check_MK Git: check_mk: Revert "Revert " updated windows agent to use a resizable container for list of eventlogs""

by Andreas Boesl

Module: check_mk Branch: master Commit: ba322de12b9ecb85447a6fc0b0aa3c91c72eff39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba322de12b9ecb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 1 12:59:15 2015 +0200 Revert "Revert "updated windows agent to use a resizable container for list of eventlogs"" This reverts commit 302708bff685d5dcc6ed4d393c4907df4be2d20c. --- agents/windows/check_mk_agent.cc | 127 ++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ba322de12b…

9 years

Check_MK Git: check_mk: Revert "Revert " fixes and improvements to the windows agent""

by Andreas Boesl

Module: check_mk Branch: master Commit: 63fa4c1c4514a88f0b07db14769930149ef02fd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63fa4c1c4514a8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 1 13:00:41 2015 +0200 Revert "Revert "fixes and improvements to the windows agent"" This reverts commit 922e1aa5a8c9011a3ce05daba2dba32b3f4c6754. Conflicts: agents/windows/build_version agents/windows/check_mk_agent-64.exe agents/windows/check_mk_agent-64.unversioned.exe agents/windows/check_mk_agent.exe agents/windows/check_mk_agent.msi agents/windows/check_mk_agent.unversioned.exe agents/windows/install_agent-64.exe agents/windows/install_agent.exe --- agents/windows/check_mk_agent.cc | 33 ++++++++++++++++++++++++--------- agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/install_agent-64.exe | Bin 179108 -> 179107 bytes agents/windows/install_agent.exe | Bin 160060 -> 160059 bytes 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 364a54e..8e07b0f 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -561,7 +561,17 @@ void debug_script_container( script_container* container ) crash_log("buffer_work: \n<<<<\n%s\n>>>>", container->buffer_work); } +bool ci_compare_pred(unsigned char lhs, unsigned char rhs) +{ + return std::tolower(lhs) == std::tolower(rhs); +} +// case insensitive compare +bool ci_equal(const std::string &lhs, const std::string &rhs) +{ + return std::lexicographical_compare(lhs.begin(), lhs.end(), + rhs.begin(), rhs.end(), ci_compare_pred); +} template <typename FuncT> FuncT dynamic_func(LPCWSTR dllName, LPCSTR funcName) { HMODULE mod = LoadLibraryW(dllName); @@ -1807,13 +1817,9 @@ void save_logwatch_offsets() { FILE *file = fopen(g_logwatch_statefile, "w"); if (!file) { - fprintf(stderr, "Cannot open %s for writing.\n", g_logwatch_statefile); - // what to do, what to do? - // If we continue, the whole log will be delivered all the time and - // this error message may go unnoticed which will feel like a bug. - // Allow the agent to crash? Even more of a bug. - // Try to fix the problem automatically? Won't work reliably anyway. - exit(1); + crash_log("Cannot open %s for writing.\n", g_logwatch_statefile); + // not stopping the agent from crashing. This way the user at least + // notices something went wrong } for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); it_tf != g_logwatch_textfiles.end(); it_tf++) { @@ -1885,7 +1891,7 @@ void save_eventlog_offsets() for (eventlog_config_t::iterator conf_iter = g_eventlog_config.begin(); conf_iter != g_eventlog_config.end(); ++conf_iter) { - if ((conf_iter->name == "*") || (conf_iter->name == state_iter->name)) { + if ((conf_iter->name == "*") || ci_equal(conf_iter->name, state_iter->name)) { level = conf_iter->level; break; } @@ -2537,7 +2543,7 @@ void section_eventlog(SOCKET &out) int hide_context = 0; for (eventlog_config_t::iterator conf_iter = g_eventlog_config.begin(); conf_iter != g_eventlog_config.end(); ++conf_iter) { - if ((conf_iter->name == "*") || (conf_iter->name == it_st->name)) { + if ((conf_iter->name == "*") || ci_equal(conf_iter->name, it_st->name)) { level = conf_iter->level; hide_context = conf_iter->hide_context; break; @@ -4987,6 +4993,15 @@ void determine_directories(bool use_cwd) snprintf(g_temp_dir, sizeof(g_temp_dir), "%s\\temp", g_agent_directory); snprintf(g_log_dir, sizeof(g_log_dir), "%s\\log", g_agent_directory); + char *dirs[] = { g_plugins_dir, g_config_dir, g_local_dir, g_spool_dir, g_state_dir, g_temp_dir, g_log_dir }; + for (size_t i = 0; i < sizeof(dirs) / sizeof(char*); ++i) { + if (!CreateDirectoryA(dirs[i], NULL)) { + if (GetLastError() != ERROR_ALREADY_EXISTS) { + crash_log("Failed to create directory %s: %s", GetLastError(), get_last_error_as_string().c_str()); + } + } + } + snprintf(g_logwatch_statefile, sizeof(g_logwatch_statefile), "%s\\logstate.txt", g_state_dir); snprintf(g_eventlog_statefile, sizeof(g_eventlog_statefile), "%s\\eventstate.txt", g_state_dir); diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 3a89b8e..2da48d8 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index dbce37a..baab18e 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 8b4c86a..3f0b2d1 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years

Check_MK Git: check_mk: Fixed permissions of new compresslog.py

by Mathias Kettner

Module: check_mk Branch: master Commit: eabf66450321359eb80e243e606c81f3b659485c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eabf6645032135… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 1 11:18:50 2015 +0200 Fixed permissions of new compresslog.py --- 0 files changed diff --git a/modules/compresslog.py b/modules/compresslog.py old mode 100755 new mode 100644

9 years

Check_MK Git: check_mk: replaced wrong oids in comments and changed state for active srst mode

by Simon Betz

Module: check_mk Branch: master Commit: 2ed809dd5a8332db311b4dfbcbd12a4781851efd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed809dd5a8332… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 1 09:15:47 2015 +0200 replaced wrong oids in comments and changed state for active srst mode --- checks/cisco_srst_state | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/checks/cisco_srst_state b/checks/cisco_srst_state index 56ba614..3181012 100644 --- a/checks/cisco_srst_state +++ b/checks/cisco_srst_state @@ -24,11 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -# 1.3.6.1.4.1.9.9.441.1.2.32.1.1 -> csrstAccessCodeType: 1, 2, 3, 4(pri) -# 1.3.6.1.4.1.9.9.441.1.2.32.1.2 -> csrstAccessCode: SnmpAdminString -# 1.3.6.1.4.1.9.9.441.1.2.32.1.3 -> csrstAccessCodeDIDEnabled TruthValue - +# .1.3.6.1.4.1.9.9.441.1.3.1 CISCO-SRST-MIB::csrstState (1: active, 2: inactive) +# .1.3.6.1.4.1.9.9.441.1.3.4 CISCO-SRST-MIB::csrstTotalUpTime def inventory_cisco_srst_state(info): return [ (None, None) ] @@ -39,7 +36,7 @@ def check_cisco_srst_state(_no_item, _no_params, info): # Check the state if srst_state == '1': - yield 1, "SRST active" + yield 2, "SRST active" else: yield 0, "SRST inactive"

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015