lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
February 2017
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
10 participants
452 discussions
Start a n
N
ew thread
Moved enterprise edition related gitbugs to top level hierarchy
by Lars Michelsen
Module: check_mk Branch: master Commit: fb3fba59849d2b12d9c0ab664f5d6ba2a9ae3ebe URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb3fba59849d2b…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 10:48:49 2017 +0100 Moved enterprise edition related gitbugs to top level hierarchy Change-Id: Ib61531789b4be2f558b2adc39497a3a4bf3df324 --- .bugs/2600 | 19 ++++++++ .bugs/2601 | 13 ++++++ .bugs/2602 | 30 +++++++++++++ .bugs/2603 | 13 ++++++ .bugs/2604 | 12 +++++ .bugs/2605 | 12 +++++ .bugs/2606 | 12 +++++ .bugs/2607 | 23 ++++++++++ .bugs/2608 | 18 ++++++++ .bugs/2609 | 12 +++++ .bugs/2610 | 13 ++++++ .bugs/2611 | 40 +++++++++++++++++ .bugs/2612 | 17 +++++++ .bugs/2613 | 17 +++++++ .bugs/2614 | 22 +++++++++ .bugs/2615 | 16 +++++++ .bugs/2616 | 12 +++++ .bugs/2617 | 11 +++++ .bugs/2618 | 12 +++++ .bugs/2619 | 11 +++++ .bugs/2620 | 13 ++++++ .bugs/2621 | 15 +++++++ .bugs/2622 | 31 +++++++++++++ .bugs/2623 | 89 +++++++++++++++++++++++++++++++++++++ .bugs/2624 | 15 +++++++ .bugs/2625 | 33 ++++++++++++++ .bugs/2626 | 11 +++++ .bugs/2627 | 49 ++++++++++++++++++++ .bugs/2628 | 14 ++++++ .bugs/2629 | 10 +++++ .bugs/2630 | 26 +++++++++++ .bugs/2631 | 12 +++++ .bugs/2632 | 11 +++++ .bugs/2633 | 13 ++++++ .bugs/2634 | 13 ++++++ .bugs/2635 | 49 ++++++++++++++++++++ .bugs/2636 | 12 +++++ .bugs/2637 | 14 ++++++ .bugs/2638 | 12 +++++ .bugs/2639 | 23 ++++++++++ .bugs/2640 | 28 ++++++++++++ .bugs/2641 | 16 +++++++ .bugs/2642 | 32 +++++++++++++ .bugs/2650 | 48 ++++++++++++++++++++ .bugs/2651 | 16 +++++++ .bugs/2652 | 9 ++++ .bugs/2653 | 9 ++++ .bugs/2660 | 22 +++++++++ .bugs/2661 | 39 ++++++++++++++++ .bugs/2662 | 22 +++++++++ .bugs/2663 | 12 +++++ .bugs/2664 | 16 +++++++ .bugs/2665 | 16 +++++++ .bugs/2666 | 24 ++++++++++ .bugs/2667 | 12 +++++ .bugs/2668 | 14 ++++++ .bugs/2669 | 11 +++++ .bugs/2670 | 14 ++++++ .bugs/2671 | 13 ++++++ .bugs/2672 | 29 ++++++++++++ .bugs/2673 | 14 ++++++ .bugs/2674 | 75 +++++++++++++++++++++++++++++++ .bugs/2675 | 17 +++++++ .bugs/2676 | 13 ++++++ .bugs/2677 | 9 ++++ .bugs/2678 | 13 ++++++ .bugs/2680 | 17 +++++++ .bugs/2681 | 23 ++++++++++ .bugs/2682 | 12 +++++ .bugs/2683 | 11 +++++ .bugs/2684 | 18 ++++++++ .bugs/2685 | 12 +++++ .bugs/2686 | 13 ++++++ .bugs/2687 | 13 ++++++ .bugs/2688 | 30 +++++++++++++ .bugs/2689 | 17 +++++++ .bugs/2700 | 16 +++++++ .bugs/2701 | 21 +++++++++ .bugs/2702 | 11 +++++ .bugs/2703 | 11 +++++ .bugs/2704 | 21 +++++++++ .bugs/2710 | 21 +++++++++ .bugs/2711 | 19 ++++++++ .bugs/2712 | 9 ++++ .bugs/2713 | 12 +++++ .bugs/2714 | 22 +++++++++ .bugs/2715 | 19 ++++++++ .bugs/2716 | 26 +++++++++++ .bugs/2717 | 16 +++++++ .bugs/2718 | 17 +++++++ .bugs/2720 | 16 +++++++ .bugs/2721 | 23 ++++++++++ .bugs/2722 | 33 ++++++++++++++ .bugs/2723 | 24 ++++++++++ .bugs/2724 | 14 ++++++ .bugs/2725 | 26 +++++++++++ .bugs/2726 | 23 ++++++++++ .bugs/2728 | 7 +++ .bugs/2729 | 13 ++++++ .bugs/2730 | 19 ++++++++ .bugs/2731 | 10 +++++ .bugs/2732 | 13 ++++++ .bugs/2733 | 22 +++++++++ .bugs/2734 | 12 +++++ .bugs/2735 | 20 +++++++++ .bugs/2736 | 16 +++++++ .bugs/2737 | 11 +++++ .bugs/2738 | 10 +++++ .bugs/2739 | 11 +++++ .bugs/2740 | 7 +++ .bugs/2741 | 7 +++ .bugs/2742 | 21 +++++++++ .bugs/2743 | 14 ++++++ .bugs/2744 | 15 +++++++ .bugs/2745 | 10 +++++ .bugs/2746 | 9 ++++ .bugs/2747 | 11 +++++ .bugs/2748 | 13 ++++++ .bugs/2749 | 7 +++ .bugs/2750 | 15 +++++++ .bugs/2751 | 37 ++++++++++++++++ .bugs/2752 | 12 +++++ .bugs/2753 | 10 +++++ .bugs/2754 | 10 +++++ .bugs/2755 | 15 +++++++ .bugs/2756 | 12 +++++ .bugs/2757 | 11 +++++ .bugs/2758 | 7 +++ .bugs/2759 | 8 ++++ .bugs/2780 | 8 ++++ .bugs/2781 | 67 ++++++++++++++++++++++++++++ .bugs/2782 | 9 ++++ .bugs/2790 | 12 +++++ .bugs/2800 | 11 +++++ .bugs/2801 | 18 ++++++++ .bugs/2802 | 31 +++++++++++++ .bugs/2803 | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ .bugs/2804 | 9 ++++ .bugs/2805 | 13 ++++++ .bugs/2806 | 8 ++++ .bugs/2807 | 12 +++++ .bugs/2808 | 9 ++++ .bugs/2810 | 10 +++++ .bugs/2811 | 12 +++++ .bugs/2812 | 15 +++++++ .bugs/2813 | 13 ++++++ .bugs/2814 | 18 ++++++++ .bugs/2815 | 15 +++++++ .bugs/2816 | 16 +++++++ .bugs/2817 | 19 ++++++++ .bugs/2818 | 16 +++++++ .bugs/2819 | 10 +++++ .bugs/2820 | 13 ++++++ .bugs/2821 | 18 ++++++++ .bugs/2822 | 9 ++++ .bugs/2823 | 8 ++++ .bugs/2830 | 10 +++++ .bugs/2831 | 19 ++++++++ .bugs/2832 | 12 +++++ .bugs/2833 | 24 ++++++++++ .bugs/2834 | 17 +++++++ .bugs/2835 | 14 ++++++ .bugs/2836 | 10 +++++ .bugs/2837 | 14 ++++++ .bugs/2838 | 20 +++++++++ .bugs/2839 | 90 +++++++++++++++++++++++++++++++++++++ .bugs/2840 | 17 +++++++ .bugs/2841 | 9 ++++ .bugs/2842 | 12 +++++ .bugs/2843 | 19 ++++++++ .bugs/2845 | 10 +++++ .bugs/2850 | 38 ++++++++++++++++ .bugs/2855 | 7 +++ .bugs/2856 | 8 ++++ .bugs/config | 3 +- .bugs/first_free | 2 +- 176 files changed, 3209 insertions(+), 2 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fb3fba5984…
7 years, 6 months
1
0
0
0
Repaired generator tests.
by Roland Halbig
Module: check_mk Branch: master Commit: 6b657bd064e08d7d79462a7be6f49c16d45fd381 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b657bd064e08d…
Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 22 10:24:41 2017 +0100 Repaired generator tests. Change-Id: I81bf3e1f32db037d8861423772843e9d13c37fd5 --- tests/web/test_generator.py | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index 72b0137..553b990 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -7,6 +7,7 @@ import re # internal imports from htmllib import HTML, HTMLGenerator +import tools def test_HTMLGenerator(): @@ -14,23 +15,28 @@ def test_HTMLGenerator(): html = HTMLGenerator() html.plug() - html.open_div() - assert html.drain() == "<div>" + with html.plugged(): + html.open_div() + text = html.drain() + assert text.rstrip('\n').rstrip(' ') == "<div>" + + with html.plugged(): + #html.open_div().write("test").close_div() + html.open_div() + html.write("test") + html.close_div() + assert tools.compare_html(html.drain(), "<div>test</div>") + + with html.plugged(): + #html.open_table().open_tr().td("1").td("2").close_tr().close_table() + html.open_table() + html.open_tr() + html.td("1") + html.td("2") + html.close_tr() + html.close_table() + assert tools.compare_html(html.drain(), "<table><tr><td>1</td><td>2</td></tr></table>") - #html.open_div().write("test").close_div() - html.open_div() - html.write("test") - html.close_div() - assert html.drain() == "<div>test</div>" - - #html.open_table().open_tr().td("1").td("2").close_tr().close_table() - html.open_table() - html.open_tr() - html.td("1") - html.td("2") - html.close_tr() - html.close_table() - assert html.drain() == "<table><tr><td>1</td><td>2</td></tr></table>" def test_exception_handling(): html = HTMLGenerator() @@ -38,4 +44,4 @@ def test_exception_handling(): try: raise Exception("Test") except Exception, e: - assert html.render_div(e) == "<div>%s</div>" % e + assert tools.compare_html(html.render_div(e), "<div>%s</div>" % e)
7 years, 6 months
1
0
0
0
4408 FIX checkpoint_temp, checkpoint_fan, checkpoint_voltage:
by Simon Betz
fixed status and value handling Message-ID: <58ad5a4d.YTNGe0s7IP4EcKO4%si(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: d735d091ad677de197445b4fb549262367300520 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d735d091ad677d…
Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 22 10:28:34 2017 +0100 4408 FIX checkpoint_temp, checkpoint_fan, checkpoint_voltage: fixed status and value handling Change-Id: I3fd8c22573ecc36a189fc92085210b957600a46a --- .werks/4408 | 10 + ChangeLog | 8830 +++++++++++++++++++++++++++++++++++++++++++++ checks/checkpoint.include | 6 +- checks/checkpoint_fan | 4 +- checks/checkpoint_temp | 10 +- checks/checkpoint_voltage | 4 +- 6 files changed, 8855 insertions(+), 9 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d735d091ad…
7 years, 6 months
1
0
0
0
4029 Windows Agent Process Monitoring: Now able to set levels to process age
by Andreas Boesl
Module: check_mk Branch: master Commit: abc37645142428fd132ed5d4fec382e4b382d29e URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc37645142428…
Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 21 16:51:23 2017 +0100 4029 Windows Agent Process Monitoring: Now able to set levels to process age Change-Id: I64643c7865623716bf6e9a39bfe5e751379342e4 --- .werks/4029 | 9 ++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1329664 -> 1332224 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15658530 -> 15690517 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1329664 -> 1332224 bytes agents/windows/check_mk_agent.exe | Bin 1305600 -> 1308672 bytes agents/windows/check_mk_agent.msi | Bin 2905088 -> 2910720 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13549114 -> 13575746 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305600 -> 1308672 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 586870 -> 588355 bytes agents/windows/install_agent.exe | Bin 583912 -> 585583 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/sections/SectionPS.cc | 26 +++++++++++++++++++---- agents/windows/sections/SectionPS.h | 2 +- checks/ps.include | 16 +++++++++++++- 16 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.werks/4029 b/.werks/4029 new file mode 100644 index 0000000..04f161e --- /dev/null +++ b/.werks/4029 @@ -0,0 +1,9 @@ +Title: Windows Agent Process Monitoring: Now able to set levels to process age +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487692248 +Class: feature + + diff --git a/agents/windows/build_version b/agents/windows/build_version index fe534ad..7f9c296 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2543 +2599 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 79ab757..5a5f003 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index cd2401d..bda51ed 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 8ad627c..bdb8e76 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 9723e87..e172ed1 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 0b254b8..291835a 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 824db74..9b23f09 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 6896b17..9fc5bc2 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/crash.exe b/agents/windows/crash.exe index a672400..d05202c 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4fdd569..844efbe 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 962a2c6..0a6cdea 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index dbd94c0..72eb539 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index ebf1579..8d84e31 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -29,6 +29,12 @@ #include "../logging.h" #include <windows.h> #include <tlhelp32.h> +#include <iomanip> + + +extern double file_time(const FILETIME *filetime); +extern double current_time(); + SectionPS::SectionPS(Configuration &config) : Section("ps") @@ -146,7 +152,7 @@ bool SectionPS::produceOutputInner(std::ostream &out, const Environment&) { void SectionPS::outputProcess(std::ostream &out, ULONGLONG virtual_size, ULONGLONG working_set_size, - ULONGLONG pagefile_usage, ULONGLONG usermode_time, + ULONGLONG pagefile_usage, ULONGLONG uptime, ULONGLONG usermode_time, ULONGLONG kernelmode_time, DWORD process_id, DWORD process_handle_count, DWORD thread_count, const std::string &user, LPCSTR exe_file) { @@ -156,7 +162,7 @@ void SectionPS::outputProcess(std::ostream &out, ULONGLONG virtual_size, << working_set_size / 1024 << ",0" << "," << process_id << "," << pagefile_usage / 1024 << "," << usermode_time << "," << kernelmode_time << "," - << process_handle_count << "," << thread_count << ")\t" << exe_file + << process_handle_count << "," << thread_count << "," << uptime << ")\t" << exe_file << "\n"; } @@ -195,10 +201,18 @@ bool SectionPS::outputWMI(std::ostream &out) { LocalFree(argv); } + auto creation_date = result.get<std::wstring>(L"CreationDate"); + std::wistringstream ss(creation_date); + std::tm t; + ss >> std::get_time(&t, L"%Y%m%d%H%M%S"); + time_t creation_time = mktime(&t); + auto uptime = (ULONGLONG)((time_t)current_time() - creation_time); + outputProcess( out, std::stoull(result.get<std::string>(L"VirtualSize")), std::stoull(result.get<std::string>(L"WorkingSetSize")), result.get<int>(L"PagefileUsage"), + uptime, std::stoull(result.get<std::wstring>(L"UserModeTime")), std::stoull(result.get<std::wstring>(L"KernelModeTime")), processId, result.get<int>(L"HandleCount"), @@ -288,10 +302,14 @@ bool SectionPS::outputNative(std::ostream &out) { pagefile_usage = it_perf->second.pagefile_usage; } + // Uptime + double ft = file_time(&createTime); + ULONGLONG uptime = (ULONGLONG)(current_time() - ft); + // Note: CPU utilization is determined out of usermodetime and // kernelmodetime outputProcess(out, virtual_size, working_set_size, pagefile_usage, - usermodetime.QuadPart, kernelmodetime.QuadPart, + uptime, usermodetime.QuadPart, kernelmodetime.QuadPart, pe32.th32ProcessID, processHandleCount, pe32.cntThreads, user, pe32.szExeFile); } @@ -304,7 +322,7 @@ bool SectionPS::outputNative(std::ostream &out) { // We simply fake this entry.. SYSTEM_INFO sysinfo; GetSystemInfo(&sysinfo); - outputProcess(out, 0, 0, 0, 0, 0, 0, 0, sysinfo.dwNumberOfProcessors, + outputProcess(out, 0, 0, 0, 0, 0, 0, 0, 0, sysinfo.dwNumberOfProcessors, "SYSTEM", "System Idle Process"); return true; } diff --git a/agents/windows/sections/SectionPS.h b/agents/windows/sections/SectionPS.h index 42ea89d..56edb08 100644 --- a/agents/windows/sections/SectionPS.h +++ b/agents/windows/sections/SectionPS.h @@ -63,7 +63,7 @@ private: void outputProcess(std::ostream &out, ULONGLONG virtual_size, ULONGLONG working_set_size, ULONGLONG pagefile_usage, - ULONGLONG usermode_time, ULONGLONG kernelmode_time, + ULONGLONG uptime, ULONGLONG usermode_time, ULONGLONG kernelmode_time, DWORD process_id, DWORD process_handle_count, DWORD thread_count, const std::string &user, LPCSTR exe_file); diff --git a/checks/ps.include b/checks/ps.include index 13d35d3..02fcd5f 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -376,6 +376,20 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" # even more data: processId, pagefile_usage, usermodetime, kernelmodetime, threadCount, openHandles pid, pagefile_usage, user_c, kernel_c, handle_c = map(saveint, process_info[4:9]) + # Info may include creation time + if len(process_info) >= 11: + uptime_secs = int(process_info[10]) + creation_time_unix = int(now - uptime_secs) + if creation_time_unix != 0: + process.append(("creation time", (get_timestamp_human_readable(creation_time_unix), ""))) + + elapsed = now - creation_time_unix + max_elapsed = max(max_elapsed, elapsed) + if min_elapsed == None: + min_elapsed = elapsed + else: + min_elapsed = min(min_elapsed, elapsed) + process.append(("pagefile usage", (pagefile_usage, ""))) process.append(("handle count", (handle_c, ""))) @@ -552,7 +566,7 @@ def check_ps_common(item, params, parsed, cpu_cores = 1, info_name = "processes" if max_elapsed >= crit_age: state = 2 infotext += "(!!)" - elif max_elapsed >= crit_age: + elif max_elapsed >= warn_age: state = max(state, 1) infotext += "(!)"
7 years, 6 months
1
0
0
0
4391 FIX Services: Fixed broken link for services having no WATO configurable check parameters
by Lars Michelsen
Module: check_mk Branch: master Commit: fa5498694949bec868da203feed54f03e419e103 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa5498694949be…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 09:37:48 2017 +0100 4391 FIX Services: Fixed broken link for services having no WATO configurable check parameters Change-Id: I88ca124d53b49b8bd93854d6ad3c4e9e9725906a --- .werks/4391 | 10 ++++++++++ web/htdocs/wato.py | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4391 b/.werks/4391 new file mode 100644 index 0000000..9f590b5 --- /dev/null +++ b/.werks/4391 @@ -0,0 +1,10 @@ +Title: Services: Fixed broken link for services having no WATO configurable check parameters +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.5.0i1 +Date: 1487752620 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d39b9d..78dbf6a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3211,8 +3211,12 @@ class ModeDiscovery(WatoMode): _("View and edit the parameters for this service"), "rulesets") def check_parameters_button(): + ruleset_name = self._get_ruleset_name(check_source, check_type, checkgroup) + if ruleset_name is None: + return + url = folder_preserving_link([("mode", "edit_ruleset"), - ("varname", self._get_ruleset_name(check_source, check_type, checkgroup)), + ("varname", ruleset_name), ("host", self._host_name), ("item", mk_repr(item))]) html.icon_button(url,
7 years, 6 months
1
0
0
0
Refactored html.plugged().
by Roland Halbig
Module: check_mk Branch: master Commit: 9da8238841535a8a9916d5707678fd2af3562ca7 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9da8238841535a…
Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Wed Feb 15 13:01:24 2017 +0100 Refactored html.plugged(). Change-Id: I97ac369688ee1844b0566489b64b6b913d1900d7 --- tests/web/test_OutputFunnel.py | 48 +++++++++++++-- web/htdocs/htmllib.py | 33 ++++++----- web/htdocs/index.py | 7 ++- web/htdocs/sidebar.py | 31 +++++----- web/htdocs/wato.py | 11 ++-- web/plugins/views/availability.py | 122 ++++++++++++++++++++------------------ web/plugins/views/bi.py | 24 ++++---- web/plugins/views/inventory.py | 8 +-- 8 files changed, 169 insertions(+), 115 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9da8238841…
7 years, 6 months
1
0
0
0
Refactoring htmllib: replaced some writes with write_htmls. removed idle_tag
by Roland Halbig
Module: check_mk Branch: master Commit: 1730ff4aa02b34b2d1791635ea5bad4bc8423cac URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1730ff4aa02b34…
Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 7 13:59:10 2017 +0100 Refactoring htmllib: replaced some writes with write_htmls. removed idle_tag Change-Id: I1c40a6407fc21875a2be5b327fe07f180b2d3e04 --- tests/web/test_OutputFunnel.py | 44 +++++++++++++++---------- web/htdocs/htmllib.py | 75 ++++++++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 52 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1730ff4aa0…
7 years, 6 months
1
0
0
0
GUI crawl: retry failed "connection aborted" failed HTTP calls to fix known keepalive issue
by Lars Michelsen
Module: check_mk Branch: master Commit: 698f92cbc1ced02d17ee3f00c95fdf81863cc917 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=698f92cbc1ced0…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 22 08:41:54 2017 +0100 GUI crawl: retry failed "connection aborted" failed HTTP calls to fix known keepalive issue Change-Id: I1266c915d54d4570108a4219721db685e51fae65 --- tests/testlib/__init__.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index e971e3b..fa54837 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -550,7 +550,7 @@ class WebSession(requests.Session): def _request(self, method, path, proto="http", expected_code=200, expect_redirect=None, allow_errors=False, add_transid=False, allow_redirect_to_login=False, - **kwargs): + allow_retry=True, **kwargs): url = self.url(proto, path) if add_transid: @@ -561,9 +561,23 @@ class WebSession(requests.Session): kwargs["allow_redirects"] = False if method == "post": - response = super(WebSession, self).post(url, **kwargs) + func = super(WebSession, self).post else: - response = super(WebSession, self).get(url, **kwargs) + func = super(WebSession, self).get + + # May raise "requests.exceptions.ConnectionError: ('Connection aborted.', BadStatusLine("''",))" + # suddenly without known reason. This may be related to some + # apache or HTTP/1.1 issue when working with keepalive connections. See + #
https://www.google.de/search?q=connection+aborted+Connection+aborted+bad+st…
+ #
https://github.com/mikem23/keepalive-race
+ # Trying to workaround this by trying the problematic request a second time. + try: + response = func(url, **kwargs) + except requests.ConnectionError, e: + if allow_retry and "Connection aborted" in "%s" % e: + response = func(url, **kwargs) + else: + raise self._handle_http_response(response, expected_code, allow_errors, expect_redirect, allow_redirect_to_login)
7 years, 6 months
1
0
0
0
Test site now uses branch specific daily version in daily/git version mode
by Lars Michelsen
Module: check_mk Branch: master Commit: 5733078f92087f54da1965ec1a2c48ea9829cfb9 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5733078f92087f…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 12:30:50 2017 +0100 Test site now uses branch specific daily version in daily/git version mode Change-Id: I62b7e40f675db722713893aa4c89823a5830c074 --- tests/conftest.py | 5 ++++- tests/testlib/__init__.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index a005291..3c01873 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -74,11 +74,14 @@ def _get_site_object(): def site_edition(): return os.environ.get("EDITION", testlib.CMKVersion.CEE) + def site_branch(): + return os.environ.get("BRANCH", "master") + def reuse_site(): return os.environ.get("REUSE", "1") == "1" return testlib.Site(site_id=_site_id(), version=site_version(), - edition=site_edition(), reuse=reuse_site()) + edition=site_edition(), reuse=reuse_site(), branch=site_branch()) def _site_id(): diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 81b4d4a..f0090ec 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -60,8 +60,8 @@ class CMKVersion(object): CEE = "cee" CRE = "cre" - def __init__(self, version, edition): - self.set_version(version) + def __init__(self, version, edition, branch): + self.set_version(version, branch) if len(edition) != 3: raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") @@ -78,9 +78,13 @@ class CMKVersion(object): return os.path.split(path)[-1].rsplit(".", 1)[0] - def set_version(self, version): + def set_version(self, version, branch): if version in [ CMKVersion.DAILY, CMKVersion.GIT ]: - self.version = time.strftime("%Y.%m.%d") + date_part = time.strftime("%Y.%m.%d") + if branch != "master": + return "%s-%s" % (branch, date_part) + else: + return date_part elif version == CMKVersion.DEFAULT: self.version = self.get_default_version() @@ -145,11 +149,11 @@ class CMKVersion(object): class Site(object): def __init__(self, site_id, reuse=True, version=CMKVersion.DEFAULT, - edition=CMKVersion.CEE): + edition=CMKVersion.CEE, branch="master"): assert site_id self.id = site_id self.root = "/omd/sites/%s" % self.id - self.version = CMKVersion(version, edition) + self.version = CMKVersion(version, edition, branch) self.update_with_git = version == CMKVersion.GIT
7 years, 7 months
1
0
0
0
Fixed recent change
by Lars Michelsen
Module: check_mk Branch: master Commit: 87b3b41f44d9efed16b502419a1117c5e9159b79 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b3b41f44d9ef…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 15:35:22 2017 +0100 Fixed recent change Change-Id: I40e0d87d6602af1e58697e41ac2e232da1172fcb --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f0090ec..e971e3b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -82,9 +82,9 @@ class CMKVersion(object): if version in [ CMKVersion.DAILY, CMKVersion.GIT ]: date_part = time.strftime("%Y.%m.%d") if branch != "master": - return "%s-%s" % (branch, date_part) + self.version = "%s-%s" % (branch, date_part) else: - return date_part + self.version = date_part elif version == CMKVersion.DEFAULT: self.version = self.get_default_version()
7 years, 7 months
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
46
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
Results per page:
10
25
50
100
200