monitoring/SatConfig/general/Monitoring.pm | 13 ++----------- web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml | 9 --------- 2 files changed, 2 insertions(+), 20 deletions(-)
New commits: commit f8510568495380d2a71eeeb3154231e8febc315d Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 15:32:04 2009 +0200
501797 - remove /etc/rc.d/np.d/step MonitoringScout install
it is obsolete by <action-name>Enable ${app.name} services</action-name> action
diff --git a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml index b786ef7..b32a29c 100644 --- a/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.3/install-rhn-proxy.xml @@ -625,15 +625,6 @@ fi <configfile acl="global_config(ssl_available);session_data_true(enable_osad)">/etc/jabberd/sm.xml</configfile> </deploy-configs>
- <run-script acl="session_data_true(enable_monitoring)"> - <action-name>Enable Monitoring Services</action-name> - <script> -#!/bin/sh - -/etc/rc.d/np.d/step MonitoringScout install - </script> - </run-script> - <run-script> <action-name>Allow Proxy service to read Satellite Configuration</action-name> <script>
commit fd376e82dbe5c2718ee4829bebed47fa0169d89d Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 14:25:23 2009 +0200
remove unused code
diff --git a/monitoring/SatConfig/general/Monitoring.pm b/monitoring/SatConfig/general/Monitoring.pm index ab37e36..28e6267 100644 --- a/monitoring/SatConfig/general/Monitoring.pm +++ b/monitoring/SatConfig/general/Monitoring.pm @@ -46,7 +46,6 @@ sub startActions my $pxtconf = new PXT::Config("web"); my $startMIABServices = $pxtconf->get("is_monitoring_backend"); my $startScoutServices = $pxtconf->get("is_monitoring_scout"); - #my $separateWebserver = 0; my $configIsInstalled;
if ( $startMIABServices or $startScoutServices ) { @@ -66,12 +65,6 @@ sub startActions $self->startModule(Notifier); $self->startModule(AckProcessor); $self->startModule(TSDBLocalQueue); - # Next is a fall-back in the event that the single apache instance proves to - # be instable, overburdened, etc. Fully enabling this will require that - # some indication of which IP and/or port to bind to is provided somewhere. - #if ($separateWebserver) { - # $self->startModule(Apache); - #} } else { $self->addError('Monitoring configuration not loaded - not starting MOC functions!'); }
commit 82b5e6bb6deee8414f3eae88b8ecddd3946ea414 Author: Miroslav Suchý msuchy@redhat.com Date: Fri May 29 14:24:34 2009 +0200
fix formating
diff --git a/monitoring/SatConfig/general/Monitoring.pm b/monitoring/SatConfig/general/Monitoring.pm index 4fdaaa6..ab37e36 100644 --- a/monitoring/SatConfig/general/Monitoring.pm +++ b/monitoring/SatConfig/general/Monitoring.pm @@ -17,8 +17,6 @@ use TrapReceiver; use NOCpulse::NOCpulseini; use PXT::Config;
- - sub overview { return 'Starts up monitoring functionality. What it starts depends on web.is_monitoring_backend and web.is_monitoring_scout in /etc/rhn/rhn.conf'; @@ -26,7 +24,7 @@ sub overview
sub printStatus { - my ($self,@params) = @_; + my ($self,@params) = @_; my $pxtconf = new PXT::Config("web"); if ($pxtconf->get("is_monitoring_backend")) { $self->dprint(1," ++++ Monitoring backend functionality is enabled"); @@ -62,7 +60,7 @@ sub startActions if ($configIsInstalled) { # REQUIRE that NOCpulse.ini is installed, else bad stuff could happen if # MOC services start. - $self->startModule(GenerateNotifConfig); + $self->startModule(GenerateNotifConfig); $self->startModule(NotifEscalator); $self->startModule(NotifLauncher); $self->startModule(Notifier);
spacewalk-commits@lists.fedorahosted.org