From fec4230894e1c24460031f4ac3ae7f10ed1cf815 Mon Sep 17 00:00:00 2001 From: Tobi Oetiker Date: Thu, 30 Aug 2007 07:49:16 +0000 Subject: some fixes after intitial slave testing --- doc/smokeping_master_slave.pod | 8 +++++--- lib/Smokeping/Slave.pm | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/smokeping_master_slave.pod b/doc/smokeping_master_slave.pod index a93abde..aced8a0 100644 --- a/doc/smokeping_master_slave.pod +++ b/doc/smokeping_master_slave.pod @@ -57,13 +57,15 @@ instance. =head2 Master Configuration To configure a master/slave setup, add a slaves section to your smokeping -configuration file. If some configuration parameter must be set to a special -value for the slave, use an override section to configure this. +configuration file. Each slave has a section in the slaves part of the +master configuration file. The section name must match the hostname of the +slave. If some configuration parameter must be set to a special value for +the slave, use an override section to configure this. *** slaves **** secrets=/etc/smokeping/slavesecrets.conf +slave1 - name=Slave 1 + display_name=erul22 location=India ++override Probes.FPing.binary = /usr/bin/fping diff --git a/lib/Smokeping/Slave.pm b/lib/Smokeping/Slave.pm index 9ed8c7c..8f95c5f 100644 --- a/lib/Smokeping/Slave.pm +++ b/lib/Smokeping/Slave.pm @@ -98,10 +98,10 @@ sub submit_results { return undef; } my $zone = new Safe; - $zone->permit_only(':base_core'); + # $zone->permit_only(???); #input welcome as to good settings my $config = $zone->reval($data); if ($@){ - warn "WARNING evaluating new config from server failed: $@"; + warn "WARNING evaluating new config from server failed: $@ --\n$data"; } elsif (defined $config and ref $config eq 'HASH'){ $config->{General}{piddir} = $slave_cfg->{cache_dir}; Smokeping::do_debuglog("Sent data to Server and got new config"); -- cgit v1.2.3-24-g4f1b