Manage your cloud organization

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 Elastic Cloud, you create an organization. This organization is the umbrella for all of your Elastic Cloud 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 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 [Elastic Cloud](https://www.elastic.co/docs/api/doc/cloud), [Elastic Cloud Billing](https://www.elastic.co/docs/api/doc/cloud-billing/), and [Elastic Cloud Serverless](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 Elastic Cloud 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 [Elastic Cloud organization tools and APIs](/deploy-manage/cloud-organization/tools-and-apis.md).
 
+::::{tip} 
+To learn how to manage your Elastic Cloud 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 Elastic Cloud. 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
+Elastic Cloud pricing and billing is based on your usage across a number of dimensions. These dimensions are different for Elastic Cloud Hosted deployments and Elastic Cloud Serverless projects. Each Elastic Cloud Serverless project type also has its own billing dimensions.
+
+* [Elastic Cloud Hosted deployments](/deploy-manage/cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md)
+* [Elastic Cloud Serverless](/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 [Elastic Cloud Hosted](https://www.elastic.co/pricing) and [Elastic Cloud Serverless](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 Elastic Cloud
+
+You can explore and manage billing, as well as your Elastic Cloud subscription, from the **Billing** section of the Elastic Cloud 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 Elastic Cloud 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 Elastic Cloud 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 Elastic Cloud together with other cloud services that you're already using, then you can subscribe to Elastic Cloud through a [marketplace](/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md).
+
+If you plan to use Elastic Cloud Hosted, 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 [Elastic Cloud 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).

deploy-manage/cloud-organization/billing/billing-faq.md

@@ -1,19 +1,22 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-billing.html
+applies:
+  hosted: all
+  serverless: all
 ---
 
 # Billing FAQ [ec-faq-billing]
 
-This frequently-asked-questions list answers some of your more common questions about Elasticsearch Service billing.
+This frequently-asked-questions list answers some of your more common questions about Elastic Cloud billing.
 
 **General billing questions**
 
-* [Is there a way for me to estimate how much Elasticsearch Service will cost?](#faq-cost)
+* [Is there a way for me to estimate how much Elastic Cloud will cost?](#faq-cost)
 * [Where can I find a detailed view of my consumption?](#faq-consumption)
 * [How do I view previous receipts and billing history?](#faq-history)
 * [How can I change who receives receipts and billing notifications?](#faq-notify)
-* [What are the available payment methods on Elasticsearch Service?](#faq-payment)
+* [What are the available payment methods on Elastic Cloud?](#faq-payment)
 * [Who can I contact for more information?](#faq-contact)
 * [Why is my credit card charged?](#faq-charge)
 * [When is my credit card charged?](#faq-when)
@@ -22,7 +25,7 @@ This frequently-asked-questions list answers some of your more common questions
 * [Why am I being charged if I don’t use any of my deployments?](#faq-chargednotusing)
 * [How can I delete my Elastic Cloud account?](#faq-deleteaccount)
 * [Can I get a refund?](#faq-refund)
-* [What is included in my paid Elasticsearch Service deployment?](#faq-included)
+* [What is included in my paid Elastic Cloud deployment?](#faq-included)
 * [What are the data transfer and storage charges and how can I control them?](#faq-dts)
 * [What taxes will be applied on my invoice?](#faq-taxes)
 
@@ -44,18 +47,15 @@ This frequently-asked-questions list answers some of your more common questions
 
 ## General billing FAQ [ec-faq-billing-general]
 
-$$$faq-cost$$$Is there a way for me to estimate how much Elasticsearch Service will cost?
-:   Yes, there is: Try our [Elasticsearch Service Pricing Calculator](https://www.elastic.co/cloud/elasticsearch-service/pricing?page=docs&placement=docs-body). You can also use the  [Elasticsearch Service price list](https://ela.st/esspricelist).
+$$$faq-cost$$$Is there a way for me to estimate how much Elastic Cloud will cost?
+:   Yes, there is: If you plan to use Elastic Cloud Hosted deployments, try our [pricing calculator](https://www.elastic.co/cloud/elasticsearch-service/pricing?page=docs&placement=docs-body). You can also use the [Elastic Cloud pricing table](https://ela.st/esspricelist).
 
 $$$faq-consumption$$$Where can I find a detailed view of my consumption?
-:   To make it easy to track the ongoing cost of Elasticsearch Service, we’ve added line items to the downloadable [invoices](https://cloud.elastic.co/billing/overview?page=docs&placement=docs-body).
+:   To make it easy to track the ongoing cost of Elastic Cloud, we’ve added line items to the downloadable [invoices](https://cloud.elastic.co/billing/overview?page=docs&placement=docs-body).
 
-    Example invoice
-    :   :::{image} ../../../images/cloud-ec-bill-example-new.png
-    :alt: Example invoice
-    :::
+    ![Example invoice](../../../images/cloud-ec-bill-example-new.png)
 
-    Additionally, on the Elasticsearch Service [Usage analysis](https://cloud.elastic.co/billing/usage?page=docs&placement=docs-body) page, the **month-to-date usage** tile shows accrued costs and can help you to better estimate the next charge amount.
+    Additionally, on the Elastic Cloud [Usage](https://cloud.elastic.co/billing/usage?page=docs&placement=docs-body) page, the **Month-to-date usage** tile shows accrued costs and can help you to better estimate the next charge amount.
 
 
 $$$faq-history$$$How do I view previous receipts and billing history?
@@ -64,14 +64,14 @@ $$$faq-history$$$How do I view previous receipts and billing history?
 $$$faq-notify$$$How can I change who receives receipts and billing notifications?
 :   The account owner can change who receives receipts and billing notifications by changing the [email details](https://cloud.elastic.co/account/contacts?page=docs&placement=docs-body).
 
-$$$faq-payment$$$What are the available payment methods on Elasticsearch Service?
+$$$faq-payment$$$What are the available payment methods on Elastic Cloud?
 :   For month-to-month payments only credit cards are accepted. We also allow payments by bank transfer for annual subscriptions.
 
 $$$faq-contact$$$Who can I contact for more information?
 :   If you have any further questions about your credit card statement, billing, or receipts, please send an email to `[email protected]` or open a [Support case](../../../troubleshoot/troubleshoot/index.md) using the *Billing issue* category.
 
 $$$faq-charge$$$Why is my credit card charged?
-:   If you are on a monthly plan, the charge is a recurring fee for using our hosted Elasticsearch Service. The fee is normally charged at the start of each month, but it can also be charged at other times during the month. If a charge is unsuccessful, we will try to charge your card again at a later date.
+:   If you are on a monthly plan, the charge is a recurring fee for using Elastic Cloud. The fee is normally charged at the start of each month, but it can also be charged at other times during the month. If a charge is unsuccessful, we will try to charge your card again at a later date.
 
 $$$faq-when$$$When is my credit card charged?
 :   You are billed on the first day of each month for usage in the prior month.
@@ -83,16 +83,16 @@ $$$faq-cancelpolicy$$$What is the cancellation policy for monthly subscriptions?
 :   There are no cancellation or termination fees for monthly subscriptions. If the service is no longer needed, you can spin down all of your deployments. Usage for that month will be billed at the end of the month in your final bill.
 
 $$$faq-chargednotusing$$$Why am I being charged if I don’t use any of my deployments?
-:   Even if you have no activity on your account and you haven’t logged into the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body), your active deployments still incur costs that we need to charge you for. To avoid being charged for active but unused deployments, you can simply delete them. Your account will stay active with no charges, and you can always spin up more capacity when you need it.
+:   Even if you have no activity on your account and you haven’t logged into the [Elastic Cloud Console](https://cloud.elastic.co?page=docs&placement=docs-body), your active deployments still incur costs that we need to charge you for. To avoid being charged for active but unused deployments, you can simply delete them. Your account will stay active with no charges, and you can always spin up more capacity when you need it.
 
 $$$faq-deleteaccount$$$How can I delete my Elastic Cloud account?
 :   To have your account removed, you can contact support through the Elasticsearch Service [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) or use one of these [alternative contact methods](../../../troubleshoot/troubleshoot/index.md). For details about our data erasure policy, check [Privacy Rights and Choices](https://www.elastic.co/legal/privacy-statement#privacy-rights-and-choices?page=docs&placement=docs-body) in our General Privacy Statement.
 
 $$$faq-refund$$$Can I get a refund?
 :   Charges are non-refundable, but once you delete a deployment we’ll stop charging you for that deployment immediately. You only pay for what you use and you can stop using the service at any time. For any special considerations warranting a potential refund, please use the Elasticsearch Service Console [Support form](https://cloud.elastic.co/support?page=docs&placement=docs-body) to open a support case and select *Billing issue* as the category. To ensure quick processing, be sure to provide detail about the reasons for the refund request as well as other matters pertaining to the issue. For other ways to open a Support case, check [Contact us](../../../troubleshoot/troubleshoot/index.md).
 
-$$$faq-included$$$What is included in my paid Elasticsearch Service deployment?
-:   All subscription tiers for the Elasticsearch Service include the following free allowance:
+$$$faq-included$$$What is included in my paid Elastic Cloud Hosted deployment?
+:   All subscription tiers for Elastic Cloud Hosted include the following free allowance:
 
     * Free 1GB RAM Kibana instance
     * Free 1GB RAM Machine Learning node
@@ -104,7 +104,7 @@ $$$faq-included$$$What is included in my paid Elasticsearch Service deployment?
 
 
 $$$faq-dts$$$What are the data transfer and storage charges and how can I control them?
-:   Read about our [usage-based billing dimensions](cloud-hosted-deployment-billing-dimensions.md).
+:   Read about our [usage-based billing dimensions](/deploy-manage/cloud-organization/billing.md#pricing-model).
 
 $$$faq-taxes$$$What taxes will be applied on my invoice?
 :   Customers within the United States, and US territories, will be billed from Elasticsearch Inc., based out of the United States. The US Sales Tax rate will be based on the SaaS tax rates in the local jurisdiction (state/county/city) of the billing address of your subscription.
@@ -121,7 +121,7 @@ $$$faq-channels$$$What purchasing channels can be used for prepaid consumption c
 :   The prepaid consumption billing model is currently only available for Elastic Direct customers - customers who are purchasing directly from Elastic. This offering may expand to marketplace customers in the future.
 
 $$$faq-migration$$$Can I migrate my monthly account to the prepaid consumption model?
-:   Yes, if you have a monthly Elasticsearch Service account, you can [contact us](https://www.elastic.co/cloud/contact) to migrate to prepaid consumption.
+:   Yes, if you have a monthly Elastic Cloud account, you can [contact us](https://www.elastic.co/cloud/contact) to migrate to prepaid consumption.
 
 $$$faq-depletion$$$What happens if I run out of credits?
 :   If your credit balance is entirely consumed while you have an active contract, you can continue to use Elastic Cloud and will receive invoices for the additional on-demand usage.