monitoring/SatConfig/bootstrap/npBootstrap.pl | 3 ++- proxy/installer/cluster.ini | 1 + spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/cluster.ini | 1 + web/html/applications/rhn-proxy/5.3/cluster.ini | 1 + 4 files changed, 5 insertions(+), 1 deletion(-)
New commits: commit 8b5b5c0e4fff24c28aae8687d2d45bbaf7d9655d Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 23 14:44:18 2009 +0200
493060 - do not send email "RHN Monitoring Scout started" by default
diff --git a/monitoring/SatConfig/bootstrap/npBootstrap.pl b/monitoring/SatConfig/bootstrap/npBootstrap.pl index 3f30888..2b73df3 100755 --- a/monitoring/SatConfig/bootstrap/npBootstrap.pl +++ b/monitoring/SatConfig/bootstrap/npBootstrap.pl @@ -23,6 +23,7 @@ my $soapbox = new NOCpulse::Gritch('/var/lib/nocpulse/npBootstrap.db'); # get the scout_shared_key formt he /etc/rhn/cluster.ini file my $cluster_config = NOCpulse::Config->new('/etc/rhn/cluster.ini'); my $ssk=$cluster_config->get('', 'scoutsharedkey'); +my $notify_scout_start = $cluster_config->get('', 'notify_scout_start');
my $gritchMsg; if (!$ssk) { @@ -106,7 +107,7 @@ if ($res->is_success) { unlink($llnsFile); } # Send notification that the sat may have been rebooted. - $soapbox->gritch('RHN Monitoring Scout started', $gritchMsg); + $soapbox->gritch('RHN Monitoring Scout started', $gritchMsg) if ($notify_scout_start);
} else { # Send notification that the sat may have been rebooted. diff --git a/proxy/installer/cluster.ini b/proxy/installer/cluster.ini index 5cb0ec1..d4563e3 100644 --- a/proxy/installer/cluster.ini +++ b/proxy/installer/cluster.ini @@ -6,3 +6,4 @@ smontestaddr=${session.rhn_monitoring_parent_ip} smontestfqdn=${session.rhn_monitoring_parent} scoutsharedkey=${session.scout_shared_key} PhysNode.1.exists=1 +notify_scout_start=0 diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/cluster.ini b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/cluster.ini index 203d5ff..68376d4 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/cluster.ini +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/cluster.ini @@ -9,3 +9,4 @@ smontestaddr=@@monitoringDOTsmonDOTtestaddr@@ smontestfqdn=@@monitoringDOTsmonDOTtestfqdn@@ scoutsharedkey=@@monitoringDOTscout_shared_key@@ PhysNode.1.exists=1 +notify_scout_start=0 diff --git a/web/html/applications/rhn-proxy/5.3/cluster.ini b/web/html/applications/rhn-proxy/5.3/cluster.ini index 5cb0ec1..d4563e3 100644 --- a/web/html/applications/rhn-proxy/5.3/cluster.ini +++ b/web/html/applications/rhn-proxy/5.3/cluster.ini @@ -6,3 +6,4 @@ smontestaddr=${session.rhn_monitoring_parent_ip} smontestfqdn=${session.rhn_monitoring_parent} scoutsharedkey=${session.scout_shared_key} PhysNode.1.exists=1 +notify_scout_start=0
spacewalk-commits@lists.fedorahosted.org