I'm working on:
https://bugzilla.redhat.com/show_bug.cgi?id=476851
Bug 226915 - [ 976930 ] Monitoring failure on Satellite with external
db (where db name != db instance name)
Which start to be PITA and one solution which comes to my mind is to
remove tables: rhn_db_environment and rhn_enviroment. It has been used
in past [1]. It relate database name to enviroment. E.g.
'dev01a' => 'dev' environment;
But today it contain only one record:
insert into rhn_db_environment(db_name,environment) values
('WEBDEV','LICENSE');
where webdev is replaced during installation with dbname (but some parts
of our code take is as instance name).
Rhn_enviroment is even more simplier:
SQL> select * from RHN_ENVIRONMENT;
NAME DESCRIPTION
---- -----------
LICENSE Licensed Software Model
Only part of Spacewalk, which use it is rhn_config_macro table, which is
AFAIK used only by monitoring. Main server do not use it.
So here comes the question: Do we want to deploy Spacewalk in highly
clustered environment with several databases or not? May I remove those
tables in question or not?
If I do not get any objection till Wednesday I will start working on the
removal.
Attached is (completly untested and unverified) patch. Just to give you
overview.
[1] For those with access to old Satellite svn - revision 45606 as example
--
Miroslav Suchy
Red Hat Satellite Engineering
>From 1bc0febfc1ae667bc46937c2d230ed6951201f3b Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Miroslav=20Such=C3=BD?= <[email protected]>
Date: Mon, 7 Sep 2009 16:39:09 +0200
Subject: [PATCH] 476851 - removal of tables: rhn_db_environment, rhn_enviroment
---
.../domain/monitoring/config/DbEnvironment.hbm.xml | 18 ------
.../domain/monitoring/config/DbEnvironment.java | 59 --------------------
.../monitoring/config/MonitoringConfigFactory.java | 17 ------
.../config/test/MonitoringConfigTest.java | 19 ------
.../satellite/ConfigureSatelliteCommand.java | 2 -
.../test/ConfigureSatelliteCommandTest.java | 13 ----
monitoring/SatConfig/general/NOCpulse-ini | 8 +--
monitoring/nocpulse-common/NOCpulse.ini.txt | 9 +--
.../perl-API/NOCpulse/NOCpulseini.pm | 7 +--
schema/spacewalk/common/data/data.deps | 2 -
.../spacewalk/common/data/rhn_db_environment.sql | 44 ---------------
schema/spacewalk/common/data/rhn_environment.sql | 44 ---------------
.../spacewalk/common/tables/rhn_config_macro.sql | 3 -
.../spacewalk/common/tables/rhn_db_environment.sql | 32 -----------
schema/spacewalk/common/tables/rhn_environment.sql | 28 ---------
schema/spacewalk/common/tables/tables.deps | 2 -
.../spacewalk/oracle/synonyms/db_environment.sql | 28 ---------
schema/spacewalk/oracle/synonyms/environment.sql | 28 ---------
spacewalk/setup/bin/spacewalk-setup | 33 -----------
.../setup/share/upgrade/rhn-enable-monitoring.pl | 3 -
.../rhn/RHN/DB/DataSource/xml/probe_queries.xml | 6 +--
web/modules/rhn/RHN/DB/SatInstall.pm | 21 -------
22 files changed, 6 insertions(+), 420 deletions(-)
delete mode 100644 java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml
delete mode 100644 java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java
delete mode 100644 schema/spacewalk/common/data/rhn_db_environment.sql
delete mode 100644 schema/spacewalk/common/data/rhn_environment.sql
delete mode 100644 schema/spacewalk/common/tables/rhn_db_environment.sql
delete mode 100644 schema/spacewalk/common/tables/rhn_environment.sql
delete mode 100644 schema/spacewalk/oracle/synonyms/db_environment.sql
delete mode 100644 schema/spacewalk/oracle/synonyms/environment.sql
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml b/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml
deleted file mode 100644
index aa17ec8..0000000
--- a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping
-PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-<hibernate-mapping>
- <class name="com.redhat.rhn.domain.monitoring.config.DbEnvironment"
- table="rhn_db_environment" >
- <id name="environment" type="string" column="environment">
- <meta attribute="scope-set">protected</meta>
- <generator class="assigned"/>
- </id>
- <property name="dbName" column="db_name" type="string" length="255" />
- </class>
- <query name="DbEnvironment.loadByEnvironment">
- <![CDATA[from com.redhat.rhn.domain.monitoring.config.DbEnvironment where environment = :environment]]>
- </query>
-
-</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java
deleted file mode 100644
index 2f20b1a..0000000
--- a/java/code/src/com/redhat/rhn/domain/monitoring/config/DbEnvironment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2009 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.domain.monitoring.config;
-
-
-
-/**
- * DbEnvironment - Class representation of the table rhn_db_environment.
- * @version $Rev: 1 $
- */
-public class DbEnvironment {
-
- private String dbName;
- private String environment;
- /**
- * Getter for dbName
- * @return String to get
- */
- public String getDbName() {
- return this.dbName;
- }
-
- /**
- * Setter for dbName
- * @param dbNameIn to set
- */
- public void setDbName(String dbNameIn) {
- this.dbName = dbNameIn;
- }
-
- /**
- * Getter for environment
- * @return String to get
- */
- public String getEnvironment() {
- return this.environment;
- }
-
- /**
- * Setter for environment
- * @param environmentIn to set
- */
- public void setEnvironment(String environmentIn) {
- this.environment = environmentIn;
- }
-
-}
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java
index 8fd2a02..ffbd53b 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/MonitoringConfigFactory.java
@@ -98,23 +98,6 @@ public class MonitoringConfigFactory extends HibernateFactory {
}
/**
- * Make sure we have the configuration record
- * for the DB Environment stored correctly
- * @return boolean if it was updated correctly or not.
- */
- public static boolean ensureDbEnvironmentExists() {
- DbEnvironment env = null;
- Map params = new HashMap();
- params.put("environment", "LICENSE");
- env = (DbEnvironment) singleton.lookupObjectByNamedQuery(
- "DbEnvironment.loadByEnvironment", params);
- env.setDbName(getDatabaseName());
- assert (env.getDbName() != null);
- singleton.saveObject(env);
- return true;
- }
-
- /**
* Get the database name being used by Hibernate.
* @return String db name
*/
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java
index bda7b4a..e3f3f69 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/config/test/MonitoringConfigTest.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.domain.monitoring.config.test;
import com.redhat.rhn.domain.monitoring.config.ConfigMacro;
-import com.redhat.rhn.domain.monitoring.config.DbEnvironment;
import com.redhat.rhn.domain.monitoring.config.MonitoringConfigFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -60,23 +59,5 @@ public class MonitoringConfigTest extends RhnBaseTestCase {
assertNotNull(cm);
}
- public void testDbEnv() throws Exception {
- Object o = TestUtils.lookupTestObject(
- "from com.redhat.rhn.domain.monitoring.config." +
- "DbEnvironment d");
- assertNotNull(o);
- assertTrue(o instanceof DbEnvironment);
- }
-
- public void testCreateDbEnv() throws Exception {
-
- DbEnvironment env =
- (DbEnvironment) TestUtils.lookupTestObject(
- "from com.redhat.rhn.domain.monitoring.config.DbEnvironment");
- assertNotNull(env);
-
- assertTrue(MonitoringConfigFactory.ensureDbEnvironmentExists());
- }
-
}
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
index 24e54ed..a269228 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java
@@ -241,8 +241,6 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand
// looks for a method with this name.
mmc.setMethodName("Panic Destination");
mmc.storeMethod(getUser());
- boolean dbenvExists = MonitoringConfigFactory.ensureDbEnvironmentExists();
- assert (dbenvExists);
//HibernateFactory.getSession().evict(scout);
scouts.add(scout);
}
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
index b90836c..49078cf 100644
--- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
@@ -18,7 +18,6 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.monitoring.config.ConfigMacro;
-import com.redhat.rhn.domain.monitoring.config.DbEnvironment;
import com.redhat.rhn.domain.monitoring.config.MonitoringConfigFactory;
import com.redhat.rhn.domain.monitoring.satcluster.SatCluster;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -137,15 +136,6 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser {
flushAndEvict(cm);
}
-
- String randomString = RandomStringUtils.random(4);
- DbEnvironment db = (DbEnvironment) TestUtils.lookupTestObject(
- "from com.redhat.rhn.domain.monitoring.config.DbEnvironment");
- assertNotNull(db);
- db.setDbName(randomString);
- TestUtils.saveAndFlush(db);
-
-
cmd = new ConfigureSatelliteCommand(user) {
protected Executor getExecutor() {
return new TestExecutor();
@@ -162,9 +152,6 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser {
assertEquals(1, orgAdmin.getOrg().getMonitoringScouts().size());
// Make sure we created the gritch dest
assertEquals(1, orgAdmin.getNotificationMethods().size());
- db = (DbEnvironment) TestUtils.lookupTestObject(
- "from com.redhat.rhn.domain.monitoring.config.DbEnvironment");
- assertNotSame(randomString, db.getDbName());
assertNotNull(Config.get().getString(ConfigDefaults.WEB_SCOUT_SHARED_KEY));
ConfigMacro cm = MonitoringConfigFactory.lookupConfigMacroByName("MAIL_MX");
assertFalse(cm.getDefinition().startsWith("**"));
diff --git a/monitoring/SatConfig/general/NOCpulse-ini b/monitoring/SatConfig/general/NOCpulse-ini
index f172631..8bcd01f 100644
--- a/monitoring/SatConfig/general/NOCpulse-ini
+++ b/monitoring/SatConfig/general/NOCpulse-ini
@@ -103,13 +103,7 @@ if ($set_macro) {
my $sql = qq|
UPDATE rhn_config_macro
SET definition=?
- WHERE (environment, name) = ( SELECT macro.environment, macro.name
- FROM db_environment dbenv, config_macro macro
- WHERE UPPER(sys_context('userenv', 'db_name')) = UPPER(dbenv.db_name)
- AND DECODE(macro.environment, 'ALL', dbenv.environment,
- macro.environment) = dbenv.environment
- AND macro.name = ?
- )
+ WHERE macro.name = ?
|;
my $sth = $ini->dbh->prepare($sql);
$sth->execute($new_value, $set_macro);
diff --git a/monitoring/nocpulse-common/NOCpulse.ini.txt b/monitoring/nocpulse-common/NOCpulse.ini.txt
index dbad557..a770061 100644
--- a/monitoring/nocpulse-common/NOCpulse.ini.txt
+++ b/monitoring/nocpulse-common/NOCpulse.ini.txt
@@ -2,19 +2,14 @@ To add configuration parameters to /etc/NOCpulse.ini, you need to
update the database in the usual way, in particular the following
tables:
- ENVIRONMENT - Lists all environments (dev, prod, etc);
-
- DB_ENVIRONMENT - Relates database name to environment, e.g.
- 'dev01a' => 'dev' environment;
-
CONFIG_SECURITY_TYPE - Lists all security levels (e.g. internal, external);
CONFIG_GROUP - Stores group names (formerly section headings,
e.g. '[general]' became the 'general' group);
CONFIG_PARAMETER - Stores config parameters (key/value pairs) for
- a given security type and environment;
+ a given security type;
- CONFIG_MACRO - Stores macros for a given environment.
+ CONFIG_MACRO - Stores macros.
diff --git a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
index 9f9818b..8002123 100644
--- a/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
+++ b/monitoring/nocpulse-common/perl-API/NOCpulse/NOCpulseini.pm
@@ -110,11 +110,8 @@ sub fetch_macros {
# Fetch macros
my $sql = q{
- SELECT macro.name, macro.definition, macro.description
- FROM db_environment dbenv, config_macro macro
- WHERE UPPER(sys_context('userenv', 'db_name')) = UPPER(dbenv.db_name)
- AND DECODE(macro.environment, 'ALL', dbenv.environment,
- macro.environment) = dbenv.environment
+ SELECT name, definition, description
+ FROM config_macro
};
my $list = $self->do_fetch_hash($sql);
# First, create a database of unexpanded macros
diff --git a/schema/spacewalk/common/data/data.deps b/schema/spacewalk/common/data/data.deps
index 649e6ad..752615b 100644
--- a/schema/spacewalk/common/data/data.deps
+++ b/schema/spacewalk/common/data/data.deps
@@ -48,10 +48,8 @@ rhn_command_parameter :: data/rhn_semantic_data_type \
rhn_command_param_threshold :: data/rhn_command \
data/rhn_metrics \
data/rhn_threshold_type
-rhn_config_macro :: data/rhn_environment
rhn_config_parameter :: data/rhn_config_group \
data/rhn_config_security_type
-rhn_db_environment :: data/rhn_environment
rhn_metrics :: data/rhn_command_class data/rhn_units
rhn_os_commands_xref :: data/rhn_command data/rhn_os
rhn_schedule_days :: data/rhn_schedules
diff --git a/schema/spacewalk/common/data/rhn_db_environment.sql b/schema/spacewalk/common/data/rhn_db_environment.sql
deleted file mode 100644
index 603ac7a..0000000
--- a/schema/spacewalk/common/data/rhn_db_environment.sql
+++ /dev/null
@@ -1,44 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
---
---
-
---data for rhn_db_environment
-
-insert into rhn_db_environment(db_name,environment) values ('WEBDEV','LICENSE');
-commit;
-
---
---Revision 1.6 2004/07/15 01:14:20 dfaraldo
---Removed unused environments.
---
---Revision 1.5 2004/06/17 20:48:59 kja
---bugzilla 124970 -- _data is in for 350.
---
---Revision 1.4 2004/05/29 21:51:49 pjones
---bugzilla: none -- _data is not for 340, so says kja.
---
---Revision 1.3 2004/05/07 23:29:09 kja
---Populated the script with correct data.
---
---Revision 1.2 2004/05/04 20:03:38 kja
---Added commits.
---
---Revision 1.1 2004/04/22 17:49:49 kja
---Added data for the reference tables.
---
diff --git a/schema/spacewalk/common/data/rhn_environment.sql b/schema/spacewalk/common/data/rhn_environment.sql
deleted file mode 100644
index d78ab72..0000000
--- a/schema/spacewalk/common/data/rhn_environment.sql
+++ /dev/null
@@ -1,44 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
---
---
-
---data for rhn_environment
-
-insert into rhn_environment(name,description)
- values ( 'LICENSE','Licensed Software Model');
-insert into rhn_environment(name,description)
- values ( 'ALL','All environments');
-commit;
-
---
---Revision 1.5 2004/07/15 00:58:05 dfaraldo
---Removed DEV, QA, STAGE, and PROD environments. -dfaraldo
---
---Revision 1.4 2004/06/17 20:48:59 kja
---bugzilla 124970 -- _data is in for 350.
---
---Revision 1.3 2004/05/29 21:51:49 pjones
---bugzilla: none -- _data is not for 340, so says kja.
---
---Revision 1.2 2004/05/04 20:03:38 kja
---Added commits.
---
---Revision 1.1 2004/04/22 17:49:49 kja
---Added data for the reference tables.
---
diff --git a/schema/spacewalk/common/tables/rhn_config_macro.sql b/schema/spacewalk/common/tables/rhn_config_macro.sql
index 07d9b71..c8af25a 100644
--- a/schema/spacewalk/common/tables/rhn_config_macro.sql
+++ b/schema/spacewalk/common/tables/rhn_config_macro.sql
@@ -37,7 +37,4 @@ CREATE UNIQUE INDEX rhn_confm_environment_name_pk
ALTER TABLE rhn_config_macro
ADD CONSTRAINT rhn_confm_environment_name_pk PRIMARY KEY (environment, name);
-ALTER TABLE rhn_config_macro
- ADD CONSTRAINT rhn_confm_envir_environment_fk FOREIGN KEY (environment)
- REFERENCES rhn_environment (name);
diff --git a/schema/spacewalk/common/tables/rhn_db_environment.sql b/schema/spacewalk/common/tables/rhn_db_environment.sql
deleted file mode 100644
index e922045..0000000
--- a/schema/spacewalk/common/tables/rhn_db_environment.sql
+++ /dev/null
@@ -1,32 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhn_db_environment
-(
- db_name VARCHAR2(20) NOT NULL
- CONSTRAINT rhn_dbenv_db_name_pk PRIMARY KEY
- USING INDEX TABLESPACE [[64k_tbs]],
- environment VARCHAR2(255)
-)
-ENABLE ROW MOVEMENT
-;
-
-COMMENT ON TABLE rhn_db_environment IS 'dbenv environments - database_names xref';
-
-ALTER TABLE rhn_db_environment
- ADD CONSTRAINT rhn_dbenv_envir_environment_fk FOREIGN KEY (environment)
- REFERENCES rhn_environment (name);
-
diff --git a/schema/spacewalk/common/tables/rhn_environment.sql b/schema/spacewalk/common/tables/rhn_environment.sql
deleted file mode 100644
index 840f53b..0000000
--- a/schema/spacewalk/common/tables/rhn_environment.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhn_environment
-(
- name VARCHAR2(255) NOT NULL
- CONSTRAINT rhn_envir_name_pk PRIMARY KEY
- USING INDEX TABLESPACE [[64k_tbs]],
- description VARCHAR2(255)
-)
-ENABLE ROW MOVEMENT
-;
-
-COMMENT ON TABLE rhn_environment IS 'envir environments:dev,qa,stage,prod,license';
-
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index 2bae2aa..5668da7 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -261,7 +261,6 @@ rhn_command_queue_instances :: rhn_command_queue_commands
rhn_command_queue_params :: rhn_command_queue_instances
rhn_command_queue_sessions :: web_contact
rhn_command_target :: web_customer
-rhn_config_macro :: rhn_environment
rhn_config_parameter :: rhn_config_group rhn_config_security_type
rhn_contact_group_members :: rhn_contact_methods rhn_contact_groups
rhn_contact_groups :: web_customer rhn_strategies \
@@ -269,7 +268,6 @@ rhn_contact_groups :: web_customer rhn_strategies \
rhn_contact_methods :: web_contact rhn_method_types rhn_pager_types \
rhn_sat_cluster rhn_schedules rhn_time_zone_names \
rhn_notification_formats rhnTimezone rhnUserInfo
-rhn_db_environment :: rhn_environment
rhn_host_check_suites :: rhn_check_suites rhn_host_probe
rhn_host_monitoring :: rhn_server_monitoring_info rhn_interface_monitoring
rhn_host_probe :: rhnServer rhn_probe rhn_sat_cluster
diff --git a/schema/spacewalk/oracle/synonyms/db_environment.sql b/schema/spacewalk/oracle/synonyms/db_environment.sql
deleted file mode 100644
index 64556e4..0000000
--- a/schema/spacewalk/oracle/synonyms/db_environment.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
---create special db_environment synonyms for monitoring backend code to function as is
-
-create or replace synonym db_environment for rhn_db_environment;
-
---
---
---Revision 1.1 2004/06/23 15:01:07 kja
---bugzilla 126465 -- fix synonyms for monitoring backend
---
---
diff --git a/schema/spacewalk/oracle/synonyms/environment.sql b/schema/spacewalk/oracle/synonyms/environment.sql
deleted file mode 100644
index 0d95cc6..0000000
--- a/schema/spacewalk/oracle/synonyms/environment.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
---create special environment synonyms for monitoring backend code to function as is
-
-create or replace synonym environment for rhn_environment;
-
---
---
---Revision 1.1 2004/06/23 15:01:07 kja
---bugzilla 126465 -- fix synonyms for monitoring backend
---
---
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 6e1299c..252a5e4 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1158,7 +1158,6 @@ sub setup_monitoring {
RHN::DB->set_default_connection($connection_string);
update_monitoring_config($answers, \%mon_config);
- update_monitoring_environment($answers);
# Bugzilla 466747: On s390x, stty: standard input: Bad file descriptor
# For some reason DBI mistakenly sets FD_CLOEXEC on a stdin file descriptor
@@ -1171,38 +1170,6 @@ sub setup_monitoring {
return 1;
}
-sub update_monitoring_environment {
- my $answers = shift;
-
- my $dbh = Spacewalk::Setup::get_dbh($answers);
-
- my $db_name = $answers->{'db-sid'};
- if ($answers->{'db-backend'} eq 'oracle') {
- # BZ 226915 we cannot use db_name from %answers - it contains instance name
- # we want real db name
- ($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv', 'db_name')) FROM dual|);
- }
-
- my $sth = $dbh->prepare(<<EOQ);
-UPDATE rhn_db_environment
- SET db_name = UPPER(?)
- WHERE environment = 'LICENSE'
-EOQ
-
- $sth->execute($db_name);
-
- if ($DEBUG) {
- $dbh->rollback();
- }
- else {
- $dbh->commit();
- }
-
- $dbh->disconnect();
-
- return 1;
-}
-
sub update_monitoring_config {
my $answers = shift;
my $mon_config = shift;
diff --git a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
index 61b1ef1..ad9a467 100644
--- a/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-enable-monitoring.pl
@@ -115,9 +115,6 @@ my %mon_config =
RHN::SatInstall->update_monitoring_config(\%mon_config);
-my $dbname = $mon_config{RHN_DB_NAME};
-RHN::SatInstall->update_monitoring_environment($dbname);
-
print "Restarting satellite services\n";
system("/usr/sbin/rhn-satellite", "restart");
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
index a39c62c..68b9812 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
@@ -229,12 +229,8 @@ SELECT macro.name,
macro.description,
macro.last_update_user,
TO_CHAR(macro.last_update_date, 'YYYY-MM-DD HH24:MI:SS') AS last_update_date
-FROM db_environment dbenv, config_macro macro
+FROM config_macro macro
WHERE macro.editable = 1
-AND dbenv.db_name = UPPER(sys_context('userenv', 'db_name'))
-AND dbenv.environment = DECODE(macro.environment,
- 'ALL', dbenv.environment,
- macro.environment)
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm
index 873d05d..aa30940 100644
--- a/web/modules/rhn/RHN/DB/SatInstall.pm
+++ b/web/modules/rhn/RHN/DB/SatInstall.pm
@@ -334,27 +334,6 @@ EOQ
return;
}
-sub update_monitoring_environment {
- my $class = shift;
-
- my $dbh = RHN::DB->connect;
- # BZ 226915 we cannot use db_name from %answers - it contains instance name
- # we want real db name
- my ($db_name) = $dbh->selectrow_array(q|SELECT UPPER(sys_context('userenv', 'db_name')) FROM dual|);
-
- my $sth = $dbh->prepare(<<EOQ);
-UPDATE rhn_db_environment
- SET db_name = UPPER(:db_name)
- WHERE environment = 'LICENSE'
-EOQ
-
- $sth->execute_h(db_name => $db_name);
-
- $dbh->commit;
-
- return;
-}
-
sub create_satellite_org {
my $class = shift;
my $org_name = shift;
--
1.5.5.6
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
