fix merge conflcits

_data/sidebars/doc_sidebar.yml

@@ -970,7 +970,7 @@ entries:
             output: web
 
           - title: Security Policy Rules
-            url: /csp_metrics_security.html
+            url: /csp_security_policy.html
             output: web
 
       - title: Authentication Model

pages/doc/2020_10.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.10.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020.10 of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service. We also recently released a new version (6.1) of the Wavefront proxy. See the [Wavefront Proxy Release Notes](proxies_versions.html) for details.
+These release notes give an overview of the changes for Release 2020.10 of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service. We also recently released a new version (6.1) of the Wavefront proxy. See the [Wavefront Proxy Release Notes](proxies_versions.html) for details.
 
 ## New Histogram Functions
 

pages/doc/2020_14.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.14.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020.14 of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020.14 of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## Wavefront for Spring Boot
 [Wavefront for Spring Boot](wavefront_springboot.html) allows you to quickly configure your environment, so Spring Boot components send metrics, histograms, and traces/spans to the Wavefront service. After you’ve completed setup, you can examine the data in preconfigured or custom Wavefront dashboards.

pages/doc/2020_22.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.22.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020.22 of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020.22 of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 {% include note.html content="[Tracing](tracing_basics.html) and [Histograms](proxies_histograms.html) are available by default for all customers starting with this release. Try them out and contact [support@wavefront.com](mailto:support@wavefront.com) if you have any questions." %}
 

pages/doc/2020_26.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.26.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020.26 of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020.26 of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## PromQL Support (Beta)

pages/doc/2020_30.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.30.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020-30.x of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020-30.x of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## OpenTelemetry Support in Wavefront
 

pages/doc/2020_38.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.38.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020-38.x of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020-38.x of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## Metrics Security
 

pages/doc/2020_42.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2020.42.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2020-42.x of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2020-42.x of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## Apdex Score for Services

pages/doc/2021-08.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.08.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2021-02.x to 2021-08.x of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2021-02.x to 2021-08.x of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ##  Delta Counter Changes
 

pages/doc/2021-14.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.14.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for Release 2021-09.x to 2021-14.x of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for Release 2021-09.x to 2021-14.x of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## Partial Regex Support
 

pages/doc/2021-19.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.19.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2021-15.x to 2021-19.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2021-15.x to 2021-19.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## 2021-19.x Release Notes
 

pages/doc/2021-24.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.24.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2021-20.x to 2021-24.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2021-20.x to 2021-24.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 ## 2021-24.x Release Notes
 

pages/doc/2021-35.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.35.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2021-26.x to 2021-35.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2021-26.x to 2021-35.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2021-35.x Release Notes

pages/doc/2021-49.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2021.49.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2021-40.x to 2021-49.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service. 
+These release notes give an overview of the changes for the 2021-40.x to 2021-49.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service. 
 
 
 ## 2021-49.x Release Notes

pages/doc/2022-06.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2022-06.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2022-01.x to 2022-06.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2022-01.x to 2022-06.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2022-06.x Release Notes

pages/doc/2022-20.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2022-20.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2022-08.x to 2022-20.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2022-08.x to 2022-20.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2022-20.x Release Notes

pages/doc/2022-29.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2022-29.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2022-22.x to 2022-29.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2022-22.x to 2022-29.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2022-29.x Release Notes

pages/doc/2022-39.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2022-39.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2022-32.x to 2022-39.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2022-32.x to 2022-39.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2022-39.x Release Notes

pages/doc/2022-49.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2022-49.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2022-41.x to 2022-49.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2022-41.x to 2022-49.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2022-49.x Release Notes

pages/doc/2023-06.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2023-06.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2023-02.x to 2023-06.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2023-02.x to 2023-06.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2023-06.x Release Notes

pages/doc/2023-13.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2023-13.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2023-07.x to 2023-13.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2023-07.x to 2023-13.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2023-13.x Release Notes

pages/doc/2023-29.x_release_notes.md

@@ -6,7 +6,7 @@ permalink: 2023-29.x_release_notes.html
 summary: New and updated features.
 ---
 
-These release notes give an overview of the changes for the 2023-18.x to 2023-29.x releases of the Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
+These release notes give an overview of the changes for the 2023-18.x to 2023-29.x releases of the VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) service.
 
 
 ## 2023-29.x Release Notes

pages/doc/access.md

@@ -7,9 +7,9 @@ permalink: access.html
 summary: Control access to individual dashboards and alerts.
 ---
 
-{% include note.html content="Starting July 3, 2023, VMware Aria Operations for Applications is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Managing Access to Dashboards and Alerts in Operations for Applications on VMware Cloud Services](csp_access.html)."%}
+{% include note.html content="Starting July 3, 2023, VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Managing Access to Dashboards and Alerts in Tanzu Observability on VMware Cloud Services](csp_access.html)."%}
 
-VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) supports the roles, permissions, and groups authorization paradigm for managing global permissions. For example, a user with **Dashboards** permission can manage *all* dashboards. This paradigm is sufficient for many of our customers.
+Tanzu Observability supports the roles, permissions, and groups authorization paradigm for managing global permissions. For example, a user with **Dashboards** permission can manage *all* dashboards. This paradigm is sufficient for many of our customers.
 
 Super Admins or users with the **Accounts** permission who need finer-grained control can manage access on a per-object basis. We currently support access control for dashboards and alerts.
 
@@ -26,7 +26,7 @@ This video shows how to limit access for a dashboard, how to give access (share)
 
 ## How Access Control Works
 
-Operations for Applications supports granting and revoking access to dashboards and alerts.
+Tanzu Observability supports granting and revoking access to dashboards and alerts.
 * By default, all users can view all dashboards and alerts.
 * Users with **Dashboards** permission can:
   - Restrict or grant access to individual dashboards from the Dashboard browser.

pages/doc/accounts-service.md

@@ -7,9 +7,9 @@ permalink: service-accounts.html
 summary: Create and manage service accounts.
 ---
 
-{% include note.html content="Starting July 3, 2023, VMware Aria Operations for Applications is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Manage Server to Server Apps](csp_server_to_server_apps.html) and [Manage Service Accounts](csp_service_accounts.html)."%}
+{% include note.html content="Starting July 3, 2023, VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Manage Server to Server Apps](csp_server_to_server_apps.html) and [Manage Service Accounts](csp_service_accounts.html)."%}
 
-VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) supports service accounts that can be used to automate management of objects such as dashboards, alerts, etc. A service account can't perform the **UI operations** that all user accounts can [perform by default](user-accounts.html#what-can-a-new-user-do). There's no limit on the number of service accounts that you can create in your organization. 
+Tanzu Observability supports service accounts that can be used to automate management of objects such as dashboards, alerts, etc. A service account can't perform the **UI operations** that all user accounts can [perform by default](user-accounts.html#what-can-a-new-user-do). There's no limit on the number of service accounts that you can create in your organization. 
 
 {% include note.html content="Service accounts have no permissions by default. As a user with the **Accounts** permission, you must explicitly grant each service account only the permission required for the task that’s being automated (least required privilege). Doing so, you ensure that permissions for service accounts are always very limited. Service accounts do not have the view permissions that user accounts have by default. A service account must have **permissions** to perform tasks. To run queries, a service account must have **Metrics** permission. To manage dashboards and alerts, the service account might need both permissions and [access](access.html)." %}
 
@@ -27,7 +27,7 @@ As a user with the **Accounts** permission, you [generate (and revoke, if needed
 
 ## How Service Accounts Work
 
-If you build a service or tool that manages proxies or ingests data, then that tool must authenticate to the Operations for Applications REST API.
+If you build a service or tool that manages proxies or ingests data, then that tool must authenticate to the Tanzu Observability REST API.
 
 1. Create a service account from the UI. The service account name must be unique.
 2. Assign a role to the account to give the account the permissions it needs. Service accounts can perform get, modify, and delete tasks **only if** they have the necessary permissions.
@@ -54,7 +54,7 @@ Creating a service account is different from creating a user account.
 <tr>
 <td>
 Account ID</td>
-<td>ID of the account. We prefix this ID with <strong>sa::</strong>. <p>A service account name must be unique. Operations for Applications converts service account ID to lower case to avoid confusion that can result from almost identical account names (e.g. Service-1 and service-1). Users can type upper case or lower case. </p> </td>
+<td>ID of the account. We prefix this ID with <strong>sa::</strong>. <p>A service account name must be unique. Tanzu Observability converts service account ID to lower case to avoid confusion that can result from almost identical account names (e.g. Service-1 and service-1). Users can type upper case or lower case. </p> </td>
 </tr>
 <tr>
 <td>

pages/doc/accounts.md

@@ -7,9 +7,9 @@ permalink: user-accounts.html
 summary: Create and manage user accounts.
 ---
 
-{% include note.html content="Starting July 3, 2023, VMware Aria Operations for Applications is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Manage Users of Operations for Applications on VMware Cloud Services](csp_user_management.html)."%}
+{% include note.html content="Starting July 3, 2023, VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) is a service on the VMware Cloud services platform. The content in this chapter is valid for **original** subscribers. For VMware Cloud services subscriptions, see [Manage Users of Tanzu Observability on VMware Cloud Services](csp_user_management.html)."%}
 
-VMware Aria Operations for Applications (formerly known as Tanzu Observability by Wavefront) supports:
+Tanzu Observability supports:
 * User accounts, discussed here, which authenticate with a username and password.
 * [Service accounts](service-accounts.html), which authenticate with a token.
 

pages/doc/alert_target_customizing.md

@@ -7,7 +7,7 @@ permalink: alert_target_customizing.html
 summary: Learn how to customize alert notifications by modifying alert target templates.
 ---
 
-An alert target provides a template that specifies how Tanzu Observability (formerly known as VMware Aria Operations for Applications) extracts information from the alert, and how to assemble the notification from the alert information.
+An alert target provides a template that specifies how VMware Tanzu Observability (formerly known as VMware Aria Operations for Applications) extracts information from the alert, and how to assemble the notification from the alert information.
 
 You can customize the predefined template for the alert target type by making and saving changes. The template uses [Mustache syntax](https://mustache.github.io/) to combine literal text with _variables_ and _functions_ to produce the structures to be sent to the receiving messaging platform.