Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: rebuild windows agent after reverted changes

by Andreas Boesl

Module: check_mk Branch: master Commit: c514be48e58900577cb61876f521abfe5868471f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c514be48e58900… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 31 18:09:01 2015 +0200 rebuild windows agent after reverted changes --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 179108 -> 179108 bytes agents/windows/install_agent.exe | Bin 160059 -> 160060 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 7d645f5..cd7da05 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -208 +210 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a89e9f1..4466cf3 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 854cef4..268d767 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 ae2db3a..dde806f 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 042c8a3..3a89b8e 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 865f9df..72947c4 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/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4f0dd81..dbce37a 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 79080cb..8b4c86a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 9 months

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

by Andreas Boesl

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

8 years, 9 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 922e1aa5a8c9011a3ce05daba2dba32b3f4c6754 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922e1aa5a8c901… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 31 18:07:50 2015 +0200 Revert "fixes and improvements to the windows agent" This reverts commit bb9a6d46ba183d848917531b77a143d99c406304. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 307712 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 307712 -> 302080 bytes agents/windows/check_mk_agent.cc | 33 ++++++---------------- agents/windows/check_mk_agent.exe | Bin 190464 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 747008 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 190464 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 181025 -> 179108 bytes agents/windows/install_agent.exe | Bin 163071 -> 160059 bytes 9 files changed, 10 insertions(+), 25 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 9d683f8..7d645f5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -214 +208 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index c9c1214..a89e9f1 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 0c809f5..854cef4 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.cc b/agents/windows/check_mk_agent.cc index 8e07b0f..364a54e 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -561,17 +561,7 @@ 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); @@ -1817,9 +1807,13 @@ void save_logwatch_offsets() { FILE *file = fopen(g_logwatch_statefile, "w"); if (!file) { - 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 + 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); } for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); it_tf != g_logwatch_textfiles.end(); it_tf++) { @@ -1891,7 +1885,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 == "*") || ci_equal(conf_iter->name, state_iter->name)) { + if ((conf_iter->name == "*") || (conf_iter->name == state_iter->name)) { level = conf_iter->level; break; } @@ -2543,7 +2537,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 == "*") || ci_equal(conf_iter->name, it_st->name)) { + if ((conf_iter->name == "*") || (conf_iter->name == it_st->name)) { level = conf_iter->level; hide_context = conf_iter->hide_context; break; @@ -4993,15 +4987,6 @@ 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.exe b/agents/windows/check_mk_agent.exe index e256d3a..ae2db3a 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 c0a28da..042c8a3 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 aefd2bc..865f9df 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/install_agent-64.exe b/agents/windows/install_agent-64.exe index a3b6674..4f0dd81 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 07c47cb..79080cb 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2360, #2361, #2357, #2358, #2359

by Sebastian Herbord

Module: check_mk Branch: master Commit: 23af3e83e3fc1eadc057ecf4a9ffe55e5e741a3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23af3e83e3fc1e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 16:35:10 2015 +0200 Updated bug entries #2360, #2361, #2357, #2358, #2359 --- .bugs/2357 | 8 ++++++++ .bugs/2358 | 8 ++++++++ .bugs/2359 | 9 +++++++++ .bugs/2360 | 8 ++++++++ .bugs/2361 | 8 ++++++++ 5 files changed, 41 insertions(+) diff --git a/.bugs/2357 b/.bugs/2357 new file mode 100644 index 0000000..0608c16 --- /dev/null +++ b/.bugs/2357 @@ -0,0 +1,8 @@ +Title: Host and Service View with Layout "Matrix" are broken +Component: multisite +State: open +Date: 2015-08-31 15:37:56 +Targetversion: 1.2.7 +Class: bug + +"Edit View" on a host or service view allows the user to select "Matrix" as the Basic Layout. This layout however presents the data in a completely unreadable way, apparently mixing data from different elements into one field and leaving out most most rows. There is no indication visible to the user that this layout can't be used in this way. diff --git a/.bugs/2358 b/.bugs/2358 new file mode 100644 index 0000000..68b85c3 --- /dev/null +++ b/.bugs/2358 @@ -0,0 +1,8 @@ +Title: "Invalid check parameter" error in "Check Parameters" column in wato +Component: wato +State: open +Date: 2015-08-31 16:05:11 +Targetversion: 1.2.7 +Class: bug + +In the service list of a host in wato, if the "Show check parameters" button is pressed, many checks (i.e. cpu.loads, mounts) only show an error message in the new column: "Invalid check parameter: ..." \ No newline at end of file diff --git a/.bugs/2359 b/.bugs/2359 new file mode 100644 index 0000000..1f5c04a --- /dev/null +++ b/.bugs/2359 @@ -0,0 +1,9 @@ +Title: Quotes in generated confirmation messages are htmlized incorrectly +Component: multisite +State: open +Date: 2015-08-31 16:18:23 +Targetversion: 1.2.7 +Class: bug + +Apparently the mechanism to convert " into " is incorrect or applied in places where this isn't required. One reproducable example is when hitting the "Send monitoring notification" button in the Event Console the confirmation message is "Do you really want to execute that action "Send monitoring notification&quot the following 1 Event Console Events?". +Apart from the that the grammer is quite bad imho. \ No newline at end of file diff --git a/.bugs/2360 b/.bugs/2360 new file mode 100644 index 0000000..9078342 --- /dev/null +++ b/.bugs/2360 @@ -0,0 +1,8 @@ +Title: "Fake check results" on hosts doesn't work +Component: multisite +State: open +Date: 2015-08-31 16:26:06 +Targetversion: 1.2.7 +Class: bug + +The "Fake check results" feature on hosts allows to set the status of the host to "up", "down" or "unreachable" but this has no effect, the host status stays as it was. \ No newline at end of file diff --git a/.bugs/2361 b/.bugs/2361 new file mode 100644 index 0000000..9688b63 --- /dev/null +++ b/.bugs/2361 @@ -0,0 +1,8 @@ +Title: User without the permission "Use Check_MK sidebar" has a white bar on the left +Component: multisite +State: open +Date: 2015-08-31 16:30:26 +Targetversion: 1.2.7 +Class: nastiness + +If a user logs in who doesn't have the permission "Use Check_MK sidebar", the page is displayed with a huge white bar where the sidebar is supposed to be. This looks hideous. What's more: He also doesn't have a logout button or the button to his profile that would allow him to change his password.

8 years, 9 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: faa8147fda0ee3f41d8966bebfac260d2e9a8dd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faa8147fda0ee3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 15:34:27 2015 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index da79784..9b65630 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2357 +2367

8 years, 9 months

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

by Sebastian Herbord

Module: check_mk Branch: master Commit: bb9a6d46ba183d848917531b77a143d99c406304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb9a6d46ba183d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 14:51:32 2015 +0200 fixes and improvements to the windows agent fix: the commit c9b807a7 changed some string comparisons from case insensitive to sensitive fix: commit c9b807a7 dealt incorrectly with inability to create statefile fix: commit c9b807a7 didn't include new binaries agent now automatically creates all required 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.cc | 33 ++++++++++++++++------ 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/install_agent-64.exe | Bin 179108 -> 181025 bytes agents/windows/install_agent.exe | Bin 160059 -> 163071 bytes 9 files changed, 25 insertions(+), 10 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 7d645f5..9d683f8 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -208 +214 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a89e9f1..c9c1214 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 854cef4..0c809f5 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.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.exe b/agents/windows/check_mk_agent.exe index ae2db3a..e256d3a 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 042c8a3..c0a28da 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 865f9df..aefd2bc 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/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4f0dd81..a3b6674 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 79080cb..07c47cb 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 9 months

Check_MK Git: check_mk: Fix overriding of js files via local/

by Mathias Kettner

Module: check_mk Branch: master Commit: db396d2c84ce7986ad7085557696e13ba4a276f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db396d2c84ce79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 31 14:53:30 2015 +0200 Fix overriding of js files via local/ --- web/htdocs/htmllib.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 533289a..664ae20 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -836,18 +836,24 @@ class html: # b) in OMD environments, add the Check_MK version to the version (prevents update problems) # c) load the minified javascript when not in debug mode for js in [ "checkmk", "graphs" ] + javascripts: + filename_for_browser = None if defaults.omd_root: - base_dir = defaults.omd_root + "/share/check_mk/web/htdocs/js" - if not self.enable_debug and os.path.exists(base_dir + "/" + js + "_min.js"): - fname = '%s_min-%s' % (js, defaults.check_mk_version) - elif os.path.exists(base_dir + "/" + js + ".js"): - fname = '%s-%s' % (js, defaults.check_mk_version) + rel_path = "/share/check_mk/web/htdocs/js" + if self.enable_debug: + min_parts = [ "", "_min" ] else: - continue + min_parts = [ "_min", "" ] + + for min_part in min_parts: + path_pattern = defaults.omd_root + "%s" + rel_path + "/" + js + min_part + ".js" + if os.path.exists(path_pattern % "") or os.path.exists(path_pattern % "/local"): + filename_for_browser = '%s%s-%s' % (js, min_part, defaults.check_mk_version) + break else: - fname = '%s' % js + filename_for_browser = js - self.javascript_file(fname) + if filename_for_browser: + self.javascript_file(filename_for_browser) if self.browser_reload != 0: if self.browser_redirect != '':

8 years, 9 months

Check_MK Git: check_mk: if64, if64adm: Added missing include file

by Bastian Kuhn

Module: check_mk Branch: master Commit: 47ecda6e18fb8c279e30d714004923a9b6aadb95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47ecda6e18fb8c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 31 14:13:24 2015 +0200 if64, if64adm: Added missing include file --- checks/if64 | 2 +- checks/if64adm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/if64 b/checks/if64 index e69eed4..f2bcdac 100644 --- a/checks/if64 +++ b/checks/if64 @@ -38,7 +38,7 @@ check_info["if64"] = { 'inventory_function' : inventory_if64, 'service_description' : 'Interface %s', 'has_perfdata' : True, - 'includes' : [ 'if.include' ], + 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids), 'snmp_scan_function' : lambda oid: if64_scan_function(oid, False), 'group' : 'if', diff --git a/checks/if64adm b/checks/if64adm index eba5739..3c1a11b 100644 --- a/checks/if64adm +++ b/checks/if64adm @@ -50,7 +50,7 @@ check_info["if64adm"] = { 'inventory_function' : inventory_if64adm, 'service_description' : 'Interface %s', 'has_perfdata' : True, - 'includes' : [ 'if.include' ], + 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids + [ "2.2.1.7", # ifAdminStatus ]),

8 years, 9 months

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

by Sebastian Herbord

Module: check_mk Branch: master Commit: c9b807a7945284fa868d4b886c2e17d2530190ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9b807a7945284… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Aug 31 13:59:18 2015 +0200 updated windows agent to use a resizable container for list of eventlogs --- 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=c9b807a794…

8 years, 9 months

Check_MK Git: check_mk: #1289 FIX Fixed missing table headers in hostgroup view

by Bastian Kuhn

Module: check_mk Branch: master Commit: f5b2d6c7173773a0ea9023becc4cdb02383ad6a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5b2d6c7173773… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 31 13:45:06 2015 +0200 #1289 FIX Fixed missing table headers in hostgroup view --- .werks/1289 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1289 b/.werks/1289 new file mode 100644 index 0000000..1e31b65 --- /dev/null +++ b/.werks/1289 @@ -0,0 +1,10 @@ +Title: Fixed missing table headers in hostgroup view +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441021469 + + diff --git a/ChangeLog b/ChangeLog index 57c0405..55a4275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,7 @@ * 2549 FIX: Silently ignore not existing painters and sorters in views... * 2531 FIX: Fixed graph hover for services containing backslashes... * 2532 FIX: Fixed undefined variable exception in prediction in rare cases... + * 1289 FIX: Fixed missing table headers in hostgroup view WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 9ce1d27..9bce7d4 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -773,7 +773,7 @@ multisite_builtin_views.update({ 'linktitle' : _('Host Problems'), 'title': _('Problems of host')}, 'hostgroup': {'browser_reload': 30, - 'column_headers': 'off', + 'column_headers': 'pergroup', 'datasource': 'hosts', 'description': _('Lists members of a host group with the number of services in the different states.'), 'group_painters': [('site_icon', None),

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015