Module: check_mk Branch: master Commit: 81020a33460c752decd91e9b5832def4524a09d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81020a33460c75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:03:13 2012 +0200 Windows agent: output ullTotalVirtual and ullAvailVirtual --- ChangeLog | 2 ++ agents/windows/check_mk_agent.cc | 14 ++++++++------ agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/install_agent.exe | Bin 126273 -> 126319 bytes web/htdocs/wato.py | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07c0c6b..58fb475 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ update information for 30 minutes * FIX: mssql_counters checks now really only inventorize percentage based counters if a base value is set + * Windows agent: output ullTotalVirtual and ullAvailVirtual (not yet + being used by check) 1.2.0p3: Mulitisite diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4fe8134..b942a0e 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1340,12 +1340,14 @@ void section_mem(SOCKET &out) statex.dwLength = sizeof (statex); GlobalMemoryStatusEx (&statex); - output(out, "MemTotal: %11d kB\n", statex.ullTotalPhys / 1024); - output(out, "MemFree: %11d kB\n", statex.ullAvailPhys / 1024); - output(out, "SwapTotal: %11d kB\n", (statex.ullTotalPageFile - statex.ullTotalPhys) / 1024); - output(out, "SwapFree: %11d kB\n", (statex.ullAvailPageFile - statex.ullAvailPhys) / 1024); - output(out, "PageTotal: %11d kB\n", statex.ullTotalPageFile / 1024); - output(out, "PageFree: %11d kB\n", statex.ullAvailPageFile / 1024); + output(out, "MemTotal: %11d kB\n", statex.ullTotalPhys / 1024); + output(out, "MemFree: %11d kB\n", statex.ullAvailPhys / 1024); + output(out, "SwapTotal: %11d kB\n", (statex.ullTotalPageFile - statex.ullTotalPhys) / 1024); + output(out, "SwapFree: %11d kB\n", (statex.ullAvailPageFile - statex.ullAvailPhys) / 1024); + output(out, "PageTotal: %11d kB\n", statex.ullTotalPageFile / 1024); + output(out, "PageFree: %11d kB\n", statex.ullAvailPageFile / 1024); + output(out, "VirtualTotal: %11d kB\n", statex.ullTotalVirtual / 1024); + output(out, "VirtualFree: %11d kB\n", statex.ullAvailVirtual / 1024); } // .-----------------------------------------------------------------------. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 16eb20d..4838bd4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 3c820af..44ed680 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3539aaf..06e65f7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6175,6 +6175,8 @@ class TimeperiodSelection(ElementSelection): def get_elements(self): timeperiods = load_timeperiods() + if "7X24" not in timeperiods: + timeperiods["7X24"] = _("Always") elements = dict([ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ]) return elements