Merge branch and resolve conflicts.

pages/doc/csp_accounts-service.md

@@ -7,7 +7,7 @@ permalink: csp_service_accounts.html
 summary: Learn how you can 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 VMware Cloud services subscriptions. Service accounts are enabled only for a **limited number** of VMware Cloud services subscriptions, because in most cases they should use [server to server OAuth apps](csp_server_to_server_apps.html). To enable service accounts for your service instance, [contact](wavefront_support_feedback.html) our Technical Support team. For **original** subscriptions, see [Manage Service Accounts](service-accounts.html)."%}
+{% 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 VMware Cloud services subscriptions. For **original** subscriptions, see [Manage Service Accounts](service-accounts.html)."%}
 
 {% include warning.html content="The usage of service accounts in Operations for Applications on VMware Cloud services is **restricted** to support only a [limited list of integrations](integrations_onboarded_subscriptions.html#integrations-that-use-operations-for-applications-api-tokens) that still authenticate with Operations for Applications API tokens. We are in the process of updating all of our integrations to authenticate with VMware Cloud services access tokens. Service accounts and Operations for Applications API tokens will be deprecated in the future."%}
 

pages/doc/csp_api_tokens.md

@@ -1,5 +1,5 @@
 ---
-title: Manage Tokens in VMware Cloud Services and Operations for Applications
+title: Manage Tokens for Operations for Applications on VMware Cloud Services
 keywords: getting started
 tags: [getting started]
 sidebar: doc_sidebar
@@ -9,9 +9,9 @@ summary: Learn how you can generate and manage API tokens and access tokens.
 
 {% 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 VMware Cloud services subscriptions. For **original** subscriptions, see [Manage API Tokens](api_tokens.html)."%}
 
-Invoking the [Operations for Applications REST API](wavefront_api.html), using `curl` or an API client, requires a **VMware Cloud services access token**. In a few cases, when setting up a Wavefront proxy for a [limited list of integrations](integrations_onboarded_subscriptions.html#integrations-supported-with-service-accounts), authentication with an **Operations for Applications API token** is also supported.
+Invoking the [Operations for Applications REST API](wavefront_api.html), using `curl` or an API client, requires a **VMware Cloud services access token**. In a few cases, when setting up a [limited list of integrations](integrations_onboarded_subscriptions.html#integrations-supported-with-service-accounts), authentication with an **Operations for Applications API token** is also supported.
 
-To obtain a VMware Cloud services access token, you must make an API call to use the VMware Cloud services REST API and exchange it from:
+To obtain a VMware Cloud services access token, you must make an API call to the VMware Cloud services REST API and exchange it from:
 * A VMware Cloud services API token associated with your user account.
 * The credentials of a server to server OAuth app associated with the VMware Cloud organization running the service.
 
@@ -28,7 +28,7 @@ You can generate VMware Cloud services API tokens only for your user account. Yo
 * At least one Operations for Applications service role.
 * Optionally, one or more custom roles.
 
-You must also set each API token with a time to live (TTL), which is the time that the API token will be valid unless revoked earlier. When an API token expires, you must generate a new API token and update your scripts and API calls.
+You must also set each API token with a time to live (TTL), which is the time that the API token will be valid unless revoked earlier. Before an API token expires, you must generate a new API token and update your scripts and API calls.
 
 {% include important.html content="The access token exchanged from a VMware Cloud services API token has a TTL of 30 minutes. Make sure that your scripts periodically renew the access tokens before they expire."%}
 
@@ -58,13 +58,15 @@ You must assign each server to server app only with the minimum required roles f
 * At least one Operations for Applications service role.
 * Optionally, one or more custom roles.
 
-You must also set each server to server app with a time to live (TTL), which is the time that the access tokens associated with the app will be valid. The credentials of a sever to server app never expire, so that your script can periodically exchange them for new access tokens. Only if you regenerate the app secret, you must update your API calls.
+You must also set each server to server app with a time to live (TTL), which is the time that the access tokens associated with the app will be valid. The credentials of a sever to server app never expire, so that your script can periodically exchange them for new access tokens. Only if you regenerate the app secret, you must update your scripts and API calls.
 
 For details on how to create, view, and modify the details of the OAuth 2.0 apps in your organization, see [How to manage OAuth 2.0 apps](https://docs.vmware.com/en/VMware-Cloud-services/services/Using-VMware-Cloud-Services/GUID-229F9BCE-0C1F-4948-8792-23F51B5482BE.html) in the VMware Cloud services documentation.
 
 ## Manage the Operations for Applications API Tokens for a Service Account
 
-If you want to set up one of the [integrations](integrations_onboarded_subscriptions.html#integrations-that-use-operations-for-applications-api-tokens) that still use proxy authentication with an **Operations for Applications API token**, you must create a [service account](csp_service_accounts.html) and generate an API token associated with it.
+If you want to set up one of the [integrations](integrations_onboarded_subscriptions.html#integrations-that-use-operations-for-applications-api-tokens) that still authenticate with an **Operations for Applications API token**, you must create a [service account](csp_service_accounts.html) and generate an API token associated with it.
+
+{% include important.html content="Service accounts are enabled only for a **limited number** of VMware Cloud services subscriptions, because The usage of service accounts in Operations for Applications on VMware Cloud services is **restricted** to support only a [limited list of integrations](integrations_onboarded_subscriptions.html#integrations-that-use-operations-for-applications-api-tokens) that still authenticate with Operations for Applications API tokens. We are in the process of updating all of our integrations to authenticate with VMware Cloud services access tokens. Service accounts and Operations for Applications API tokens will be deprecated in the future. To enable service accounts for your service instance, [contact](wavefront_support_feedback.html) our Technical Support team. "%}
 
 {% include warning.html content=" Service accounts are enabled only for a **limited number** of VMware Cloud services subscriptions. It is strongly recommended that you gradually [switch to using server to server OAuth apps](csp_migration.html#how-to-replace-a-service-account-with-a-server-to-server-app) which authenticate with more secure VMware Cloud services access tokens. Service accounts and Operations for Applications API tokens will be deprecated in the future. Тo temporarily enable service accounts for your service instance, [contact](wavefront_support_feedback.html) our Technical Support team." %}
 

pages/doc/csp_area_differences.md

@@ -28,7 +28,7 @@ Most of the user and account management tasks done in the Operations for Applica
 
 Some administrative tasks, done by **Super Admins** and users with the **Accounts** permission in original subscriptions, are done by VMware Cloud **Organization Owners** and VMware Cloud **Organization Administrators** in VMware Cloud services subscriptions. Others can be done by Operations for Applications **Admins** in the Operations for Applications UI.
 
-With the 2023-XX release, we introduce the **Admin** permission and service role, which partially correspond to the **Accounts** permission for original subscriptions. Users with the **Admin** service role can manage service accounts and Operations for Applications API tokens. They can also restrict access to new dashboards and alerts and set the organization settings. For example, they can restrict the access to the object creator only and set default settings, such as display settings, PromQL support, default way of building queries, and define Logs settings. 
+With the 2023-38 release, we introduce the **Admin** permission and service role, which partially correspond to the **Accounts** permission for original subscriptions. Users with the **Admin** service role can manage service accounts and Operations for Applications API tokens. They can also restrict access to new dashboards and alerts and set the organization settings. For example, they can restrict the access to the object creator only and set default settings, such as display settings, PromQL support, default way of building queries, and define Logs settings. 
 
 {% include warning.html content="Service accounts are enabled only for a **limited number** of VMware Cloud services subscriptions.Service accounts and the API tokens associated with them will be deprecated in the future. It's strongly recommended that you incrementally switch to using [server to server OAuth apps](csp_server_to_server_apps.html) which authenticate with more secure VMware Cloud services access tokens. For information on how to do this, see [How to Replace a Service Account with a Server to Server App?](csp_migration.html#how-to-replace-a-service-account-with-a-server-to-server-app).  To temporarily enable service accounts for your service instance, [contact](wavefront_support_feedback.html) our Technical Support team." %}
 

pages/doc/csp_getting_started.md

@@ -7,7 +7,7 @@ summary: Learn the basics for administering your service on the VMware Cloud ser
 ---
 Starting July 3, 2023, VMware Aria Operations for Applications is a service on the VMware Cloud services platform. From this date, we support two types of subscriptions: Operations for Applications subscriptions **onboarded** to VMware Cloud services and **original** subscriptions.
 
-Original subscriptions are the existing ones and they remain as is until onboarded to VMware Cloud services. We are in the process of incrementally [onboarding](csp_migration.html) all original subscriptions to VMware Cloud services. For information about original and VMware Cloud services subscriptions and the differences between them, see [Differences Between Original and VMware Cloud Services Subscriptions](subscriptions-differences.html).
+Original subscriptions are the existing ones and they remain as is until onboarded to VMware Cloud services. We are in the process of incrementally [onboarding](csp_migration.html) all original subscriptions to VMware Cloud services. For information about original and VMware Cloud services subscriptions and the differences between them, see [Differences Between Original and VMware Cloud Services Subscriptions](csp-differences-by-area.html).
 
 {% include note.html content="Starting September 20, 2023, all [**new trial**](start_trial.html) instances of Operations for Applications are **onboarded** to VMware Cloud services."%}
 

pages/doc/csp_migration.md

@@ -14,6 +14,7 @@ Starting July 3, 2023, VMware Aria Operations for Applications is a service on t
 Currently, all original Operations for Applications subscriptions are integrated with VMware Cloud services for billing and subscription management. Therefore, you must already have a [VMware Cloud organization](csp_getting_started.html#whats-a-vmware-cloud-organization) with at least one user with the [VMware Cloud **Organization Owner** role](csp_getting_started.html#whats-a-vmware-cloud-organization-role).
 
 Before the onboarding:
+* Get familiar with the VMware Cloud service platform. See [Getting Started with Operations for Applications on VMware Cloud Services](csp_getting_started.html).
 * Verify that your VMware Cloud **Organization Owner** user can log in to the [VMware Cloud Services Console](https://console.cloud.vmware.com).
 
     - If you are the VMware Cloud **Organization Owner** user and cannot log in, try using the **Forgot Password** option.

pages/doc/csp_permissions_overview.md

@@ -40,7 +40,7 @@ VMware Cloud services allows users with the VMware Cloud **Organization Owner**
     </tr>
     <tr>
       <th>Admin</th>
-      <td>Manage the Operations for Applications organization settings: set the default display options, PromQL support and the default way of building queries for all users of the service instance. Define Logs settings, if the Logs feature is enabled. Can also restrict access to new dashboards and alerts.</td>
+      <td>Manage the Operations for Applications organization settings: set the default display options, PromQL support, and the default way of building queries for all users of the service instance. Can define logs settings, if the logs feature is enabled. Can restrict access to new dashboards and alerts. Can manage service accounts, if enabled for the service instance.</td>
     </tr>
     <tr>
       <th>Alerts</th>

pages/doc/wavefront_release_notes.md

@@ -15,6 +15,11 @@ This page lists new and updated features for the VMware Aria Operations for Appl
 
 ## Announcements
 
+### Onboarding Original VMware Aria Operations for Applications to VMware Cloud Services
+
+In October, 2023, we start to incrementally [onboard](csp_migration.html) all original subscriptions to VMware Cloud services. You will receive a notification in your Operations for Applications UI with the date scheduled for your service onboarding to VMware Cloud services. Make sure that you get familiar with the VMware Cloud services platform and prepare for the onboarding. See [What Should I Do Before the Onboarding?](csp_migration.html#what-should-i-do-before-the-onboarding).
+
+
 ### Free Trial of VMware Aria Operations for Applications on VMware Cloud Services
 
 Starting September 20, 2023, all **new trial** instances of Operations for Applications are **onboarded** to VMware Cloud services. You can [start a free trial](start_trial.html) directly from the VMware Cloud Services Console.
@@ -32,11 +37,39 @@ For information about the two subscription types and how they differ, see [Subsc
 
 {% include note.html content="We will support both original and onboarded subscriptions until all original subscriptions are onboarded to VMware Cloud services."%}
 
+## 2023-38.x Release Notes
+
+### Onboarded Subscriptions
+
+**New Admin Permission and Service Role**: With this release, we introduce the **Admin** [permission](csp_permissions_overview.html#operations-for-applications-permissions) and [service role](csp_users_roles.html#operations-for-applications-service-roles-built-in). **Admin** users can manage the Operations for Applications organization settings.
+
+
+### Original and Onboarded Subscriptions
+
+**Cloud Integrations Page Improvements**: We improved the user experience of the **Cloud Integrations** page. To navigate to this page:
+1. In your service instance, click **Integrations** on the toolbar.
+2. Click a cloud integration tile,  for example **Amazon Web Services**.
+3. On the **Setup** tab, click **Advanced**.
+
+![An annotated screenshot of the Cloud Integrations list page. The information is listed below](images/cloud-integrations-page.png)
+
+On the **Cloud Integrations** page, now you can:
+
+* Apply various filters and hide or show the filters listed on the left.
+* Search for integrations, save and share searches.
+* Hide or show the filters on the left.
+* Click the **Add Cloud Integration** button and select a new integration to add.
+* Select to display all active or only the deleted integrations.
+* Sort the cloud integrations by name, time of the last data fetch, or number of ingested metrics.
+* Use the ellipsis icon menu to:
+  * Enable or disable an integration instance, edit it, or delete it, when all integrations are displayed.
+  * Restore an integration instance or select to permanently delete it, when only deleted integrations are displayed.
+
 ## 2023-34.x Release Notes
 
 ### Original and Onboarded Subscriptions
 
-* **Kubernetes Alerts Templates**: We included new alerts templates for the Kubernetes integration. See the [Integrations Release Notes](integrations_new_changed.html#august-2023) for details.
+**Kubernetes Alerts Templates**: We included new alerts templates for the Kubernetes integration. See the [Integrations Release Notes](integrations_new_changed.html#august-2023) for details.
 
 ## 2023-33.x Release Notes