Merge pull request #1080 from ministryofjustice/DBA-784

Change Detection of OEM Host
ministryofjustice · Oct 31, 2024 · 2bc682e · 2bc682e
2 parents c339edc + d62b416
commit 2bc682e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...ensions/common/archivelog_deletion_policy/collection/ME#24#ARCHIVELOG_DELETION_POLICY.xml b/...ensions/common/archivelog_deletion_policy/collection/ME#24#ARCHIVELOG_DELETION_POLICY.xml
@@ -1,4 +1,4 @@
-<TargetCollectionExt EXT_NAME="ME$ARCHIVELOG_DELETION_POLICY" EXT_VERSION="2" TARGET_TYPE="host"><CollectionItem NAME="ME$ARCHIVELOG_DELETION_POLICY" UPLOAD="YES">
+<TargetCollectionExt EXT_NAME="ME$ARCHIVELOG_DELETION_POLICY" EXT_VERSION="4" TARGET_TYPE="host"><CollectionItem NAME="ME$ARCHIVELOG_DELETION_POLICY" UPLOAD="YES">
 	<Schedule>
 		<IntervalSchedule INTERVAL="12" TIME_UNIT="Hr"/>
 	</Schedule>

diff --git a/.../roles/oracle-oms-setup/files/metric_extensions/common/archivelog_deletion_policy/mea.xml b/.../roles/oracle-oms-setup/files/metric_extensions/common/archivelog_deletion_policy/mea.xml
@@ -1,5 +1,5 @@
 <MetricExtensionArchive name="MEAME$ARCHIVELOG_DELETION_POLICY">
-<MetricExtension name="ME$ARCHIVELOG_DELETION_POLICY" type="host" version="2" is_repos="FALSE" display_name="Archivelog Deletion Policy" description="Check RMAN Archivelog Deletion Policy does not include Backup if no Backups taken on host" version_comment=" " metadata_digest="e02e83e86137ecf892639eb0fcae241c" coll_digest="be21f123e5b495bb6b3d4c22422ebcdd" attach_digest="4d93b4d5572f2229f7ad0b9d850a87d8">
+<MetricExtension name="ME$ARCHIVELOG_DELETION_POLICY" type="host" version="4" is_repos="FALSE" display_name="Archivelog Deletion Policy" description="Check RMAN Archivelog Deletion Policy does not include Backup if no Backups taken on host" version_comment=" " metadata_digest="e02e83e86137ecf892639eb0fcae241c" coll_digest="be21f123e5b495bb6b3d4c22422ebcdd" attach_digest="19c163d11d05f5c358f7c1bb02f7e310">
 <scripts name="archivelog_deletion_policy_check.sh">
 </scripts>
 </MetricExtension>

diff --git a/...xtensions/common/archivelog_deletion_policy/metadata/ME#24#ARCHIVELOG_DELETION_POLICY.xml b/...xtensions/common/archivelog_deletion_policy/metadata/ME#24#ARCHIVELOG_DELETION_POLICY.xml
@@ -1,4 +1,4 @@
-<TargetMetadataExt EXT_NAME="ME$ARCHIVELOG_DELETION_POLICY" EXT_VERSION="2" TARGET_TYPE="host"><Metric NAME="ME$ARCHIVELOG_DELETION_POLICY" TYPE="TABLE">
+<TargetMetadataExt EXT_NAME="ME$ARCHIVELOG_DELETION_POLICY" EXT_VERSION="4" TARGET_TYPE="host"><Metric NAME="ME$ARCHIVELOG_DELETION_POLICY" TYPE="TABLE">
 <Display>
 <Label NLSID="NLS_METRIC_hostME$ARCHIVELOG_DELETION_POLICY">Archivelog Deletion Policy</Label>
 <Description NLSID="NLS_DESCRIPTION_hostME$ARCHIVELOG_DELETION_POLICY">Check RMAN Archivelog Deletion Policy does not include Backup if no Backups taken on host</Description>

diff --git a/..._extensions/common/archivelog_deletion_policy/scripts/archivelog_deletion_policy_check.sh b/..._extensions/common/archivelog_deletion_policy/scripts/archivelog_deletion_policy_check.sh
@@ -7,7 +7,7 @@
 . ~/.bash_profile
 
 # If run on an instance hosting OEM we need to explicitly set up the database environment
-if srvctl config database -d EMREP > /dev/null; then
+if grep "^EMREP:" /etc/oratab > /dev/null; then
         export ORAENV_ASK=NO
         export ORACLE_SID=EMREP
         . oraenv >/dev/null