Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: netapp_api_volumes:

by Andreas Boesl

Module: check_mk Branch: master Commit: db8d3a12d6ea80183c06f7ac0f4ead2da19da44e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db8d3a12d6ea80… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 28 16:55:17 2015 +0200 netapp_api_volumes: fixed misleading warning for offline volumes, now also reports inode information netapp_api_disks: reformatted check output, fixed incorrect disk numbers, data and parity disk now have a separate prefailed information. Conflicts: ChangeLog checks/netapp_api_volumes --- .werks/2072 | 16 ++++++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 10 +++++---- checks/netapp_api_disk | 50 ++++++++++++++++++++++++++----------------- checks/netapp_api_volumes | 10 +++++++-- 5 files changed, 61 insertions(+), 26 deletions(-) diff --git a/.werks/2072 b/.werks/2072 new file mode 100644 index 0000000..85eabf4 --- /dev/null +++ b/.werks/2072 @@ -0,0 +1,16 @@ +Title: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430232561 + +netapp_api_volumes: +fixed misleading warning for offline volumes, now also reports inode information + + +netapp_api_disks: +reformatted check output, fixed incorrect disk numbers, data and parity disk now have a separate prefailed information. + diff --git a/ChangeLog b/ChangeLog index 8a0ed7f..4a2b5ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -348,6 +348,7 @@ * 2234 FIX: AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow)... * 2247 FIX: ibm_svc_mdiskgrp: Made check working with different firmware versions outputs * 2071 FIX: windows agent: fileinfo check now correctly reports empty directories... + * 2072 FIX: agent_netapp, netapp_api_volumes, netapp_api_disks: Improved check output... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 83c8947..32147d1 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -55,7 +55,8 @@ netapp_objects["netapp_api_cpu"] = { } netapp_objects["netapp_api_volumes"] = { - "configs" : { "volume-list-info" : ["name", "volume-info", "size-total", "size-available", "volumes"] }, + "configs" : { "volume-list-info" : ["name", "volume-info", "size-total", "size-available", + "volumes", "files-total", "files-used", "state"] }, # Feel free to execute this construct in a python interpreter. It just creates a list of elements... "counters" : { "volume": sum(map(lambda x: ["%s" % x, "nfs_%s" % x, "cifs_%s" % x, "san_%s" % x, "fcp_%s" % x, "iscsi_%s" % x], sum(map(lambda x: ["read_%s" % x, "write_%s" % x], ["data", "latency"]), [])), []) + [ "instance_name" ] } @@ -72,6 +73,7 @@ netapp_objects["netapp_api_protocol"] = { "iscsi": ["instance_name", "iscsi_read_ops", "iscsi_write_ops"], "cifs": ["instance_name", "cifs_read_ops", "cifs_write_ops"], "fcp": ["instance_name", "fcp_read_ops", "fcp_write_data"], +# "system": [], } } @@ -89,6 +91,7 @@ netapp_objects["netapp_api_cluster"] = { } + def output_disks(results): bay_list = results["configs"]["storage-shelf-bay-list-info"].child_get("shelf-bay-list") shelf_uids = {} @@ -117,7 +120,8 @@ def output_disks(results): print "disk-detail-info" print "%s\t%s" % ("disk-uid", disk_uid) print "%s\t%s" % ("raid-state", raid_state) - for key in [ "bay", "used-space", "physical-space", "shelf", "serial-number" ]: + for key in [ "bay", "used-space", "physical-space", "shelf", "serial-number", + "is-prefailed", "raid-type" ]: print "%s\t%s" % (key, disk.child_get_string(key)) print "[config_instance]\tshelf-uids-of-disks" @@ -414,8 +418,6 @@ try: raise Exception("\n".join(errors)) except Exception, e: - if opt_debug: - raise sys.stderr.write("Error(s) on processing the received data:\n%s" % e) sys.exit(1) diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index 66ac334..4582ff6 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -60,33 +60,44 @@ def check_netapp_api_disk_summary(_no_item, params, info): my_disks = dict([disk for disk in disks.items() if not disk[1].get("raid-state") == "partner"]) spare_count = 0 - prefailed_disks = [] - broken_disks = [] + data_disks = [] + parity_disks = [] + broken_disks = [] + prefailed_data_disks = [] + prefailed_parity_disks = [] raid_states = {} - phys_space = 0 - total_space = 0 + phys_space = 0 + total_space = 0 for name, disk in my_disks.items(): - if disk.get("raid-state") == "partner": - continue # Disk belongs to partner - total_space += int(disk.get("used-space")) + raid_type = disk.get("raid-type") if disk.get("raid-state", "") == "broken": broken_disks.append(disk) - elif disk.get("is-prefailed", "false") != "false": - prefailed_disks.append(disk) + elif disk.get("is-prefailed", "false") not in [ "false", "None" ]: + if raid_type in ["parity", "dparity"]: + prefailed_parity_disks.append(disk) + elif raid_type == "data": + prefailed_data_disks.append(disk) elif disk.get("raid-state","") == "spare": spare_count += 1 - if disk.get("raid-type"): - raid_states.setdefault(disk["raid-type"], 0) - raid_states[disk["raid-type"]] += 1 + + if raid_type in ["parity", "dparity"]: + parity_disks.append(disk) + elif raid_type in ["data"]: + data_disks.append(disk) yield 0, "Total Raw Capacity: %s" % get_bytes_human_readable(total_space), [("total_space", total_space)] - yield 0, "Disks Total: %s Spare: %s" % (len(my_disks), spare_count), [ ("total", len(my_disks)), - ("spare", spare_count), - ("broken", len(broken_disks)) ] + yield 0, "Total disks: %d (%d Spare)" % (len(my_disks) - len(broken_disks), spare_count), [ + ("total", len(my_disks)), + ("spare", spare_count), + ("broken", len(broken_disks)) ] + + yield 0, "Data disks: %d (%d prefailed)" % (len(data_disks), len(prefailed_data_disks)) + yield 0, "Parity disks: %d (%d prefailed)" % (len(parity_disks), len(prefailed_parity_disks)) + yield 0, "Broken disks: %d" % len(broken_disks) disk_to_shelf_map = {} @@ -98,8 +109,9 @@ def check_netapp_api_disk_summary(_no_item, params, info): disk_to_shelf_map[disk] = shelf return disk_to_shelf_map.get(disk_uid) - for text, disks, state in [("Prefailed", prefailed_disks, 0), - ("Broken" , broken_disks, 0)]: + for text, disks, state in [("Data-Prefailed", prefailed_data_disks, 0), + ("Parity-Prefailed", prefailed_parity_disks, 0), + ("Broken", broken_disks, 0)]: info = [] for disk in disks: disk_info = "Serial: %s" % disk.get("serial-number") @@ -111,9 +123,7 @@ def check_netapp_api_disk_summary(_no_item, params, info): info.append(disk_info) if info: - yield state, "%s: %s - %s" % (text, len(disks), " / ".join(info)) - else: - yield 0, "%s: %s" % (text, len(disks)) + yield state, "%s Disk Details: %s" % (text, " / ".join(info)) if broken_disks: warn, crit = params.get("broken_spare_ratio", (1.0, 50.0)) diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index d6bb34d..62616ee 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -62,12 +62,18 @@ def check_netapp_api_volumes(item, params, parsed): volume = find_volume(item) if not volume: - return (3, "Volume not found in agent output") + return 3, "Volume not found in agent output" + + if volume.get("state") == "offline": + return 1, "Volume is offline" mega = 1024.0 * 1024.0 size_total = int(volume.get("size-total")) / mega size_avail = int(volume.get("size-available")) / mega - state, info, perf = df_check_filesystem_list(item, params, [(volume.get("name"), size_total, size_avail, 0)]) + inodes_total = int(volume.get("files-total")) + inodes_avail = inodes_total - int(volume.get("files-used")) + state, info, perf = df_check_filesystem_single(g_hostname, item, size_total, size_avail, 0, + inodes_total, inodes_avail, params) counter_wrapped = False counters = []

9 years, 7 months

Check_MK Git: check_mk: update of #2065, can now handle versions of type 1.2.6-2015.04.12

by Andreas Boesl

Module: check_mk Branch: master Commit: 7c49cdc96c44e1b6745e6a74abc0227ea0af96ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c49cdc96c44e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 28 16:26:16 2015 +0200 update of #2065, can now handle versions of type 1.2.6-2015.04.12 --- agents/windows/msibuild/msi-update | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index 8b5ac0c..14699bd 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -50,11 +50,15 @@ try: # Revision (from build_version) revision = sys.argv[3] - # Official version name, e.g 1.2.5i4p1 - new_version_name = sys.argv[4] + # Official version name, e.g + # 1.2.5i4p1 + # 2015.04.12 + # 1.2.6-2015.04.12 + new_version_name = sys.argv[4] major, minor, build = 1, 0, 0 try: - major, minor, build = map(lambda x: x.lstrip("0"), new_version_name.split(".")[:3]) + major, minor, build = map(lambda x: x.lstrip("0"), + new_version_name.split("-")[0].split(".")[:3]) if len(major) > 3: # Looks like a daily build.. 2015.03.05 major = major[2:].lstrip("0")

9 years, 7 months

Check_MK Git: check_mk: 2071 fix: windows agent: fileinfo check now correctly reports empty directories

by Andreas Boesl

Module: check_mk Branch: master Commit: fd413348568153de8ad60fea8aa1be5f8b509901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd413348568153… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 28 10:55:30 2015 +0200 2071 fix: windows agent: fileinfo check now correctly reports empty directories --- .werks/2071 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 15 +++++++++++---- agents/windows/check_mk_agent.exe | Bin 181760 -> 181760 bytes agents/windows/check_mk_agent.msi | Bin 730112 -> 730112 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 181760 -> 181760 bytes agents/windows/install_agent-64.exe | Bin 177836 -> 177835 bytes agents/windows/install_agent.exe | Bin 158872 -> 158921 bytes 9 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/2071 b/.werks/2071 new file mode 100644 index 0000000..13043a2 --- /dev/null +++ b/.werks/2071 @@ -0,0 +1,12 @@ +Title: windows agent: fileinfo check now correctly reports empty directories +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430210905 + +The fileinfo check did not report any data in case the directory +in question exists but did not contain any files. + diff --git a/ChangeLog b/ChangeLog index 9babfb8..8a0ed7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -347,6 +347,7 @@ * 1243 FIX: mk_postgres: Prevent loading of .psqlrc... * 2234 FIX: AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow)... * 2247 FIX: ibm_svc_mdiskgrp: Made check working with different firmware versions outputs + * 2071 FIX: windows agent: fileinfo check now correctly reports empty directories... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/windows/build_version b/agents/windows/build_version index 897bdc8..dee261d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -139 +140 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3b2c576..3d6a090 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2560,7 +2560,7 @@ void section_mem(SOCKET &out) // '-----------------------------------------------------------------------' void output_fileinfos(SOCKET &out, const char *path); -void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data); +bool output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data); void section_fileinfo(SOCKET &out) { @@ -2577,6 +2577,8 @@ void output_fileinfos(SOCKET &out, const char *path) { WIN32_FIND_DATA data; HANDLE h = FindFirstFileEx(path, FindExInfoStandard, &data, FindExSearchNameMatch, NULL, 0); + bool found_file = false; + if (h != INVALID_HANDLE_VALUE) { // compute basename of path: search backwards for '\' const char *basename = ""; @@ -2585,12 +2587,15 @@ void output_fileinfos(SOCKET &out, const char *path) *end = 0; basename = path; } - output_fileinfo(out, basename, &data); + found_file = output_fileinfo(out, basename, &data); while (FindNextFile(h, &data)) - output_fileinfo(out, basename, &data); + found_file = output_fileinfo(out, basename, &data) || found_file; if (end) *end = '\\'; // repair string FindClose(h); + + if (!found_file) + output(out, "%s|missing|%d\n", path, current_time()); } else { DWORD e = GetLastError(); @@ -2599,7 +2604,7 @@ void output_fileinfos(SOCKET &out, const char *path) } -void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data) +bool output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data) { unsigned long long size = (unsigned long long)data->nFileSizeLow + (((unsigned long long)data->nFileSizeHigh) << 32); @@ -2607,7 +2612,9 @@ void output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data) if (0 == (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { output(out, "%s\\%s|%llu|%.0f\n", basename, data->cFileName, size, file_time(&data->ftLastWriteTime)); + return true; } + return false; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5d33379..30aecce 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 9402311..bdde1ea 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 8f5fab4..6b2b57e 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 8df5e16..80efe14 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 0024f6c..b83ae28 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 7 months

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: f7faf5ec6c41af0894c07c9aa00bfedf6c66d847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7faf5ec6c41af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 28 10:29:03 2015 +0200 Conflicts: ChangeLog checks/ibm_svc_mdiskgrp --- .werks/2247 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_svc_mdiskgrp | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2247 b/.werks/2247 new file mode 100644 index 0000000..379378b --- /dev/null +++ b/.werks/2247 @@ -0,0 +1,10 @@ +Title: ibm_svc_mdiskgrp: Made check working with different firmware versions outputs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430209659 + + diff --git a/ChangeLog b/ChangeLog index a6a4584..9babfb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -346,6 +346,7 @@ * 2212 FIX: oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings... * 1243 FIX: mk_postgres: Prevent loading of .psqlrc... * 2234 FIX: AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow)... + * 2247 FIX: ibm_svc_mdiskgrp: Made check working with different firmware versions outputs Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 17856a4..6cbb77c 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -57,12 +57,12 @@ def ibm_svc_mdiskgrp_to_mb(size): def inventory_ibm_svc_mdiskgrp(info): for line in info: - if len(line) in (15, 19, 24, 25): + if len(line) > 10: yield line[1], {} def check_ibm_svc_mdiskgrp(item, params, info): for line in info: - if len(line) in (15, 19, 24, 25) and item == line[1]: + if len(line) > 10 and item == line[1]: mgrp_status = line[2] if mgrp_status != "online":

9 years, 7 months

Check_MK Git: check_mk: #2246 FIX Linux CPU Inventory: Fixed wrong number of CPUs when first CPU is not in first slot

by Lars Michelsen

Module: check_mk Branch: master Commit: 831f4a0712aedc5f5ac4c0296a71257a20c1d428 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=831f4a0712aedc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 28 10:08:47 2015 +0200 #2246 FIX Linux CPU Inventory: Fixed wrong number of CPUs when first CPU is not in first slot --- .werks/2246 | 10 ++++++++++ ChangeLog | 1 + inventory/aix_packages | 2 ++ inventory/lnx_cpuinfo | 6 ++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2246 b/.werks/2246 new file mode 100644 index 0000000..91491e5 --- /dev/null +++ b/.werks/2246 @@ -0,0 +1,10 @@ +Title: Linux CPU Inventory: Fixed wrong number of CPUs when first CPU is not in first slot +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430208490 + + diff --git a/ChangeLog b/ChangeLog index cba4d20..a6a4584 100644 --- a/ChangeLog +++ b/ChangeLog @@ -534,6 +534,7 @@ * 2108 FIX: win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output * 2197 FIX: win_reg_uninstall: Fix exception in case of invalid output line... * 2224 FIX: Fixed sorting in inventory based views... + * 2246 FIX: Linux CPU Inventory: Fixed wrong number of CPUs when first CPU is not in first slot 1.2.6b1: diff --git a/inventory/aix_packages b/inventory/aix_packages index 199c177..b606c6d 100644 --- a/inventory/aix_packages +++ b/inventory/aix_packages @@ -40,6 +40,8 @@ def inv_aix_packages(info): return # Empty section paclist = inv_tree("software.packages:") + if not info: + return headers = info[0] headers[0] = headers[0].lstrip("#") for line in info[1:]: diff --git a/inventory/lnx_cpuinfo b/inventory/lnx_cpuinfo index c7c3f03..47e7449 100644 --- a/inventory/lnx_cpuinfo +++ b/inventory/lnx_cpuinfo @@ -58,7 +58,7 @@ def inv_lnx_cpuinfo(info): node = inv_tree("hardware.cpu.") num_threads_total = 0 - num_sockets = 0 + sockets = set([]) for varname, value in info: if varname == "cpu cores": node["cores_per_cpu"] = int(value) @@ -80,13 +80,15 @@ def inv_lnx_cpuinfo(info): elif varname == "processor": num_threads_total = int(value) + 1 elif varname == "physical id": - num_sockets = int(value) + 1 + sockets.add(int(value)) elif varname == "flags": if re.search(" lm ", value): node["arch"] = "x86_64" else: node["arch"] = "i386" + num_sockets = len(sockets) + if num_threads_total: node.setdefault("cores_per_cpu", 1) node.setdefault("threads_per_cpu", 1)

9 years, 7 months

Check_MK Git: check_mk: #2245 AIX-Agent: Added support for the uptime check

by Lars Michelsen

Module: check_mk Branch: master Commit: df912958360624b04ee0163ade2c804f39a6721e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df912958360624… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 28 09:37:23 2015 +0200 #2245 AIX-Agent: Added support for the uptime check --- .werks/2245 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/2245 b/.werks/2245 new file mode 100644 index 0000000..dfc9446 --- /dev/null +++ b/.werks/2245 @@ -0,0 +1,9 @@ +Title: AIX-Agent: Added support for the uptime check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1430206627 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0e6940a..cba4d20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -170,6 +170,7 @@ * 2211 netapp_api_disk.summary: output physical size of broken disks as an additional information * 1242 enterasys_powersupply: It's now possible to choice which redundancy state treated as OK... * 2214 icom_repeater: New set of checks for Icom repeaters... + * 2245 AIX-Agent: Added support for the uptime check * 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/check_mk_agent.aix b/agents/check_mk_agent.aix index c8394b3..ee10f7f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -216,6 +216,10 @@ then fi +echo '<<<uptime>>>' +uptime | awk '{print $3,$5}' | tr ":" " " | sed 's/,//' | awk '{a=86400*int($1)+3600*int($2)+60*int($3);printf("%d\n",a)}' + + if cd $PLUGINSDIR 2>/dev/null then for skript in $(ls)

9 years, 7 months

Check_MK Git: check_mk: #2244 FIX Fixed sorting of host tag topics in dropdown selections

by Lars Michelsen

Module: check_mk Branch: master Commit: 295b49b9a36b2a531f98946b177318570e940567 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=295b49b9a36b2a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 28 08:50:34 2015 +0200 #2244 FIX Fixed sorting of host tag topics in dropdown selections --- .werks/2244 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/2244 b/.werks/2244 new file mode 100644 index 0000000..7ad607a --- /dev/null +++ b/.werks/2244 @@ -0,0 +1,10 @@ +Title: Fixed sorting of host tag topics in dropdown selections +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430203818 + + diff --git a/ChangeLog b/ChangeLog index 95d2820..0e6940a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -467,6 +467,7 @@ * 1956 FIX: WATO Web-API: Fixed exception information for single sites... * 2178 FIX: Fixed handling of user erros in WATO when using Python < 2.5 * 2203 FIX: Fix sorting of unselected elements in a list choice with two panes + * 2244 FIX: Fixed sorting of host tag topics in dropdown selections Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 03c6f45..8d50384 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13020,6 +13020,7 @@ def mode_edit_auxtag(phase): explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, + sorted = True ) if phase == "action": @@ -13146,6 +13147,7 @@ def mode_edit_hosttag(phase): explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, + sorted = True ) vs_choices = ListOf(

9 years, 7 months

Check_MK Git: check_mk: Added popup menu to new graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: 0dddddeba7e43de11f678771b83c301ce89a6f5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dddddeba7e43d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 27 14:33:32 2015 +0200 Added popup menu to new graphs --- web/htdocs/images/button_menu_hi.png | Bin 0 -> 808 bytes web/htdocs/images/button_menu_lo.png | Bin 0 -> 803 bytes web/htdocs/js/checkmk.js | 2 +- web/htdocs/pages.css | 5 ++--- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/images/button_menu_hi.png b/web/htdocs/images/button_menu_hi.png new file mode 100644 index 0000000..7203938 Binary files /dev/null and b/web/htdocs/images/button_menu_hi.png differ diff --git a/web/htdocs/images/button_menu_lo.png b/web/htdocs/images/button_menu_lo.png new file mode 100644 index 0000000..7d8e46b Binary files /dev/null and b/web/htdocs/images/button_menu_lo.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 28a905c..03bfb37 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -744,7 +744,7 @@ function create_graph(data, params) { // needs to be extracted from "params", hack! var source = parseInt(getUrlParam('source', params)); - // Add the control for adding the graph to a dashboard + // Add the control for adding the graph to a visual var visualadd = document.createElement('a'); visualadd.title = data['add_txt']; visualadd.className = 'popup_trigger'; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0df68f1..e3c2b03 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1121,11 +1121,10 @@ div.pnp_graph a.popup_trigger { display: block; width: 20px; height: 20px; - background-image: url(images/button_add_dashlet_lo.png); + background-image: url(images/button_menu_lo.png); } div.pnp_graph a.popup_trigger:hover { - background-image: url(images/button_add_dashlet_hi.png); + background-image: url(images/button_menu_hi.png); cursor: pointer; } -

9 years, 7 months

Check_MK Git: check_mk: #2234 FIX AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow )

by Sven Rueß

Module: check_mk Branch: master Commit: 3e6dbd3fab60b9719a161903ce444da8406a4eda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e6dbd3fab60b9… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Apr 27 12:06:20 2015 +0200 #2234 FIX AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow) Environment was not loaded if the agent was called from xinetd/remote. The environment is loaded every time if the agent is called. Libelle Business Shadow cannot be called without an absolute path. Now it is called with an absolute path. --- .werks/2234 | 13 +++++++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 13 ++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/2234 b/.werks/2234 new file mode 100644 index 0000000..d23fa83 --- /dev/null +++ b/.werks/2234 @@ -0,0 +1,13 @@ +Title: AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1430128713 +Class: fix + +Environment was not loaded if the agent was called from xinetd/remote. The environment +is loaded every time if the agent is called. + +Libelle Business Shadow cannot be called without an absolute path. Now it is called +with an absolute path. diff --git a/ChangeLog b/ChangeLog index 70112e3..95d2820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -344,6 +344,7 @@ * 2070 FIX: agent_netapp: fixed exception when a channel has no shelf-list configured * 2212 FIX: oracle_tablespaces: Fix plugin output in case of detected problem in Autoextend settings... * 1243 FIX: mk_postgres: Prevent loading of .psqlrc... + * 2234 FIX: AIX Agent: Forced load of environment and fixed call of trd (Libelle Business Shadow)... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 0edfa08..c8394b3 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -23,6 +23,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# force load of environment +if [ -e $HOME/.profile ] +then + . $HOME/.profile +fi + # Remove locale settings to eliminate localized outputs where possible export LC_ALL=C unset LANG @@ -55,7 +61,7 @@ fi # Shell version of the waitmax utility, that limits the runtime of # commands. This version does not conserve the original exit code # of the command. It is successfull if the command terminated - # in time. +# in time. function waitmax { TIMEOUT=${1}0 @@ -206,7 +212,7 @@ netstat -ntfinet | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; if type trd >/dev/null 2>&1 then echo '<<<libelle_business_shadow:sep(58)>>>' - trd -s + $(which trd) -s fi @@ -258,6 +264,3 @@ then echo "(${PLUGIN##*/}) $descr $? $OUTPUT" done fi - - -

9 years, 7 months

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: f939b8dae7fb810e66ba0101510e6002d9215392 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f939b8dae7fb81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 27 11:12:22 2015 +0200 Conflicts: ChangeLog modules/check_mk.py --- .werks/2243 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 6 +++--- modules/check_mk.py | 23 ++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.werks/2243 b/.werks/2243 new file mode 100644 index 0000000..cce7619 --- /dev/null +++ b/.werks/2243 @@ -0,0 +1,10 @@ +Title: Check_MK notifications don't fail anymore when duplicate hosts are configured +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430125860 + + diff --git a/ChangeLog b/ChangeLog index 46960a0..70112e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -486,6 +486,7 @@ * 2081 FIX: Improved logging of mkeventd in error cases * 2193 FIX: Remove duplicate performance data from host notifications... * 2207 FIX: Fix exception in rule based notifiations with Nagios core and event type filter... + * 2243 FIX: Check_MK notifications don't fail anymore when duplicate hosts are configured BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/modules/automation.py b/modules/automation.py index 294bac6..8b03447 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -34,17 +34,17 @@ class MKAutomationError(Exception): def do_automation(cmd, args): try: if cmd == "get-configuration": - read_config_files(with_autochecks=False, with_conf_d=False) + read_config_files(with_conf_d=False) result = automation_get_configuration() elif cmd == "get-check-information": result = automation_get_check_information() elif cmd == "delete-host": - read_config_files(with_autochecks=False) + read_config_files() result = automation_delete_host(args) elif cmd == "notification-get-bulks": result = automation_get_bulks(args) elif cmd == "update-dns-cache": - read_config_files(with_autochecks=False) + read_config_files() result = automation_update_dns_cache() else: read_config_files() diff --git a/modules/check_mk.py b/modules/check_mk.py index dc294e7..6d937a5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5420,7 +5420,7 @@ def interactive_abort(error): sys.stderr.write(error + "\n") sys.exit(1) -def read_config_files(with_autochecks=True, with_conf_d=True): +def read_config_files(with_conf_d=True, validate_hosts=True): global vars_before_config, final_mk, local_mk, checks # Initialize dictionary-type default levels variables @@ -5479,13 +5479,14 @@ def read_config_files(with_autochecks=True, with_conf_d=True): collect_hosttags() - # Sanity check for duplicate hostnames - seen_hostnames = set([]) - for hostname in all_active_hosts(): - if hostname in seen_hostnames: - sys.stderr.write("Error in configuration: duplicate host '%s'\n" % hostname) - sys.exit(3) - seen_hostnames.add(hostname) + if validate_hosts: + # Sanity check for duplicate hostnames + seen_hostnames = set([]) + for hostname in all_active_hosts(): + if hostname in seen_hostnames: + sys.stderr.write("Error in configuration: duplicate host '%s'\n" % hostname) + sys.exit(3) + seen_hostnames.add(hostname) # Add WATO-configured explicit checks to (possibly empty) checks # statically defined in checks. @@ -5901,15 +5902,15 @@ try: do_inv_check(a) done = True elif o == '--notify': - read_config_files(False, True) + read_config_files(with_conf_d=True, validate_hosts=False) sys.exit(do_notify(args)) elif o == '--create-rrd': - read_config_files(False, True) + read_config_files(with_conf_d=True) execfile(modules_dir + "/rrd.py") do_create_rrd(args) done = True elif o == '--convert-rrds': - read_config_files(False, True) + read_config_files(with_conf_d=True) execfile(modules_dir + "/rrd.py") do_convert_rrds(args) done = True

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015