From 9144bdf0004db1f3f1aa6c99339fd239caa41d8e Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Sat, 28 May 2011 00:09:29 +0200 Subject: removed the tinc-only host in favor of using its tinc address --- modules/Monitoring/conf/krebs_hosts.cfg | 7 ++++--- modules/Monitoring/conf/krebsnet.cfg | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg index 4747ec2d..a929fa19 100644 --- a/modules/Monitoring/conf/krebs_hosts.cfg +++ b/modules/Monitoring/conf/krebs_hosts.cfg @@ -25,14 +25,15 @@ define host{ } # # ytart +# will use tinc ip as long as no static ip is supplied # define host{ - use tinc-only-host + use generic-host host_name ytart alias ytart _tinc_address 10.7.7.201 - parents shack-coreswitch - address 10.42.1.227 + parents shack-wlan-ap5 + address 10.7.7.201 hostgroups krebs-machines,tinc-nodes,ssh-servers } # diff --git a/modules/Monitoring/conf/krebsnet.cfg b/modules/Monitoring/conf/krebsnet.cfg index c799183d..ae5b898e 100644 --- a/modules/Monitoring/conf/krebsnet.cfg +++ b/modules/Monitoring/conf/krebsnet.cfg @@ -12,8 +12,9 @@ define hostextinfo{ vrml_image krebs.png statusmap_image krebs/krebs.gd2 } -define host{ - use generic-host - name tinc-only-host - check_command check_internal_tinc_up!100.0,20%!500.0,60% - } +#define host{ +# use generic-host +# register 0 +# name tinc-only-host +# check_command check_internal_tinc_up!100.0,20%!500.0,60% +# } -- cgit v1.2.3