From c64f846bce58069481c44b0c6856686130bce18e Mon Sep 17 00:00:00 2001
From: Bill Buchan <bill.buchan@digital.justice.gov.uk>
Date: Wed, 13 Nov 2024 17:18:54 +0000
Subject: [PATCH 1/2] Move monitoring start to 8am

---
 .../roles/oracle-oms-setup/files/monitoring_schedule   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/oracle-oms-setup/files/monitoring_schedule b/ansible/roles/oracle-oms-setup/files/monitoring_schedule
index fde3e2ea7..26ca34b07 100644
--- a/ansible/roles/oracle-oms-setup/files/monitoring_schedule
+++ b/ansible/roles/oracle-oms-setup/files/monitoring_schedule
@@ -17,11 +17,11 @@
 #
 # If the Node is not matched then it is assumed to be monitored 24/7
 #
-delius-core-dev         * 7-19 * * 1-5
-delius-mis-dev          * 7-19 * * 1-5
+delius-core-dev         * 8-19 * * 1-5
+delius-mis-dev          * 8-19 * * 1-5
 DEVRCVCAT_sys           * * * * *
-DMD.{3}_sys             * 7-19 * * 1-5
-^DMDNDA_sys             * 7-19 * * 1-5
+DMD.{3}_sys             * 8-19 * * 1-5
+^DMDNDA_sys             * 8-19 * * 1-5
 EMREP_*_sys             * * * * *
-TRNDA_sys               * 7-19 * * 1-5
+TRNDA_sys               * 8-19 * * 1-5
 TSTNDA_sys              * 8-23 * * 1-5
\ No newline at end of file

From f3c2408a1782e40063c7bcc468c2cf86b67b7dad Mon Sep 17 00:00:00 2001
From: Bill Buchan <bill.buchan@digital.justice.gov.uk>
Date: Fri, 15 Nov 2024 09:21:30 +0000
Subject: [PATCH 2/2] Normalise Audit Trail in READ ONLY without APPLY

---
 .../collection/ME#24#STANDBY_PARAMETER_COMPARISON.xml           | 2 +-
 .../common/standby_parameter_comparison/mea.xml                 | 2 +-
 .../metadata/ME#24#STANDBY_PARAMETER_COMPARISON.xml             | 2 +-
 .../standby_parameter_comparison/scripts/compare_parameters.sh  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/collection/ME#24#STANDBY_PARAMETER_COMPARISON.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/collection/ME#24#STANDBY_PARAMETER_COMPARISON.xml
index e0ef324a6..1103653e1 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/collection/ME#24#STANDBY_PARAMETER_COMPARISON.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/collection/ME#24#STANDBY_PARAMETER_COMPARISON.xml
@@ -1,4 +1,4 @@
-<TargetCollectionExt EXT_NAME="ME$STANDBY_PARAMETER_COMPARISON" EXT_VERSION="2" TARGET_TYPE="host"><CollectionItem NAME="ME$STANDBY_PARAMETER_COMPARISON" UPLOAD="YES">
+<TargetCollectionExt EXT_NAME="ME$STANDBY_PARAMETER_COMPARISON" EXT_VERSION="3" TARGET_TYPE="host"><CollectionItem NAME="ME$STANDBY_PARAMETER_COMPARISON" UPLOAD="YES">
 	<Schedule>
 		<IntervalSchedule INTERVAL="12" TIME_UNIT="Hr"/>
 	</Schedule>
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/mea.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/mea.xml
index a135748df..8ee084f56 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/mea.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/mea.xml
@@ -1,5 +1,5 @@
 <MetricExtensionArchive name="MEAME$STANDBY_PARAMETER_COMPARISON">
-<MetricExtension name="ME$STANDBY_PARAMETER_COMPARISON" type="host" version="2" is_repos="FALSE" display_name="Standby Parameter Comparison" description="Ensure Database Instance Parameters match between Primary and Standby" version_comment=" " metadata_digest="dc5139d6b2d0ecb83e08cbce088f9269" coll_digest="a75a4b544189577ab7b53bd9c5685cbe" attach_digest="3c096ee11057c81750cdfce3c4bd9550">
+<MetricExtension name="ME$STANDBY_PARAMETER_COMPARISON" type="host" version="3" is_repos="FALSE" display_name="Standby Parameter Comparison" description="Ensure Database Instance Parameters match between Primary and Standby" version_comment=" " metadata_digest="dc5139d6b2d0ecb83e08cbce088f9269" coll_digest="a75a4b544189577ab7b53bd9c5685cbe" attach_digest="5b7d7aaf85c059d5645dbe79af0ddc79">
 <scripts name="compare_parameters.sh">
 </scripts>
 </MetricExtension>
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/metadata/ME#24#STANDBY_PARAMETER_COMPARISON.xml b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/metadata/ME#24#STANDBY_PARAMETER_COMPARISON.xml
index 7c802905c..43c6a574e 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/metadata/ME#24#STANDBY_PARAMETER_COMPARISON.xml
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/metadata/ME#24#STANDBY_PARAMETER_COMPARISON.xml
@@ -1,4 +1,4 @@
-<TargetMetadataExt EXT_NAME="ME$STANDBY_PARAMETER_COMPARISON" EXT_VERSION="2" TARGET_TYPE="host"><Metric NAME="ME$STANDBY_PARAMETER_COMPARISON" TYPE="TABLE">
+<TargetMetadataExt EXT_NAME="ME$STANDBY_PARAMETER_COMPARISON" EXT_VERSION="3" TARGET_TYPE="host"><Metric NAME="ME$STANDBY_PARAMETER_COMPARISON" TYPE="TABLE">
 <Display>
 <Label NLSID="NLS_METRIC_hostME$STANDBY_PARAMETER_COMPARISON">Standby Parameter Comparison</Label>
 <Description NLSID="NLS_DESCRIPTION_hostME$STANDBY_PARAMETER_COMPARISON">Ensure Database Instance Parameters match between Primary and Standby</Description>
diff --git a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/scripts/compare_parameters.sh b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/scripts/compare_parameters.sh
index 5d39fef28..f654c1673 100644
--- a/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/scripts/compare_parameters.sh
+++ b/ansible/roles/oracle-oms-setup/files/metric_extensions/common/standby_parameter_comparison/scripts/compare_parameters.sh
@@ -181,7 +181,7 @@ WITH parameter_values AS (
                     'DEFAULT'
                 WHEN a.name IN('audit_trail')
                      AND a.database_role = 'PHYSICAL STANDBY'
-                     AND a.open_mode = 'READ ONLY WITH APPLY' THEN
+                     AND a.open_mode IN ('READ ONLY','READ ONLY WITH APPLY') THEN
                     'DB'
                 WHEN a.name IN('log_archive_config') -- Make ordering consistent for values in log_archive_config
                  THEN