Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown '

by Andreas Boesl

Module: check_mk Branch: master Commit: 3a49369fc6b6d7e72eb8268ba55b35193684a14c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a49369fc6b6d7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 3 10:52:24 2015 +0100 #1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown' The unknown level can be configured via the WATO rule State of ESX hosts and virtual machines --- .werks/1933 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/.werks/1933 b/.werks/1933 new file mode 100644 index 0000000..188ce7c --- /dev/null +++ b/.werks/1933 @@ -0,0 +1,11 @@ +Title: esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown' +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422957021 + +The unknown level can be configured via the WATO rule State of ESX hosts and virtual machines + diff --git a/ChangeLog b/ChangeLog index 49129db..d413469 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1220 if,if64: Discovery can now be based on port description... * 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)... + * 1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown'... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 59a564f..04c5eeb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3216,6 +3216,13 @@ register_check_parameters( default_value = 1, ) ), + ( "unknown", + MonitoringState( + title = _("Unknown"), + help = _("Check result if the host or VM state is reported as unknown"), + default_value = 3, + ) + ), ] ) ),

9 years, 4 months

Check_MK Git: check_mk: #1932 FIX check_http: Check SSL Certificate: did not work when SNI Option was set

by Andreas Boesl

Module: check_mk Branch: master Commit: df8999591109979db19a0013ef492a21348241a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df899959110997… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 3 09:23:36 2015 +0100 #1932 FIX check_http: Check SSL Certificate: did not work when SNI Option was set The option <tt>--sni</tt> did not work in conjunction with <tt>--IP-address</tt>. --- .werks/1932 | 10 ++++++++++ ChangeLog | 1 + checks/check_http | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1932 b/.werks/1932 new file mode 100644 index 0000000..6efa6b4 --- /dev/null +++ b/.werks/1932 @@ -0,0 +1,10 @@ +Title: check_http: Check SSL Certificate: did not work when SNI Option was set +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422951366 + +The option <tt>--sni</tt> did not work in conjunction with <tt>--IP-address</tt>. diff --git a/ChangeLog b/ChangeLog index aaf50a4..49129db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -136,6 +136,7 @@ * 1971 FIX: printer_input/printer_output: Discovery is using name field when available no... NOTE: Please refer to the migration notes! * 1931 FIX: agent_vsphere: no longer crashes when host has no license information + * 1932 FIX: check_http: Check SSL Certificate: did not work when SNI Option was set... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/check_http b/checks/check_http index ee885db..66989e2 100644 --- a/checks/check_http +++ b/checks/check_http @@ -48,8 +48,11 @@ def check_http_arguments(params): if "cert_host" in settings: omit_ip = True - args += ' -H $HOSTADDRESS$' - args += ' -I %s' % quote_shell_string(settings['cert_host']) + if settings.get("sni"): + args += ' -H %s' % quote_shell_string(settings['cert_host']) + else: + args += ' -H $HOSTADDRESS$' + args += ' -I %s' % quote_shell_string(settings['cert_host']) if "cert_days" in settings: args += ' -C %d' % settings["cert_days"]

9 years, 4 months

Check_MK Git: check_mk: (treasures check) check_cpu_peak: now able to process windows rrds

by Andreas Boesl

Module: check_mk Branch: master Commit: 557f4b21332e7e5fa78c39b59e9ee64b13516ef6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=557f4b21332e7e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 2 16:50:17 2015 +0100 (treasures check) check_cpu_peak: now able to process windows rrds --- doc/treasures/active_checks/check_cpu_peaks | 29 +++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/doc/treasures/active_checks/check_cpu_peaks b/doc/treasures/active_checks/check_cpu_peaks index 2dd344d..6b4ab20 100755 --- a/doc/treasures/active_checks/check_cpu_peaks +++ b/doc/treasures/active_checks/check_cpu_peaks @@ -93,13 +93,25 @@ if not fromtime: try: datasets = [] step_secs = 0 - for key in ["system", "user", "wait"]: - data = get_rrd_data(host, "CPU utilization", key, "AVERAGE", fromtime, untiltime) + util_total = [] + is_windows = True + try: + data = get_rrd_data(host, "CPU utilization", "util", "AVERAGE", fromtime, untiltime) datasets.append(data[1]) - util_total = map(lambda x: int(sum([y for y in x if y != None])), - zip(datasets[0], datasets[1], datasets[2])) + step_secs = data[0] + util_total = [ x for x in datasets[0] if x != None ] + except Exception, e: + # looks like this is not a windows rrd... + is_windows = False + for key in ["system", "user", "wait"]: + data = get_rrd_data(host, "CPU utilization", key, "AVERAGE", fromtime, untiltime) + datasets.append(data[1]) + step_secs = data[0] + util_total = map(lambda x: int(sum([y for y in x if y != None])), + zip(datasets[0], datasets[1], datasets[2])) cpu_peak = max(util_total) + peak_time = time.localtime(fromtime + step_secs * util_total.index(cpu_peak)) if opt_verbose: @@ -110,7 +122,12 @@ try: sys.stdout.write("%s" % int(datasets[2][idx] or -1)) print "" - info = [ "CPU utilization (user, system, wait) from %s until %s" %\ + if is_windows: + info = [ "CPU utilization from %s until %s" %\ + (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), + time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] + else: + info = [ "CPU utilization (user, system, wait) from %s until %s" %\ (time.strftime("%b %d %H:%M:%S", time.localtime(fromtime)), time.strftime("%b %d %H:%M:%S", time.localtime(untiltime))) ] @@ -127,6 +144,6 @@ try: except Exception, e: # TODO: Exception handling could be improved. # Right now no handling of MKGeneralException, etc. is implemented - print "Exception while processing data." + print "Exception while processing data.", e sys.exit(2)

9 years, 4 months

Check_MK Git: check_mk: #1931 FIX agent_vsphere: no longer crashes when host has no license information

by Andreas Boesl

Module: check_mk Branch: master Commit: 4ce3d01fbbaf615c2e870c03974a73e65e641279 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ce3d01fbbaf61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 2 16:02:02 2015 +0100 #1931 FIX agent_vsphere: no longer crashes when host has no license information --- .werks/1931 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1931 b/.werks/1931 new file mode 100644 index 0000000..bf9f995 --- /dev/null +++ b/.werks/1931 @@ -0,0 +1,10 @@ +Title: agent_vsphere: no longer crashes when host has no license information +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422889303 + + diff --git a/ChangeLog b/ChangeLog index f477999..aaf50a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 1970 FIX: lparstat_aix: Made the check compatible to different kind of lparstat output... * 1971 FIX: printer_input/printer_output: Discovery is using name field when available no... NOTE: Please refer to the migration notes! + * 1931 FIX: agent_vsphere: no longer crashes when host has no license information Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 505aa9d..e64884c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -703,7 +703,10 @@ if not error: license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response) licenses = {} for host in license_hosts: - key, name, total, used = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host)[0] + license_info = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host) + if not license_info: + continue + key, name, total, used = license_info[0] # We merge all entries with the same name, duplicate keys are ignored since they provide the same data licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0}) if key not in licenses[name]["used_keys"]:

9 years, 4 months

Check_MK Git: check_mk: #1221 FIX veeam_client: Multisite perfometer is now more robust

by Bastian Kuhn

Module: check_mk Branch: master Commit: 98ee74e35d0c6c32b8a59c703de883262ec3d303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98ee74e35d0c6c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 2 15:19:09 2015 +0100 #1221 FIX veeam_client: Multisite perfometer is now more robust --- .werks/1221 | 10 ++++++++++ ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1221 b/.werks/1221 new file mode 100644 index 0000000..c1a1590 --- /dev/null +++ b/.werks/1221 @@ -0,0 +1,10 @@ +Title: veeam_client: Multisite perfometer is now more robust +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422886659 + + diff --git a/ChangeLog b/ChangeLog index 6ca25b2..e437f8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 1884 FIX: Fixed exception in virtual host tree snapin * 1885 FIX: Fixed filtering by software versions in software package search * 1972 FIX: Prevent erasing of quicksearch field when sidebar is reloaded (e.g. during activate changes)... + * 1221 FIX: veeam_client: Multisite perfometer is now more robust WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 79f5ca2..f762470 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1204,8 +1204,11 @@ def perfometer_docsis_snr(row, check_command, perf_data): perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr def perfometer_veeam_client(row, check_command, perf_data): - avgspeed_bytes = int(perf_data[4][1]) - duration_secs = int(perf_data[3][1]) + for graph in perf_data: + if graph[0] == "avgspeed": + avgspeed_bytes = int(graph[1]) + if graph[0] == "duration": + duration_secs = int(graph[1]) h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 500, 2) avgspeed = bytes_human_readable(avgspeed_bytes)

9 years, 4 months

Check_MK Git: check_mk: The windows agent is now able to unpack the plugins.cap file upon install.

by Andreas Boesl

Module: check_mk Branch: master Commit: 68b46e787f0122563b83f96a60e2a44f51da70ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68b46e787f0122… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 2 15:08:14 2015 +0100 The windows agent is now able to unpack the plugins.cap file upon install. This file may contain host specific check_mk.ini parameters, as well as local and plugins scripts. Conflicts: ChangeLog agents/windows/build_version 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 --- .werks/1930 | 13 +++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 211968 -> 212480 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 211968 -> 212480 bytes agents/windows/check_mk_agent.cc | 115 +++++++++++++++++++++- agents/windows/check_mk_agent.exe | Bin 180224 -> 181760 bytes agents/windows/check_mk_agent.msi | Bin 626176 -> 628224 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 180224 -> 181760 bytes agents/windows/install_agent-64.exe | Bin 161361 -> 162045 bytes agents/windows/install_agent.exe | Bin 158131 -> 158775 bytes 11 files changed, 129 insertions(+), 2 deletions(-) diff --git a/.werks/1930 b/.werks/1930 new file mode 100644 index 0000000..a821b41 --- /dev/null +++ b/.werks/1930 @@ -0,0 +1,13 @@ +Title: Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery) +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422885763 + +The windows agent is now able to unpack the plugins.cap file upon install. +This file may contain host specific check_mk.ini parameters, as well as +local and plugins scripts. + diff --git a/ChangeLog b/ChangeLog index 6ca25b2..2c95d1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1220 if,if64: Discovery can now be based on port description... + * 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/build_version b/agents/windows/build_version index bc6298e..a57f6ce 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -110 +131 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0d026c8..1c811db 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 87de9dd..1a1f94b 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 7ef9b17..a7c30a6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4885,6 +4885,117 @@ int get_perf_counter_id(const char *counter_name) return -1; } +void do_unpack_plugins(char *plugin_filename) { + snprintf(g_logwatch_statefile, sizeof(g_logwatch_statefile), "%s\\logstate.txt", g_agent_directory); + + FILE *file = fopen(plugin_filename, "rb"); + if (!file) { + printf("Unable to open Check_MK-Agent package %s\n", plugin_filename); + exit(1); + } + + + char uninstall_file_path[512]; + snprintf(uninstall_file_path, 512, "%s\\uninstall_plugins.bat", g_agent_directory); + FILE *uninstall_file = fopen(uninstall_file_path, "w"); + fprintf(uninstall_file, "REM * If you want to uninstall the plugins which were installed during the\n" + "REM * last 'check_mk_agent.exe unpack' command, just execute this script\n\n"); + + + bool had_error = false; + while (true) { + int read_bytes; + BYTE filepath_length; + int content_length; + BYTE *filepath; + BYTE *content; + + // Read Filename + read_bytes = fread(&filepath_length, 1, 1, file); + if (read_bytes != 1) { + if (feof(file)) + break; + else { + had_error = true; + break; + } + } + filepath = (BYTE *)malloc(filepath_length + 1); + read_bytes = fread(filepath, 1, filepath_length, file); + filepath[filepath_length] = 0; + + if (read_bytes != filepath_length) { + had_error = true; + break; + } + + // Read Content + read_bytes = fread(&content_length, 1, sizeof(content_length), file); + if (read_bytes != sizeof(content_length)) { + had_error = true; + break; + } + + // Maximum plugin size is 20 MB + if (content_length > 20 * 1024 * 1024) { + had_error = true; + break; + } + content = (BYTE *)malloc(content_length); + read_bytes = fread(content, 1, content_length, file); + if (read_bytes != content_length) { + had_error = true; + break; + } + + // Extract filename and path to file + BYTE *filename = NULL; + BYTE *dirname = NULL; + for (int i = filepath_length - 1; i >= 0; i--) + { + if (filepath[i] == '/') { + if (filename == NULL) { + filename = filepath + i + 1; + dirname = filepath; + filepath[i] = 0; + } + else { + filepath[i] = '\\'; + } + } + } + + if (dirname != NULL) { + char new_dir[1024]; + snprintf(new_dir, sizeof(new_dir), "%s\\%s", g_agent_directory, dirname); + CreateDirectory(new_dir, NULL); + } + + // Add uninstall information for this plugin + fprintf(uninstall_file, "del \"%s\\%s\\%s\"\n", g_agent_directory, dirname, filename); + + // Write plugin + char plugin_path[512]; + snprintf(plugin_path, sizeof(plugin_path), "%s\\%s\\%s", g_agent_directory, dirname, filename); + FILE *plugin_file = fopen(plugin_path, "wb"); + fwrite(content, 1, content_length, plugin_file); + fclose(plugin_file); + + free(filepath); + free(content); + } + + fclose(uninstall_file); + fclose(file); + + if (had_error) { + printf("There was an error on unpacking the Check_MK-Agent package: File integrety is broken\n." + "The file might have been installed partially."); + exit(1); + } + +} + int main(int argc, char **argv) { wsa_startup(); @@ -4898,7 +5009,7 @@ int main(int argc, char **argv) SetConsoleCtrlHandler((PHANDLER_ROUTINE)ctrl_handler, TRUE); - if ( ( argc > 2) and (strcmp(argv[1], "file")) ) + if ( ( argc > 2) and (strcmp(argv[1], "file") && strcmp(argv[1], "unpack")) ) usage(); else if (argc <= 1) RunService(); @@ -4924,6 +5035,8 @@ int main(int argc, char **argv) do_install(); else if (!strcmp(argv[1], "remove")) do_remove(); + else if (!strcmp(argv[1], "unpack")) + do_unpack_plugins(argv[2]); else if (!strcmp(argv[1], "debug")) do_debug(); else if (!strcmp(argv[1], "version")) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 60108a9..d1093b3 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 7db179f..dd96fb7 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 91dfe31..1422526 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 1470dfc..fe99923 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 140ad3f..eac4305 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 4 months

Check_MK Git: check_mk: Renaming and cleanup for datacore checks ( now named sansymphony)

by Bastian Kuhn

Module: check_mk Branch: master Commit: b165e14f50ecc3b2cfab8154e9f238f2ba4dfe2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b165e14f50ecc3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 2 14:48:43 2015 +0100 Renaming and cleanup for datacore checks (now named sansymphony) --- .../plugins/{datacore.ps1 => sansymphony.ps1} | 39 +++++++++------- checks/datacore_poolstatus | 49 -------------------- checks/{datacore_alerts => sansymphony_alerts} | 18 +++---- checks/{datacore_pool => sansymphony_pool} | 38 ++++++++------- checks/{datacore_ports => sansymphony_ports} | 14 +++--- ...acore_serverstatus => sansymphony_serverstatus} | 14 +++--- ...ualdiskstatus => sansymphony_virtualdiskstatus} | 14 +++--- 7 files changed, 73 insertions(+), 113 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b165e14f50…

9 years, 4 months

Check_MK Git: check_mk: Added some more service type icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cda8994df16dbe14d6327a62aaa06ef29c8cb2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cda8994df16db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 13:59:07 2015 +0100 Added some more service type icons --- web/htdocs/images/icons/connections.png | Bin 0 -> 2469 bytes web/htdocs/images/icons/events.png | Bin 0 -> 4609 bytes web/htdocs/images/icons/job.png | Bin 0 -> 3919 bytes web/htdocs/images/icons/kernel.png | Bin 0 -> 4436 bytes web/plugins/icons/builtin.py | 8 ++++++++ 5 files changed, 8 insertions(+) diff --git a/web/htdocs/images/icons/connections.png b/web/htdocs/images/icons/connections.png new file mode 100644 index 0000000..d479c1b Binary files /dev/null and b/web/htdocs/images/icons/connections.png differ diff --git a/web/htdocs/images/icons/events.png b/web/htdocs/images/icons/events.png new file mode 100644 index 0000000..fb5ca52 Binary files /dev/null and b/web/htdocs/images/icons/events.png differ diff --git a/web/htdocs/images/icons/job.png b/web/htdocs/images/icons/job.png new file mode 100644 index 0000000..22a9248 Binary files /dev/null and b/web/htdocs/images/icons/job.png differ diff --git a/web/htdocs/images/icons/kernel.png b/web/htdocs/images/icons/kernel.png new file mode 100644 index 0000000..ea7785e Binary files /dev/null and b/web/htdocs/images/icons/kernel.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index bae451f..5f5eeea 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -663,8 +663,16 @@ def paint_basic_service_types(what, row, tags, custom_vars): return 'disk_io' elif svc_desc.startswith('Uptime'): return 'uptime' + elif svc_desc.startswith('Kernel'): + return 'kernel' + elif svc_desc.startswith('Events'): + return 'events' + elif svc_desc.startswith('TCP Connections'): + return 'connections' elif svc_desc.startswith('Postfix'): return 'mail_queue' + elif svc_desc.startswith('Job'): + return 'job' elif svc_desc.startswith('NTP') or svc_desc == 'System Time': return 'time'

9 years, 4 months

Check_MK Git: check_mk: #1974 FIX Event console views were randomly ignoring host filters

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c47884c96f75f885792b2fe0109ebffdf6b9c68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c47884c96f75f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 13:44:40 2015 +0100 #1974 FIX Event console views were randomly ignoring host filters Some times the event console views were accessed with a host filter, for example using the name of a host, the view was showing events which did not belong to this host. After reloading the page, the view was showing a correctly filtered list again some times. --- .werks/1974 | 13 +++++++++++++ ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 5 ++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/1974 b/.werks/1974 new file mode 100644 index 0000000..6cb7863 --- /dev/null +++ b/.werks/1974 @@ -0,0 +1,13 @@ +Title: Event console views were randomly ignoring host filters +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422880977 + +Some times the event console views were accessed with a host filter, +for example using the name of a host, the view was showing events +which did not belong to this host. After reloading the page, the +view was showing a correctly filtered list again some times. diff --git a/ChangeLog b/ChangeLog index 6bace5b..6ca25b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -208,6 +208,7 @@ * 1878 SEC: Fixed possible shell injection when filtering the EC archive... * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured + * 1974 FIX: Event console views were randomly ignoring host filters... HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index abab801..7afca6c 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -42,7 +42,7 @@ except: # '----------------------------------------------------------------------' def table_events(what, columns, add_headers, only_sites, limit, filters): - # First we wetch the list of all events from mkeventd - either current + # First we fetch the list of all events from mkeventd - either current # or historic ones. We ignore any filters for host_ here. Note: # event_host and host_name needn't be compatible. They might differ # in case. Also in the events table instead of the host name there @@ -139,7 +139,7 @@ def table_events(what, columns, add_headers, only_sites, limit, filters): filter_code = filt.filter('event') if filter_code: have_host_filter = True - break + break if not have_host_filter: # Create empty host for outer join on host table @@ -148,7 +148,6 @@ def table_events(what, columns, add_headers, only_sites, limit, filters): empty_host["host_state"] = 0 empty_host["host_has_been_checked"] = 0 - # We're ready to join the host-data with the event data now. The question # is what to do with events that cannot be mapped to a host... new_rows = []

9 years, 4 months

Check_MK Git: check_mk: #1220 if, if64: Discovery can now be based on port description

by Bastian Kuhn

Module: check_mk Branch: master Commit: d51ddd84bb6bf0b2b2bd254d51a69305a3b4dec7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d51ddd84bb6bf0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 2 13:42:19 2015 +0100 #1220 if,if64: Discovery can now be based on port description Like in Werk #1509 for ifAlias, interface checks can now also filter by ifDesc without the need to use the ifdescription as part of the service description --- .werks/1220 | 10 ++++++++++ ChangeLog | 1 + checks/if.include | 12 +++++++----- web/plugins/wato/check_parameters.py | 11 ++++++++++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.werks/1220 b/.werks/1220 new file mode 100644 index 0000000..4bebc4c --- /dev/null +++ b/.werks/1220 @@ -0,0 +1,10 @@ +Title: if,if64: Discovery can now be based on port description +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422880649 +Class: feature + +Like in Werk #1509 for ifAlias, interface checks can now also filter by ifDesc without the need to use the ifdescription as part of the service description + diff --git a/ChangeLog b/ChangeLog index 13071fe..6bace5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 1958 akcp_daisy_smoke: added new check for smoke sensors on expansion boards which are daisy chained to an AKCP securityProbe 5E... * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now + * 1220 if,if64: Discovery can now be based on port description... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/if.include b/checks/if.include index e6bd09f..d484ef9 100644 --- a/checks/if.include +++ b/checks/if.include @@ -131,12 +131,13 @@ def inventory_if_common(info, has_nodeinfo = False): porttypes = settings.get('porttypes', if_inventory_porttypes) portstates = settings.get('portstates', if_inventory_portstates) match_alias = settings.get('match_alias') + match_desc = settings.get('match_desc') - def alias_matches(alias): - if match_alias == None: + def port_match(name, what): + if what == None: return True - for r in match_alias: - if regex(r).match(alias): + for r in what: + if regex(r).match(name): return True return False @@ -215,7 +216,8 @@ def inventory_if_common(info, has_nodeinfo = False): duplicate.add(item) seen_items.add(item) - if ifType in porttypes and ifOperStatus in portstates and alias_matches(ifAlias): + if ifType in porttypes and ifOperStatus in portstates and \ + port_match(ifAlias, match_alias) and port_match(ifDescr, match_desc): params = {} if if_inventory_monitor_state: params["state"] = [ifOperStatus] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5af6329..59a564f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -252,7 +252,16 @@ register_rule(group + '/' + subgroup_inventory, orientation = "horizontal", valuespec = RegExp(size = 32), )), - + ( "match_desc", + ListOfStrings( + title = _("Match interface description (regex)"), + help = _("Only discover interfaces whose the description matches one of the configured " + "regular expressions. The match is done on the beginning of the description. " + "This allows you to select interfaces based on the description without having " + "the alias be part of the service description."), + orientation = "horizontal", + valuespec = RegExp(size = 32), + )), ( "portstates", ListChoice(title = _("Network interface port states to discover"), help = _("When doing discovery on switches or other devices with network interfaces "

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015