22 Jan
2012
22 Jan
'12
5:36 p.m.
Module: check_mk
Branch: master
Commit: 33db38cca42f6278e9983ab757cee860520b6b3b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33db38cca42f62…
Author: Florian Heigl <fh(a)mathias-kettner.de>
Date: Sun Jan 22 23:35:23 2012 +0100
More benchmark results. :)
---
doc/opt/benchmark/bench.cfg | 16 ++++++++++------
doc/opt/benchmark/cmkbench.sh | 16 ++++++++--------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg
index 8a6a483..e4e5845 100644
--- a/doc/opt/benchmark/bench.cfg
+++ b/doc/opt/benchmark/bench.cfg
@@ -1,16 +1,18 @@
# Config datei fuer Check_MK benchmark
# pingonly deaktiviert "services"
-_pingonly="no"
+_pingonly="yes"
_livecheck="yes"
_livecheck_helpers=30
_central="zentrale"
-_sites=8
-_hosts=800
+_sites=20
+_hosts=1600
_pnp="off"
_delay_precompile=False
+# Hosts is "Hosts per Site!"
+
# E5640 stats pingonly, livecheck
# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s
# E5640 ~30% 6 800 4800 80 4890
@@ -19,6 +21,8 @@ _delay_precompile=False
# E5640 ~35% 3 3200 9220 160 9500
# E5640 ~50% 3 6400 8000 320 8100
# E5640 ~90% 12 1600 17500 320 17800
+#2x6172 ~50% 12 1600 13600 336 13884
+#2x6172 20 1600 10250 590 11400
# E5640 stats tcp services, livecheck + 17check_mk checks + 1 extra active check
@@ -28,7 +32,7 @@ _delay_precompile=False
# E5640 32% 8 400 730/s 83/s 192/s
# E5640 40% 8 500 930/s 104/s 239/s
-# E5640 stats tcp services, livecheck + 10check_mk checks (all OK)
+# stats tcp services, livecheck + 10check_mk checks (all OK)
# CPU CPU Usage Sites Hosts SvcCh/s HostsCh/s LiveCh/s
-E5640 62% 8 800 1070/s 105/s 212/s
-
+#E5640 62% 8 800 1070/s 105/s 212/s
+#2x6172 50% 16 800 2140/s 210/s 430/s
diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh
index b7a779a..7849db6 100755
--- a/doc/opt/benchmark/cmkbench.sh
+++ b/doc/opt/benchmark/cmkbench.sh
@@ -168,11 +168,11 @@ EOF
cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk
extra_service_conf["normal_check_interval"] = [
# ( "0.0166", ALL_HOSTS, [ "Dummy" ] ),
-# ( "0.0166", ALL_HOSTS, [ "Ping" ] ),
+ ( "0.0166", ALL_HOSTS, [ "Ping" ] ),
]
legacy_checks += [
# (( "check-mk-vapor", "Dummy", True), ALL_HOSTS),
-# (( "check-mk-ping", "Ping", True), ALL_HOSTS),
+ (( "check-mk-ping", "Ping", True), ALL_HOSTS),
]
extra_nagios_conf += r"""
define command {
@@ -194,14 +194,14 @@ checks += [
(ALL_HOSTS, "cpu.threads", None, threads_default_levels),
(ALL_HOSTS, "df", '/', {}),
(ALL_HOSTS, "df", '/opt', {}),
-# (ALL_HOSTS, "diskstat", 'SUMMARY',
diskstat_default_levels),
-# (ALL_HOSTS, "kernel", 'Context Switches',
kernel_default_levels),
-# (ALL_HOSTS, "kernel", 'Major Page Faults',
kernel_default_levels),
-# (ALL_HOSTS, "kernel", 'Process Creations',
kernel_default_levels),
+ (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels),
+ (ALL_HOSTS, "kernel", 'Context Switches',
kernel_default_levels),
+ (ALL_HOSTS, "kernel", 'Major Page Faults',
kernel_default_levels),
+ (ALL_HOSTS, "kernel", 'Process Creations',
kernel_default_levels),
(ALL_HOSTS, "kernel.util", None, kernel_util_default_levels),
(ALL_HOSTS, "mem.used", None, memused_default_levels),
-# (ALL_HOSTS, "mounts", '/', ['data=ordered',
'errors=remount-ro', 'relatime', 'rw']),
-# (ALL_HOSTS, "mounts", '/opt', ['attr2',
'noatime', 'nobarrier', 'nodiratime', 'noquota',
'rw']),
+ (ALL_HOSTS, "mounts", '/', ['data=ordered',
'errors=remount-ro', 'relatime', 'rw']),
+ (ALL_HOSTS, "mounts", '/opt', ['attr2',
'noatime', 'nobarrier', 'nodiratime', 'noquota',
'rw']),
(ALL_HOSTS, "omd_status", 'zentrale', None),
(ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels),
(ALL_HOSTS, "uptime", None, None),