From 19565d418264fbce61110b3a8d99dd2ad091eca5 Mon Sep 17 00:00:00 2001
From: Bill Buchan <bill.buchan@digital.justice.gov.uk>
Date: Wed, 6 Nov 2024 09:27:50 +0000
Subject: [PATCH] Allow metric to be deployed to standby databases

---
 .../collection/ME#24#USER_NOTES_REPLICATION.xml            | 2 +-
 .../delius/user_notes_replication/mea.xml                  | 2 +-
 .../metadata/ME#24#USER_NOTES_REPLICATION.xml              | 4 ++--
 .../scripts/user_notes_replication.sh                      | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/collection/ME#24#USER_NOTES_REPLICATION.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/collection/ME#24#USER_NOTES_REPLICATION.xml
index 3f2f67917..b1efb470d 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/collection/ME#24#USER_NOTES_REPLICATION.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/collection/ME#24#USER_NOTES_REPLICATION.xml
@@ -1,4 +1,4 @@
-<TargetCollectionExt EXT_NAME="ME$USER_NOTES_REPLICATION" EXT_VERSION="1" TARGET_TYPE="host"><CollectionItem NAME="ME$USER_NOTES_REPLICATION" UPLOAD="YES">
+<TargetCollectionExt EXT_NAME="ME$USER_NOTES_REPLICATION" EXT_VERSION="2" TARGET_TYPE="host"><CollectionItem NAME="ME$USER_NOTES_REPLICATION" UPLOAD="YES">
 	<Schedule>
 		<IntervalSchedule INTERVAL="1" TIME_UNIT="Hr"/>
 	</Schedule>
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/mea.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/mea.xml
index 106f3e4c5..dfda974d1 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/mea.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/mea.xml
@@ -1,5 +1,5 @@
 <MetricExtensionArchive name="MEAME$USER_NOTES_REPLICATION">
-<MetricExtension name="ME$USER_NOTES_REPLICATION" type="host" version="1" is_repos="FALSE" display_name="User Notes Replication" description="Detect if User Notes are not being replicated by DMS" version_comment=" " metadata_digest="087605c4c7287fcc26ff2eed8a884487" coll_digest="0a60f1a562d622511bcb9ad403c100fc" attach_digest="e48a4c18daba9ee5a3bf385a52d057e5">
+<MetricExtension name="ME$USER_NOTES_REPLICATION" type="host" version="2" is_repos="FALSE" display_name="User Notes Replication" description="Detect if User Notes are not being replicated by DMS" version_comment=" " metadata_digest="3d3e6406eb36f695937398c83f735b8f" coll_digest="0a60f1a562d622511bcb9ad403c100fc" attach_digest="01bb6ffb9d327d078c986ac564a27b42">
 <scripts name="user_notes_replication.sh">
 </scripts>
 </MetricExtension>
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/metadata/ME#24#USER_NOTES_REPLICATION.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/metadata/ME#24#USER_NOTES_REPLICATION.xml
index 170c68387..6bac6232c 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/metadata/ME#24#USER_NOTES_REPLICATION.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/metadata/ME#24#USER_NOTES_REPLICATION.xml
@@ -1,4 +1,4 @@
-<TargetMetadataExt EXT_NAME="ME$USER_NOTES_REPLICATION" EXT_VERSION="1" TARGET_TYPE="host"><Metric NAME="ME$USER_NOTES_REPLICATION" TYPE="TABLE">
+<TargetMetadataExt EXT_NAME="ME$USER_NOTES_REPLICATION" EXT_VERSION="2" TARGET_TYPE="host"><Metric NAME="ME$USER_NOTES_REPLICATION" TYPE="TABLE">
 <Display>
 <Label NLSID="NLS_METRIC_hostME$USER_NOTES_REPLICATION">User Notes Replication</Label>
 <Description NLSID="NLS_DESCRIPTION_hostME$USER_NOTES_REPLICATION">Detect if User Notes are not being replicated by DMS</Description>
@@ -7,7 +7,7 @@
 <ColumnDescriptor NAME="MISSING_NOTES_COUNT" TYPE="NUMBER">
 <Display>
 <Label NLSID="NLS_COLUMN_hostME$USER_NOTES_REPLICATIONMISSING_NOTES_COUNT">Missing Notes Count</Label>
-<Unit NLSID="EM_SYS_STANDARD_RATE_OPERATIONDAY">OPERATIONDAY</Unit>
+<Unit NLSID="mext_unit_nlsid_OPERATIONDAY">OPERATIONDAY</Unit>
 <UnitCategory>RATE</UnitCategory>
 </Display>
 <CategoryValue CLASS="Default" CATEGORY_NAME="Fault">
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/scripts/user_notes_replication.sh b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/scripts/user_notes_replication.sh
index c39e8c2ba..bb3cef1eb 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/scripts/user_notes_replication.sh
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/delius/user_notes_replication/scripts/user_notes_replication.sh
@@ -10,6 +10,13 @@
 
 . ~/.bash_profile
 
+
+if [[ $(srvctl config database -d ${ORACLE_SID} | awk -F: '/Start options/{print $2}' | tr -d ' ') == mount ]];
+then
+   # Ignore this metric on mounted (not open) databases
+   exit 0
+fi
+
 sqlplus -s / as sysdba <<EOSQL
 SET HEAD OFF
 SET FEEDBACK OFF