From e866329033990e1f96e95afa5e88ae238e762782 Mon Sep 17 00:00:00 2001
From: Martin Jackson <martjack@redhat.com>
Date: Thu, 1 Oct 2026 12:02:18 -0500
Subject: [PATCH] Add openshift-observability

---
 Changes.md                        |  4 +++
 variants/odf/values-odf.yaml      |  8 ++++++
 variants/odf/values-rdr-o11y.yaml | 45 +++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 variants/odf/values-rdr-o11y.yaml

diff --git a/Changes.md b/Changes.md
index f6d85f5..376cc3f 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,5 +1,9 @@
 # Change history for significant pattern releases
 
+v1.3 - October 2026
+
+* Add `openshift-observability` application to hub to enable built-in metrics reporting for the ODF variant.
+
 v1.3 - September 2026
 
 * Drop the ODF-MCO `drpartner-s4` variant and rename `rhdr-s4` to `drpartner-s4`.
diff --git a/variants/odf/values-odf.yaml b/variants/odf/values-odf.yaml
index 04f7990..80fd170 100644
--- a/variants/odf/values-odf.yaml
+++ b/variants/odf/values-odf.yaml
@@ -92,6 +92,14 @@ clusterGroup:
       extraValueFiles:
         - '$patternref/overrides/values-console-plugins-hub.yaml'
 
+    observability:
+      name: observability
+      namespace: open-cluster-management-observability
+      chart: openshift-observability
+      chartVersion: 0.1.*
+      extraValueFiles:
+        - '$patternref/variants/odf/values-rdr-o11y.yaml'
+
     opp-policy:
       name: opp-policy
       namespace: openshift
diff --git a/variants/odf/values-rdr-o11y.yaml b/variants/odf/values-rdr-o11y.yaml
new file mode 100644
index 0000000..1b36ed3
--- /dev/null
+++ b/variants/odf/values-rdr-o11y.yaml
@@ -0,0 +1,45 @@
+---
+# Regional-DR. The hub dashboard shows operator health, cluster health,
+# metrics, alerts, and application count.
+#
+# https://docs.redhat.com/en/documentation/red_hat_openshift_data_foundation/4.22/html/configuring_openshift_data_foundation_disaster_recovery_for_openshift_workloads/monitoring_disaster_recovery_health#enabling-dr-dashboard-on-hub-cluster_monitor-dr
+#
+# The bootstrap Job sets openshift.io/cluster-monitoring=true on
+# openshift-operators. The CronJob keeps that label set. That is the
+# "Enable monitoring for disaster recovery" step, and it is required for
+# Regional-DR. This chart does not create or replace the Namespace.
+# clusterMonitoringLabel.managedClusters.namespaces is the RHACM policy that
+# sets the same label on managed clusters. Leave it empty unless those
+# projects should be scraped by platform Prometheus.
+#
+# Prerequisites: OpenShift 4.17, the Data Foundation Multicluster Orchestrator
+# console plugin, and RHACM. The chart creates MultiClusterObservability and
+# the Thanos bucket on hub NooBaa. For an external bucket, set
+# metricObjectStorage.noobaa.enabled to false and
+# metricObjectStorage.externalSecret.enabled to true, add
+# thanos-object-storage to values-secret.yaml, and run make load-secrets.
+# See the chart README.
+#
+# Refresh the hub console. Select Fleet Management, open Data Services,
+# click Disaster recovery, then the Overview tab.
+
+clusterMonitoringLabel:
+  enabled: true
+
+acmObservability:
+  enabled: true
+  multiClusterObservability:
+    enabled: true
+  names:
+    - ceph_rbd_mirror_snapshot_sync_bytes
+    - ceph_rbd_mirror_snapshot_snapshots
+  # openshift-storage is scraped by user-workload monitoring unless that
+  # namespace has openshift.io/cluster-monitoring=true. The same names have
+  # to be on the user-workload allowlist or the Overview metrics cards stay empty.
+  userWorkload:
+    names:
+      - ceph_rbd_mirror_snapshot_sync_bytes
+      - ceph_rbd_mirror_snapshot_snapshots
+  matches:
+    - '__name__="csv_succeeded",exported_namespace="openshift-dr-system",name=~"odr-cluster-operator.*"'
+    - '__name__="kube_running_pod_ready",namespace=~"volsync-system|openshift-operators",pod=~"volsync.*"'