Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

fixed display of ipv6 adresses in winows agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: f54d61dcd4ee391dac528689c4cae17047746647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f54d61dcd4ee39… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 15 10:48:16 2015 +0200 fixed display of ipv6 adresses in winows agent --- agents/windows/ListenSocket.cc | 30 +++++++++++++++------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 830464 -> 830464 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 830464 -> 830464 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 748032 -> 748032 bytes agents/windows/check_mk_agent.msi | Bin 1836544 -> 1836544 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748032 -> 748032 bytes agents/windows/install_agent-64.exe | Bin 383040 -> 383129 bytes agents/windows/install_agent.exe | Bin 374028 -> 374076 bytes 10 files changed, 23 insertions(+), 11 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index 41abdd3..7134952 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -36,6 +36,10 @@ extern void debug(char *text); #define debug(C) #endif + +static const size_t INET6_ADDRSTRLEN = 46; + + ListenSocket::ListenSocket(int port, const only_from_t &source_whitelist, bool supportIPV6) : _source_whitelist(source_whitelist) , _supports_ipv4(true) @@ -172,17 +176,25 @@ SOCKET ListenSocket::init_listen_socket(int port) std::string ListenSocket::readableIP(SOCKET connection) { - SOCKADDR_IN6 remote_addr; - int addrlen = sizeof(SOCKADDR_IN6); - getpeername(connection, (sockaddr*)&remote_addr, &addrlen); - char ip_hr[256]; - if (remote_addr.sin6_family == AF_INET6) { - u_char *ip = remote_addr.sin6_addr.u.Byte; - snprintf(ip_hr, sizeof(ip_hr), "%c.%c.%c.%c", + sockaddr_storage addr; + int addrlen = sizeof(sockaddr_storage); + getpeername(connection, (sockaddr*)&addr, &addrlen); + + char ip_hr[INET6_ADDRSTRLEN]; + + if (addr.ss_family == AF_INET) { + sockaddr_in *s = (sockaddr_in*)&addr; + u_char *ip = (u_char*)&s->sin_addr; + snprintf(ip_hr, INET6_ADDRSTRLEN, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]); + } else if (addr.ss_family == AF_INET6) { // AF_INET6 + sockaddr_in6 *s = (sockaddr_in6*)&addr; + uint16_t *ip = s->sin6_addr.u.Word; + snprintf(ip_hr, INET6_ADDRSTRLEN, "%x:%x:%x:%x:%x:%x:%x:%x", + ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7]); + } else { + snprintf(ip_hr, INET6_ADDRSTRLEN, "None"); } - else - snprintf(ip_hr, sizeof(ip_hr), "None"); return ip_hr; } diff --git a/agents/windows/build_version b/agents/windows/build_version index 2d78492..68d5f38 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -547 +553 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d213c84..559385d 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 1d74658..99d7d46 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 cc05f26..26a2ef8 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2936,7 +2936,7 @@ void section_check_mk(SOCKET &out, const Environment &env) it_from != g_config->onlyFrom().end(); ++it_from ) { ipspec *is = *it_from; if (is->ipv6) { - output(out, " %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x/%d", + output(out, " %x:%x:%x:%x:%x:%x:%x:%x/%d", is->ip.v6.address[0], is->ip.v6.address[1], is->ip.v6.address[2], is->ip.v6.address[3], is->ip.v6.address[4], is->ip.v6.address[5], diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index fbb0452..ac39027 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 4b572c2..d062b36 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 2a5bca2..67c9306 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 e73958c..d095da5 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 51a81e7..0a2779b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

#2659 Added IPv6 support to the windows agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: 701d2bb08532400c480c26fa19f441f1cdc5c209 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=701d2bb0853240… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 15 10:19:52 2015 +0200 #2659 Added IPv6 support to the windows agent added support for connecting to the windows agent via IPv6. This support is active by default and can be disabled via configuration file. --- .werks/2659 | 10 + ChangeLog | 1 + agents/windows/Configuration.cc | 166 ++++++++++++--- agents/windows/Configuration.h | 14 +- agents/windows/Environment.cc | 2 +- agents/windows/ListenSocket.cc | 243 ++++++++++++++++++++++ agents/windows/ListenSocket.h | 65 ++++++ agents/windows/Makefile | 4 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 10 +- agents/windows/check_mk_agent-64.exe | Bin 825344 -> 830464 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 825344 -> 830464 bytes agents/windows/check_mk_agent.cc | 210 ++++++------------- agents/windows/check_mk_agent.exe | Bin 742912 -> 748032 bytes agents/windows/check_mk_agent.msi | Bin 1825792 -> 1836544 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 742912 -> 748032 bytes agents/windows/install_agent-64.exe | Bin 380300 -> 383040 bytes agents/windows/install_agent.exe | Bin 370910 -> 374028 bytes agents/windows/stringutil.cc | 8 +- agents/windows/stringutil.h | 3 +- agents/windows/types.h | 17 +- 21 files changed, 575 insertions(+), 180 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=701d2bb085…

8 years, 11 months

Fixed exception "Argument of type NoneType is not iterable"

by Lars Michelsen

during discovery automation Message-ID: <561f5e4a.O+7yGg7Yv2/0pfZD%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 292dfed197b34f6161dadf7f49a4c434739eaf40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292dfed197b34f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 15 10:05:23 2015 +0200 Fixed exception "Argument of type NoneType is not iterable" during discovery automation --- modules/discovery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/discovery.py b/modules/discovery.py index fa1771c..f5c3057 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -43,7 +43,7 @@ def do_discovery(hostnames, check_types, only_new): use_caches = False if not hostnames: verbose("Discovering services on all hosts:\n") - hostnames = all_hosts_untagged + hostnames = all_active_realhosts() use_caches = True else: verbose("Discovering services on %s:\n" % ", ".join(hostnames)) @@ -141,7 +141,7 @@ def discover_on_host(mode, hostname, do_snmp_scan, use_caches, on_error="ignore" "kept" : 0 } - if hostname not in all_hosts_untagged: + if hostname not in all_active_realhosts(): return [0, 0, 0, 0], "" err = None

8 years, 11 months

#2694 cmctc_lcp: this check monitors now the device levels

by Simon Betz

Module: check_mk Branch: master Commit: 4b6c3e93387923cf40085b9e32937781971f0f8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b6c3e93387923… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 15 09:30:15 2015 +0200 #2694 cmctc_lcp: this check monitors now the device levels --- .werks/2694 | 9 +++++++++ ChangeLog | 1 + checks/cmctc_lcp | 52 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/.werks/2694 b/.werks/2694 new file mode 100644 index 0000000..1cf7283 --- /dev/null +++ b/.werks/2694 @@ -0,0 +1,9 @@ +Title: cmctc_lcp: this check monitors now the device levels +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444894074 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1bf2e08..d71f66f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ * 2656 windows agent can now optionally output the full command line in the ps section... * 2637 etherbox2_temp: new check for the etherbox 2 (from firmware version 1.21 on) / MessPC... * 2621 check_http: Can now be configured to check via IPv6 + * 2694 cmctc_lcp: this check monitors now the device levels * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index 05b6904..ce433f9 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -57,7 +57,7 @@ cmctc_lcp_sensors = { } cmctc_lcp_sensortypes = { - "temp" : ( "°C", "Temperature" ), + "temp" : ( u" °C", "Temperature" ), "blower" : ( " RPM", "Blower" ), "blowergrade" : ( "", "Blower Grade" ), "flow" : ( " l/min", "Waterflow" ), @@ -66,7 +66,7 @@ cmctc_lcp_sensortypes = { def inventory_cmctc_lcp(info, sensortype): inventory = [] - for index, typeid, status, value, description in info: + for index, typeid, status, value, high, low, description in info: typeid = saveint(typeid) if typeid in cmctc_lcp_sensors: item, st = cmctc_lcp_sensors[typeid] @@ -79,35 +79,49 @@ def inventory_cmctc_lcp(info, sensortype): return inventory def check_cmctc_lcp(item, params, info, sensortype): + map_sensor_state = { + "1" : (3, "not available"), + "2" : (2, "lost"), + "3" : (1, "changed"), + "4" : (0, "ok"), + "5" : (2, "off"), + "6" : (0, "on"), + "7" : (1, "warning"), + "8" : (2, "too low"), + "9" : (2, "too high"), + } itemindex = item.split(" - ")[-1] - for index, typeid, statuscode, value, description in info: + for index, typeid, statuscode, value, high, low, description in info: if itemindex == index: unit = cmctc_lcp_sensortypes[sensortype][0] value = int(value) infotext = "" if description: - infotext += description + ", " - infotext += "%d%s" % (value, unit) - status = 0 + infotext += "[%s] " % description + state, extra_info = map_sensor_state[statuscode] + yield state, "%s%d%s" % (infotext, value, unit) + + extra_state = 0 if params: warn, crit = params perfdata = [(sensortype, value, warn, crit)] if value >= crit: - status = 2 + extra_state = 2 elif value >= warn: - status = 1 - if status: - infotext += " (warn/crit at %d%s/%d%s)" % (warn, unit, crit, unit) + extra_state = 1 + if states[-1]: + extra_info += " (warn/crit at %d/%d%s)" % (warn, crit, unit) else: perfdata = [(sensortype, value)] - if statuscode == "4": - status = 0 - elif statuscode == "7": - status = 1 - else: - status = 2 - return (status, infotext, perfdata) - return 3, "Sensor not found in SNMP output" + # Assumption: if high and low are both 0 + # then there are no device levels + if not (int(high) == 0 and int(low) == 0) and int(high) > int(low): + if value >= int(high) or value <= int(low): + extra_state = 2 + extra_info += " (device lower/upper crit at %s/%s%s)" % (low, high, unit) + + yield extra_state, extra_info, perfdata + snmp_scan_functions["cmctc_lcp"] = \ lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") @@ -120,6 +134,8 @@ snmp_info["cmctc_lcp"] = ( "5.2.1.2", # Sensor Type "5.2.1.4", # Status "5.2.1.5", # Value + "5.2.1.6", # high + "5.2.1.7", # low "7.2.1.2", # Description ] )

8 years, 11 months

updated manpages of check cmctc_lcp

by Simon Betz

Module: check_mk Branch: master Commit: 3f4f130a0164e7b82c487ddf57444d6ca8fec074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f4f130a0164e7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 15 09:36:41 2015 +0200 updated manpages of check cmctc_lcp --- checkman/cmctc_lcp.blower | 4 ++++ checkman/cmctc_lcp.blowergrade | 4 ++++ checkman/cmctc_lcp.flow | 4 ++++ checkman/cmctc_lcp.regulator | 4 ++++ checkman/cmctc_lcp.temp | 5 +++++ 5 files changed, 21 insertions(+) diff --git a/checkman/cmctc_lcp.blower b/checkman/cmctc_lcp.blower index ffcdd3c..cd2dd95 100644 --- a/checkman/cmctc_lcp.blower +++ b/checkman/cmctc_lcp.blower @@ -5,6 +5,10 @@ license: GPL distribution: check_mk description: Check the state of blowers of a Rittal CMC-TC LCP. + Moreover this check monitors the device levels if they + are configured. In this case if the value is + above or below these levels, the service state + will be critical. item: A descriptive name of the sensor, followed by " - ", followed by diff --git a/checkman/cmctc_lcp.blowergrade b/checkman/cmctc_lcp.blowergrade index 80418d7..c5ade08 100644 --- a/checkman/cmctc_lcp.blowergrade +++ b/checkman/cmctc_lcp.blowergrade @@ -5,6 +5,10 @@ license: GPL distribution: check_mk description: Check the state of blowers of a Rittal CMC-TC LCP. + Moreover this check monitors the device levels if they + are configured. In this case if the value is + above or below these levels, the service state + will be critical. item: A descriptive name of the sensor, followed by " - ", followed by diff --git a/checkman/cmctc_lcp.flow b/checkman/cmctc_lcp.flow index b050d84..28f7bf3 100644 --- a/checkman/cmctc_lcp.flow +++ b/checkman/cmctc_lcp.flow @@ -5,6 +5,10 @@ license: GPL distribution: check_mk description: Check the speed of the water flow of a Rittal CMC-TC LCP. + Moreover this check monitors the device levels if they + are configured. In this case if the value is + above or below these levels, the service state + will be critical. item: A descriptive name of the sensor, followed by " - ", followed by diff --git a/checkman/cmctc_lcp.regulator b/checkman/cmctc_lcp.regulator index 2ee486c..5f6a0ff 100644 --- a/checkman/cmctc_lcp.regulator +++ b/checkman/cmctc_lcp.regulator @@ -5,6 +5,10 @@ license: GPL distribution: check_mk description: Check the percentage of the regular of a Rittal CMC-TC LCP. + Moreover this check monitors the device levels if they + are configured. In this case if the value is + above or below these levels, the service state + will be critical. item: A descriptive name of the sensor, followed by " - ", followed by diff --git a/checkman/cmctc_lcp.temp b/checkman/cmctc_lcp.temp index c1ad543..72dc40b 100644 --- a/checkman/cmctc_lcp.temp +++ b/checkman/cmctc_lcp.temp @@ -5,6 +5,11 @@ license: GPL distribution: check_mk description: This check polls the state of temperature sensors of a Rittal LCP. + Moreover this check monitors the device levels if they + are configured. In this case if the value is + above or below these levels, the service state + will be critical. + If parameters are configured in WATO then they will be prefered. item: A descriptive name of the sensor, followed by " - ", followed by

8 years, 11 months

Abstracted common code for cmc/nagios config

by Lars Michelsen

Module: check_mk Branch: master Commit: 99d219fbc2eb7b2f12b2eb1810ca54c1bf8e2336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99d219fbc2eb7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 15 09:09:22 2015 +0200 Abstracted common code for cmc/nagios config --- modules/check_mk.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d4f42fc..44d4ed3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -445,6 +445,9 @@ def output_check_info(): sys.stderr.write("ERROR in check_type %s: %s\n" % (check_type, e)) +def active_check_service_description(act_info, params): + return sanitize_service_description(act_info["service_description"](params).replace('$HOSTNAME$', g_hostname)) + #. # .--Host tags-----------------------------------------------------------. # | _ _ _ _ | @@ -2643,9 +2646,7 @@ define service { g_hostname = hostname has_perfdata = act_info.get('has_perfdata', False) - description = sanitize_service_description( - act_info["service_description"](params) - .replace('$HOSTNAME$', g_hostname)) + description = active_check_service_description(act_info, params) if do_omit_service(hostname, description): continue

8 years, 11 months

Updated werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cdf00ef3904792d078889542bdf280c0ee9e1e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cdf00ef390479… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 14 16:31:58 2015 +0200 Updated werk text --- .werks/2674 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.werks/2674 b/.werks/2674 index 2ad124f..cb64aa5 100644 --- a/.werks/2674 +++ b/.werks/2674 @@ -31,11 +31,16 @@ the only check working vith IPv6 is <tt>check_http</tt>. This is the default and recommended way for monitoring dual-stack hosts. You use one address family for monitoring the whole system and the other one is just being pinged. -Note: If you use the Check_MK Enterprise Edition togehter with the Micro Core, +Note: If you use the Check_MK Enterprise Edition together with the Micro Core, the Smart PING mechanism is not used for IPv6 hosts at the moment. This mechanism has a slightly slower performance, but if you don't have too many IPv6 hosts, this should be OK for the beginning. +If you use the xinetd for serving the Check_MK agent output, you need to configure +xinetd to create an IPv6 socket. By default it only creates an IPv4 socket. If you +use the Agent Bakery, the baked agents configure xinetd to use the primary IP address +family of the hosts. + The basic implementation for IPv6 monitoring has been done. But there are several components in the Check_MK environment left which need to be extended to be fully compatible with IPv6. Some of them are:

8 years, 11 months

Check_MK-Agent: IPv6 xinetd configuration statement is only added as config

by Lars Michelsen

Module: check_mk Branch: master Commit: c9d239fa1252d075934bdcf00965a81b104213f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d239fa1252d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 14 16:28:01 2015 +0200 Check_MK-Agent: IPv6 xinetd configuration statement is only added as config --- agents/cfg_examples/xinetd.conf | 5 +++-- agents/cfg_examples/xinetd_caching.conf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/agents/cfg_examples/xinetd.conf b/agents/cfg_examples/xinetd.conf index 8547382..c0e25b8 100644 --- a/agents/cfg_examples/xinetd.conf +++ b/agents/cfg_examples/xinetd.conf @@ -25,8 +25,6 @@ service check_mk { type = UNLISTED - # listen on IPv4 AND IPv6 when available on this host - flags = IPv6 port = 6556 socket_type = stream protocol = tcp @@ -34,6 +32,9 @@ service check_mk user = root server = /usr/bin/check_mk_agent + # listen on IPv4 AND IPv6 when available on this host + #flags = IPv6 + # If you use fully redundant monitoring and poll the client # from more then one monitoring servers in parallel you might # want to use the agent cache wrapper: diff --git a/agents/cfg_examples/xinetd_caching.conf b/agents/cfg_examples/xinetd_caching.conf index 6129372..7ba365e 100644 --- a/agents/cfg_examples/xinetd_caching.conf +++ b/agents/cfg_examples/xinetd_caching.conf @@ -29,8 +29,6 @@ service check_mk { type = UNLISTED - # listen on IPv4 AND IPv6 when available on this host - flags = IPv6 port = 6556 socket_type = stream protocol = tcp @@ -38,6 +36,9 @@ service check_mk user = root server = /usr/bin/check_mk_caching_agent + # listen on IPv4 AND IPv6 when available on this host + #flags = IPv6 + # configure the IP address(es) of your Nagios server here: #only_from = 127.0.0.1 10.0.20.1 10.0.20.2

8 years, 11 months

Revert " #2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks"

by Andreas Boesl

Module: check_mk Branch: master Commit: eedab9e21a522a509c567c41eee95a5040dc8119 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eedab9e21a522a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 14 16:07:55 2015 +0200 Revert " #2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks" This reverts commit b6df187a2348e264761c92c283f8f2cd8ea85d8a. --- .werks/2434 | 49 -- ChangeLog | 2 - agents/special/agent_netapp | 940 ++++++++-------------- checkman/netapp_api_cluster | 4 +- checkman/netapp_api_cpu | 16 - checkman/netapp_api_cpu.nvram_bat | 18 - checkman/netapp_api_cpu.utilization | 4 +- checkman/netapp_api_disk.summary | 3 +- checkman/netapp_api_fan | 10 +- checkman/netapp_api_fcp | 16 - checkman/netapp_api_protocol | 2 +- checkman/netapp_api_psu | 13 +- checkman/netapp_api_snapvault | 15 - checkman/netapp_api_status | 2 +- checkman/netapp_api_temp | 12 +- checkman/{netapp_api_info => netapp_api_version} | 0 checkman/netapp_api_vf_stats | 17 - checkman/netapp_api_vf_status | 6 +- checkman/netapp_api_vs_status | 13 - checkman/netapp_api_vs_traffic | 14 - checkman/netapp_api_vs_traffic.cifs | 14 - checkman/netapp_api_vs_traffic.fcp | 14 - checkman/netapp_api_vs_traffic.iscsi | 14 - checkman/netapp_api_vs_traffic.nfs | 14 - checkman/netapp_api_vs_traffic.nfsv3 | 14 - checkman/netapp_api_vs_traffic.nfsv4_1 | 14 - checks/agent_netapp | 4 - checks/netapp_api.include | 38 +- checks/netapp_api_aggr | 20 +- checks/netapp_api_cluster | 24 +- checks/netapp_api_cpu | 106 +-- checks/netapp_api_disk | 44 +- checks/netapp_api_fan | 51 +- checks/netapp_api_fcp | 173 ---- checks/netapp_api_if | 62 +- checks/netapp_api_protocol | 46 +- checks/netapp_api_psu | 44 +- checks/netapp_api_snapvault | 64 -- checks/netapp_api_status | 7 +- checks/netapp_api_temp | 59 +- checks/{netapp_api_info => netapp_api_version} | 28 +- checks/netapp_api_vf_stats | 34 +- checks/netapp_api_vf_status | 6 +- checks/netapp_api_volumes | 57 +- checks/netapp_api_vs_status | 51 -- checks/netapp_api_vs_traffic | 184 ----- web/plugins/wato/check_parameters.py | 90 --- web/plugins/wato/datasource_programs.py | 47 +- 48 files changed, 724 insertions(+), 1755 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eedab9e21a…

8 years, 11 months

Revert "upated werk"

by Andreas Boesl

Module: check_mk Branch: master Commit: a64a6c637c03ff7fa362267ddfa114036842584f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a64a6c637c03ff… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 14 16:07:45 2015 +0200 Revert "upated werk" This reverts commit 1eb532a1bf825c4b308a40442a2c8bc9a37b6df4. --- .werks/2434 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.werks/2434 b/.werks/2434 index 1a7ea6f..72312ce 100644 --- a/.werks/2434 +++ b/.werks/2434 @@ -20,25 +20,25 @@ supported NetApp mode. <table> <tr><th>Check</th><th>Description</th><th>7Mode</th><th>Cluster-Mode</th></tr> <tr> <td>netapp_api_aggr</td> <td>Used space and trend of aggregations</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_volumes</td> <td>Used space an trend of volumes. Able to record detailed performance data for each protocol</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_info</td> <td>Displays NetApp version</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_cluster</td> <td>Cluster status</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_cpu</td> <td>CPU utilization of nodes</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_cpu.utilization</td> <td>CPU utilization for 7Mode filer</td> <td>X</td> <td></td></tr> -<tr> <td>netapp_api_cluster</td> <td>Cluster status</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_cpu.nvram_bat</td> <td>NVRAM battery status</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_disk.summary</td> <td>Disk summary check. Includes total raw capacity and info about broken/spare ratio</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_fan</td> <td>Fan status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_fcp</td> <td>Fibrechannel interfaces traffic and latency</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_if</td> <td>Ethernet interfaces</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_protocol</td> <td>Read OPS / Write OPS for each protocol (nfs, nfsv4, cifs, fcp, iscsci)</td> <td>X</td> <td></td></tr> -<tr> <td>netapp_api_temp</td> <td>Temperature sensors, grouped by shelf</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_psu</td> <td>Power supplies</td> <td>X</td> <td>X</td></tr> -<tr> <td>netapp_api_fan</td> <td>Fan status</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_snapvault</td> <td>Snapvault Lag-time</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_status</td> <td>Diagnosis status</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_temp</td> <td>Temperature sensors, grouped by shelf</td> <td>X</td> <td>X</td></tr> +<tr> <td>netapp_api_info</td> <td>Displays NetApp version</td> <td>X</td> <td>X</td></tr> <tr> <td>netapp_api_vf_stats.traffic</td> <td>vFiler traffic (Read/Write OPS, Net-Data Send/Recv, Read/Write Bytes)</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_stats</td> <td>CPU utilization of vFilers</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vf_status</td> <td>vFiler status, e.g running</td> <td>X</td> <td></td></tr> <tr> <td>netapp_api_vs_status</td> <td>vServer status, e.g running</td> <td></td> <td>X</td></tr> +<tr> <td>netapp_api_volumes</td> <td>Used space an trend of volumes. Able to record detailed performance data for each protocol</td> <td></td> <td></td></tr> <tr> <td>netapp_api_vs_traffic</td> <td>vServer Traffic Summary Ethernet Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.fcp</td> <td>vServer Traffic Summary Fibrechannel Interfaces</td> <td></td> <td>X</td></tr> <tr> <td>netapp_api_vs_traffic.cifs</td> <td>vServer Traffic Summary Cifs</td> <td></td> <td>X</td></tr>

8 years, 11 months

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015