Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Removed mk/String.h, we have std::to_string nowadays.

by Sven Panne

Module: check_mk Branch: master Commit: 4777b8612c3a9a7b6f863e2cf5b13eaf3b0abb23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4777b8612c3a9a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 11 16:10:12 2016 +0100 Removed mk/String.h, we have std::to_string nowadays. --- livestatus/src/mk/String.h | 94 -------------------------------------------- 1 file changed, 94 deletions(-) diff --git a/livestatus/src/mk/String.h b/livestatus/src/mk/String.h deleted file mode 100644 index 1410c57..0000000 --- a/livestatus/src/mk/String.h +++ /dev/null @@ -1,94 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -// +------------------------------------------------------------------+ -// -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. -// -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// ails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -// Boston, MA 02110-1301 USA. - -#ifndef mk_String_h -#define mk_String_h - -#include "config.h" // IWYU pragma: keep -#include <stdio.h> -#include <limits> -#include <string> - -// Some missing functions from C++11's <string> - -namespace mk { - -template <typename T> -std::string to_string_helper(const char *format, T value) -{ - char buf[std::numeric_limits<T>::max_exponent10 == 0 - ? sizeof(T) * 4 + 1 // 4 = ceil(log2(10)) - : std::numeric_limits<T>::max_exponent10 + 20]; - const int len = snprintf(buf, sizeof(buf), format, value); - return std::string(buf, buf + len); -} - -inline std::string to_string(int x) -{ - return to_string_helper("%d", x); -} - -inline std::string to_string(unsigned x) -{ - return to_string_helper("%u", x); -} - -inline std::string to_string(long x) -{ - return to_string_helper("%ld", x); -} - -inline std::string to_string(unsigned long x) -{ - return to_string_helper("%lu", x); -} - -inline std::string to_string(long long x) -{ - return to_string_helper("%lld", x); -} - -inline std::string to_string(unsigned long long x) -{ - return to_string_helper("%llu", x); -} - -inline std::string to_string(float x) -{ - return to_string_helper("%f", x); -} - -inline std::string to_string(double x) -{ - return to_string_helper("%f", x); -} - -inline std::string to_string(long double x) -{ - return to_string_helper("%Lf", x); -} - -} // namespace mk - -#endif // mk_String_h

8 years, 7 months

updated manpages

by Simon Betz

Module: check_mk Branch: master Commit: 46caba322a0d2a3706074025d186e88bd21d6fa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46caba322a0d2a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 11 15:24:23 2016 +0100 updated manpages --- checkman/hp_msa_volume | 1 + checkman/hp_msa_volume.df | 1 + checkman/hp_msa_volume.io | 1 + 3 files changed, 3 insertions(+) diff --git a/checkman/hp_msa_volume b/checkman/hp_msa_volume index 44b13d2..16f6c5e 100644 --- a/checkman/hp_msa_volume +++ b/checkman/hp_msa_volume @@ -6,6 +6,7 @@ distribution: check_mk description: This check reports the health states of the volumes of a HP MSA 2040 storage system. + To make it work you have to configure the hp_msa datasource program via WATO. If the state of the volumes are "OK" then the service state is OK. Otherwise the service shows the health status and reason of the volume diff --git a/checkman/hp_msa_volume.df b/checkman/hp_msa_volume.df index ab14435..008436a 100644 --- a/checkman/hp_msa_volume.df +++ b/checkman/hp_msa_volume.df @@ -5,6 +5,7 @@ license: GPL distribution: check_mk description: This check monitors the disk usage of each volume of a HP MSA 2040 storage system. + To make it work you have to configure the hp_msa datasource program via WATO. The levels are configurable. Default levels are set. diff --git a/checkman/hp_msa_volume.io b/checkman/hp_msa_volume.io index 643e905..0fd7c46 100644 --- a/checkman/hp_msa_volume.io +++ b/checkman/hp_msa_volume.io @@ -5,6 +5,7 @@ license: GPL distribution: check_mk description: This check monitors the IO summary of all volume of a HP MSA 2040 storage system. + To make it work you have to configure the hp_msa datasource program via WATO. With the WATO rule "Discovery mode for Disk IO check" the check monitors each volume IO.

8 years, 7 months

gitbugs

by Sebastian Herbord

Module: check_mk Branch: master Commit: b04fbb3ff02cb0daaee34e4700ee5ceddd3d98cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b04fbb3ff02cb0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 11 15:02:02 2016 +0100 gitbugs --- .bugs/2177 | 7 +++++-- .bugs/2400 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/2177 b/.bugs/2177 index e43860c..558356f 100644 --- a/.bugs/2177 +++ b/.bugs/2177 @@ -1,9 +1,12 @@ Title: new windows agent: eventlog monitoring should be able to process cleared logfiles Component: checks -State: open +Class: bug +State: closed Date: 2015-07-30 16:04:54 Targetversion: 1.2.8 -Class: bug If someone clears the event log with the event viewer, the windows agent is unable to start from event log record 0. It insists to continue at 51212, for example. + +2016-02-11 15:01:36: changed state open -> closed +This report is invalid? Clearing the event log does not reset the event id counter. If your newest record has it 42 and you clear the event console, the next record will still have the id 43. Seeking in the event log is based on that record id so clearing the event log has no effect except that check_mk may miss cleared events it hadn't read yet. diff --git a/.bugs/2400 b/.bugs/2400 index e0021d1..0682410 100644 --- a/.bugs/2400 +++ b/.bugs/2400 @@ -1,11 +1,14 @@ Title: Windows Agent may fail to read large event logs Component: checks -State: open +Class: bug +State: done Date: 2015-11-06 11:48:19 Targetversion: 1.2.8 -Class: bug Due to a bug in the ReadEventLog function (kb 177199) reading large event logs may fail. This could be worked around in the agent by using sequential read and a manual seek to the right offset but we'd have to check the performance implications. + +2016-02-11 14:57:03: changed state open -> done +EventLog code was overhauled and should fall back to sequential reading of event logs if necessary. Unfortunately wasn't possible to reproduce this problem internally.

8 years, 7 months

#2991 Snapshot restore: Improved robustness and logging

by Andreas Boesl

Module: check_mk Branch: master Commit: 6ebb235b65b99074173e9749b881edbf16943bd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ebb235b65b990… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 11 14:58:17 2016 +0100 #2991 Snapshot restore: Improved robustness and logging The restore operation tries to complete the snapshot extraction with the rest of the data when it encounters critical errors in the crucial extract phase. Error information is logged in the file <tt>~/var/log/web.log</tt>. This should never happen anyway - there are several mechanisms to prevent this. --- .werks/2991 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 25 ++++++++++++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.werks/2991 b/.werks/2991 new file mode 100644 index 0000000..f3186ae --- /dev/null +++ b/.werks/2991 @@ -0,0 +1,12 @@ +Title: Snapshot restore: Improved robustness and logging +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1455198375 +Class: feature + +The restore operation tries to complete the snapshot extraction with the rest of +the data when it encounters critical errors in the crucial extract phase. +Error information is logged in the file <tt>~/var/log/web.log</tt>. +This should never happen anyway - there are several mechanisms to prevent this. diff --git a/ChangeLog b/ChangeLog index c717b67..2aaafc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -334,6 +334,7 @@ * 2923 SNMP community in WATO is now always displayed with ******... * 2924 WATO can now add contact groups from hosts also to services... * 2902 Hosts can now be added by regular network scans of configured IP ranges... + * 2991 Snapshot restore: Improved robustness and logging... * 2666 FIX: Fix search for global configuration variables: ignore case now * 2715 FIX: Fixed visibility of BI aggregations in editor * 2716 FIX: Fixed error reporting on disabled checks page in case of broken man pages diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index d635965..d020186 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -197,7 +197,7 @@ def extract_domains(tar, domains): try: target_dir = domain.get("prefix") if not target_dir: - return + return [] # The complete tar.gz file never fits in stringIO buffer.. tar.extract(tar_member, restore_dir) @@ -217,6 +217,8 @@ def extract_domains(tar, domains): except Exception, e: return [ "%s - %s" % (domain["title"], str(e)) ] + return [] + def execute_restore(domain, is_pre_restore = True): if is_pre_restore: @@ -227,8 +229,9 @@ def extract_domains(tar, domains): return domain["post_restore"]() return [] - total_errors = [] + logger(LOG_INFO, "Restoring snapshot: %s" % tar.name) + logger(LOG_INFO, "Domains: %s" % ", ".join(tar_domains.keys())) for what, abort_on_error, handler in [ ("Permissions", True, lambda domain, tar_member: check_domain(domain, tar_member)), ("Pre-Restore", True, lambda domain, tar_member: execute_restore(domain, is_pre_restore = True)), @@ -239,9 +242,21 @@ def extract_domains(tar, domains): errors = [] for name, tar_member in tar_domains.items(): if name in domains: - dom_errors = handler(domains[name], tar_member) - if dom_errors: - errors.extend(dom_errors) + try: + dom_errors = handler(domains[name], tar_member) + errors.extend(dom_errors or []) + except Exception, e: + # This should NEVER happen + err_info = "Restore-Phase: %s, Domain: %s\nError: %s" % (what, name, format_exception()) + errors.append(err_info) + logger(LOG_CRIT, err_info) + if abort_on_error == False: + # At this state, the restored data is broken. + # We still try to apply the rest of the snapshot + # Hopefully the log entry helps in identifying the problem.. + logger(LOG_ALERT, "Snapshot restore FAILED! (possible loss of snapshot data)") + continue + break if errors: if what == "Permissions":

8 years, 7 months

windows agent: worked around bug in vmware esx that caused system uptime to produce bad results

by Sebastian Herbord

Module: check_mk Branch: master Commit: e6ec3781ba6e34eaa8388ab8cdcd1359944107d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6ec3781ba6e34… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 11 14:52:54 2016 +0100 windows agent: worked around bug in vmware esx that caused system uptime to produce bad results --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 906240 -> 907776 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 906240 -> 907776 bytes agents/windows/check_mk_agent.cc | 24 +++++++++++++++------- agents/windows/check_mk_agent.exe | Bin 830464 -> 832000 bytes agents/windows/check_mk_agent.msi | Bin 1997312 -> 2000384 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 830464 -> 832000 bytes agents/windows/install_agent-64.exe | Bin 416143 -> 416904 bytes agents/windows/install_agent.exe | Bin 406731 -> 407353 bytes 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 53d108b..939b0cb 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1231 +1233 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 12672f1..5ffab7b 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 aaaf191..4e864d9 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 19c901f..082538a 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -322,15 +322,25 @@ void section_systemtime(OutputProxy &out) { void section_uptime(OutputProxy &out) { crash_log("<<<uptime>>>"); - static LARGE_INTEGER Frequency, Ticks; - QueryPerformanceFrequency(&Frequency); - QueryPerformanceCounter(&Ticks); - Ticks.QuadPart = Ticks.QuadPart - Frequency.QuadPart; - unsigned int uptime = (double)Ticks.QuadPart / Frequency.QuadPart; + + std::string uptime = "0"; + + typedef ULONGLONG WINAPI (*GetTickCount64_type)(void); + DYNAMIC_FUNC(GetTickCount64, L"kernel32.dll"); + if (GetTickCount64_dyn != nullptr) { + // GetTickCount64 is only available on Vista/2008 and newer + uptime = std::to_string(GetTickCount64_dyn() / 1000); + } else { + // fallback if GetTickCount64 is not available + wmi::Result res = WMILookup::get().query( + L"SELECT SystemUpTime FROM Win32_PerfFormattedData_PerfOS_System"); + uptime = res.get<std::string>(L"SystemUpTime"); + } + out.output( "<<<uptime>>>\n" - "%u\n", - uptime); + "%s\n", + uptime.c_str()); } // .----------------------------------------------------------------------. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9f0ff83..2b81fa5 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 d26f970..95d0461 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 2735b75..22c2986 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 6b31833..8b18ba5 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 ba645aa..9ad7b41 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

#2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name , group name, model, serial number and system location of all access points of this WLC

by Simon Betz

Module: check_mk Branch: master Commit: 5e438501650fe28f65505ab7070fc5ac3673e48d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e438501650fe2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 10 16:45:10 2016 +0100 #2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name, group name, model, serial number and system location of all access points of this WLC --- .werks/2979 | 9 +++++ ChangeLog | 1 + inventory/aruba_wlc_aps | 76 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 9 +++++ 4 files changed, 95 insertions(+) diff --git a/.werks/2979 b/.werks/2979 new file mode 100644 index 0000000..78ced64 --- /dev/null +++ b/.werks/2979 @@ -0,0 +1,9 @@ +Title: aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name, group name, model, serial number and system location of all access points of this WLC +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455118995 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 82ca4ab..4f95643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 2989 netapp_api_snapshots: increased performance while querying data. levels configurable... * 2977 aruba_wlc_clients: new check which monitors the WLC clients of a Aruba Networks WLAN Controller * 3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model + * 2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name, group name, model, serial number and system location of all access points of this WLC * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/inventory/aruba_wlc_aps b/inventory/aruba_wlc_aps new file mode 100644 index 0000000..1cdab56 --- /dev/null +++ b/inventory/aruba_wlc_aps @@ -0,0 +1,76 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.3.0.36.108.192.2.186 ALA-AP 2.1.1 --> WLSX-WLAN-MIB::wlanAPName.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.4.0.36.108.192.2.186 ALA-Office --> WLSX-WLAN-MIB::wlanAPGroupName.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.5.0.36.108.192.2.186 .1.3.6.1.4.1.14823.1.2.34 --> WLSX-WLAN-MIB::wlanAPModel.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.6.0.36.108.192.2.186 AL0000642 --> WLSX-WLAN-MIB::wlanAPSerialNumber.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.32.0.36.108.192.2.186 --> WLSX-WLAN-MIB::wlanAPSysLocation.'.$l...' + + +def inv_aruba_wlc_aps(info): + map_ap_products = { + "1" : "a50", "2" : "a52", "3" : "a60", "4" : "a61", "5" : "a70", + "6" : "walljackAp61", "7" : "a2E", "8" : "ap1200", "9" : "ap80s", "10" : "ap80m", + "11" : "wg102", "12" : "ap40", "13" : "ap41", "14" : "ap65", "15" : "NesotMW1700", + "16" : "ortronics Wi Jack Duo", "17" : "ortronics Duo", "18" : "ap80MB", "19" : "ap80SB", "20" : "ap85", + "21" : "ap124", "22" : "ap125", "23" : "ap120", "24" : "ap121", "25" : "ap1250", + "26" : "ap120abg", "27" : "ap121abg", "28" : "ap124abg", "29" : "ap125abg", "30" : "rap5wn", + "31" : "rap5", "32" : "rap2wg", "33" : "reserved-4", "34" : "ap105", "35" : "ap65wb", + "36" : "ap651", "37" : "reserved-6", "38" : "ap60p", "39" : "reserved-7", "40" : "ap92", + "41" : "ap93", "42" : "ap68", "43" : "ap68p", "44" : "ap175p", "45" : "ap175ac", + "46" : "ap175dc", "47" : "ap134", "48" : "ap135", "49" : "reserved-8", "50" : "ap93h", + "51" : "rap3wn", "52" : "rap3wnp", "53" : "ap104", "54" : "rap155", "55" : "rap155p", + "56" : "rap108", "57" : "rap109", "58" : "ap224", "59" : "ap225", "60" : "ap114", + "61" : "ap115", "62" : "rap109L", "63" : "ap274", "64" : "ap275", "65" : "ap214a", + "66" : "ap215a", "67" : "ap204", "68" : "ap205", "69" : "ap103", "70" : "ap103H", + "72" : "ap227", "73" : "ap214", "74" : "ap215", "75" : "ap228", + "76" : "ap205H", "9999" : "undefined", + } + node = inv_tree("networking.wlan.controller.aps:") + for ap_name, ap_gr_name, ap_model, ap_serial_nr, ap_sys_loc in info: + node.append({ + "name" : ap_name, + "group" : ap_gr_name, + "model" : map_ap_products.get(ap_model.split(".")[-1], "unknown"), + "serial" : ap_serial_nr, + "sys_location" : ap_sys_loc, + }) + return node + + +inv_info['aruba_wlc_aps'] = { + 'inv_function' : inv_aruba_wlc_aps, + "snmp_info" : ( ".1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1",[ + "3", # wlanAPName + "4", # wlanAPGroupName + "5", # wlanAPModel + "6", # wlanAPSerialNumber + "32", # wlanAPSysLocation + ]), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith(".1.3.6.1.4.1.14823.1.1"), +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index c4dd663..de41272 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -663,6 +663,15 @@ inventory_displayhints.update({ ".networking.interfaces:*.speed" : { "title" : _("Speed"), "paint" : "nic_speed", }, ".networking.interfaces:*.port_type" : { "title" : _("Type"), "paint" : "if_port_type", "filter" : visuals.FilterInvtableInterfaceType }, ".networking.interfaces:*.last_change" : { "title" : _("Last Change"), "paint" : "timestamp_as_age_days", "filter" : visuals.FilterInvtableTimestampAsAge }, + + ".networking.wlan" : { "title" : _("WLAN") }, + ".networking.wlan.controller" : { "title" : _("Controller") }, + ".networking.wlan.controller.accesspoints:" : { "title" : _("Access Points"), "keyorder" : ["name", "group", "model", "serial_nr", "sys_location"], "render" : render_inv_dicttable }, + ".networking.wlan.controller.accesspoints:*.name" : { "title" : _("Name") }, + ".networking.wlan.controller.accesspoints:*.group" : { "title" : _("Group") }, + ".networking.wlan.controller.accesspoints:*.model" : { "title" : _("Model") }, + ".networking.wlan.controller.accesspoints:*.serial" : { "title" : _("Serial Number") }, + ".networking.wlan.controller.accesspoints:*.sys_location" : { "title" : _("System Location") }, }) # create painters for node with a display hint

8 years, 7 months

fixed wrong subpath

by Simon Betz

Module: check_mk Branch: master Commit: c24b5f934cb473bed49adee845154ed30f011ce8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c24b5f934cb473… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 11 14:42:30 2016 +0100 fixed wrong subpath --- inventory/aruba_wlc_aps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/aruba_wlc_aps b/inventory/aruba_wlc_aps index 1cdab56..75ab750 100644 --- a/inventory/aruba_wlc_aps +++ b/inventory/aruba_wlc_aps @@ -51,7 +51,7 @@ def inv_aruba_wlc_aps(info): "72" : "ap227", "73" : "ap214", "74" : "ap215", "75" : "ap228", "76" : "ap205H", "9999" : "undefined", } - node = inv_tree("networking.wlan.controller.aps:") + node = inv_tree("networking.wlan.controller.accesspoints:") for ap_name, ap_gr_name, ap_model, ap_serial_nr, ap_sys_loc in info: node.append({ "name" : ap_name,

8 years, 7 months

NetApp datasource program: updated help text

by Andreas Boesl

Module: check_mk Branch: master Commit: 64e4fd76cd18660749a53910a8948f5948e00568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64e4fd76cd1866… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 11 11:39:37 2016 +0100 NetApp datasource program: updated help text --- web/plugins/wato/datasource_programs.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 5ced95c..8dc3f61 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -248,13 +248,12 @@ register_rule(group, ), title = _("Check NetApp via WebAPI"), help = _("This rule set selects the NetApp special agent instead of the normal Check_MK Agent " - "and allows monitoring via the NetApp API. Right now only <i>7-Mode</i> is supported, " - "<i>Cluster Mode</i> will follow soon. Important: To make this special agent NetApp work " - "you will have to provide two additional python files (<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) " - "from the NetApp Manageability SDK. They need to be put into the site directory " - "into <tt>~/local/lib/python</tt>. The user requires a number of permissions for specific API classes. " - "They are displayed if you call the agent with <tt>agent_netapp --help</tt>. The agent itself " - "is located in the site directory under <tt>~/share/check_mk/agents/special</tt>."), + "and allows monitoring via the NetApp Web API. Important: To get this agent running, you need to " + "install two additional python files (<tt>NaServer.py</tt>, <tt>NaElement.py</tt>) from the " + "NetApp Manageabiltiy SDK into the <tt>~/local/lib/python</tt> directory. To access the data the " + "user requires permissions to several API classes. They are shown when you call the agent with " + "<tt>agent_netapp --help</tt>. The agent itself is located in the site directory under " + "<tt>~/share/check_mk/agents/special</tt>."), match = 'first') register_rule(group,

8 years, 7 months

added some helpful usage infos

by Andreas Boesl

Module: check_mk Branch: master Commit: b8e9b412cdc1e5aa1416462ffd94675d663c5fbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8e9b412cdc1e5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 11 11:38:34 2016 +0100 added some helpful usage infos --- agents/special/agent_netapp | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 209cd62..1af7c8f 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -72,6 +72,45 @@ OPTIONS: subquery. --nocounters volumes (clustermode only), skip counters for the given element right now only "volumes" is supported + +Required user permissions +######################### + +General: + cf-status + diagnosis-status-get + perf-object-get-instances + perf-object-instance-list-info-iter + storage-shelf-environment-list-info + system-get-info + system-get-version + +7-Mode specific: + aggr-list-info + disk-list-info + license-v2-list-info + net-ifconfig-get + snapvault-secondary-relationship-status-list-iter-end + snapvault-secondary-relationship-status-list-iter-next + snapvault-secondary-relationship-status-list-iter-start + vfiler-list-info + volume-list-info + +Cluster-Mode specific: + aggr-get-iter + fcp-adapter-get-iter + fcp-interface-get-iter + net-interface-get-iter + net-port-get-iter + snapmirror-get-iter + storage-disk-get-iter + storage-shelf-environment-list-info + system-get-node-info-iter + system-get-node-info-iter + system-get-node-info-iter + system-node-get-iter + volume-get-iter + vserver-get-iter """)

8 years, 7 months

windows agent: hiding source of new eventlog wrapper from unpackaged agents list

by Sebastian Herbord

Module: check_mk Branch: master Commit: dc05854b89996632d327564b1829a4c73e4af145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc05854b899966… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Feb 11 11:19:19 2016 +0100 windows agent: hiding source of new eventlog wrapper from unpackaged agents list --- agents/windows/CONTENTS | 2 ++ agents/windows/check_mk_agent.cc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index 5252919..2766b05 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -48,4 +48,6 @@ wmiHelper.h (hide) wmitest.cc (hide) OHMMonitor.h (hide) OHMMonitor.cc (hide) +EventLog.h (hide) +EventLog.cc (hide) .depend (hide) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1d92df2..19c901f 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -856,7 +856,6 @@ void output_eventlog(OutputProxy &out, const char *logname, EVENTLOGRECORD *record = log.read(); while (record != nullptr) { std::pair<char, int> state = determine_event_state(record, level); - crash_log("peek %d", (int)record->RecordNumber); worst_state = std::max(worst_state, state.second); // store highest record number we found. This is just in case

8 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016