java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 4
java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java | 4
java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java | 4
web/modules/dobby/scripts/check-database-space-usage.sh | 46
+---------
4 files changed, 11 insertions(+), 47 deletions(-)
New commits:
commit 17eda3b9ef1f086c6d75dd7bf894c400a93d3272
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Mon Aug 26 15:34:43 2013 +0200
993978 - removing oracle specific code
as oracle is no longer supported by db-control the oracle specific code can be now
safely removed
diff --git a/web/modules/dobby/scripts/check-database-space-usage.sh
b/web/modules/dobby/scripts/check-database-space-usage.sh
index be067c4..0b11753 100755
--- a/web/modules/dobby/scripts/check-database-space-usage.sh
+++ b/web/modules/dobby/scripts/check-database-space-usage.sh
@@ -17,32 +17,6 @@
PATH=/usr/bin:/bin
export PATH
-get_db_backend() {
- if [ ! -e /usr/bin/spacewalk-cfg-get ]; then
- if [ x$(grep db_backend /etc/rhn/rhn.conf | awk '{print $3}') =
x"postgresql" ]; then
- echo "postgresql"
- else
- echo "oracle"
- fi
- else
- if [ x$(spacewalk-cfg-get db_backend) = x"postgresql" ]; then
- echo "postgresql"
- else
- echo "oracle"
- fi
- fi
-}
-
-reportusage() {
- # both command produce percent as 5th field and first row is header, which is ignored
- if [ x"$(get_db_backend)" = x"postgresql" ]; then
- df -hP /var/lib/pgsql/data/
- else
- # don't report UNDO usage
- /sbin/runuser oracle -c "db-control report" | grep -E -v
'UNDO|TEMP'
- fi
-}
-
mailitout() {
local reportusage=$1
@@ -52,28 +26,18 @@ mailitout() {
MAILADDRESS=$(spacewalk-cfg-get traceback_mail)
fi
- if [ x$(get_db_backend) = x"postgresql" ]; then
- SUBJECT="Warning - PostgreSQL database mount point is running out of
space"
- BODY="This is a notice to let you know that you have gone over 90% usage of
+ SUBJECT="Warning - PostgreSQL database mount point is running out of space"
+ BODY="This is a notice to let you know that you have gone over 90% usage of
the mount point where the PostgreSQL database resides. We recommend to be
proactive and increase the storage before getting to 100% usage."
- else
- SUBJECT="Warning - high tablespace usage on Satellite oracle DB"
-
- BODY="This is a notice to let you know that you have gone over 90% usage in
-one of the Oracle Tablespaces. We recommend to be proactive and increase the
-size of the tablespace before getting to 100% usage. Please consult
-the Satellite documentation on using db-control to increase the size or
-contact Red Hat Support for assistance."
- fi
echo -e "$BODY\n\n$reportusage" | mail -s "$SUBJECT" $MAILADDRESS
exit 0
}
-#grab the usage numbers from the db-control report output
-REPORTUSAGE=$(reportusage)
+
+REPORTUSAGE=$(df -hP /var/lib/pgsql/data/)
NUMBERS=$(echo "$REPORTUSAGE" | awk '{if (FNR > 1)
{sub("%",""); print $5}}')
-# run db-control and then use awk and sed to get the % numbers
+
for num in $NUMBERS
do
# if number is over 90% then send warning email
commit a360d239a149588b8a338ce4131a5e9498ccc58a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Sep 2 10:00:48 2013 +0200
common.db.datasource tests: get database username from configuration file
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
index 5de2473..915c0b5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.common.db.datasource.test;
import com.redhat.rhn.common.ObjectCreateWrapperException;
+import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CallableMode;
import com.redhat.rhn.common.db.datasource.DataResult;
@@ -60,12 +61,11 @@ public class AdvDataSourceTest extends RhnBaseTestCase {
super(name);
if (ConfigDefaults.get().isOracle()) {
db_sufix = "_or";
- db_user = "SPACEUSER";
}
else {
db_sufix = "_pg";
- db_user = "spaceuser";
}
+ db_user = Config.get().getString(ConfigDefaults.DB_USER);
}
private void lookup(String foobar, int id, int size) {
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
index 4a135e6..c371b08 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataListTest.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataList;
import com.redhat.rhn.common.db.datasource.DataResult;
@@ -37,12 +38,11 @@ public class DataListTest extends RhnBaseTestCase {
public void setUp() {
if (ConfigDefaults.get().isOracle()) {
db_sufix = "_or";
- db_user = "SPACEUSER";
}
else {
db_sufix = "_pg";
- db_user = "spaceuser";
}
+ db_user = Config.get().getString(ConfigDefaults.DB_USER);
hsm = new HookedSelectMode(
ModeFactory.getMode("test_queries", "user_tables" +
db_sufix));
diff --git
a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
index fd00cfd..b267e12 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.common.db.datasource.test;
+import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CachedStatement;
import com.redhat.rhn.common.db.datasource.DataResult;
@@ -46,12 +47,11 @@ public class DataSourceParserTest extends RhnBaseTestCase {
public DataSourceParserTest() {
if (ConfigDefaults.get().isOracle()) {
db_sufix = "_or";
- db_user = "SPACEUSER";
}
else {
db_sufix = "_pg";
- db_user = "spaceuser";
}
+ db_user = Config.get().getString(ConfigDefaults.DB_USER);
}
public void testGetModes() throws Exception {
Show replies by date