[checkmk-commits] Check_MK Git: check_mk: diskstat: removed (ever incorrect)

latency computation for Linux Message-ID: <525b46f7.xGv0qQPZ//xWH7FK%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f840e6dc9beeae219daddc0487a2898d94447437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f840e6dc9beeae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 13 22:18:35 2013 +0200 diskstat: removed (ever incorrect) latency computation for Linux --- ChangeLog | 3 +++ checks/.f12 | 2 +- checks/diskstat | 2 +- checks/diskstat.include | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0dc4ccd..407761d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ are omitted, since they do not really matter and make the results less useful when using CMC. + Checks & Agents: + * diskstat: removed (ever incorrect) latency computation for Linux + WATO: * You can now have site-specific global settings when using distributed WATO (available in the "Distributed Monitoring") diff --git a/checks/.f12 b/checks/.f12 index 5e1a7fa..57202fb 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,5 +1,5 @@ #!/bin/bash -SITE=${SITE:-$(cat ../.site)} +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/ diff --git a/checks/diskstat b/checks/diskstat index 84d3039..41f4d3a 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -131,7 +131,7 @@ def linux_diskstat_convert(info): int(l[9]), int(l[3]), int(l[7]), - int(l[12]) + # int(l[12]) ) for l in info[1:] if len(l) >= 13 ] diff --git a/checks/diskstat.include b/checks/diskstat.include index 5f68c3b..0afe294 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -30,7 +30,7 @@ diskstat_default_levels = { # "read" : (10, 20), # MB/sec # "write" : (20, 40), # MB/sec # "average" : 15, # min -# "latency" : (10, 20), # ms +# "latency" : (10, 20), # ms # "latency_perfdata" : True, }