diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index a0f4cdae98..87246f1c8c 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -146,3 +146,142 @@ Ownership transfer automatically transfers subscription charges to the new organ To transfer an organization to a different owner, first make sure that user is part of the organization. If they aren't yet, [add them](/administration/users.md#add-a-user-to-an-organization). Then open a [support ticket](/learn/overview/get-support.md) from the current organization to ask for the transfer. + +## Fixed and Flex organizations + +### What is a fixed organization? +Ideal for workloads that have consistent resource requirements with stable and predictable usage. +Users can select a plan with predefined CPU and Memory resources. You can not adjust these resources, nor scale them automatically. To increase capacity, you’ll need to upgrade to a higher plan. + +{{< note theme="note" title="Fixed resources">}} + +**Fixed:** Resource from the plan is applied to the production environment. For preview, the user has the default small size for all containers. + +{{< /note >}} + +### What is a flex organization? +Ideal for workloads that evolve over time or have dynamic resource requirements. Flex will suit most use cases. Users will be able to allocate the exact CPU and Memory resources that your applications and services need. You can adjust these resources at any time, or configure them to adapt automatically. You are charged based on the resources you allocate. + +{{< note theme="info" title="Flex resources">}} + +**Flex:** Users can customize resources per container (per app or service) for **all** environments. + +{{< /note >}} + +### What can you do? +When creating a new organization, users will be able to select the organization type from a drop-down option based on their preference. Once the organization is created, users can manage their organizations like they do today. + +### Feature differences + +#### Developer experience + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Manual backups | Yes | Yes | +| Health notifications | Yes | Yes | +| Preview environments | Yes | Yes | +| Free SSL certificates | Yes | Yes | +| Source integrations (GitHub, GitLab, Bitbucket) | Yes | Yes | +| Runtime operations | Yes | Yes | +| Custom # of preview environments | No (3 small included, purchase by bulk of 3) | Yes | +| Custom size of preview environments | No | Yes | +| Resource allocation | Project Level Plans | Container Level | +| Custom build resources | No | Yes | +| Autoscaling | No | Yes | +| Horizontal scaling of apps | No | Yes | +| Guaranteed CPU | No | Yes | +| Dedicated architecture | Yes | No | +| Custom domains on preview environments | Enterprise and Elite only | Yes | +| Automated code updates | Enterprise and Elite only | Yes | +| Manual deployment | Enterprise and Elite only | Yes | +| Zero downtime deployment | Enterprise and Elite only | Yes | +| Custom backup retention policies | Different packages | Unlimited (pay for storage) | +| Email SMTP server | Yes | Yes | +| Email validation (DKIM) | Enterprise and Elite only | Yes | +| ElasticSearch (Premium containers) | Enterprise and Elite only | No | +| MongoDB (Premium containers) | Enterprise and Elite only | No | + +#### Observability tools + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Logs forwarding | Enterprise and Elite only | Yes | +| Blackfire | Enterprise and Elite only (or self-service add-on) | Yes | +| HTTP Traffic | Yes (but longer timeframe with Enterprise) | Yes | +| Continuous profiling | Enterprise and Elite only | Yes | +| Resources | Yes (but longer timeframe with Enterprise) | Yes | + +#### User management + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Google SSO | Enterprise and Elite only | Yes, with add-on | +| OpenID | Elite only | No | +| Multifactor Authentication | Enterprise and Elite only | Yes, with add-on | +| Teams | Enterprise and Elite only | Yes, with add-on | + +#### Support & SLAs + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Support SLA | Enterprise and Elite only | Yes, with add-on | +| Uptime SLA | Enterprise and Elite only (Architecture based) | Yes, with add-on | +| CDN | Enterprise and Elite only | Yes | +| Fastly WAF | Enterprise & Elite only as add-on | Yes, with add-on | +| Upsun WAF | Enterprise and Elite only | Yes | + +#### Billing + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Pay as you go (Monthly) | Yes | Yes | +| Pay with credit card | Yes | Yes | +| Pay with SEPA | Enterprise and Elite only | Yes | +| Volume discounts | No | Yes | + +#### Security & Compliance + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Privacy regulations | Yes | Yes | +| SOC 2 | Yes | Yes | +| PCI DSS Level 1-compatible | Yes | Yes | +| HIPAA | Enterprise and Elite only in specific regions | Coming soon | + +### Fixed and Flex FAQs + +#### What happens to my URL? +- `https://auth.api.platform.sh/` will become `https://auth.upsun.com/`. + +#### If I had a fixed organization (previously Platform.sh), will I be redirected to my organizations? +- Yes. You will be automatically redirected to the new console and can log in using the same credentials. + +#### Will I be able to switch if I have both fixed and flex organizations? +- Yes. You can navigate between organizations (fixed or flex) from a drop-down list. + +#### How will fixed vs flex be identifiable in the console? +- Organizations will have tags next to their names in the console. +- Organizations will also be categorized by organization type in the console. + +#### Will I be able to access fixed projects via the Upsun CLI? +- Correct. + +#### Will I still use the same configuration files for fixed projects? +- Correct. The same configuration file structures remain (`.platform.app.yaml`, `.platform/services.yaml`, `.platform/routes.yaml`, etc). + +#### Will mount differences still exist between fixed and flex after September? +- Yes. Waiting for git fixes to resolve this. + +#### Besides the name "Platform.sh" going away, will there be visual changes in the console? +- Yes. + - New way to create organizations (choose fixed or flex). + - Ability to navigate between organization types. + - **15-day free trial** for users creating Flex organizations. + +#### With a unified CLI, will there be a way to identify fixed vs flex in the project list? +- You will see a list of all organizations. +- There is no field in the CLI that explicitly identifies fixed vs flex. + + + + diff --git a/sites/upsun/src/administration/organizations.md b/sites/upsun/src/administration/organizations.md index ea12c5530b..d861c2c6c1 100644 --- a/sites/upsun/src/administration/organizations.md +++ b/sites/upsun/src/administration/organizations.md @@ -152,5 +152,139 @@ Ownership transfer automatically transfers subscription charges to the new organ ## Transfer organization ownership To transfer an organization to a different owner, first make sure that user is part of the organization. -If they aren't yet, [add them](/administration/users.md#add-a-user-to-an-organization). -Then open a [support ticket](/learn/overview/get-support.md) from the current organization to ask for the transfer. +If they aren't yet, [add them](/administration/users.md#add-a-user-to-an-organization). Then open a [support ticket](/learn/overview/get-support.md) from the current organization to ask for the transfer. + +## Fixed and Flex organizations + +### What is a fixed organization? +Ideal for workloads that have consistent resource requirements with stable and predictable usage. +Users can select a plan with predefined CPU and Memory resources. You can not adjust these resources, nor scale them automatically. To increase capacity, you’ll need to upgrade to a higher plan. + +{{< note theme="note" title="Fixed resources">}} + +**Fixed:** Resource from the plan is applied to the production environment. For preview, the user has the default small size for all containers. + +{{< /note >}} + +### What is a flex organization? +Ideal for workloads that evolve over time or have dynamic resource requirements. Flex will suit most use cases. Users will be able to allocate the exact CPU and Memory resources that your applications and services need. You can adjust these resources at any time, or configure them to adapt automatically. You are charged based on the resources you allocate. + +{{< note theme="info" title="Flex resources">}} + +**Flex:** Users can customize resources per container (per app or service) for **all** environments. + +{{< /note >}} + +### What can you do? +When creating a new organization, users will be able to select the organization type from a drop-down option based on their preference. Once the organization is created, users can manage their organizations like they do today. + +### Feature differences + +#### Developer experience + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Manual backups | Yes | Yes | +| Health notifications | Yes | Yes | +| Preview environments | Yes | Yes | +| Free SSL certificates | Yes | Yes | +| Source integrations (GitHub, GitLab, Bitbucket) | Yes | Yes | +| Runtime operations | Yes | Yes | +| Custom # of preview environments | No (3 small included, purchase by bulk of 3) | Yes | +| Custom size of preview environments | No | Yes | +| Resource allocation | Project Level Plans | Container Level | +| Custom build resources | No | Yes | +| Autoscaling | No | Yes | +| Horizontal scaling of apps | No | Yes | +| Guaranteed CPU | No | Yes | +| Dedicated architecture | Yes | No | +| Custom domains on preview environments | Enterprise and Elite only | Yes | +| Automated code updates | Enterprise and Elite only | Yes | +| Manual deployment | Enterprise and Elite only | Yes | +| Zero downtime deployment | Enterprise and Elite only | Yes | +| Custom backup retention policies | Different packages | Unlimited (pay for storage) | +| Email SMTP server | Yes | Yes | +| Email validation (DKIM) | Enterprise and Elite only | Yes | +| ElasticSearch (Premium containers) | Enterprise and Elite only | No | +| MongoDB (Premium containers) | Enterprise and Elite only | No | + +#### Observability tools + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Logs forwarding | Enterprise and Elite only | Yes | +| Blackfire | Enterprise and Elite only (or self-service add-on) | Yes | +| HTTP Traffic | Yes (but longer timeframe with Enterprise) | Yes | +| Continuous profiling | Enterprise and Elite only | Yes | +| Resources | Yes (but longer timeframe with Enterprise) | Yes | + +#### User management + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Google SSO | Enterprise and Elite only | Yes, with add-on | +| OpenID | Elite only | No | +| Multifactor Authentication | Enterprise and Elite only | Yes, with add-on | +| Teams | Enterprise and Elite only | Yes, with add-on | + +#### Support & SLAs + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Support SLA | Enterprise and Elite only | Yes, with add-on | +| Uptime SLA | Enterprise and Elite only (Architecture based) | Yes, with add-on | +| CDN | Enterprise and Elite only | Yes | +| Fastly WAF | Enterprise & Elite only as add-on | Yes, with add-on | +| Upsun WAF | Enterprise and Elite only | Yes | + +#### Billing + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Pay as you go (Monthly) | Yes | Yes | +| Pay with credit card | Yes | Yes | +| Pay with SEPA | Enterprise and Elite only | Yes | +| Volume discounts | No | Yes | + +#### Security & Compliance + +| **Feature** | **Upsun Fixed** | **Upsun Flex** | +|-------------|-----------------|----------------| +| Privacy regulations | Yes | Yes | +| SOC 2 | Yes | Yes | +| PCI DSS Level 1-compatible | Yes | Yes | +| HIPAA | Enterprise and Elite only in specific regions | Coming soon | + +### Fixed and Flex FAQs + +#### What happens to my URL? +- `https://auth.api.platform.sh/` will become `https://auth.upsun.com/`. + +#### If I had a fixed organization (previously Platform.sh), will I be redirected to my organizations? +- Yes. You will be automatically redirected to the new console and can log in using the same credentials. + +#### Will I be able to switch if I have both fixed and flex organizations? +- Yes. You can navigate between organizations (fixed or flex) from a drop-down list. + +#### How will fixed vs flex be identifiable in the console? +- Organizations will have tags next to their names in the console. +- Organizations will also be categorized by organization type in the console. + +#### Will I be able to access fixed projects via the Upsun CLI? +- Correct. + +#### Will I still use the same configuration files for fixed projects? +- Correct. The same configuration file structures remain (`.platform.app.yaml`, `.platform/services.yaml`, `.platform/routes.yaml`, etc). + +#### Will mount differences still exist between fixed and flex after September? +- Yes. Waiting for git fixes to resolve this. + +#### Besides the name "Platform.sh" going away, will there be visual changes in the console? +- Yes. + - New way to create organizations (choose fixed or flex). + - Ability to navigate between organization types. + - **15-day free trial** for users creating Flex organizations. + +#### With a unified CLI, will there be a way to identify fixed vs flex in the project list? +- You will see a list of all organizations. +- There is no field in the CLI that explicitly identifies fixed vs flex.