Merge branch 'main' into ts-obs

Author: natasha-moore-elastic

deploy-manage/cloud-organization.md

@@ -1,19 +1,29 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-organizations.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Manage your Cloud organization [ec-organizations]
 
-When you sign up to Elastic Cloud, you create an organization.
+When you sign up to {{ecloud}}, you create an organization. This organization is the umbrella for all of your {{ecloud}} resources, users, and account settings. Every organization has a unique identifier. 
 
-This organization is the umbrella for all of your Elastic Cloud resources, users, and account settings. Every organization has a unique identifier. Bills are invoiced according to the billing contact and details that you set for your organization.
+You can perform the following tasks to manage your Cloud organization:
 
-From the Organization page, you can:
+* [Manage billing](/deploy-manage/cloud-organization/billing.md)
+* Manage user access to your organization: 
+  * [Add members to your organization](/deploy-manage/users-roles/cloud-organization/manage-users.md)
+  * [Assign roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md)
+  * [Create custom roles](/deploy-manage/users-roles/cloud-enterprise-orchestrator.md) ({{serverless-short}} only)
+  * [Configure SAML single sign-on](/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md) to your organization
+* [Manage API keys](/deploy-manage/api-keys.md) to use with the [{{ecloud}}](https://www.elastic.co/docs/api/doc/cloud), [{{ecloud}} Billing](https://www.elastic.co/docs/api/doc/cloud-billing/), and [{{serverless-full}}](https://www.elastic.co/docs/api/doc/elastic-cloud-serverless) APIs
+* Configure who receives [operational emails](/deploy-manage/cloud-organization/operational-emails.md) related to your organization
+* Track the [status of {{ecloud}} services](/deploy-manage/cloud-organization/service-status.md).
 
-* [Manage members of your organization](users-roles/cloud-organization/manage-users.md)
-* [Leave an organization](users-roles/cloud-organization/manage-users.md#ec-leave-organization)
-* [Assign user roles and privileges](users-roles/cloud-organization/user-roles.md)
-* [Create API keys for using the Elastic Cloud API](api-keys/elastic-cloud-api-keys.md#ec-api-keys)
-* [Configure SAML single sign-on for your organization](users-roles/cloud-organization/configure-saml-authentication.md)
+Several aspects of your organization can also be managed using tools provided by Elastic. For a list of tools, refer to [{{ecloud}} organization tools and APIs](/deploy-manage/cloud-organization/tools-and-apis.md).
 
+::::{tip} 
+To learn how to manage your {{ecloud}} account as a user, refer to [Manage your Cloud account](/cloud-account/index.md).
+::::

deploy-manage/cloud-organization/billing.md

@@ -2,13 +2,48 @@
 mapped_urls:
   - https://www.elastic.co/guide/en/cloud/current/ec-billing.html
   - https://www.elastic.co/guide/en/serverless/current/general-manage-billing.html
+applies:
+  serverless: all
+  hosted: all
 ---
 
 # Billing
 
-% What needs to be done: Align serverless/stateful
+Elastic charges a recurring fee for using our offerings on {{ecloud}}. In this section, you'll learn how to about the dimensions used to calculate your bill, how to monitor account usage, how to manage billing, and more.
 
-% Use migrated content from existing pages that map to this page:
+## Pricing model
 
-% - [ ] ./raw-migrated-files/cloud/cloud/ec-billing.md
-% - [ ] ./raw-migrated-files/docs-content/serverless/general-manage-billing.md
+{{ecloud}} pricing and billing is based on your usage across a number of dimensions. These dimensions are different for {{ech}} deployments and {{serverless-full}} projects. Each {{serverless-full}} project type also has its own billing dimensions.
+
+* [{{ech}} deployments](/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md)
+* [{{serverless-full}}](/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md)
+  * [Elasticsearch projects](/deploy-manage/cloud-organization/billing/elasticsearch-billing-dimensions.md)
+  * [Elastic Observability projects](/deploy-manage/cloud-organization/billing/elastic-observability-billing-dimensions.md)
+  * [Elastic Security projects](/deploy-manage/cloud-organization/billing/security-billing-dimensions.md)
+  
+For more information, you can also refer to our [{{ech}}](https://www.elastic.co/pricing) and [{{serverless-full}}](https://www.elastic.co/pricing/serverless-search) pricing pages.
+
+## Billing models
+
+Depending on your organization's needs, you can use one of several billing models. These models impact who bills you for your usage, and how often you're billed.
+
+[Learn more](/deploy-manage/cloud-organization/billing/billing-models.md).
+
+## Manage your subscription and billing in {{ecloud}}
+
+You can explore and manage billing, as well as your {{ecloud}} subscription, from the **Billing** section of the {{ecloud}} Console.
+
+* [Add your billing details](/deploy-manage/cloud-organization/billing/add-billing-details.md)
+* [View your billing history](/deploy-manage/cloud-organization/billing/view-billing-history.md)
+* [Manage your subscription](/deploy-manage/cloud-organization/billing/manage-subscription.md)
+* [Monitor and analyze your account usage](/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md)
+
+You might also want to [update the contacts that receive billing emails](/deploy-manage/cloud-organization/billing/update-billing-operational-contacts.md)
+
+For any other questions that you have about billing, refer to our [billing FAQ](/deploy-manage/cloud-organization/billing/billing-faq.md).
+
+## Stop charges for a deployment or project
+
+To stop charges for an {{ecloud}} deployment or project, you need to [delete it](/deploy-manage/uninstall/delete-a-cloud-deployment.md).
+
+When a deployment or project is deleted, all data is lost. Billing for usage is by the hour and any outstanding charges for usage before you deleted the deployment or project will still appear on your next bill.

deploy-manage/cloud-organization/billing/add-billing-details.md

@@ -1,27 +1,28 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-billing-details.html
+applies:
+  hosted: all
+  serverless: all
 ---
 
 # Add your billing details [ec-billing-details]
 
-If you want to use Elasticsearch Service beyond the trial period or if you want to use features not included in the trial, you need to add a credit card to your account. Your credit card information is sent securely to our [billing provider](http://recurly.com/security) and stored with them.
+If you want to use {{ecloud}} beyond the trial period or if you want to use features not included in the trial, then you need to add a credit card to your account. Your credit card information is sent securely to our [billing provider](http://recurly.com/security) and stored with them.
+
+Alternatively, if you want to pay for {{ecloud}} together with other cloud services that you're already using, then you can subscribe to {{ecloud}} through a [marketplace](/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
+
+If you plan to use {{ech}}, then you can estimate how much your use case will cost using our [pricing calculator](https://www.elastic.co/cloud/elasticsearch-service/pricing). 
 
 ::::{tip} 
 Trials get converted to paid subscriptions and billing starts when you add a credit card. If you want to maximize your trial, make sure to add your credit card near the end of the trial period.
 ::::
 
-
-Just want a quick price estimate? Try our [Elasticsearch Service pricing calculator](https://www.elastic.co/cloud/elasticsearch-service/pricing). Monitor the cost of your deployments by checking [your account usage](monitor-analyze-usage.md). Monthly costs are shown for convenience only, as billing is done by the hour. You can also test with a bigger deployment or try out additional features and only pay for the hours used.
-
-We also offer [AWS Marketplace](../../deploy/elastic-cloud/aws-marketplace.md), [GCP Marketplace](../../deploy/elastic-cloud/google-cloud-platform-marketplace.md), and [Azure Marketplace](https://www.elastic.co/guide/en/cloud/current/ec-billing-azure.html) billing, if you prefer not to add a credit card directly.
-
 To add your billing details:
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. Select the user icon on the header bar and select **Billing** from the menu.
 3. On the **Overview** page, select **Add billing information**.
 4. If prompted, complete the multifactor authentication (MFA) required by your bank.
 
-If you want, you can [stop new charges](stop-charges-for-project-deployment.md) by deleting your deployment.
-
+If you want, you can stop new charges by [deleting your project or deployment](/deploy-manage/uninstall/delete-a-cloud-deployment.md).