diff --git a/cloud-account/index.md b/cloud-account/index.md index ab7fc8ee82..308d1e070c 100644 --- a/cloud-account/index.md +++ b/cloud-account/index.md @@ -3,9 +3,9 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-account-user-settings.html - https://www.elastic.co/guide/en/serverless/current/general-user-profile.html applies_to: - serverless: all + serverless: ga deployment: - ess: all + ess: ga products: - id: cloud-hosted - id: cloud-serverless @@ -16,24 +16,37 @@ description: Manage your Elastic Cloud account settings, including email, passwo # Manage your Cloud account and preferences +This section explains how to manage your {{ecloud}} account as a user, including your account settings, organizations, and interface preferences. + +::::{tip} +This section covers only your personal account. Organization-wide settings, such as user permissions and organization-level access controls, are managed by organization administrators. + +For information on organization and access management, refer to: +- [Manage your Cloud organization](/deploy-manage/cloud-organization.md) +- [Manage user roles and permissions](/deploy-manage/users-roles/cloud-organization/user-roles.md) +:::: + + +## Manage your account settings + Your {{ecloud}} account allows you to manage your personal settings, including your email address, password, and authentication methods. You can perform the following tasks at any time from your user profile: -* [Update your email address](/cloud-account/update-your-email-address.md) -* [Add an additional login method](/cloud-account/add-a-login-method.md): Choose from password-based login, Google sign-in, and Microsoft sign-in. +* [](/cloud-account/update-your-email-address.md) +* [](/cloud-account/add-a-login-method.md): Choose from password-based login, Google sign-in, and Microsoft sign-in. + If you use password-based login, then you can perform the following additional tasks: -* [Change your password](/cloud-account/change-your-password.md) -* [Configure multifactor authentication](/cloud-account/multifactor-authentication.md) +* [](/cloud-account/change-your-password.md) +* [](/cloud-account/multifactor-authentication.md) -Additionally, you can manage your organization membership, including joining or leaving an organization. Refer to [Join or leave an organization](/cloud-account/join-or-leave-an-organization.md) for more information. +## Manage your organizations -Some options also let you set personal preferences and customize the interface, such as [using dark mode](dark-mode.md) in your projects and deployments. +Organizations are groupings of {{ecloud}} resources and associated settings. As an {{ecloud}} user, you can be a member of multiple organizations. -::::{tip} -This section focuses on the actions you can take as an individual user to manage your own account. It does not cover organization-wide settings, such as managing user permissions or configuring organization-level access controls, which are handled by the organization administrators. +* [](/cloud-account/join-or-leave-an-organization.md) +* [](/cloud-account/switch-organizations.md) -For information on organization and access management, refer to: -- [Manage your Cloud organization](/deploy-manage/cloud-organization.md) -- [Manage user roles and permissions](/deploy-manage/users-roles/cloud-organization/user-roles.md) -:::: +## Customize your interface + +Some options also let you set personal preferences and customize the interface, such as [using dark mode](dark-mode.md) in your projects and deployments. \ No newline at end of file diff --git a/cloud-account/join-or-leave-an-organization.md b/cloud-account/join-or-leave-an-organization.md index eb3bf14115..5392167071 100644 --- a/cloud-account/join-or-leave-an-organization.md +++ b/cloud-account/join-or-leave-an-organization.md @@ -3,9 +3,9 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-invite-users.html - https://www.elastic.co/guide/en/serverless/current/general-manage-organization.html applies_to: - serverless: all + serverless: ga deployment: - ess: all + ess: ga products: - id: cloud-hosted - id: cloud-serverless @@ -13,34 +13,46 @@ products: # Join or leave an organization -Organizations in {{ecloud}} group user accounts, projects and deployments under a common billing and access structure. If you have been invited to an organization, you can accept the invitation and become a member. You can also leave an organization at any time, as long as you don’t have active projects or deployments associated with your account. +Organizations in {{ecloud}} group user accounts, projects, and deployments under a common billing and access structure. If you have been invited to an organization, you can accept the invitation and become a member. You can join multiple organizations, or [create a new organization](/deploy-manage/cloud-organization/manage-multiple-organizations.md#create-a-new-organization). -This guide explains how to join or leave an organization, including steps for handling projects and deployments when switching organizations. +You can also leave an organization, with some restrictions. Refer to [Leave an organization](#ec-leave-organization) for details. + +This guide explains how to join or leave an organization. To learn how to view organizations you have access to and switch between them, refer to [](switch-organizations.md). + +:::{tip} +If you're an organization owner or admin, refer to [](/deploy-manage/cloud-organization/manage-multiple-organizations.md) to learn how to manage multiple organizations. +::: ## Accept an invitation [ec-accept-invitation] -Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation. If they do not join within that period, an administrator of the organization will have to send a new invitation. Refer to [manage users](/deploy-manage/users-roles/cloud-organization/manage-users.md) for more information. +When you're invited to join an organization, you receive an email with a link to accept the invitation. Invitations expire after 72 hours. If you don't accept within that period, an administrator of the organization needs to send a new invitation. Refer to [manage users](/deploy-manage/users-roles/cloud-organization/manage-users.md) for more information. -## Leave an organization [ec-leave-organization] +To accept an invitation: -On the **Members** tab of the **Organization** page, click the three dots corresponding to your email address and select **Leave organization**. +1. Open the invitation email and click **Accept invitation**. +2. Log in if prompted. If you already have an active session in your browser, you don't need to log in again. +3. After accepting, you're switched to the new organization automatically. The new organization also appears in your [list of organizations](/cloud-account/switch-organizations.md). -If you’re the only user in the organization, you can only leave if you deleted all your deployments and projects, and you don’t have pending bills. +:::{note} +If the organization enforces a specific login method, such as SAML SSO, you're redirected to that login flow when accepting the invitation. +::: + +To decline an invitation, you can ignore the email. The invitation expires automatically after 72 hours. + +## Leave an organization [ec-leave-organization] -## Join an organization from an existing {{ecloud}} account [ec-join-invitation] +You can leave an organization at any time. If you are the only owner of an organization, you must transfer ownership before leaving. -If you already belong to an organization, and you want to join a new one you will need to leave your existing organization and follow this steps: +You can leave only the organization you're currently signed in to. To leave a different organization, [switch to it](/cloud-account/switch-organizations.md) first. -1. Make sure you do not have active projects or deployments before you leave your current organization. -2. Delete your projects or deployments and clear any bills. -3. Leave your current organization. -4. Ask the administrator to invite you to the organization you want to join. -5. Accept the invitation that you will get by email. +:::{warning} +Leaving an organization revokes your access to all of its resources, including deployments, projects, and settings. This action cannot be undone. To rejoin the organization, ask an organization owner to invite you again. +::: -Alternatively, for Elastic Cloud Hosted deployments, there's a possibility to migrate your deployments to the new organization through back up and restore operations. In such case: +To leave your current organization: -1. [Back up your deployments to any private repository](/deploy-manage/tools/snapshot-and-restore/elastic-cloud-hosted.md) so that you can restore them to your new organization. -2. Leave your current organization. -3. Ask the administrator to invite you to the organization you want to join. -4. Accept the invitation that you will get by email. -5. Configure the private repository in your new organization and restore the backup you took in step 1. +1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). +2. From the top navigation menu, click on the user menu and select **Profile**. +3. Click the **My organizations** tab. +4. Click **Leave current organization**. +5. In the confirmation dialog, click **Leave current organization** to confirm. diff --git a/cloud-account/multifactor-authentication.md b/cloud-account/multifactor-authentication.md index 5b67f06875..5814152a49 100644 --- a/cloud-account/multifactor-authentication.md +++ b/cloud-account/multifactor-authentication.md @@ -2,9 +2,9 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-account-security-mfa.html applies_to: - serverless: all + serverless: ga deployment: - ess: all + ess: ga products: - id: cloud-hosted --- diff --git a/cloud-account/switch-organizations.md b/cloud-account/switch-organizations.md new file mode 100644 index 0000000000..489ebd667d --- /dev/null +++ b/cloud-account/switch-organizations.md @@ -0,0 +1,45 @@ +--- +applies_to: + deployment: + ess: ga + serverless: ga +products: + - id: cloud-hosted + - id: cloud-serverless +navigation_title: View and switch between organizations +description: Learn how to view all Elastic Cloud organizations you belong to, switch between them, and understand the login experience when you have multiple organizations. +--- + +# View and switch between {{ecloud}} organizations + +From a single {{ecloud}} account, you can access multiple organizations. + +You might be a member of multiple organizations in cases such as the following: + +* You use different organizations for different use cases or teams. +* You're a consultant working with multiple clients who have different {{ecloud}} organizations. + +You can switch between organizations at any time. Depending on the organization that you're switching to, you might be required to re-authenticate. + +If you're an organization owner, then you can learn more about managing multiple organizations in [](/deploy-manage/cloud-organization/manage-multiple-organizations.md). + +:::{tip} +To join an additional organization, [accept an invitation](/cloud-account/join-or-leave-an-organization.md#ec-accept-invitation) to join the organization. You can also [create a new organization](/deploy-manage/cloud-organization/manage-multiple-organizations.md#create-a-new-organization). +::: + +:::{include} /deploy-manage/cloud-organization/_snippets/view-orgs.md +::: + +:::{include} /deploy-manage/cloud-organization/_snippets/switch-orgs.md +::: + +## Log in with multiple organizations + +When you belong to multiple organizations, the login experience depends on whether your browser has information about the organization you most recently used: + +* **Returning user (same browser):** You're automatically logged in to the organization you last used. You don't need to select an organization. +* **New browser or cleared data:** After logging in, you're presented with a list of your organizations to choose from. Select the organization you want to access. + +If your last used organization enforces a specific login method (such as SAML SSO), you're directed to that login flow automatically. + +If you log out, your browser remembers which organization you last used. The next time you log in, you're directed to the appropriate login page for that organization. \ No newline at end of file diff --git a/cloud-account/toc.yml b/cloud-account/toc.yml index 967d4fcad8..7d11449dfb 100644 --- a/cloud-account/toc.yml +++ b/cloud-account/toc.yml @@ -6,5 +6,6 @@ toc: - file: change-your-password.md - file: add-a-login-method.md - file: multifactor-authentication.md + - file: switch-organizations.md - file: dark-mode.md - file: high-contrast.md \ No newline at end of file diff --git a/cloud-account/update-your-email-address.md b/cloud-account/update-your-email-address.md index 1ea769bd7e..5228cbcc70 100644 --- a/cloud-account/update-your-email-address.md +++ b/cloud-account/update-your-email-address.md @@ -2,9 +2,9 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-update-email-address.html applies_to: - serverless: all + serverless: ga deployment: - ess: all + ess: ga products: - id: cloud-hosted --- @@ -13,8 +13,14 @@ products: Each {{ecloud}} account has a primary email associated with it. By default, the primary email address is used to sign up for {{ecloud}} and to log in. If needed, you can change this primary email address. -Your email address is used to uniquely identify you. It can’t be used for more than one {{ecloud}} account, whether that account is a trial account, a standard {{ecloud}} account, or a subscription account through a marketplace. An {{ecloud}} account can belong to only one organization at a time. - +Your email address is used to uniquely identify you. It can’t be used for more than one {{ecloud}} account, whether that account is a trial account, a standard {{ecloud}} account, or a subscription account through a marketplace. However, a single {{ecloud}} account can belong to [multiple organizations](/cloud-account/switch-organizations.md). + +If you have separate {{ecloud}} accounts for different organizations and want to consolidate to a single account, ask an organization owner in each organization to [reconcile your accounts](/deploy-manage/cloud-organization/manage-multiple-organizations.md#reconcile-alternative-email-addresses). + +:::{note} +If you belong to any organization that enforces a specific authentication method (such as SAML SSO, Google Sign-In, or Microsoft Sign-In), you can't change your primary email address using the procedures on this page. This restriction applies even if other organizations you belong to don't enforce a login method. +::: + ## Change your email address (native sign-in) If you log in using a standard email and password, follow these steps to update your email address: @@ -35,16 +41,4 @@ If you log in using Google or Microsoft Sign-In, follow these steps to update yo ## Changing your email address with a Microsoft Marketplace account -If your organization is associated with [Microsoft Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to join your organization. - -## Sign up using an existing email address [sign-up-existing] - -In some situations, you might want to create a new {{ecloud}} account using an email address that is already associated with an existing account. To sign up to {{ecloud}} using an email address associated with another {{ecloud}} account, you must remove the email address from your previous account and replace it with a new address. - -1. Use your current email address (for example, `my.preferred.address@foobar.com`) to log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). -2. Follow the steps from one of the procedures on this page to update that email address to another email address, such as `my.alternate.address@gmail.com`. - -You can now use the email address from step 1 to do the following: - -* [Sign up for a new account](/deploy-manage/deploy/elastic-cloud/create-an-organization.md). -* [Join an existing organization](/cloud-account/join-or-leave-an-organization.md). \ No newline at end of file +If your organization is associated with [Microsoft Marketplace](../deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md), you can’t change your primary email address using the above methods. Instead, [invite another user](../deploy-manage/users-roles/cloud-organization/manage-users.md) with the desired email address to join your organization. \ No newline at end of file diff --git a/deploy-manage/cloud-organization.md b/deploy-manage/cloud-organization.md index 218d4c71bc..c02c344a22 100644 --- a/deploy-manage/cloud-organization.md +++ b/deploy-manage/cloud-organization.md @@ -11,9 +11,15 @@ products: # Manage your Cloud organization [ec-organizations] -When you [sign up for {{ecloud}}](/deploy-manage/deploy/elastic-cloud/create-an-organization.md), 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. +An organization is the umbrella for a group of {{ecloud}} resources, users, and account settings. Every organization has a unique identifier. -You can perform the following tasks to manage your Cloud organization: +When you [sign up for {{ecloud}}](/deploy-manage/deploy/elastic-cloud/create-an-organization.md), you have the option to create a new organization. You also can be [added to an existing organization](/deploy-manage/users-roles/cloud-organization/manage-users.md). + +The administrator of an organization is referred to as the organization owner, and belongs to the [Organization owner role](/deploy-manage/users-roles/cloud-organization/user-roles.md#ec_organization_level_roles). An organization can have more than one organization owner. + +## Organization management tasks + +As an organization owner, you can perform the following tasks to manage your Cloud organization: * [Manage billing](/deploy-manage/cloud-organization/billing.md) * Manage user access to your organization: @@ -23,10 +29,23 @@ You can perform the following tasks to manage your Cloud organization: * [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}}]({{cloud-apis}}), [{{ecloud}} Billing]({{cloud-billing-apis}}), and [{{serverless-full}}]({{cloud-serverless-apis}}) APIs. For {{serverless-full}} projects, you can also create {{ecloud}} API keys that grant access to project-level {{es}} and {{kib}} 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). +* Track the [status of {{ecloud}} services](/deploy-manage/cloud-organization/service-status.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). :::: + +## Managing multiple organizations + +You can create or access multiple organizations from a single {{ecloud}} account. + +You might want to create multiple organizations for reasons such as the following: + +* You want to separate management of your {{ecloud}} resources and settings for different use cases or teams. +* You want to create a [trial](/deploy-manage/deploy/elastic-cloud/create-an-organization.md#general-sign-up-trial-what-is-included-in-my-trial) to evaluate additional {{ecloud}} features or solutions. + +Each organization has its own set of resources, users, settings, and billing and licensing. + +You need to be logged in to the organization you want to manage to make changes to its resources and settings. [Learn how to manage multiple organizations](/deploy-manage/cloud-organization/manage-multiple-organizations.md). \ No newline at end of file diff --git a/deploy-manage/cloud-organization/_snippets/switch-orgs.md b/deploy-manage/cloud-organization/_snippets/switch-orgs.md index aea6b9684a..81d465fde8 100644 --- a/deploy-manage/cloud-organization/_snippets/switch-orgs.md +++ b/deploy-manage/cloud-organization/_snippets/switch-orgs.md @@ -5,4 +5,8 @@ You can switch between organizations at any time. Depending on the authenticatio 1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). 2. From the top navigation menu, click on the user menu and select **Profile**. 3. Click the **My organizations** tab. -4. Click the name of the organization you want to switch to. If it doesn't appear in the list, click **Manage organizations** to view all of the organizations you have access to. \ No newline at end of file +4. Click the name of the organization you want to switch to. If it doesn't appear in the list, click **Manage organizations** to view all of the organizations you have access to. + +:::{tip} +You can also switch organizations from the breadcrumbs at the top of any page. Click your current organization name and select another organization from the list. +::: \ No newline at end of file diff --git a/deploy-manage/cloud-organization/billing.md b/deploy-manage/cloud-organization/billing.md index d9be1a34a8..81d72a5b0f 100644 --- a/deploy-manage/cloud-organization/billing.md +++ b/deploy-manage/cloud-organization/billing.md @@ -5,8 +5,8 @@ mapped_pages: - https://www.elastic.co/guide/en/serverless/current/general-billing-stop-project.html applies_to: deployment: - ess: all - serverless: all + ess: ga + serverless: ga products: - id: cloud-hosted - id: cloud-serverless diff --git a/deploy-manage/cloud-organization/billing/add-billing-details.md b/deploy-manage/cloud-organization/billing/add-billing-details.md index b1167dd80b..0cba40e49f 100644 --- a/deploy-manage/cloud-organization/billing/add-billing-details.md +++ b/deploy-manage/cloud-organization/billing/add-billing-details.md @@ -3,8 +3,8 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-billing-details.html applies_to: deployment: - ess: all - serverless: all + ess: ga + serverless: ga products: - id: cloud-hosted --- @@ -13,7 +13,7 @@ products: 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). +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 already have an {{ecloud}} trial, you can [convert it to a marketplace subscription](/deploy-manage/deploy/elastic-cloud/marketplace-trial-conversion.md) to preserve your existing deployments and data. 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). diff --git a/deploy-manage/cloud-organization/billing/billing-faq.md b/deploy-manage/cloud-organization/billing/billing-faq.md index 6fd267f90a..c13bb25421 100644 --- a/deploy-manage/cloud-organization/billing/billing-faq.md +++ b/deploy-manage/cloud-organization/billing/billing-faq.md @@ -3,11 +3,11 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-faq-billing.html applies_to: deployment: - self: - ece: - eck: - ess: all - serverless: all + self: ga + ece: ga + eck: ga + ess: ga + serverless: ga products: - id: cloud-hosted --- diff --git a/deploy-manage/cloud-organization/manage-multiple-organizations.md b/deploy-manage/cloud-organization/manage-multiple-organizations.md index 1cab5df0f2..dfd7f9ec03 100644 --- a/deploy-manage/cloud-organization/manage-multiple-organizations.md +++ b/deploy-manage/cloud-organization/manage-multiple-organizations.md @@ -1,8 +1,8 @@ --- applies_to: deployment: - ess: preview - serverless: preview + ess: ga + serverless: ga products: - id: cloud-hosted - id: cloud-serverless @@ -11,34 +11,28 @@ navigation_title: Manage multiple organizations # Manage multiple {{ecloud}} organizations -An [organization](/deploy-manage/cloud-organization.md) is the umbrella for all of your {{ecloud}} resources, users, and account settings. You can create or access multiple organizations from a single {{ecloud}} account. You might want to use multiple organizations for reasons such as the following: +An [organization](/deploy-manage/cloud-organization.md) is the umbrella for all of your {{ecloud}} resources, users, and account settings. You can create or access multiple organizations from a single {{ecloud}} account. + +You might want to create multiple organizations for reasons such as the following: * You want to separate management of your {{ecloud}} resources and settings for different use cases or teams. * You want to create a [trial](/deploy-manage/deploy/elastic-cloud/create-an-organization.md#general-sign-up-trial-what-is-included-in-my-trial) to evaluate additional {{ecloud}} features or solutions. -Although you can access multiple organizations from the same {{ecloud}} account, each organization is independent. Each organization has its own set of resources, users, settings, and billing and licensing. Because of this, you need to be logged in to the organization you want to manage to make changes to its resources and settings, or invite users to join it. +Although you can access multiple organizations from the same {{ecloud}} account, each organization is independent. Each organization has its own set of resources, users, settings, and billing and licensing. Because of this, you need to be logged in to the organization you want to manage to make changes to its resources and settings. -You can perform the following tasks to manage multiple organizations: +:::{tip} +This page covers admin tasks for managing organizations. To learn about joining, viewing, switching between, or leaving organizations as a member, refer to [](/cloud-account/join-or-leave-an-organization.md) and [](/cloud-account/switch-organizations.md). +::: -**Admin actions:** +You can perform the following tasks to manage multiple organizations: * [Create a new organization](#create-a-new-organization) -* [Invite users to join additional organizations](#invite-users-to-join-additional-organizations) -* [View your users' organization memberships](#view-your-users-organization-memberships) - -**User actions:** - -* [Accept an invitation](#accept-an-invitation) -* [Log in with multiple organizations](#log-in-with-multiple-organizations) * [View the organizations you have access to](#view-organizations) * [Switch to a different organization](#switch-to-a-different-organization) -* [Leave an organization](#leave-an-organization) - -## Technical preview limitations - -The following limitations apply during the multi-organization tech preview: +* [Invite users to join additional organizations](#invite-additional-orgs) -* **Email notification links:** Organization-specific links in notification emails, such as billing or deployment health alerts, don't yet carry organization context. If you belong to multiple organizations, an email link might take you to the wrong organization. Switch to the appropriate organization before taking action. +:::{include} _snippets/view-orgs.md +::: ## Create a new organization @@ -58,75 +52,20 @@ After you create the organization, you can switch to it by clicking the organiza You can also create a new organization by clicking on your current organization name and selecting {icon}`plus_in_circle` **Create**. ::: -## Invite users to join additional organizations - -You must [send invitations](/deploy-manage/users-roles/cloud-organization/manage-users.md#ec-invite-users) from the organization you want users to join. You can't invite users to join multiple organizations at once. - -If a user already has an {{ecloud}} account, then they don't need to sign up again. Instead, they can log in with their selected login method. - -If your organization uses [SAML SSO](/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md), then you don't need to invite users to join the organization. Users are added to the organization automatically when they log in to your identity provider SSO URL. - -Organizations can have different authentication requirements. For example, one organization might enforce SAML SSO, while another organization might not enforce any specific login method. If your organization enforces a specific login method, then the user will need to use that method to log in, and might be prompted to re-authenticate. - -## View your users' organization memberships - -You can view the organizations that your users are members of from the **Members** tab of the **Organization** page. This page shows which organizations each member of your current organization belongs to. - -To view the organizations: - -1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). -2. From a deployment or project on the home page, select **Manage**. -3. From the lower navigation menu, select **Organization**. -4. Click the **Members** tab. -5. Click the name of the user you want to view the organizations for. - -## Accept an invitation - -When you're invited to join an organization, you receive an email with a link to accept the invitation. Invitations expire after 72 hours. - -To accept an invitation: - -1. Open the invitation email and click **Accept invitation**. -2. Log in if prompted. If you already have an active session in your browser, you don't need to log in again. -3. After accepting, you're switched to the new organization automatically. The new organization also appears in your [list of organizations](#view-organizations). - -:::{note} -If the organization enforces a specific login method (such as SAML SSO), you're redirected to that login flow when accepting the invitation. -::: - -To decline an invitation, you can ignore the email. The invitation expires automatically after 72 hours. - -## Log in with multiple organizations - -When you belong to multiple organizations, the login experience depends on whether your browser has information about the organization you most recently used: - -* **Returning user (same browser):** You're automatically logged in to the organization you last used. You don't need to select an organization. -* **New browser or cleared data:** After logging in, you're presented with a list of your organizations to choose from. Select the organization you want to access. - -If your last used organization enforces a specific login method (such as SAML SSO), you're directed to that login flow automatically. - -If you log out, your browser remembers which organization you last used. The next time you log in, you're directed to the appropriate login page for that organization. - -:::{include} _snippets/view-orgs.md -::: - :::{include} _snippets/switch-orgs.md ::: -## Leave an organization +## Invite users to join additional organizations [invite-additional-orgs] -You can leave an organization at any time, as long as you are a member of at least one other organization. If you are the only owner of an organization, you must transfer ownership before leaving. +:::{include} /deploy-manage/users-roles/cloud-organization/_snippets/invite-additional-orgs.md +::: -You can leave only the organization you're currently signed in to. To leave a different organization, [switch to it](#switch-to-a-different-organization) first. +## Reconcile alternative email addresses -:::{warning} -Leaving an organization revokes your access to all of its resources, including deployments, projects, and settings. This action cannot be undone. To rejoin the organization, ask an organization owner to invite you again. +:::{include} /deploy-manage/users-roles/cloud-organization/_snippets/reconcile-email.md ::: -To leave your current organization: +## View your users' organization memberships -1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). -2. From the top navigation menu, click on the user menu and select **Profile**. -3. Click the **My organizations** tab. -4. Click **Leave current organization**. -5. In the confirmation dialog, click **Leave current organization** to confirm. \ No newline at end of file +:::{include} /deploy-manage/users-roles/cloud-organization/_snippets/view-org-memberships.md +::: \ No newline at end of file diff --git a/deploy-manage/cloud-organization/operational-emails.md b/deploy-manage/cloud-organization/operational-emails.md index c527298547..e457bc2c98 100644 --- a/deploy-manage/cloud-organization/operational-emails.md +++ b/deploy-manage/cloud-organization/operational-emails.md @@ -3,7 +3,7 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-operational-emails.html applies_to: deployment: - ess: all + ess: ga products: - id: cloud-hosted --- diff --git a/deploy-manage/cloud-organization/tools-and-apis.md b/deploy-manage/cloud-organization/tools-and-apis.md index fd9c4764e5..d6bba285b3 100644 --- a/deploy-manage/cloud-organization/tools-and-apis.md +++ b/deploy-manage/cloud-organization/tools-and-apis.md @@ -4,6 +4,10 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-work-with-apis.html products: - id: cloud-hosted +applies_to: + deployment: + ech: ga + serverless: ga --- # Tools and APIs for your Cloud organization [ec-work-with-apis] diff --git a/deploy-manage/deploy/elastic-cloud/aws-marketplace.md b/deploy-manage/deploy/elastic-cloud/aws-marketplace.md index d10173e4fe..c0e045cd49 100644 --- a/deploy-manage/deploy/elastic-cloud/aws-marketplace.md +++ b/deploy-manage/deploy/elastic-cloud/aws-marketplace.md @@ -8,6 +8,7 @@ applies_to: navigation_title: AWS Marketplace products: - id: cloud-hosted + - id: cloud-serverless --- # {{ecloud}} from AWS Marketplace [ec-billing-aws] @@ -21,10 +22,11 @@ The free trial includes provisioning of a single deployment and you are not char You can subscribe to {{ecloud}} directly from the AWS Marketplace. You then have the convenience of viewing your {{ecloud}} subscription as part of your AWS bill, and you do not have to supply any additional billing information to Elastic. +If you already have an {{ecloud}} trial, you can [convert it to an AWS Marketplace subscription](marketplace-trial-conversion.md) instead of creating a new account. + Some differences exist when you subscribe to {{ecloud}} through the AWS Marketplace: * Billing starts automatically after the 7-day trial period. -* Previous {{ecloud}} accounts cannot be converted to use the AWS Marketplace. If you already have an account, you must use a different email address when you sign up for a subscription through the AWS Marketplace. * Pricing is based on the AWS region, the size of your deployment, as well as some other parameters such as data transfer out, data transfer internode, snapshot storage, and snapshot APIs. For more details, check [Billing Dimensions](../../cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md). * The consolidated charges for your {{ecloud}} subscription display in the AWS Marketplace billing console. It can take a day or two before new charges show up. * Regardless of where your deployment is hosted (visible in the {{ecloud}} console), the AWS Marketplace charges for all AWS regions are metered in US East (Northern Virginia). As a result, US East (Northern Virginia) is listed as the region in the AWS Marketplace console. @@ -43,8 +45,8 @@ Elastic provides different [subscription levels](https://www.elastic.co/subscrip Note the following items before you subscribe: -* You cannot use an email address that already has an {{ecloud}} account. If you want to use the same account email address with AWS Marketplace billing, you must first change the email address on your existing account before setting up your new AWS Marketplace subscription. For instructions on how to change your email address in {{ecloud}}, check [update your email address](../../../cloud-account/update-your-email-address.md). -* If you want to manage deployments on the existing {{ecloud}} account with your AWS MP billing account, you must migrate your deployments over to the new MP billing account. To migrate, use a [custom repository](../../tools/snapshot-and-restore/elastic-cloud-hosted.md) to take a snapshot and then restore that snapshot to a new deployment under your AWS Marketplace account. +* Each AWS billing account supports one {{ecloud}} subscription, which maps to one {{ecloud}} organization. If you need multiple organizations (for example, separate production and development environments), use separate AWS accounts. +* If you want to migrate deployments from an existing non-marketplace organization into your AWS Marketplace organization, use a [custom repository](../../tools/snapshot-and-restore/elastic-cloud-hosted.md) to take a snapshot and then restore it to a new deployment under your AWS Marketplace organization. ## Subscribe to {{ecloud}} through the AWS Marketplace [ec_subscribe_to_elasticsearch_service_through_the_aws_marketplace] @@ -56,7 +58,7 @@ To subscribe to {{ecloud}} through the AWS Marketplace: 3. Follow the steps displayed to complete the signup process. 1. Ensure that you have the necessary AWS permissions required to complete a marketplace transaction. - 2. Create a new {{ecloud}} account. This account is linked to your AWS Marketplace subscription. + 2. Create a new {{ecloud}} account or log in with an existing account. This account is linked to your AWS Marketplace subscription. 3. (Optional) Use the {{ecloud}} CloudFormation template to quickly get started with Elastic. The template deploys the {{stack}} in your {{ecloud}} account, and also provisions the {{agent}} on a new EC2 instance in your AWS environment. 4. Navigate to {{ecloud}} to continue. @@ -79,7 +81,7 @@ This section describes some scenarios that you may experience onboarding onto th This occurs when you attempt to sign up to the marketplace offer using an email address that already exists in {{ecloud}}, such as part of a trial account. You have a few options: -* **Change the email address of your previous {{ecloud}} account** - Log in to your existing {{ecloud}} account and change the email address. Once changed, navigate back to the AWS console to finish setting up your marketplace subscription. +* **Sign in with your existing account** - Choose to sign in instead of signing up. You can then [convert an existing trial organization](marketplace-trial-conversion.md) to your AWS Marketplace subscription or create a new organization. * **Sign up using a different email address** - Sign up to {{ecloud}} using a different email address. @@ -90,6 +92,7 @@ If the {{ecloud}} login page displays when coming from the AWS console, then an If you can’t remember which email address you used to sign up to {{ecloud}}, or you need more help, contact `support@elastic.co`. +% is this still true? ### When I try to configure an account from the AWS console I get an error that an active AWS subscription already exists. [ec-awsmp-account-collision03] This error occurs when you have already provisioned a marketplace subscription under your AWS user account. Each AWS user account can only subscribe to {{ecloud}} once. diff --git a/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md b/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md index aa3574ffff..bb064fa538 100644 --- a/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md +++ b/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md @@ -42,7 +42,7 @@ $$$ec-supported-regions$$$ Before setting up an {{ecloud}} deployment or project through the Azure Native Service, review the following requirements: * Your Azure account role for the subscription must be set to **Owner** or **Contributor**. For details and steps to assign roles, refer to [Roles and permissions](https://learn.microsoft.com/en-us/marketplace/roles-permissions#roles-and-permissions-1) in the Azure documentation. -* You can't use an email address that already has an {{ecloud}} account. Use a different Azure account to set up the {{es}} resource, or [contact Elastic Support](azure-native-isv-service-troubleshooting.md#azure-integration-support) for assistance. For a workaround, refer to [Sign up using an existing email address](//cloud-account/update-your-email-address.md#sign-up-existing). +* If you already have an {{ecloud}} account, you can sign in with your existing credentials during setup. Your new resource will be linked to an existing organization or a new one will be created. For details on how accounts and organizations work together, refer to [Subscribe from a marketplace](subscribe-from-marketplace.md#ec-marketplace-org-relationship). * You must have a payment method registered on your Azure subscription. If you have a non-payment subscription, such as a [Virtual Studio Subscription](https://visualstudio.microsoft.com/subscriptions/), you can't create an {{ecloud}} deployment. Refer to the Azure [Purchase errors](https://learn.microsoft.com/en-us/azure/partner-solutions/elastic/troubleshoot#marketplace-purchase-errors) troubleshooting documentation for more information. * To single sign-on into your {{ecloud}} deployment or project from Azure, you need to request approval from your Azure administrator. @@ -101,25 +101,34 @@ You have a few options to access your deployment or project: * [{{ech}}](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md#ec_how_to_operate_elasticsearch_service) * [{{serverless-full}}](/deploy-manage/deploy/elastic-cloud/serverless.md#get-started) +## Multi-org accounts and the Azure portal [ec-azure-multi-org-limitations] + +Unlike {{aws}} and {{gcp}}, the Azure portal does not provide an organization picker during resource creation. When your account has a single organization, the Azure portal automatically adds new resources to that organization and can handle trial conversion. When your account has multiple organizations, the portal might not be able to determine which organization to target. + +The following limitations apply: + +- **Multiple Azure MP organizations:** You can't create resources from the Azure portal. Create resources directly from the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body) instead, where you can select the specific organization to use. +- **Multiple eligible trial organizations:** You can't convert a trial from the Azure portal. To resolve this, leave the other trial organizations so that only one eligible organization remains. Alternatively, use the [{{aws}}](aws-marketplace.md) or [{{gcp}}](google-cloud-platform-marketplace.md) marketplace instead, which support an organization picker during sign-up. + ## Trials and existing accounts [ec-azure-integration-trials] -% needs to be updated for multi org $$$azure-integration-prior-cloud-account$$$ -If you already have an {{ecloud}} account with the same email address as your Azure account, you might need to contact `support@elastic.co`. +If you already have an {{ecloud}} account, you can sign in with your existing credentials when creating an Elastic resource in the Azure portal. If your account has a single organization, the resource is added to that organization. If you have multiple organizations, refer to [Multi-org accounts and the Azure portal](#ec-azure-multi-org-limitations). ### Convert a trial to Azure Native Service [azure-integration-convert-trial] -You can start a [free {{ecloud}} trial](https://cloud.elastic.co/registration?page=docs&placement=docs-body) and then convert your organization over to Azure. There are a few requirements: +If you have an existing {{ecloud}} trial, you can convert it to a Microsoft Marketplace subscription. For step-by-step instructions, refer to [Convert a trial to a marketplace subscription](marketplace-trial-conversion.md#ec-marketplace-trial-conversion-azure). + +Keep in mind: -* Make sure when creating resources in the trial account that you specify Azure as the cloud provider. -* To convert your trial to the Microsoft Marketplace you need to [create a resource](/deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md#ec-azure-integration-getting-started) in the Azure portal. Delete this resource if you don't need it. After you create the new resource, your marketplace subscription is ready. -* Any resources previously created during your trial won't show up in the Azure portal, because they weren't created in Azure, but they are still accessible through the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body) and you are billed for their usage. +* When creating resources in the trial account, specify Azure as the cloud provider so that the organization is [eligible for conversion](marketplace-trial-conversion.md#ec-marketplace-conversion-candidates). +* To convert your trial to the Microsoft Marketplace, [create a resource](#ec-azure-integration-getting-started) in the Azure portal. Delete this resource if you don't need it. After you create the new resource, your marketplace subscription is ready. +* Any resources created during your trial won't show up in the Azure portal, because they weren't created in Azure, but they are still accessible through the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body) and you are billed for their usage. ### Start a trial from Microsoft Marketplace [azure-integration-native-trials] You can start a 7-day trial by creating a deployment through the Microsoft Marketplace. The following restrictions apply: -* The email associated with the Azure account used to create the deployment must not already be linked to an existing Elastic organization. * During the 7-day trial period, you can create up to one deployment and three serverless projects. If you want to convert to a paid subscription before the end of the trial period, contact `support@elastic.co`. * After 7 days, the trial will automatically convert to a paid offering. If you don't want to convert your trial, then you can delete the resource you created in the Azure portal. You can also contact Elastic Support to unsubscribe, which might result in your resources being deleted after a grace period. * You can sign up for only one trial per user account. After the trial expires, you can't start another trial. If you need a trial extension, reach out to Elastic Support. @@ -156,7 +165,7 @@ The integrated billing process involves the following concepts: The following diagram shows the mapping between Microsoft Azure IDs, {{ecloud}} organization IDs, and your Elastic resources (deployments). -% needs to be updated for multi org +% TODO: update diagram for multi-org :::{image} /deploy-manage/images/cloud-ec-azure-billing-mapping.png :alt: Azure to {{ecloud}} mappings ::: @@ -190,9 +199,8 @@ $$$azure-integration-billing-which-subscription$$$ The Microsoft Marketplace integrated billing posts all of the Elastic resource costs related to an {{ecloud}} organization to the Azure subscription you used to create your first-ever Elastic resource, even if your individual Elastic resources (deployments and projects) are spread across different Azure subscriptions. -% needs to be updated for multi org $$$azure-integration-billing-different-deployments$$$ -To have different Elastic resources' costs reported to different Azure subscriptions, they need to be in separate {{ecloud}} organizations. To create a separate {{ecloud}} organization from an Azure subscription, you will need to subscribe as a user who is not already part of an existing {{ecloud}} organization. +To have different Elastic resources' costs reported to different Azure subscriptions, they need to be in separate {{ecloud}} organizations. To create a separate organization, [create a new Elastic resource](#ec-azure-integration-getting-started) from the Azure portal. A new organization is created as part of the resource creation process. #### How costs are reported diff --git a/deploy-manage/deploy/elastic-cloud/create-an-organization.md b/deploy-manage/deploy/elastic-cloud/create-an-organization.md index 87f6bcb0ca..ee615d7feb 100644 --- a/deploy-manage/deploy/elastic-cloud/create-an-organization.md +++ b/deploy-manage/deploy/elastic-cloud/create-an-organization.md @@ -13,27 +13,22 @@ products: - id: cloud-serverless --- -# Sign up and create an organization +# Sign up - -To sign up: +To get started with {{ecloud}}, sign up for an account: 1. Go to the [{{ecloud}} Sign Up](https://cloud.elastic.co/registration?page=docs&placement=docs-body) page. 2. Choose one of the available sign up methods. You can register with your email address and a password, use a Google or Microsoft account, or [subscribe from a Marketplace](../../../deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md). -:::{note} -* You can only belong to one {{ecloud}} organization at a time. If you want to create or join another organization, you must [leave the previous one](/cloud-account/join-or-leave-an-organization.md#ec-leave-organization) or use a different email address. -* An email address can’t be used for more than one {{ecloud}} account. To make the email address available for a new account, you can [remove it from your existing account](/cloud-account/update-your-email-address.md#sign-up-existing). -::: - When you first sign up, you create an organization and start with a trial license. -This organization is the umbrella for all of your {{ecloud}} 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. For more details on how to manage your organization, refer to [](/deploy-manage/cloud-organization.md). - +An organization is the umbrella for a group of {{ecloud}} 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. A user can belong to multiple organizations, or be the owner of multiple organizations. For more details on how to manage your organizations, refer to [](/deploy-manage/cloud-organization.md). ## Trial information [general-sign-up-trial-what-is-included-in-my-trial] -Your free 14-day trial includes: +When you create an organization, you start with a free 14-day trial. During this trial, you have access to the following: + +% do we want to tell them that they have unlimited trials by creating multiple organizations? **One hosted deployment** @@ -49,7 +44,7 @@ For more information, check the [{{ech}} documentation](cloud-hosted.md). * [Observability](../../../solutions/observability.md) * [Security](../../../solutions/security.md) -When you create a project, you select the project type applicable to your use case, so only the relevant and impactful applications and features are easily accessible to you. +When you create a project, you select the project type applicable to your use case, so the most relevant applications and features are surfaced for you from the start. For more information, check the [{{serverless-short}} documentation](serverless.md). @@ -79,7 +74,7 @@ Subscribe to [{{ecloud}}](/deploy-manage/cloud-organization/billing/add-billing- * Third availability zone for your deployments. * Access to additional features, such as {{ccs}} and {{ccr}}. -You can subscribe to {{ecloud}} at any time during your trial. +You can subscribe to {{ecloud}} at any time during your trial by [adding your billing details](/deploy-manage/cloud-organization/billing/add-billing-details.md) or by [converting your trial to a marketplace subscription](marketplace-trial-conversion.md). [Billing](/deploy-manage/cloud-organization/billing/serverless-project-billing-dimensions.md) starts when you subscribe. To maximize the benefits of your trial, subscribe at the end of the free period. To monitor charges, anticipate future costs, and adjust your usage, check your [account usage](/deploy-manage/cloud-organization/billing/monitor-analyze-usage.md) and [billing history](/deploy-manage/cloud-organization/billing/view-billing-history.md). @@ -90,7 +85,6 @@ When your trial expires, the deployment and projects that you created during the If you’re interested in learning more ways to subscribe to {{ecloud}}, don’t hesitate to [contact us](https://www.elastic.co/contact). - ## How do I get help? [ec_how_do_i_get_help] We’re here to help. If you have any questions feel free to reach out to [Support](https://cloud.elastic.co/support). diff --git a/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md b/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md index 3d7cca2abe..fdbda4919e 100644 --- a/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md +++ b/deploy-manage/deploy/elastic-cloud/google-cloud-platform-marketplace.md @@ -15,12 +15,15 @@ products: Subscribe to {{ecloud}} directly from the Google Cloud Platform (GCP). You then have the convenience of viewing your {{ecloud}} subscription as part of your GCP bill, and you do not have to supply any additional credit card information to Elastic. Your investment in Elastic draws against your cloud purchase commitment. +If you already have an {{ecloud}} trial, you can [convert it to a GCP Marketplace subscription](marketplace-trial-conversion.md) instead of creating a new organization through the GCP Marketplace. + Some differences exist when you subscribe to {{ecloud}} through the GCP Marketplace: * New {{ecloud}} customers obtain a 7-day trial period. During this period, you can use a single deployment and three projects of {{ecloud}}. After this period, usage-based billing starts, unless you delete your cloud resources. Note that once customers unsubscribe from the GCP offer, their trial will end immediately. Even if they resubscribe, they will not be able to resume the trial. * Pricing for an {{ecloud}} subscription through the GCP Marketplace follows the pricing outlined on the [{{ecloud}}](https://console.cloud.google.com/marketplace/product/elastic-prod/elastic-cloud) page in the GCP Marketplace. Pricing is based the {{ecloud}} [billing dimensions](../../cloud-organization/billing.md#pricing-model). * To access your billing information at any time go to **Account & Billing**. You can also go to **Account & Billing** and then **Usage** to view your usage hours and units per hour. +% is this still true? ::::{important} Only one {{ecloud}} organization can be subscribed through GCP Marketplace per GCP billing account. :::: @@ -35,8 +38,8 @@ To subscribe to {{ecloud}} through the GCP Marketplace: 5. When you are presented with a pop-up that specifies that "Your order request has been sent to Elastic" choose **Sign up with Elastic** to continue. 6. After choosing to sign up, a new window will appear. Do one of the following: - * Create a new, unique user account for an {{ecloud}} {{ecloud}} organization. - * Log in with an existing user account that’s associated with an {{ecloud}} trial. This links the billing account used for the purchase on GCP Marketplace to the existing Elastic organization. + * Create a new, unique user account for an {{ecloud}} organization. + * Log in with an existing user account. If the account is associated with an {{ecloud}} trial, it links the billing account used for the purchase on GCP Marketplace to the existing Elastic organization. [Learn more](marketplace-trial-conversion.md). 7. After signing up, check your inbox to verify the email address you signed up with. Upon verification, you will be asked to create a password, and once created your organization will be set up and you will be logged into it. diff --git a/deploy-manage/deploy/elastic-cloud/marketplace-trial-conversion.md b/deploy-manage/deploy/elastic-cloud/marketplace-trial-conversion.md new file mode 100644 index 0000000000..75d6dc9d5d --- /dev/null +++ b/deploy-manage/deploy/elastic-cloud/marketplace-trial-conversion.md @@ -0,0 +1,92 @@ +--- +applies_to: + deployment: + ess: ga + serverless: ga +products: + - id: cloud-hosted +description: Learn how to convert an existing Elastic Cloud trial to an AWS, Azure, or GCP marketplace subscription. +--- + +# Convert a trial to a marketplace subscription [ec-marketplace-trial-conversion] + +If you started with an {{ecloud}} trial and want to pay through a cloud marketplace instead of adding a credit card directly, you can convert your trial organization to a marketplace subscription. Your existing deployments, projects, and data are preserved during the conversion. + +This works for both active and expired trials, as long as the organization is eligible for conversion and the data retention window has not passed. + +## Requirements + +- An {{ecloud}} trial organization that is [eligible for conversion](#ec-marketplace-conversion-candidates). +- Access to one of the supported marketplaces: [{{aws}} Marketplace](aws-marketplace.md), [Azure Marketplace](azure-native-isv-service.md), or [{{gcp}} Marketplace](google-cloud-platform-marketplace.md). +- The email address associated with your {{ecloud}} account matches the credentials you use during the marketplace sign-up process. +- To convert from the Azure Marketplace: your {{ecloud}} account must only be owner of a single [convertible](#ec-marketplace-conversion-candidates) organization. + +## Convert your trial in {{aws}} and {{gcp}} marketplaces [ec-marketplace-trial-conversion-aws-gcp] + +For {{aws}} and {{gcp}}, you complete the subscription in the marketplace and then sign in to {{ecloud}} to link the subscription to an organization. + +::::::{stepper} +:::::{step} Create your {{ecloud}} trial +If you haven't already, [sign up](create-an-organization.md) for an {{ecloud}} trial using the email address you prefer. +::::: +:::::{step} Subscribe through your marketplace + +::::{tab-set} +:::{tab-item} {{aws}} Marketplace +Go to the [{{ecloud}} listing on the {{aws}} Marketplace](https://aws.amazon.com/marketplace/pp/prodview-voru33wi6xs7k) and click **View purchase options**, then **Subscribe** and **Set Up Your Account**. +::: +:::{tab-item} {{gcp}} Marketplace +Go to the [{{ecloud}} listing on the {{gcp}} Marketplace](https://console.cloud.google.com/marketplace/product/elastic-prod/elastic-cloud). Select **Subscribe**, accept the terms, and choose **Sign up with Elastic**. +::: +:::: +::::: +:::::{step} Sign in with your existing credentials +When prompted to create a new account or sign in, choose to **sign in** with your existing {{ecloud}} credentials. +::::: +:::::{step} Select the organization to upgrade +The upgrade page shows the cloud provider account that the subscription will be linked to. Confirm this is the correct account before continuing. + +What happens next depends on how many organizations your account belongs to: + +- **Single convertible trial organization:** You are presented with an option to upgrade the trial to the marketplace subscription. Billing through the marketplace begins immediately upon upgrade. +- **Multiple organizations:** You are shown a list of your eligible organizations. Click the organization you want to upgrade. To also see organizations that aren't eligible, toggle **Show non-convertible organizations**. + +You can also choose to **create a new organization** instead of upgrading an existing one. The new organization starts with its own 7-day marketplace trial. + +If none of your existing organizations are eligible for upgrading, you can still create a new organization through the marketplace, or refer to [Which organizations can be converted](#ec-marketplace-conversion-candidates) to understand why. +::::: +:::::: + +## Convert your trial in the Azure Marketplace [ec-marketplace-trial-conversion-azure] + +The Azure flow works differently from {{aws}} and {{gcp}} because Elastic resources are created directly from the Azure portal rather than through an Elastic sign-up page. + +::::::{stepper} +:::::{step} Create your {{ecloud}} trial +If you haven't already, [sign up](create-an-organization.md) for an {{ecloud}} trial using the email address you prefer. When creating resources during the trial, specify Azure as the cloud provider so that the organization is [eligible for conversion](#ec-marketplace-conversion-candidates). +::::: +:::::{step} Create an Elastic resource from the Azure portal +Go to the [{{ecloud}} ({{es}}) - An Azure Native ISV Service](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/elastic.ec-azure-pp) listing in the Azure portal. Select **Subscribe** and follow the prompts to create an Elastic resource. + +When you create the resource, it is linked to your existing trial organization and the trial is converted to an Azure Marketplace subscription. You can delete the new deployment afterward if you don't need it. +::::: +:::::: + +## Which organizations can be converted [ec-marketplace-conversion-candidates] + +Not all organizations are eligible for marketplace conversion. An organization can be converted if it meets the following conditions: + +- You are the owner of the organization. +- The organization is on a trial subscription (active or expired). +- The organization does not already have a credit card or another marketplace subscription attached. +- The organization's deployments and projects are hosted on the same cloud provider as the marketplace. For example, an organization with deployments on {{aws}} can only be converted to an {{aws}} Marketplace subscription, not a {{gcp}} Marketplace subscription. + +If none of your organizations are eligible, you can create a new organization through the marketplace sign-up flow, or [subscribe directly](/deploy-manage/cloud-organization/billing/add-billing-details.md) with a credit card. + +## After conversion [ec-marketplace-post-conversion] + +After your trial is converted: + +- All existing deployments and projects in the converted organization are preserved. +- Billing starts through the marketplace immediately. There is no additional trial period. +- To monitor your usage and costs, go to **Billing > Usage** in the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). diff --git a/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md b/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md index c24ec67a2a..ede3d529b0 100644 --- a/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md +++ b/deploy-manage/deploy/elastic-cloud/subscribe-from-marketplace.md @@ -7,22 +7,49 @@ applies_to: serverless: ga products: - id: cloud-hosted + - id: cloud-serverless --- # Subscribe from a marketplace [ec-marketplaces] -You can subscribe to {{ecloud}} from a marketplace. Your subscription gets billed together with other services that you’re already using, and can contribute towards your spend commitment with cloud providers. +You can subscribe to {{ecloud}} from a cloud marketplace instead of paying Elastic directly. Marketplace subscriptions offer the following benefits: + +- **Consolidated billing.** Your {{ecloud}} charges appear on your existing cloud provider bill alongside your other services. +- **Spend commitment.** Your {{ecloud}} usage draws against your committed spend with your cloud provider. If you subscribe directly to Elastic (with a credit card or an Elastic contract), your {{ecloud}} spend does not count toward any cloud provider commitment. +- **Simplified procurement.** No need to set up a separate billing relationship with Elastic. Trial availability and duration can vary depending on the marketplace. -When subscribing from a marketplace, your marketplace email is used for your [Elastic account](../../../cloud-account/update-your-email-address.md). +## Marketplace options -* [AWS Marketplace](aws-marketplace.md) +* [{{aws}} Marketplace](aws-marketplace.md) * [Microsoft Marketplace](azure-native-isv-service.md) -* [GCP Marketplace](google-cloud-platform-marketplace.md) -* [Heroku](heroku.md) +* [{{gcp}} Marketplace](google-cloud-platform-marketplace.md) +* [Heroku](heroku.md) ({{ech}} only - no organization functionality) ::::{tip} You can also purchase {{ecloud}} through a reseller on any of these marketplaces. Contact your reseller to learn more. :::: +## How marketplaces, organizations, and accounts work together [ec-marketplace-org-relationship] + +When you subscribe to {{ecloud}} through a marketplace, a relationship is established between your marketplace account and an {{ecloud}} [organization](/deploy-manage/cloud-organization.md). + +- **One marketplace subscription maps to one {{ecloud}} organization.** Billing for all deployments and projects within that organization flows through the linked marketplace subscription. The specifics vary by marketplace: + - **{{aws}}**: One subscription for each {{aws}} billing account. Customers with multiple {{aws}} accounts (for example, production and development) can have separate subscriptions, each linked to its own {{ecloud}} organization. + - **{{gcp}}**: One {{ecloud}} organization for each {{gcp}} billing account. + - **Azure**: Organization creation is tied to Elastic resource creation in the Azure portal, so customers who create multiple resources can accumulate multiple organizations. +- **Each organization can only be linked to a single billing source**: either a marketplace subscription or direct credit card billing. +- **A single {{ecloud}} account can belong to [multiple organizations](/deploy-manage/cloud-organization/manage-multiple-organizations.md).** When you subscribe through a marketplace, you can either create a new organization or link the subscription to an existing one. If your account is organization owner for multiple organizations, you choose which organization to associate with the marketplace subscription. +- **Your {{ecloud}} account uses a single email address across all your organizations.** If you already have an {{ecloud}} account, you can sign in with your existing credentials during the marketplace sign-up process. If you don't have an account, one is created using your marketplace email. + +If you already have an {{ecloud}} trial and want to start paying through a marketplace, you can [convert your trial to a marketplace subscription](marketplace-trial-conversion.md) without losing your existing deployments, projects, or data. + +## Multi-cloud strategy [ec-marketplace-multi-cloud] + +Because a single {{ecloud}} account can belong to multiple organizations, and each organization can be linked to a different marketplace, you can subscribe to multiple marketplaces to support a multi-cloud strategy. For example, you might have: + +- An {{aws}} Marketplace subscription for an organization running production workloads on {{aws}} +- A {{gcp}} Marketplace subscription for a separate organization running analytics workloads on {{gcp}} + +Each subscription draws against the respective cloud provider's spend commitment, letting you maximize the benefits of each marketplace independently. diff --git a/deploy-manage/toc.yml b/deploy-manage/toc.yml index 581e069a1e..e98b93f2e5 100644 --- a/deploy-manage/toc.yml +++ b/deploy-manage/toc.yml @@ -15,6 +15,7 @@ toc: children: - file: deploy/elastic-cloud/subscribe-from-marketplace.md children: + - file: deploy/elastic-cloud/marketplace-trial-conversion.md - hidden: deploy/elastic-cloud/create-monthly-pay-as-you-go-subscription-on-aws-marketplace.md - hidden: deploy/elastic-cloud/complete-registration-of-an-annual-subscription-on-aws-marketplace.md - hidden: deploy/elastic-cloud/azure-marketplace-pricing.md @@ -799,7 +800,7 @@ toc: - file: kibana-custom-branding.md - file: cloud-organization.md children: - - hidden: cloud-organization/manage-multiple-organizations.md + - file: cloud-organization/manage-multiple-organizations.md - file: cloud-organization/billing.md children: - file: cloud-organization/billing/cloud-hosted-deployment-billing-dimensions.md diff --git a/deploy-manage/users-roles.md b/deploy-manage/users-roles.md index 175011a2cf..04761bf2a5 100644 --- a/deploy-manage/users-roles.md +++ b/deploy-manage/users-roles.md @@ -3,8 +3,8 @@ navigation_title: Users and roles mapped_pages: - https://www.elastic.co/guide/en/serverless/current/project-settings-access.html applies_to: - stack: all - serverless: all + stack: ga + serverless: ga products: - id: cloud-serverless --- diff --git a/deploy-manage/users-roles/cloud-organization/_snippets/invite-additional-orgs.md b/deploy-manage/users-roles/cloud-organization/_snippets/invite-additional-orgs.md new file mode 100644 index 0000000000..203238f54a --- /dev/null +++ b/deploy-manage/users-roles/cloud-organization/_snippets/invite-additional-orgs.md @@ -0,0 +1,7 @@ +You must [send invitations](/deploy-manage/users-roles/cloud-organization/manage-users.md#ec-invite-users) from the organization you want users to join. You can't invite users to join multiple organizations at once. + +If a user already has an {{ecloud}} account, then they don't need to sign up again. Instead, they can log in with their selected login method. + +If your organization uses [SAML SSO](/deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md), then you don't need to invite users to join the organization. Users are added to the organization automatically when they log in to your identity provider SSO URL. + +Organizations can have different authentication requirements. For example, one organization might enforce SAML SSO, while another organization might not enforce any specific login method. If your organization enforces a specific login method, then the user will need to use that method to log in, and might be prompted to re-authenticate. \ No newline at end of file diff --git a/deploy-manage/users-roles/cloud-organization/_snippets/reconcile-email.md b/deploy-manage/users-roles/cloud-organization/_snippets/reconcile-email.md new file mode 100644 index 0000000000..81d0e904b9 --- /dev/null +++ b/deploy-manage/users-roles/cloud-organization/_snippets/reconcile-email.md @@ -0,0 +1,5 @@ +Before April 2026, each organization required its own {{ecloud}} account and email address. You can now use one {{ecloud}} account across multiple organizations, and you might want to remove redundant accounts. + +For each organization where a user currently signs in with a different email address, invite them again using the email address that you want them to use everywhere. Assign the same [roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md) they had on the alternate account. + +After the user accepts the invitation, you can [delete](/deploy-manage/users-roles/cloud-organization/manage-users.md#manage-existing-users) their alternate account from that organization. \ No newline at end of file diff --git a/deploy-manage/users-roles/cloud-organization/_snippets/view-org-memberships.md b/deploy-manage/users-roles/cloud-organization/_snippets/view-org-memberships.md new file mode 100644 index 0000000000..00bf379e7f --- /dev/null +++ b/deploy-manage/users-roles/cloud-organization/_snippets/view-org-memberships.md @@ -0,0 +1,9 @@ +You can view the organizations that your users are members of from the **Members** tab of the **Organization** page. This page shows which organizations each member of your current organization belongs to. + +To view the organizations: + +1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body). +2. From a deployment or project on the home page, select **Manage**. +3. From the lower navigation menu, select **Organization**. +4. Click the **Members** tab. +5. Click the name of the user you want to view the organizations for. \ No newline at end of file diff --git a/deploy-manage/users-roles/cloud-organization/manage-users.md b/deploy-manage/users-roles/cloud-organization/manage-users.md index 748936a3bc..c13c088513 100644 --- a/deploy-manage/users-roles/cloud-organization/manage-users.md +++ b/deploy-manage/users-roles/cloud-organization/manage-users.md @@ -5,7 +5,7 @@ mapped_pages: - https://www.elastic.co/guide/en/cloud/current/ec-api-organizations.html applies_to: deployment: - ess: ga + ech: ga serverless: ga products: - id: cloud-hosted @@ -20,14 +20,12 @@ You can invite users to join your organization to allow them to interact with al Alternatively, [configure {{ecloud}} SAML SSO](../../../deploy-manage/users-roles/cloud-organization/configure-saml-authentication.md) to enable your organization members to join the {{ecloud}} organization automatically. +An {{ecloud}} account can belong to multiple organizations. However, the user's roles and the resources that they have access to are controlled at the organization level. + :::{agent-skill} :url: https://github.com/elastic/agent-skills/tree/main/skills/cloud/access-management ::: -::::{note} -Users can only belong to one organization at a time. If a user that you want to invite already belongs to a different organization, that user first needs to leave their current organization, or to use a different email address. Check [Join an organization from an existing {{ecloud}} account](/cloud-account/join-or-leave-an-organization.md). -:::: - :::{tip} If you're using {{ech}}, then you can also manage users and control access [at the deployment level](/deploy-manage/users-roles/cluster-or-deployment-auth.md). ::: @@ -55,7 +53,7 @@ To invite users to your organization: To add multiple members, enter the member email addresses, separated by a space. -5. If desired, assign roles to the users so that they automatically get the appropriate permissions when they accept the invitation and sign in to {{ecloud}}. +5. If desired, assign roles to the users so that they automatically get the appropriate permissions when they accept the invitation and sign in to your organization. You can grant access to {{ech}} deployments, {{serverless-full}} projects, or connected clusters, either to all resources or scoped to specific ones. For more details, refer to [User roles and privileges](/deploy-manage/users-roles/cloud-organization/user-roles.md). @@ -63,12 +61,27 @@ To invite users to your organization: Invitations to join an organization are sent by email. Invited users have 72 hours to accept the invitation before it expires. If the invite has expired, an admin can resend the invitation. +## Invite users to join additional organizations [invite-additional-orgs] + +:::{include} _snippets/invite-additional-orgs.md +::: + ## Manage existing users -On the **Members** tab of the **Organization** page, you can view the list of current members, including status and role. +On the **Members** tab of the **Organization** page, you can view the list of current members, including their status, role, and any other organizations that they are members of. In the **Actions** column, click the three dots to edit a member’s role, or revoke an invite, or remove a member from your organization. +### Reconcile alternative email addresses + +:::{include} /deploy-manage/users-roles/cloud-organization/_snippets/reconcile-email.md +::: + +## View your users' organization memberships + +:::{include} _snippets/view-org-memberships.md +::: + ## Manage users through the {{ecloud}} API [ec-api-organizations] You can also manage members of your organization using the [{{ecloud}} API]({{cloud-apis}}).