Module: check_mk
Branch: master
Commit: 76fc062ef7d63f674130707dbdcaa2b69bc2e465
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76fc062ef7d63f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 27 19:25:14 2011 +0100
cmk -d: honor --cache and --no-tcp
---
.bugs/38 | 8 ++++++--
ChangeLog | 4 ++++
modules/check_mk.py | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.bugs/38 b/.bugs/38
index cfbcb79..dca4ae0 100644
--- a/.bugs/38
+++ b/.bugs/38
@@ -1,9 +1,13 @@
Title: cmk -d verwendet --cache nicht
Component: core
+State: done
+Class: nastiness
Benefit: 1
-State: open
Cost: 2
Date: 2010-12-21 21:15:52
-Class: nastiness
+Targetversion: future
Sollte es aber tun. So wird es erwartet.
+
+2011-12-27 19:25:03: changed state open -> done
+Ist nun umgesetzt. Auch --no-tcp funktioniert.
diff --git a/ChangeLog b/ChangeLog
index 2bf2f39..8b3bf36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
1.1.13i3:
+ Core, Setup, etc.:
+ * cmk -d does now honor --cache and --no-tcp
+
Checks & Agents:
* Windows agent: output eventlog texts in UTF-8 encoding. This
should fix problems with german umlauts in message texts.
+
1.1.13i2:
Core, Setup, etc.:
* cmk -I: accept host tags and cluster names
diff --git a/modules/check_mk.py b/modules/check_mk.py
index add0ecd..e90115a 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -3144,6 +3144,10 @@ def list_all_hosts_with_tags(tags):
# Implementation of option -d
def output_plain_hostinfo(hostname):
+ info = read_cache_file(hostname, 999999999)
+ if info:
+ sys.stdout.write(info)
+ return
try:
ipaddress = lookup_ipaddress(hostname)
sys.stdout.write(get_agent_info(hostname, ipaddress, 0))