Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

clang-tidy fixes for clang-analyzer-security.insecureAPI.strcpy check.

by Sven Panne

Module: check_mk Branch: master Commit: e630bd29e09b8aa660b0f21f8987551226fc2031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e630bd29e09b8a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 3 15:45:13 2016 +0100 clang-tidy fixes for clang-analyzer-security.insecureAPI.strcpy check. --- livestatus/src/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index a665caa..c10c6ed 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -647,9 +647,9 @@ void livestatus_parse_arguments(const char *args_orig) { sizeof(g_logfile_path) - 16 /* len of "livestatus.log" */); char *slash = strrchr(g_logfile_path, '/'); if (!slash) - strcpy(g_logfile_path, "/tmp/livestatus.log"); + strncpy(g_logfile_path, "/tmp/livestatus.log", 20); else - strcpy(slash + 1, "livestatus.log"); + strncpy(slash + 1, "livestatus.log", 15); /* there is no default PNP path */ g_pnp_path[0] = 0;

8 years, 7 months

clang-tidy fixes for readability-named-parameter check.

by Sven Panne

Module: check_mk Branch: master Commit: e27d8dc4ba0272c8e27d2018553a2e9caaa1970f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e27d8dc4ba0272… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 3 16:06:33 2016 +0100 clang-tidy fixes for readability-named-parameter check. --- .clang-tidy | 3 +-- livestatus/src/AttributelistColumn.cc | 2 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/CustomTimeperiodColumn.cc | 2 +- livestatus/src/DoubleAggregator.cc | 2 +- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/EmptyColumn.cc | 4 +++- livestatus/src/GlobalCountersColumn.cc | 2 +- livestatus/src/HostSpecialIntColumn.cc | 2 +- livestatus/src/LogCache.cc | 4 ++-- livestatus/src/Logfile.cc | 3 ++- livestatus/src/NullColumn.cc | 2 +- livestatus/src/OffsetIntColumn.cc | 2 +- livestatus/src/OffsetStringHostMacroColumn.cc | 4 +++- livestatus/src/OffsetStringMacroColumn.cc | 5 +++-- livestatus/src/OffsetTimeperiodColumn.cc | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/ServiceSpecialIntColumn.cc | 2 +- livestatus/src/StatusSpecialIntColumn.cc | 2 +- 19 files changed, 27 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e27d8dc4ba…

8 years, 7 months

Fixed width of werk title filter input field

by Lars Michelsen

Module: check_mk Branch: master Commit: ce315d441cc4e4f35e3a19818075de7a8b5c6d5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce315d441cc4e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 15:59:02 2016 +0100 Fixed width of werk title filter input field --- web/htdocs/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 24b396c..08b719c 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -322,7 +322,7 @@ werk_table_option_entries = [ "single", TextUnicode( title = _("Werk title or content"), - size = 44, + size = 41, ), "" ),

8 years, 7 months

Fixed acknowleding incompatible werks on site creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 71f4d8d3912049a6819eda4fa017879d1c2d1059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f4d8d3912049… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 15:55:59 2016 +0100 Fixed acknowleding incompatible werks on site creation --- web/htdocs/werks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index acaf140..24b396c 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -200,6 +200,7 @@ def save_acknowledgements(acknowledged_werks): def acknowledge_all_werks(): + load_werks() acknowledge_werks(unacknowledged_incompatible_werks())

8 years, 7 months

Fixed showing incomp werks as unacknowledged after acknowledging

by Lars Michelsen

Module: check_mk Branch: master Commit: e856ba6bda5eb3290fd60d9f5671f72408122fc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e856ba6bda5eb3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 15:53:40 2016 +0100 Fixed showing incomp werks as unacknowledged after acknowledging --- web/htdocs/werks.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 76c1e46..acaf140 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -100,6 +100,7 @@ def handle_acknowledgement(): acknowledge_werk(werk) html.message(HTML(_("Werk %s - %s has been acknowledged.") % (render_werk_id(werk, with_link=True), render_werk_title(werk)))) html.reload_sidebar() + load_werks() # reload ack states after modification elif html.var("_ack_all"): if (html.confirm(_("Do you really want to acknowledge <b>all</b> incompatible werks?"), method="GET")): @@ -107,6 +108,7 @@ def handle_acknowledgement(): acknowledge_all_werks() html.message(_("%d incompatible Werks have been acknowledged.") % num) html.reload_sidebar() + load_werks() # reload ack states after modification render_unacknowleged_werks()

8 years, 7 months

#3046 FIX Acknowledging all incompatible werks when creating new sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 2985e3fa9302da7f317d4e2bf51ba61eb19eb640 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2985e3fa9302da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 15:48:19 2016 +0100 #3046 FIX Acknowledging all incompatible werks when creating new sites --- .werks/3046 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++++ web/htdocs/werks.py | 18 +++++++++++------- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/3046 b/.werks/3046 new file mode 100644 index 0000000..96bf4ca --- /dev/null +++ b/.werks/3046 @@ -0,0 +1,9 @@ +Title: Acknowledging all incompatible werks when creating new sites +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1454510874 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3f6e4fe..b868396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -296,6 +296,7 @@ * 3035 FIX: Fixed broken graph preview when hovering graph icon in Check_MK Raw Edition * 3040 FIX: Removed all summary_hosts related filters from shipped views... * 3041 FIX: Fixed deselecting view checkbox options like "Always show checkboxes" in dashboard embedded views + * 3046 FIX: Acknowledging all incompatible werks when creating new sites WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1242d49..736e571 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14035,6 +14035,11 @@ def create_sample_config(): except: pass # silently ignore building errors here + # This is not really the correct place for such kind of action, but the best place we could + # find to execute it only for new created sites. + import werks + werks.acknowledge_all_werks() + #. # .--Pattern Editor------------------------------------------------------. # | ____ _ _ _____ _ _ _ | diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index f163aac..76c1e46 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -99,10 +99,14 @@ def handle_acknowledgement(): if werk["compatible"] == "incomp_unack": acknowledge_werk(werk) html.message(HTML(_("Werk %s - %s has been acknowledged.") % (render_werk_id(werk, with_link=True), render_werk_title(werk)))) + html.reload_sidebar() elif html.var("_ack_all"): if (html.confirm(_("Do you really want to acknowledge <b>all</b> incompatible werks?"), method="GET")): + num = len(unacknowledged_incompatible_werks()) acknowledge_all_werks() + html.message(_("%d incompatible Werks have been acknowledged.") % num) + html.reload_sidebar() render_unacknowleged_werks() @@ -177,9 +181,14 @@ def may_acknowledge(): def acknowledge_werk(werk): + acknowledge_werks([werk]) + + +def acknowledge_werks(werks): config.need_permission("general.acknowledge_werks") ack_ids = load_acknowledgements() - ack_ids.append(werk["id"]) + for werk in werks: + ack_ids.append(werk["id"]) werk["compatible"] = "incomp_ack" save_acknowledgements(ack_ids) @@ -189,12 +198,7 @@ def save_acknowledgements(acknowledged_werks): def acknowledge_all_werks(): - num = 0 - for werk in g_werks.values(): - if werk["compatible"] == "incomp_unack": - acknowledge_werk(werk) - num += 1 - html.message(_("%d incompatible Werks have been acknowledged.") % num) + acknowledge_werks(unacknowledged_incompatible_werks()) def werk_is_pre_127(werk):

8 years, 7 months

Fixed wrong code formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ff2068f7e33c97174f738bb2002f330139a1073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ff2068f7e33c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 3 15:38:02 2016 +0100 Fixed wrong code formating --- web/htdocs/wato.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5fd7cc6..1242d49 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14022,8 +14022,7 @@ def create_sample_config(): save_notification_rules(notification_rules) if "create_cee_sample_config" in globals(): - create_cee_sample_config() - + create_cee_sample_config() # Make sure the host tag attributes are immediately declared! config.wato_host_tags = wato_host_tags

8 years, 7 months

windows agent: updated binaries

by Sebastian Herbord

Module: check_mk Branch: master Commit: 5dca7ca2214f7b7eedff55d0921e00006465b1ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dca7ca2214f7b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Feb 3 15:38:02 2016 +0100 windows agent: updated binaries --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 6614119 -> 6614210 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 6614119 -> 6614210 bytes agents/windows/check_mk_agent.exe | Bin 5267330 -> 5267934 bytes agents/windows/check_mk_agent.msi | Bin 12224512 -> 12225536 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 5267330 -> 5267934 bytes agents/windows/install_agent-64.exe | Bin 1558571 -> 1558611 bytes agents/windows/install_agent.exe | Bin 1422547 -> 1422553 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index ba3343d..d94081a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1158 +1160 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index fc62534..2af754c 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 590401f..6952673 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.exe b/agents/windows/check_mk_agent.exe index 8cda0db..2f841f8 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 c5764e7..a5134ac 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 25e4734..1c80e76 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 4e018d5..654b78a 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 1ed6f1c..165cf95 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 7 months

#3066 FIX windows agent: 32-bit performance counters were not returned correctly

by Sebastian Herbord

Module: check_mk Branch: master Commit: b18cfc52de1473b2054d6e0decb486443235fa25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b18cfc52de1473… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Feb 3 15:36:34 2016 +0100 #3066 FIX windows agent: 32-bit performance counters were not returned correctly --- .werks/3066 | 9 +++++++++ ChangeLog | 1 + agents/windows/PerfCounter.cc | 42 ++++++++++++++++++++++++----------------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.werks/3066 b/.werks/3066 new file mode 100644 index 0000000..6552d0f --- /dev/null +++ b/.werks/3066 @@ -0,0 +1,9 @@ +Title: windows agent: 32-bit performance counters were not returned correctly +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454510131 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8b675b3..3f6e4fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -244,6 +244,7 @@ * 3065 FIX: mem.win: renamed "Pagefile" to "Commit Charge" to clarify what the number actually expresses... * 3043 FIX: agent_emcvnx: Fixed error handling in case of missing naviseccli command * 3045 FIX: veeam_backup_status: Fixed wrong date format reported by agent... + * 3066 FIX: windows agent: 32-bit performance counters were not returned correctly Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc index 5826aa2..ddd3620 100644 --- a/agents/windows/PerfCounter.cc +++ b/agents/windows/PerfCounter.cc @@ -111,25 +111,33 @@ std::string PerfCounter::typeName() const { ULONGLONG PerfCounter::extractValue(PERF_COUNTER_BLOCK *block) const { unsigned offset = _counter->CounterOffset; - int size = _counter->CounterSize; BYTE *pData = ((BYTE *)block) + offset; - if (_counter->CounterType & PERF_SIZE_DWORD) { - return static_cast<ULONGLONG>(*(DWORD *)block); - } else if (_counter->CounterType & PERF_SIZE_LARGE) { - return *(UNALIGNED ULONGLONG *)pData; - } - // handle other data generically. This is wrong in some situation. - // Once upon a time in future we might implement a conversion as - // described in - // http://msdn.microsoft.com/en-us/library/aa373178%28v=vs.85%29.aspx - else if (size == 4) { - return static_cast<ULONGLONG>(*(DWORD *)pData); - } else if (size == 8) { - DWORD *data_at = (DWORD *)pData; - return (DWORDLONG)*data_at + ((DWORDLONG) * (data_at + 1) << 32); - } else { - return 0ULL; + static const DWORD PERF_SIZE_MASK = 0x00000300; + + switch (_counter->CounterType & PERF_SIZE_MASK) { + case PERF_SIZE_DWORD: + return static_cast<ULONGLONG>(*(DWORD *)block); + case PERF_SIZE_LARGE: + return *(UNALIGNED ULONGLONG *)pData; + case PERF_SIZE_ZERO: + return 0ULL; + default: { // PERF_SIZE_VARIABLE_LEN + // handle other data generically. This is wrong in some situation. + // Once upon a time in future we might implement a conversion as + // described in + // http://msdn.microsoft.com/en-us/library/aa373178%28v=vs.85%29.aspx + int size = _counter->CounterSize; + if (size == 4) { + return static_cast<ULONGLONG>(*(DWORD *)pData); + } else if (size == 8) { + DWORD *data_at = (DWORD *)pData; + return (DWORDLONG)*data_at + + ((DWORDLONG) * (data_at + 1) << 32); + } else { + return 0ULL; + } + } break; } }

8 years, 7 months

check_mk_agent.hpux: df section of the agent now outputs all filesystems

by Bastian Kuhn

Module: check_mk Branch: master Commit: b7c681de2486684569d55ad5fab2617896868ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7c681de248668… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Feb 3 15:30:23 2016 +0100 check_mk_agent.hpux: df section of the agent now outputs all filesystems --- agents/check_mk_agent.hpux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 45f5b6e..add508d 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -59,7 +59,7 @@ echo AgentDirectory: $MK_CONFDIR # modern systems with vxfs only here. The filesystem type is currently # not used by the check anyway. echo '<<<df>>>' -df -kP -F vxfs | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" +df -kP | sed 's/ / - /' | awk '/^(.*-.*)$/ { print $0 } /^([^-]+)$/ { printf $0 }' | grep -Ev "^/proc|^Filesystem|^/aha|:" # Process table: HP-UX does not provide a resident size of processes. # We send a 0 here for RSZ.

8 years, 7 months

← Newer
1
...
30
31
32
33
34
35
36
...
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