Module: check_mk
Branch: master
Commit: 0731127dd006ecadde6899f2e243be0e1967094c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0731127dd006ec…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Feb 20 12:05:38 2013 +0100
FIX: Fix output of cmk -D: datasource programs were missing
---
ChangeLog | 15 ++++++++-------
modules/check_mk.py | 4 ++--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5aa6763..c9ff6d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,23 +25,24 @@
* New editor for Business Intelligence rules
1.2.2b4:
+ Core:
+ * FIX: Fix output of cmk -D: datasource programs were missing
+
Checks & Agents:
* FIX: smart - not trying to parse unhandled lines to prevent errors
* FIX: winperf_processor - fixed wrong calculations of usage
* FIX: WATO configuration of filesystem trends: it's hours, not days!
+ * FIX: mysql: fixed crash on computing IO information
+ * FIX: diskstat: fix local variable 'ios_per_sec' referenced before
assignment
+ * Linux agent: limit netstat to 10 seconds
+ * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows
+ reordering of matched groups
Multisite:
* FIX: Fixed problem with error during localization scanning
* FIX: Fixed wrong localization right after a user changed its language
* FIX: Improved handling of error messages in bulk inventory
- Checks & Agents:
- * Linux agent: limit netstat to 10 seconds
- * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows
- reordering of matched groups
- * FIX: mysql: fixed crash on computing IO information
- * FIX: diskstat: fix local variable 'ios_per_sec' referenced before
assignment
-
BI:
* FIX: fixed invalid links to hosts and services in BI tree view
* FIX: fix exception in top/down and bottom/up views
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 394793e..a0e70b1 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -3672,11 +3672,11 @@ def dump_host(hostname):
agenttypes = []
if is_tcp_host(hostname):
- agenttypes.append("TCP (port: %d)" % agent_port_of(hostname))
- else:
dapg = get_datasource_program(hostname, ipaddress)
if dapg:
agenttypes.append("Datasource program: %s" % dapg)
+ else:
+ agenttypes.append("TCP (port: %d)" % agent_port_of(hostname))
if is_snmp_host(hostname):
if is_usewalk_host(hostname):