fix merge conflicts

pages/doc/csp_invite-AoA-users_tutorial.md

@@ -116,7 +116,8 @@ In a multi-tenant environment, you assign service roles on a tenant basis. You c
 
    1. Click **+ Add an Instance**.
    1. From the **in** drop-down menu, select the target service instance (tenant).
-      ![A screenshot with the Tanzu Observability service instance selected.](images/csp-select-another-service.png)
+      ![A screenshot with the Tanzu Observabilitys service instance selected.](images/csp-select-another-service.png)
+
    1. From the **with roles** drop-down menu, select the **Super Admin** service role, so that you grant full administrative privileges for the selected service instance.
 
       ![A screenshot with the Tanzu Observability roles selected.](images/csp-assign-superadmin-service-role.png)

pages/doc/missing_data_troubleshooting.md

@@ -9,6 +9,7 @@ summary: Learn how to troubleshoot when you expect to see data but it doesn't ap
 
 Sometimes you expect to see certain data in VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) but, for some reason, it doesn't show up! This can be a frustrating and confusing experience, especially when you urgently need the data. What could be the problem?
 
+
 <!-- Before removing data retention link
 
 Sometimes you expect to see certain data in VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) but, for some reason, it doesn't show up! This can be a frustrating and confusing experience, especially when you urgently need the data. Operations for Applications does not delete data - the [retention period](terms_of_service.html#data-retention) is 18 months for persistent metrics and 28 days for ephemeral metrics. What could be the problem?

pages/doc/wavefront_release_notes.md

@@ -58,6 +58,28 @@ In October, 2023, we start to incrementally [**onboard**](csp_migration.html) al
 
 
 
+## 2024-07.x Release Notes
+
+**Ephemeral Internal Metrics**: Most of the [internal metrics](wavefront-internal-metrics.html) are now [ephemeral](metric_types.html#metric-types-per-retention-period) and not convertible to persistent. Exceptions are the following internal metrics, which remain persistent:
+
+- `~collector.*points.reported`
+- `~externalservices.*.points`
+- `~derived-metrics.points.reported`
+- `~collector.*histograms.reported`
+- `~derived-histograms.histograms.reported`
+- `~collector.*spans.reported`
+- `~query.metrics_scanned`
+- `~proxy.points.*.received`
+- `~proxy.histograms.*.received`
+- `~proxy.spans.*.received`
+- `~proxy.spanLogs.*.received`
+- `~proxy.build.version`
+- `~metric.global.namespace.*`
+- `~histogram.global.namespace.*`
+- `~counter.global.namespace.*`
+
+
+
 ## 2024-05.x Release Notes
 
 * **New Ephemeral Metric Type**: With this release, we introduce ephemeral metrics, which have a short retention period. Ephemeral metrics are retained for 28 days, whereas persistent (default) metrics are retained for 18 months. For details, see [Metric Types per Retention Period](metric_types.html#metric-types-per-retention-period).