Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: FIX: multipath check now handles dashes in " user friendly names"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 341226bd5eb3956f5e8b48865aabc84392eb6748 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=341226bd5eb395… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:55:20 2012 +0200 FIX: multipath check now handles dashes in "user friendly names" --- ChangeLog | 1 + checks/multipath | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58fb475..a035b55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used * FIX: Windows agent: quote '%' in plugin output correctly + * FIX: multipath check now handles '-' in "user friendly names" 1.2.1i1: Core: diff --git a/checks/multipath b/checks/multipath index 2eb1a40..0d9ccbc 100644 --- a/checks/multipath +++ b/checks/multipath @@ -120,6 +120,15 @@ # \_ 4:0:1:11 sdcf 69:48 [active][undef] # \_ 3:0:0:11 sdl 8:176 [active][undef] +# Just an underscore and a dash in the LUN name +# SDataCoreSANsymphony_DAT05-fscl dm-6 DataCore,SANsymphony +# [size=600G][features=0][hwhandler=0] +# \_ round-robin 0 [prio=-1][enabled] +# \_ 3:0:0:11 sdae 65:224 [active][undef] +# \_ round-robin 0 [prio=-1][enabled] +# \_ 4:0:0:11 sdt 65:48 [active][undef] + + def parse_multipath_output(info, only_uuid = None): # only_uuid --> look only for data of this uuid or alias @@ -136,7 +145,7 @@ def parse_multipath_output(info, only_uuid = None): (get_regex(r"^[a-zA-Z0-9_]+$"), 0, None), # 3. (get_regex(r"^([0-9a-z]{33}|[0-9a-z]{49})\s?dm.+$"), 1, None), # 4. (get_regex(r"^[a-zA-Z0-9_]+dm-.+$"), 0, None), # 5. Remove this line in 1.2.0 - (get_regex(r"^([a-zA-Z0-9_]+)\s?dm-.+$"), 1, None), # 6. + (get_regex(r"^([a-zA-Z0-9_-]+)\s?dm-.+$"), 1, None), # 6. and 7. ] reg_prio = get_regex("[[ ]prio=")

11 years, 11 months

Check_MK Git: check_mk: Revert "Removed debug output in multipath check"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 387b5908dda43121b31e08224e10f3c2ba4c52ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=387b5908dda431… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:56:45 2012 +0200 Revert "Removed debug output in multipath check" This reverts commit 36240f936afc4fb58ac76aa31cee1293d15c7ab6. --- checks/multipath | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/checks/multipath b/checks/multipath index 0d9ccbc..f9006aa 100644 --- a/checks/multipath +++ b/checks/multipath @@ -156,6 +156,7 @@ def parse_multipath_output(info, only_uuid = None): group = {} numpaths = None for line in info: + print line # newer agent also output the device mapper table. # ignore those lines for now. if line[0] == "dm":

11 years, 11 months

Check_MK Git: check_mk: WATO: Always allow to configure timeperiod 7X24

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 00be680a1f55d7c4081e294b41adbf85dea672e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00be680a1f55d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:50:48 2012 +0200 WATO: Always allow to configure timeperiod 7X24 --- web/htdocs/wato.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 06e65f7..4becf6d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6175,9 +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() ]) + elements = dict([ ("7X24", _("Always")) ] + \ + [ (name, "%s - %s" % (name, tp["alias"])) for (name, tp) in timeperiods.items() ]) return elements # Check if a timeperiod is currently in use and cannot be deleted

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 094a243e18b7870b7bac12c20a806d5559f5b313 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094a243e18b787… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:50:54 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 317e1497fec29c0ddb429f45c25b0144c1b6713e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=317e1497fec29c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 17:29:25 2012 +0200 Add new bug entry --- .bugs/809 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/809 b/.bugs/809 new file mode 100644 index 0000000..c1016ca --- /dev/null +++ b/.bugs/809 @@ -0,0 +1,11 @@ +Title: BI foldertree should hint aggretion method (worst, best) +Component: bi +State: open +Date: 2012-10-10 17:24:38 +Targetversion: future +Class: phantasm + +Customers have asked to see some indication for what aggregation method used +at the aggregation levels. The user of the aggretion view is usually not the +author so he can't obtain the information; simulation would only allow for +guessing this.

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d37c80575c15ce00ae9d11830c9e2fcd98987cd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d37c80575c15ce… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Oct 11 16:41:24 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Windows agent: output ullTotalVirtual and ullAvailVirtual

by git＠mathias-kettner.de

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

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7a525e55a940f795d17a757415a4fe37f75fbd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a525e55a940f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 16:03:18 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Removed debug output in multipath check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36240f936afc4fb58ac76aa31cee1293d15c7ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36240f936afc4f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 11 14:16:41 2012 +0200 Removed debug output in multipath check --- checks/multipath | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/multipath b/checks/multipath index f9006aa..0d9ccbc 100644 --- a/checks/multipath +++ b/checks/multipath @@ -156,7 +156,6 @@ def parse_multipath_output(info, only_uuid = None): group = {} numpaths = None for line in info: - print line # newer agent also output the device mapper table. # ignore those lines for now. if line[0] == "dm":

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0746

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 019be7b08ba13b02dce4bd17ad9c2b990b3ff0dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=019be7b08ba13b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 11 10:49:57 2012 +0200 Updated bug entries #0746 --- .bugs/746 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/746 b/.bugs/746 new file mode 100644 index 0000000..650eb13 --- /dev/null +++ b/.bugs/746 @@ -0,0 +1,8 @@ +Title: check_mk --cleanup-autochecks shows usage message instead of performing operation. +Component: core +State: open +Date: 2012-10-11 10:49:23 +Targetversion: future +Class: nastiness + +The documentation suggests that check_mk --cleanup-autochecks is synonymous with check_mk -u but when I run check_mk --cleanup-autochecks it reports a usage error instead of performing the operation. When I run check_mk -u, it does not report the usage message.

11 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012