Skip to content
This repository has been archived by the owner on Aug 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request #44 from amreo/master
Browse files Browse the repository at this point in the history 
Various fix
  • Loading branch information
@amreo
amreo committed Nov 18, 2019
2 parents c8c89d9 + ad64cba commit 89a1e20
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 46 deletions.
14 changes: 2 additions & 12 deletions ercole-agent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,7 @@ sub buildData { #OK

if ($dbStatus =~ m/OPEN/) {
my $outVersion = fetcher("dbversion", $dbEntry{"DBName"}, $dbEntry{"OracleHome"}); #$db=XE, #outVersion 18.0.0.0
my $prefix = substr $outVersion, 0, 2;

my $dbVersion = "12";

if ($prefix eq "11"){
$dbVersion = "11";
} elsif($prefix eq "10"){
$dbVersion = "10";
} elsif($prefix eq "9"){
$dbVersion = "9";
}
my ($dbVersion) = split /\./, $outVersion;

#DA RIMETTERE ALLA FINE
# if ($configuration{'forcestats'}) { #true, ok
Expand Down Expand Up @@ -275,4 +265,4 @@ sub fetchDbStatus {
return $out;
}

main();
main();
6 changes: 3 additions & 3 deletions fetch/feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export ORACLE_SID=$SID
export ORACLE_HOME=$HOME
export PATH=$HOME/bin:$PATH

if [ "$DBV" -eq "11" ] || [ "$DBV" -eq "12" ]; then
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/feature.sql
else
if [ $DBV == "9" ] || [ $DBV == "10" ]; then
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/feature-10.sql
else
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/feature.sql
fi
4 changes: 2 additions & 2 deletions fetch/license
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ else
fi


if [ $DBV = "10" ]; then
sqlplus -S "/ AS SYSDBA" @${ERCOLE_HOME}/sql/license-10.sql $CPU_THREAD $FACTOR
if [ $DBV == "10" ] || [ $DBV == "9" ]; then
sqlplus -S "/ AS SYSDBA" @${ERCOLE_HOME}/sql/license-10.sql $LICENSING_CPU_CORES $FACTOR
else
sqlplus -S "/ AS SYSDBA" @${ERCOLE_HOME}/sql/license.sql $CPU_THREAD $FACTOR $DB_ONE
fi
2 changes: 1 addition & 1 deletion fetch/patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export ORACLE_SID=$SID
export ORACLE_HOME=$HOME
export PATH=$HOME/bin:$PATH

if [ "$DBV" -eq "12" ]; then
if [ $DBV -gt "11" ]; then
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/patch-12.sql
else
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/patch.sql
Expand Down
2 changes: 1 addition & 1 deletion fetch/psu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export PATH=$HOME/bin:$PATH
ERCOLE_HOME=$(dirname "$0")
ERCOLE_HOME="$(dirname "$ERCOLE_HOME")"

if [ "$DBV" -eq "10" ] || [ "$DBV" -eq "11" ]; then
if [ $DBV -lt "12" ]; then
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/psu-1.sql
else
sqlplus -S "/ AS SYSDBA" < ${ERCOLE_HOME}/sql/psu-2.sql
Expand Down
16 changes: 8 additions & 8 deletions sql/dbmounted.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ select
(select value from v$nls_parameters where parameter='NLS_NCHAR_CHARACTERSET') as NCharset,
(select value from v$parameter where name='db_block_size') as Blocksize,
(select value from v$parameter where name='cpu_count') as Cpu_count,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS='',.'''),',') from v$parameter where name='sga_target') as Sga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS='',.'''),',') from v$parameter where name='pga_aggregate_target') as Pga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS='',.'''),',') from v$parameter where name='memory_target') as Pga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS='',.'''),',') from v$parameter where name='sga_max_size') as sga_max_size,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS=''.,'''),',') from v$parameter where name='sga_target') as Sga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS=''.,'''),',') from v$parameter where name='pga_aggregate_target') as Pga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS=''.,'''),',') from v$parameter where name='memory_target') as Pga_Target,
(select rtrim(to_char(value/1024/1024/1024, 'FM9G999G999D999', 'NLS_NUMERIC_CHARACTERS=''.,'''),',') from v$parameter where name='sga_max_size') as sga_max_size,
--(select round(sum(bytes/1024/1024/1024)) from dba_segments),
'N/A',
'0',
--((select round(sum(bytes/1024/1024/1024)) from v$datafile)+(select round(sum(bytes/1024/1024/1024)) from v$tempfile)+(select round(sum(bytes/1024/1024/1024)) from v$log)),
'N/A',
'0',
--((select round(sum(decode(autoextensible,'NO',bytes/1024/1024/1024,'YES',maxbytes/1024/1024/1024))) from v$datafile)+(select round(sum(bytes/1024/1024/1024)) from v$tempfile)+(select round(sum(bytes/1024/1024/1024)) from v$log)),
'N/A',
'0',
--(SELECT replace(replace(output,'Elapsed:',''),chr(32), '') FROM TABLE (DBMS_WORKLOAD_REPOSITORY.awr_report_text (:dbid, :inst_num, :bid, :eid, 0)) where rownum <20 and output like '%Elapsed: %'),
--(SELECT replace(replace(output,'DB Time:',''),chr(32), '') FROM TABLE (DBMS_WORKLOAD_REPOSITORY.awr_report_text (:dbid, :inst_num, :bid, :eid, 0)) where rownum <20 and output like '%DB Time: %'),
--:elapsed,:dbtime,(select :result from dual),
'N/A','N/A','N/A',
'0','0','0',
(select case when (select count(*) from v$datafile where name like '+%') > 0 then 'Y' else 'N' end as "ASM" from dual ),
case when ( select count(*) from V$DATAGUARD_CONFIG) > 1 then 'Y' else 'N' end as "Dataguard"
from dual;
Expand Down
38 changes: 19 additions & 19 deletions sql/psu-1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,25 @@ select * into :BP from (select COMMENTS from registry$history order by action_t
select
case
WHEN COMMENTS = 'BP20' THEN TO_DATE('151015','YYMMDD')
WHEN COMMENTS = 'BP19' THEN TO_DATE('150915','YYMMDD')
WHEN COMMENTS = 'BP18' THEN TO_DATE('150815','YYMMDD')
WHEN COMMENTS = 'BP17' THEN TO_DATE('150715','YYMMDD')
WHEN COMMENTS = 'BP16' THEN TO_DATE('150415','YYMMDD')
WHEN COMMENTS = 'BP15' THEN TO_DATE('150115','YYMMDD')
WHEN COMMENTS = 'BP14' THEN TO_DATE('151214','YYMMDD')
WHEN COMMENTS = 'BP13' THEN TO_DATE('151114','YYMMDD')
WHEN COMMENTS = 'BP12' THEN TO_DATE('151014','YYMMDD')
WHEN COMMENTS = 'BP11' THEN TO_DATE('150914','YYMMDD')
WHEN COMMENTS = 'BP10' THEN TO_DATE('150814','YYMMDD')
WHEN COMMENTS = 'BP9' THEN TO_DATE('150714','YYMMDD')
WHEN COMMENTS = 'BP8' THEN TO_DATE('150614','YYMMDD')
WHEN COMMENTS = 'BP7' THEN TO_DATE('150514','YYMMDD')
WHEN COMMENTS = 'BP6' THEN TO_DATE('150414','YYMMDD')
WHEN COMMENTS = 'BP5' THEN TO_DATE('150314','YYMMDD')
WHEN COMMENTS = 'BP4' THEN TO_DATE('150214','YYMMDD')
WHEN COMMENTS = 'BP3' THEN TO_DATE('150114','YYMMDD')
WHEN COMMENTS = 'BP2' THEN TO_DATE('151213','YYMMDD')
WHEN COMMENTS = 'BP1' THEN TO_DATE('151113','YYMMDD')
WHEN COMMENTS = 'BP19' THEN TO_DATE('150915','YYMMDD')
WHEN COMMENTS = 'BP18' THEN TO_DATE('150815','YYMMDD')
WHEN COMMENTS = 'BP17' THEN TO_DATE('150715','YYMMDD')
WHEN COMMENTS = 'BP16' THEN TO_DATE('150415','YYMMDD')
WHEN COMMENTS = 'BP15' THEN TO_DATE('150115','YYMMDD')
WHEN COMMENTS = 'BP14' THEN TO_DATE('151214','YYMMDD')
WHEN COMMENTS = 'BP13' THEN TO_DATE('151114','YYMMDD')
WHEN COMMENTS = 'BP12' THEN TO_DATE('151014','YYMMDD')
WHEN COMMENTS = 'BP11' THEN TO_DATE('150914','YYMMDD')
WHEN COMMENTS = 'BP10' THEN TO_DATE('150814','YYMMDD')
WHEN COMMENTS = 'BP9' THEN TO_DATE('150714','YYMMDD')
WHEN COMMENTS = 'BP8' THEN TO_DATE('150614','YYMMDD')
WHEN COMMENTS = 'BP7' THEN TO_DATE('150514','YYMMDD')
WHEN COMMENTS = 'BP6' THEN TO_DATE('150414','YYMMDD')
WHEN COMMENTS = 'BP5' THEN TO_DATE('150314','YYMMDD')
WHEN COMMENTS = 'BP4' THEN TO_DATE('150214','YYMMDD')
WHEN COMMENTS = 'BP3' THEN TO_DATE('150114','YYMMDD')
WHEN COMMENTS = 'BP2' THEN TO_DATE('151213','YYMMDD')
WHEN COMMENTS = 'BP1' THEN TO_DATE('151113','YYMMDD')
ELSE
TO_DATE(substr(COMMENTS,3,7), 'YYMMDD')
END as PSU_DATE
Expand Down

0 comments on commit 89a1e20

Please sign in to comment.