Module: check_mk
Branch: master
Commit: a56a7fc95af6f9744344dfd25535cfaf1ec9dad3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a56a7fc95af6f9…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Feb 20 12:51:36 2013 +0100
windows_broadcom_bonding: checkman update
---
checkman/windows_broadcom_bonding | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/checkman/windows_broadcom_bonding b/checkman/windows_broadcom_bonding
index 41f8fa8..419bd78 100644
--- a/checkman/windows_broadcom_bonding
+++ b/checkman/windows_broadcom_bonding
@@ -6,32 +6,12 @@ distribution: check_mk
description:
This check checks the current state of a Windows broadcom bonding interface.
If the total bonding state of the interface is down, then the
- check gets critical. If at least one slave interface is down
- or not the expected slave is currently active, then the check
+ check gets critical. If at least one slave interface is down the check
gets WARN.
item:
The name of the bonding interface, etc {Bond_10.4}.
-examples:
- # On windows hosts the lowest numbered eth interface should be
- # the active one.
- check_parameters = [
- ( { "expect_active" : "lowest" }, [ 'windows'], ALL_HOSTS, ALL_SERVICES )
- ]
-
inventory:
One check per {active} bonding interface will be created.
-[parameters]
-parameters (dict): Currently two parameters are available in this dict:
-
- {"primary"}: The assumed primary interface. This is for agents that do
- not provide this information. In that case this is set automatically
- by the inventory to the currently active interface.
-
- {"expect_active"}: Which interface should be expected active. This is one
- of the following strings: {"primary"}: The interface set by the
- parameter {"primary"}, {"lowest"}: The interface sorting lowest
- alphabetically, {"ignore"}: Ignore which interace is active.
-
Module: check_mk
Branch: master
Commit: b90862cf16b4f2ec962e975f6e474616ffe895d1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b90862cf16b4f2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Feb 20 12:30:57 2013 +0100
piggyback: also allow merging by IP address
---
modules/check_mk_base.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 861fe9a..a547100 100755
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -364,7 +364,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age):
# If we have piggyback data for that host from another host,
# then we prepend this data and also tolerate a failing
# normal Check_MK Agent access.
- piggy_output = get_piggyback_info(hostname)
+ piggy_output = get_piggyback_info(hostname) + get_piggyback_info(ipaddress)
output = ""
agent_failed = False
if is_tcp_host(hostname):