Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3270 FIX Fix button [Deprecated Rulesets] within deprecated manual checks rulesets

by Mathias Kettner

Module: check_mk Branch: master Commit: 692c14713917e6c7da8bd3b3b30904ccac394be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=692c14713917e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 13:21:33 2016 +0100 3270 FIX Fix button [Deprecated Rulesets] within deprecated manual checks rulesets --- .werks/3270 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3270 b/.werks/3270 new file mode 100644 index 0000000..d9346eb --- /dev/null +++ b/.werks/3270 @@ -0,0 +1,10 @@ +Title: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457612462 + + diff --git a/ChangeLog b/ChangeLog index 179a138..8c752fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 3005 FIX: webapi: now able to add new hosts to main folder (bug was introduced recently) * 3283 FIX: Bulk import of hosts: It is now possible again to import a simple list of hosts... * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... + * 3270 FIX: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1e025b1..b6ee5a5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11890,8 +11890,12 @@ def mode_rulesets(phase, group=None): if group != "static": html.context_button(_("All Rulesets"), folder_preserving_link([("mode", "ruleeditor")]), "back") else: - html.context_button(_("Deprecated Rulesets"), - folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") + if show_deprecated: + html.context_button(_("Normal Rulesets"), + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "0")]), "rulesets") + else: + html.context_button(_("Deprecated Rulesets"), + folder_preserving_link([("mode", "rulesets"), ("group", "static"), ("deprecated", "1")]), "rulesets_deprecated") if config.may("wato.hosts") or config.may("wato.seeall"): html.context_button(_("Folder"), folder_preserving_link([("mode", "folder")]), "folder") if group == "agents":

8 years, 8 months

3269 FIX Fix rendering of floating point values < 1 in graphs (

by Mathias Kettner

e.g. CPU load) Message-ID: <56e1562f.1g2Rv0e1skiGUdKf%mk(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: 9b9b4365ba3f1e9e7fcce496440185d7212e441a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9b4365ba3f1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 10 12:10:22 2016 +0100 3269 FIX Fix rendering of floating point values < 1 in graphs (e.g. CPU load) --- .werks/3269 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 28 ++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.werks/3269 b/.werks/3269 new file mode 100644 index 0000000..c614186 --- /dev/null +++ b/.werks/3269 @@ -0,0 +1,10 @@ +Title: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) +Level: 2 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457608199 + + diff --git a/ChangeLog b/ChangeLog index 90dd0b7..179a138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 3267 New availability option for reclassifying host state "unreachable"... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button * 3268 FIX: Availability options were invalid after resetting them... + * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index aa58e0a..8f4f09d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -620,6 +620,34 @@ def drop_dotzero(v, digits=1): return t +# Renders a floating point number with the given number +# of non-zero digits. Example if precision is 3: +# 12.40349034 -> 12.4 +# 1.23894859348563478 -> 1.24 +# 0.00001239898568978 -> 0.0000124 +# 12400000.00230923 -> 12400000 + +def render_float_with_precision(value, precision): + if value == 0: + return "0" + + elif value < 0: + return "-" + render_float_with_precision(-value, precision) + + mantissa, exponent = frexp10(float(value)) + # exponent + 1 is the number of digits left of the . + + # Digits left of . are more than precision -> no fraction. + if exponent + 1 >= precision: + return "%.0f" % value + + # Allow so many digits after comma that we have at least 'precision' + # valid non-zero digits + else: + digits = precision - exponent - 1 + return "%%.%df" % digits % value + + def number_human_readable(n, precision=1, unit="B"): base = 1024.0 if unit == "Bit": diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7433be8..c9aa20f 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -65,7 +65,7 @@ unit_info[""] = { "title" : "", "description" : _("Floating point number"), "symbol" : "", - "render" : lambda v: "%.2f" % v, + "render" : lambda v: render_float_with_precision(v, 3), } unit_info["count"] = {

8 years, 8 months

3007 FIX Interface groups: fixed exception when port type or interface items were not set in the WATO rule

by Andreas Boesl

Module: check_mk Branch: master Commit: 58780974e071e29692185d3015167b4876c28988 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58780974e071e2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 10 11:25:55 2016 +0100 3007 FIX Interface groups: fixed exception when port type or interface items were not set in the WATO rule You should do a new service discovery for hosts with grouped interfaces. This is not mandatory, however it will clean up some invalid values stored values in the autochecks directory. --- .werks/3007 | 11 +++++++++++ ChangeLog | 1 + checks/if.include | 41 ++++++++++++++++++++++++++++------------- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/.werks/3007 b/.werks/3007 new file mode 100644 index 0000000..bdcf5ef --- /dev/null +++ b/.werks/3007 @@ -0,0 +1,11 @@ +Title: Interface groups: fixed exception when port type or interface items were not set in the WATO rule +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1457605216 +Class: fix + +You should do a new service discovery for hosts with grouped interfaces. +This is not mandatory, however it will clean up some invalid values stored values +in the autochecks directory. diff --git a/ChangeLog b/ChangeLog index 3011201..90dd0b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 3094 FIX: cisco_temperature: fixed duplicated sensors on some devices... * 3006 FIX: agent_vsphere: fixed exception when providing the wrong login credentials * 3261 FIX: cisco_temperature: fixed wrong datatype handling + * 3007 FIX: Interface groups: fixed exception when port type or interface items were not set in the WATO rule... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/if.include b/checks/if.include index 89d8a26..fe3b795 100644 --- a/checks/if.include +++ b/checks/if.include @@ -293,12 +293,14 @@ def inventory_if_common(info, has_nodeinfo = False): is_only_in_group = False for group_name, pattern in group_patterns.items(): # Interfaces can be grouped by item and iftype - match_item = not pattern.get("include_items") or (tryint(item) in map(tryint, pattern["include_items"])) - match_type = not pattern.get("iftype") or (pattern["iftype"] == saveint(ifType)) + match_item = "include_items" not in pattern or (tryint(item) in map(tryint, pattern["include_items"])) + match_type = "iftype" not in pattern or (pattern["iftype"] == saveint(ifType)) if match_item and match_type: - have_groups.setdefault(group_name, {"interfaces": [], - "iftype": pattern.get("iftype"), - "include_items": pattern.get("include_items")}) + have_groups.setdefault(group_name, {"interfaces": []}) + for what in [ "iftype", "include_items" ]: + if pattern.get(what): + have_groups[group_name][what] = pattern.get(what) + have_groups[group_name]["interfaces"].append((saveint(ifSpeed), ifOperStatus, ifType)) if pattern.get("single"): is_only_in_group = True @@ -337,9 +339,10 @@ def inventory_if_common(info, has_nodeinfo = False): group_operStatus = one_up and "1" or "2" if group_operStatus in portstates: - params = { "iftype" : values["iftype"], - "include_items": values["include_items"], - "aggregate" : True } + params = { "aggregate": True } + for what in [ "iftype", "include_items" ]: + if what in values: + params[what] = values[what] if uses_description: params["aggr_member_item"] = "description" @@ -399,10 +402,17 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou if ifGroup and ifGroup == item: matching_interfaces.append((if_member_item, element)) - # tryint -> force "01" and "1" to be identical. - elif (params.get("include_items") == None or tryint(if_member_item) in map(tryint, params["include_items"])) or\ - saveint(element[2 + node_offset]) == params.get("iftype"): - matching_interfaces.append((if_member_item, element)) + else: + # The iftype and include_items parameters are further restrictions + # If none of them are set, the interface is added to the group + add_interface = True # This approach is easier to comprehend.. + # tryint -> force "01" and "1" to be identical. + if params.get("include_items") != None and tryint(if_member_item) not in map(tryint, params["include_items"]): + add_interface = False + elif params.get("iftype") != None and saveint(element[2 + node_offset]) != params["iftype"]: + add_interface = False + if add_interface: + matching_interfaces.append((if_member_item, element)) # Accumulate info over matching_interfaces wrapped = False @@ -477,6 +487,8 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou group_info["ifOutErrors"] += saveint(ifOutErrors) group_info["ifOutQLen"] += saveint(ifOutQLen) + group_info["ifType"] = ifType # This is the fallback ifType if none is set in the parameters + # Append an additional entry to the info table containing the calculated group_info @@ -503,10 +515,13 @@ def check_if_common(item, params, info, has_nodeinfo = False, group_name = "Grou else: group_entry = [] + if params.get("ifType"): + group_info["ifType"] = params["ifType"] + group_entry += [ "ifgroup%s" % item, # ifIndex item, # ifDescr - params["iftype"], # ifType + group_info["ifType"], # ifType group_info["ifSpeed"], # ifSpeed group_operStatus, # ifOperStatus group_info["ifInOctets"], # ifInOctets

8 years, 8 months

slight improvement to the wmitest tool

by Sebastian Herbord

Module: check_mk Branch: master Commit: 08d51620768810f994e4bbcc32fd2554c9a16814 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08d51620768810… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Mar 10 10:53:41 2016 +0100 slight improvement to the wmitest tool --- agents/windows/wmitest.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/windows/wmitest.cc b/agents/windows/wmitest.cc index 4bd81e0..f35751b 100644 --- a/agents/windows/wmitest.cc +++ b/agents/windows/wmitest.cc @@ -95,7 +95,11 @@ int main(int argc, char **argv) { try { if (strcmp(argv[1], "tree") == 0) { - print_namespace(L"Root"); + if (argc < 3) { + print_namespace(L"Root"); + } else { + print_namespace(to_utf16(argv[2]).c_str()); + } } if (strcmp(argv[1], "csv") == 0) {

8 years, 8 months

3261 FIX cisco_temperature: fixed wrong datatype handling

by Simon Betz

Module: check_mk Branch: master Commit: 67568b45a7643b874aa8eee82b60e5821dc876cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67568b45a7643b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 10 09:20:26 2016 +0100 3261 FIX cisco_temperature: fixed wrong datatype handling --- .werks/3261 | 10 ++++++++++ ChangeLog | 1 + checks/cisco_temperature | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/3261 b/.werks/3261 new file mode 100644 index 0000000..f64ff8f --- /dev/null +++ b/.werks/3261 @@ -0,0 +1,10 @@ +Title: cisco_temperature: fixed wrong datatype handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457597947 + + diff --git a/ChangeLog b/ChangeLog index 99ccb73..3011201 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 3259 FIX: ad_replication: fixed wrong timestamp handling * 3094 FIX: cisco_temperature: fixed duplicated sensors on some devices... * 3006 FIX: agent_vsphere: fixed exception when providing the wrong login credentials + * 3261 FIX: cisco_temperature: fixed wrong datatype handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cisco_temperature b/checks/cisco_temperature index 68f51ff..b17cbbd 100644 --- a/checks/cisco_temperature +++ b/checks/cisco_temperature @@ -176,16 +176,16 @@ def parse_cisco_temperature(info): def inventory_cisco_temperature(parsed): for item, value in parsed.iteritems(): - if not value.get("obsolete", False): + if type(parsed[item]) == tuple or not value.get("obsolete", False): yield item, {} def check_cisco_temperature(item, params, parsed): if item in parsed: - if parsed[item].get("obsolete", False): - return 3, "This sensor is obsolete, please rediscover" if type(parsed[item]) == tuple: return parsed[item] + elif parsed[item].get("obsolete", False): + return 3, "This sensor is obsolete, please rediscover" else: return check_temperature(parsed[item]['temp'], params, "cisco_temperature_%s" % item, dev_levels = parsed[item]['dev_levels'],

8 years, 8 months

fixed compilation of pdh-based perfcounter implementation ( not currently used)

by Sebastian Herbord

Module: check_mk Branch: master Commit: e73ad7e99fb4beb716c71daed68d38b245e24ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e73ad7e99fb4be… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Mar 10 09:21:02 2016 +0100 fixed compilation of pdh-based perfcounter implementation (not currently used) --- agents/windows/PerfCounterPdh.cc | 1 - agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 910336 -> 910336 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 910336 -> 910336 bytes agents/windows/check_mk_agent.cc | 4 +- agents/windows/check_mk_agent.exe | Bin 836096 -> 836096 bytes agents/windows/check_mk_agent.msi | Bin 2007040 -> 2007040 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 836096 -> 836096 bytes agents/windows/install_agent-64.exe | Bin 418357 -> 418513 bytes agents/windows/install_agent.exe | Bin 408775 -> 408949 bytes agents/windows/plugins/rstcli.bat | 30 +++++++-------- agents/windows/stringutil.cc | 44 ++++++++++++++++++++++ agents/windows/stringutil.h | 1 + 13 files changed, 63 insertions(+), 19 deletions(-) diff --git a/agents/windows/PerfCounterPdh.cc b/agents/windows/PerfCounterPdh.cc index 30cf783..6f4b5a9 100644 --- a/agents/windows/PerfCounterPdh.cc +++ b/agents/windows/PerfCounterPdh.cc @@ -278,7 +278,6 @@ void PerfCounterQuery::execute() { if (((DWORD)status != ERROR_SUCCESS) && ((DWORD)status != PDH_NO_MORE_DATA)) { - printf("query status: %x\n", (DWORD)status); throw std::runtime_error(get_win_error_as_string(status)); } } diff --git a/agents/windows/build_version b/agents/windows/build_version index e847bdc..0123fb2 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1364 +1366 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 202327b..a4fe869 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 dcd99f0..c04890d 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 427b2b6..1494306 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -593,8 +593,8 @@ void dump_performance_counters(OutputProxy &out, unsigned counter_base_number, LARGE_INTEGER Frequency; QueryPerformanceFrequency(&Frequency); out.output("<<<winperf_%s>>>\n", countername); - out.output("%.2f %u %" PRId64 "\n", current_time(), counter_base_number, - Frequency.QuadPart); + out.output("%.2f %u %" PRId64 "\n", current_time(), + counter_base_number, Frequency.QuadPart); std::vector<PERF_INSTANCE_DEFINITION *> instances = counterObject.instances(); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 920b73e..093426c 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 506e786..b765111 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 82df89c..6da8a1f 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 92c6baf..539bc5f 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 57f90ad..2b347b3 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/plugins/rstcli.bat b/agents/windows/plugins/rstcli.bat index a2c041f..12ea8e5 100644 --- a/agents/windows/plugins/rstcli.bat +++ b/agents/windows/plugins/rstcli.bat @@ -1,15 +1,15 @@ -@ECHO off & setlocal EnableDelayedExpansion - -REM customize rstcli to your needs -SET "rstcli=!ProgramFiles!\rstcli\rstcli64.exe" -SET "rstcli_x86=!ProgramFiles!\rstcli\rstcli.exe" - -ECHO ^<^<^<rstcli:sep(58)^>^>^> -IF EXIST !rstcli! ( - !rstcli! --information --volume -) ELSE IF EXIST !rstcli_x86! ( - !rstcli_x86! --information --volume -) ELSE ( - ECHO rstcli not found -) - +@ECHO off & setlocal EnableDelayedExpansion + +REM customize rstcli to your needs +SET "rstcli=!ProgramFiles!\rstcli\rstcli64.exe" +SET "rstcli_x86=!ProgramFiles!\rstcli\rstcli.exe" + +ECHO ^<^<^<rstcli:sep(58)^>^>^> +IF EXIST !rstcli! ( + !rstcli! --information --volume +) ELSE IF EXIST !rstcli_x86! ( + !rstcli_x86! --information --volume +) ELSE ( + ECHO rstcli not found +) + diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index c697f5d..0e45b14 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -203,6 +203,50 @@ bool globmatch(const char *pattern, const char *astring) { return *p == 0; } +bool globmatch(const wchar_t *pattern, const wchar_t *astring) { + const wchar_t *p = pattern; + const wchar_t *s = astring; + while (*s) { + if (!*p) return false; // pattern too short + + // normal character-wise match + if (towlower(*p) == towlower(*s) || *p == L'?') { + p++; + s++; + } + + // non-matching charactetr + else if (*p != L'*') + return false; + + else { // check * + // If there is more than one asterisk in the pattern, + // we need to try out several variants. We do this + // by backtracking (smart, eh?) + int maxlength = wcslen(s); + // replace * by a sequence of ?, at most the rest length of s + wchar_t *subpattern = (wchar_t *)malloc( + (wcslen(p) + maxlength + 1) * sizeof(wchar_t)); + bool match = false; + for (int i = 0; i <= maxlength; i++) { + for (int x = 0; x < i; x++) subpattern[x] = L'?'; + wcscpy(subpattern + i, p + 1); // omit leading '*' + if (globmatch(subpattern, s)) { + match = true; + break; + } + } + free(subpattern); + return match; + } + } + + // string has ended, pattern not. Pattern must only + // contain * now if it wants to match + while (*p == L'*') p++; + return *p == 0; +} + #ifdef _WIN32 std::string get_win_error_as_string(DWORD error_id) { // Get the error message, if any. diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index 3126a04..9bff062 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -61,6 +61,7 @@ bool ci_equal(const std::string &lhs, const std::string &rhs); // Do a simple pattern matching with the jokers * and ?. // This is case insensitive (windows-like). bool globmatch(const char *pattern, const char *astring); +bool globmatch(const wchar_t *pattern, const wchar_t *astring); template <typename T> std::basic_string<T> join(const std::vector<std::basic_string<T>> &input,

8 years, 8 months

3006 FIX agent_vsphere: fixed exception when providing the wrong login credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 72cd48f387fd3acc5cc17fe98f9c2a2d56be2a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72cd48f387fd3a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 9 17:30:14 2016 +0100 3006 FIX agent_vsphere: fixed exception when providing the wrong login credentials --- .werks/3006 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 13 +++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/3006 b/.werks/3006 new file mode 100644 index 0000000..05d6022 --- /dev/null +++ b/.werks/3006 @@ -0,0 +1,9 @@ +Title: agent_vsphere: fixed exception when providing the wrong login credentials +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1457540970 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c2684d2..99ccb73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 3092 FIX: isc_dhcpd: fixed incorrect handling of timezones * 3259 FIX: ad_replication: fixed wrong timestamp handling * 3094 FIX: cisco_temperature: fixed duplicated sensors on some devices... + * 3006 FIX: agent_vsphere: fixed exception when providing the wrong login credentials Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 87eb4a7..64d34cc6 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1147,15 +1147,16 @@ def login(): reply_code, repy_msg, reply_headers, reply_data = \ query_server(payload, payload_params = {"username": encode_url(user), "password": encode_url(secret)}) - server_cookie = reply_headers.get("Set-Cookie") - if host_cookie_path: - cookie_file = file(host_cookie_path, "w") - os.chmod(host_cookie_path, 0600) - cookie_file.write(server_cookie) - if "InvalidLogin" in reply_data: global error error = "Cannot login to vSphere Server. Login response is not 'OK'. Please check the credentials" + else: + server_cookie = reply_headers.get("Set-Cookie") + if host_cookie_path and server_cookie: + cookie_file = file(host_cookie_path, "w") + os.chmod(host_cookie_path, 0600) + cookie_file.write(server_cookie) + # .--Main----------------------------------------------------------------.

8 years, 8 months

3283 FIX Bulk import of hosts: It is now possible again to import a simple list of hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: b98357582c91f21cfe6deb3278fdb3bc691056e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98357582c91f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 9 17:20:16 2016 +0100 3283 FIX Bulk import of hosts: It is now possible again to import a simple list of hosts In previous versions it was possible to just import a simple list of host names. Where one host name per line is given. This is now possible again. --- .werks/3283 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 40 +++++++++++++++++++++++++++++----------- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.werks/3283 b/.werks/3283 new file mode 100644 index 0000000..1e45b36 --- /dev/null +++ b/.werks/3283 @@ -0,0 +1,11 @@ +Title: Bulk import of hosts: It is now possible again to import a simple list of hosts +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457540348 + +In previous versions it was possible to just import a simple list of host names. Where +one host name per line is given. This is now possible again. diff --git a/ChangeLog b/ChangeLog index 45dbb40..c2684d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 3281 FIX: Fixed network scan overwriting folder modifications made during the scan * 3282 FIX: Fixed missing validation of network scan properties... * 3005 FIX: webapi: now able to add new hosts to main folder (bug was introduced recently) + * 3283 FIX: Bulk import of hosts: It is now possible again to import a simple list of hosts... * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... Notifications: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6fa1e64..1e025b1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2949,7 +2949,7 @@ class ModeBulkImport(WatoMode): def __init__(self): super(ModeBulkImport, self).__init__() self._csv_reader = None - self._params = {} + self._params = None def title(self): @@ -3009,6 +3009,13 @@ class ModeBulkImport(WatoMode): os.unlink(path) + def _get_custom_csv_dialect(self, delim): + class CustomCSVDialect(csv.excel): + delimiter = delim + + return CustomCSVDialect() + + def _read_csv_file(self): try: csv_file = file(self._file_path()) @@ -3017,22 +3024,23 @@ class ModeBulkImport(WatoMode): params = self._vs_parse_params().from_html_vars("_preview") self._vs_parse_params().validate_value(params, "_preview") - self._params = params or self._vs_parse_params().default_value() + self._params = params # try to detect the CSV format to be parsed if "field_delimiter" in params: - class CustomCSVDialect(csv.excel): - delimiter = params["field_delimiter"] - - csv_dialect = CustomCSVDialect() + csv_dialect = self._get_custom_csv_dialect(params["field_delimiter"]) else: try: csv_dialect = csv.Sniffer().sniff(csv_file.read(2048), delimiters=",;\t:") csv_file.seek(0) except csv.Error, e: if "Could not determine delimiter" in str(e): - raise MKUserError(None, _("Failed to detect the CSV files field delimiter character. Please " - "specify it manually.")) + # Failed to detect the CSV files field delimiter character. Using ";" now. If + # you need another one, please specify it manually. + csv_dialect = self._get_custom_csv_dialect(";") + csv_file.seek(0) + else: + raise # Save for preview in self.page() @@ -3041,7 +3049,10 @@ class ModeBulkImport(WatoMode): def _import(self): if self._params.get("has_title_line"): - self._csv_reader.next() # skip header + try: + self._csv_reader.next() # skip header + except StopIteration: + pass num_succeeded, num_failed = 0, 0 fail_messages = [] @@ -3181,7 +3192,10 @@ class ModeBulkImport(WatoMode): # Die problematischen Zeilen sollen angezeigt werden, so dass man diese als Block in ein neues CSV-File eintragen kann und dann diese Datei # erneut importieren kann. if self._params.get("has_title_line"): - headers = list(self._csv_reader.next()) + try: + headers = list(self._csv_reader.next()) + except StopIteration: + headers = [] # nope, there is no header else: headers = [] @@ -3211,7 +3225,11 @@ class ModeBulkImport(WatoMode): def _preview_form(self): - self._vs_parse_params().render_input("_preview", self._params or self._vs_parse_params().default_value()) + if self._params != None: + params = self._params + else: + params = self._vs_parse_params().default_value() + self._vs_parse_params().render_input("_preview", params) html.hidden_fields() html.button("_do_preview", _("Update preview")) html.button("_do_import", _("Import"))

8 years, 8 months

3284 FIX Bulk import of hosts: Fixed disabling of reading first line as header

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d656832929c2b75ab0da26862f5912f3054f67f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d656832929c2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 9 17:21:28 2016 +0100 3284 FIX Bulk import of hosts: Fixed disabling of reading first line as header When no delimiter is specified, it is now possible to disable treating the first line as header line. --- .werks/3284 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/3284 b/.werks/3284 new file mode 100644 index 0000000..a86bd25 --- /dev/null +++ b/.werks/3284 @@ -0,0 +1,11 @@ +Title: Bulk import of hosts: Fixed disabling of reading first line as header +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457540419 + +When no delimiter is specified, it is now possible to disable treating the +first line as header line. diff --git a/ChangeLog b/ChangeLog index 688a29c..45dbb40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 3281 FIX: Fixed network scan overwriting folder modifications made during the scan * 3282 FIX: Fixed missing validation of network scan properties... * 3005 FIX: webapi: now able to add new hosts to main folder (bug was introduced recently) + * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... Notifications: * 3263 Notifications: allow users to restrict by their contact groups...

8 years, 8 months

update for WK3004

by Andreas Boesl

Module: check_mk Branch: master Commit: ef89056126b6c42c5b654a3125d8672c5e064ee2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef89056126b6c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 9 17:20:55 2016 +0100 update for WK3004 --- agents/special/agent_vsphere | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f441bbb..87eb4a7 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1622,10 +1622,10 @@ if not error: for key in vms.keys(): data = vms[key] running_on = hostsystems.get(data.get("runtime.host"), data.get("runtime.host")) - vm_info = "virtualmachine\t%s\t%s\t%s" % (convert_hostname(data.get("name")), running_on, data.get("runtime.powerState")) + vm_info = "virtualmachine\t%s\t%s\t%s" % (convert_hostname(key), running_on, data.get("runtime.powerState")) if opt_vm_pwr_display == "vm": - vm_name = convert_hostname(data.get("name")) + vm_name = convert_hostname(key) vm_piggy_data.setdefault(vm_name, []).append(vm_info) elif opt_vm_pwr_display == "esxhost" and not opt_direct: host_piggy_data.setdefault(running_on, []).append(vm_info) @@ -1646,7 +1646,7 @@ if not error: continue vm_info = "hostsystem\t%s\t\t%s" % (running_on, hostsystems_properties[vm_host]["runtime.powerState"][0]) - vm_name = convert_hostname(data.get("name")) + vm_name = convert_hostname(key) vm_piggy_data.setdefault(vm_name, []).append(vm_info) for entries in [ host_piggy_data, vm_piggy_data ]:

8 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016