summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-28 00:09:29 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-28 00:09:29 +0200
commit9144bdf0004db1f3f1aa6c99339fd239caa41d8e (patch)
treeef6c91dd5b6c1f299f543f0fa3125e401335f009
parent1fc47548d8bef96206e5a6ae6b57623098815b29 (diff)
removed the tinc-only host in favor of using its tinc address
-rw-r--r--modules/Monitoring/conf/krebs_hosts.cfg7
-rw-r--r--modules/Monitoring/conf/krebsnet.cfg11
2 files changed, 10 insertions, 8 deletions
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%
+# }