From 0ccebeb48b9f2022e8abfa2434703964fde1a004 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Wed, 16 Jul 2025 16:00:46 +0100 Subject: [PATCH 1/5] feat: added new content added new content --- .../src/administration/organizations.md | 37 +++++++++++++++++++ .../upsun/src/administration/organizations.md | 36 ++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index a0f4cdae98..69061c9272 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -146,3 +146,40 @@ 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. + +### 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. + +### 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. + +## FAQs +### Will customers who have organizations in both fixed and flex still switch between two different consoles? +Correct, they will be able to select their organization (fixed or flex) from a drop-down. + +### How will fixed vs flex be identifiable in the console? +Organizations will have tags next to the names in the console. + +### Will customers with fixed projects be able to access them via the upsun cli tool? +Correct. + +### Will customers with fixed projects still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? +Correct. + +### Will mount differences still exist between fixed and flex after Sept? +Yes, waiting for the git fixes for this. + +### Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? +Org creation flow is being updated, free trial for only flex orgs, @Ndifreke @Miguel is there anything else? + +### Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? +Users have a list of all the organizations and right now there is no field for flex/fixed in the cli. + diff --git a/sites/upsun/src/administration/organizations.md b/sites/upsun/src/administration/organizations.md index ea12c5530b..649d5f7e1c 100644 --- a/sites/upsun/src/administration/organizations.md +++ b/sites/upsun/src/administration/organizations.md @@ -154,3 +154,39 @@ 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. + +### 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. + +### 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. + +## FAQs +### Will customers who have organizations in both fixed and flex still switch between two different consoles? +Correct, they will be able to select their organization (fixed or flex) from a drop-down. + +### How will fixed vs flex be identifiable in the console? +Organizations will have tags next to the names in the console. + +### Will customers with fixed projects be able to access them via the upsun cli tool? +Correct. + +### Will customers with fixed projects still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? +Correct. + +### Will mount differences still exist between fixed and flex after Sept? +Yes, waiting for the git fixes for this. + +### Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? +Org creation flow is being updated, free trial for only flex orgs, @Ndifreke @Miguel is there anything else? + +### Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? +Users have a list of all the organizations and right now there is no field for flex/fixed in the cli. From 2e1885c4657ff208c9ec5e32e808ba8f8e923e31 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 22 Aug 2025 09:50:35 +0100 Subject: [PATCH 2/5] feat: updated with more draft content added more draft content - to be adjusted later --- .../src/administration/organizations.md | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index 69061c9272..752f006a43 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -183,3 +183,74 @@ Org creation flow is being updated, free trial for only flex orgs, @Ndifreke @Mi ### Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? Users have a list of all the organizations and right now there is no field for flex/fixed in the cli. + + + + + + +This document provides content for new information to be displayed on Upsun docs and Platform.sh docs for fixed and flex org types as part of Brand Merger 2025. +What is happening? +As part of Brand Merger in Sep 2025, users will have the option to create either a fixed organization (currently known as PSH) or flex organization. + +Where should we reflect this update? +This requires a new section in: + https://docs.upsun.com/ particularly under this section: https://docs.upsun.com/administration/organizations.html +https://docs.platform.sh/ particularly under this section https://docs.platform.sh/administration/organizations.html +Potentially a new page? + +Content +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. + +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. + +What can the customer do? +When creating a new organization, users will have the option 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. + +More to follow: There will be a table in this section highlighting the feature differences between fixed and flex (WIP) + +Feature chart + +Flexible Resource Allocation +Flex: Users can customize resources per container (per app or service) for ALL environments. +Fixed: Resource from the plan is applied to the production environment. For preview, the user has the default small size for all containers. +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. You will be able to login using the same credentials. + +Will I be able to switch if I have both fixed and flex organizations? +Yes, you will be able to navigate between your 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 the names in the console. Organizations will also be categorized by organization types in console. + +Will I be able to access fixed projects via the upsun CLI? +Correct. + +WillI I be able to (with fixed projects) still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? +Correct. + +Will mount differences still exist between fixed and flex after Sept? +Yes, waiting for the git fixes for this. + +Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? +New way to create organizations ( either fixed or flex). +Be able to navigate between the two organization types. +15-day free trial for users creating flex organizations. + +Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? +You will have a list of all the organizations. There is no field for flex/fixed in the CLI. + + + From 9d2c051a6932a16fa751a39ad872a6e81235de32 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 22 Aug 2025 12:20:56 +0100 Subject: [PATCH 3/5] feat: added feature chart added feature chart to page --- .../src/administration/organizations.md | 217 +++++++++++------- .../upsun/src/administration/organizations.md | 152 ++++++++++-- 2 files changed, 257 insertions(+), 112 deletions(-) diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index 752f006a43..e019a867ce 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -153,104 +153,143 @@ Then open a [support ticket](/learn/overview/get-support.md) from the current or 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. -### 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. - -### 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. - -## FAQs -### Will customers who have organizations in both fixed and flex still switch between two different consoles? -Correct, they will be able to select their organization (fixed or flex) from a drop-down. - -### How will fixed vs flex be identifiable in the console? -Organizations will have tags next to the names in the console. - -### Will customers with fixed projects be able to access them via the upsun cli tool? -Correct. - -### Will customers with fixed projects still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? -Correct. - -### Will mount differences still exist between fixed and flex after Sept? -Yes, waiting for the git fixes for this. - -### Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? -Org creation flow is being updated, free trial for only flex orgs, @Ndifreke @Miguel is there anything else? - -### Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? -Users have a list of all the organizations and right now there is no field for flex/fixed in the cli. - - - - - +{{< 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. -This document provides content for new information to be displayed on Upsun docs and Platform.sh docs for fixed and flex org types as part of Brand Merger 2025. -What is happening? -As part of Brand Merger in Sep 2025, users will have the option to create either a fixed organization (currently known as PSH) or flex organization. +{{< /note >}} -Where should we reflect this update? -This requires a new section in: - https://docs.upsun.com/ particularly under this section: https://docs.upsun.com/administration/organizations.html -https://docs.platform.sh/ particularly under this section https://docs.platform.sh/administration/organizations.html -Potentially a new page? - -Content -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. - -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. - -What can the customer do? -When creating a new organization, users will have the option 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. - -More to follow: There will be a table in this section highlighting the feature differences between fixed and flex (WIP) - -Feature chart - -Flexible Resource Allocation -Flex: Users can customize resources per container (per app or service) for ALL environments. -Fixed: Resource from the plan is applied to the production environment. For preview, the user has the default small size for all containers. -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. You will be able to login using the same credentials. - -Will I be able to switch if I have both fixed and flex organizations? -Yes, you will be able to navigate between your organizations (fixed or flex) from a drop-down list. +### 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. -How will fixed vs flex be identifiable in the console? -Organizations will have tags next to the names in the console. Organizations will also be categorized by organization types in console. +{{< note theme="info" title="Flex resources">}} -Will I be able to access fixed projects via the upsun CLI? -Correct. +**Flex:** Users can customize resources per container (per app or service) for **all** environments. -WillI I be able to (with fixed projects) still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? -Correct. +{{< /note >}} -Will mount differences still exist between fixed and flex after Sept? -Yes, waiting for the git fixes for this. +### 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. -Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? -New way to create organizations ( either fixed or flex). -Be able to navigate between the two organization types. -15-day free trial for users creating flex organizations. +### 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? (To be announced soon) | +| 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 | + +#### Use cases + +| **Scenario** | **Upsun Fixed** | **Upsun Flex** | +|--------------|-----------------|----------------| +| Standard (single) app with few services, monolithic | All that is on fixed + (below) | | +| Multi-app, more services | Can be used | Best option | +| Decoupled CMS, eCommerce | Can be used | Best option | + +### 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. -Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? -You will have a list of all the organizations. There is no field for flex/fixed in the CLI. diff --git a/sites/upsun/src/administration/organizations.md b/sites/upsun/src/administration/organizations.md index 649d5f7e1c..d3f85f6453 100644 --- a/sites/upsun/src/administration/organizations.md +++ b/sites/upsun/src/administration/organizations.md @@ -152,8 +152,7 @@ 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 @@ -161,32 +160,139 @@ Then open a [support ticket](/learn/overview/get-support.md) from the current or 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. -### 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="note" title="Fixed resources">}} -### 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. +**Fixed:** Resource from the plan is applied to the production environment. For preview, the user has the default small size for all containers. -## FAQs -### Will customers who have organizations in both fixed and flex still switch between two different consoles? -Correct, they will be able to select their organization (fixed or flex) from a drop-down. +{{< /note >}} -### How will fixed vs flex be identifiable in the console? -Organizations will have tags next to the names in the console. +### 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. -### Will customers with fixed projects be able to access them via the upsun cli tool? -Correct. +{{< note theme="info" title="Flex resources">}} -### Will customers with fixed projects still use the same configuration files and configuration file structures (ie .platform.app.yaml, .platform/services.yaml, .platform/routes.yaml, etc? -Correct. +**Flex:** Users can customize resources per container (per app or service) for **all** environments. -### Will mount differences still exist between fixed and flex after Sept? -Yes, waiting for the git fixes for this. +{{< /note >}} -### Beyond the name “platform.sh” going away in console, are there other visual changes in the fixed console that will be different than it is today? -Org creation flow is being updated, free trial for only flex orgs, @Ndifreke @Miguel is there anything else? +### 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. -### Assuming a unified CLI, will there be a new field when viewing a project list to identify fixed vs flex? -Users have a list of all the organizations and right now there is no field for flex/fixed in the cli. +### 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? (To be announced soon) | +| 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 | + +#### Use cases + +| **Scenario** | **Upsun Fixed** | **Upsun Flex** | +|--------------|-----------------|----------------| +| Standard (single) app with few services, monolithic | All that is on fixed + (below) | | +| Multi-app, more services | Can be used | Best option | +| Decoupled CMS, eCommerce | Can be used | Best option | + +### 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. From 2538f8e5f86495e28d97e54206da842640023c29 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 22 Aug 2025 13:05:37 +0100 Subject: [PATCH 4/5] feat: removed question mark still need to figure out whether Fastly WAF is part of Flex org for this table --- sites/platform/src/administration/organizations.md | 2 +- sites/upsun/src/administration/organizations.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index e019a867ce..35151f6c84 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -227,7 +227,7 @@ When creating a new organization, users will be able to select the organization | 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? (To be announced soon) | +| Fastly WAF | Enterprise & Elite only as add-on | Yes, with add-on | | Upsun WAF | Enterprise and Elite only | Yes | #### Billing diff --git a/sites/upsun/src/administration/organizations.md b/sites/upsun/src/administration/organizations.md index d3f85f6453..5179475d26 100644 --- a/sites/upsun/src/administration/organizations.md +++ b/sites/upsun/src/administration/organizations.md @@ -234,7 +234,7 @@ When creating a new organization, users will be able to select the organization | 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? (To be announced soon) | +| Fastly WAF | Enterprise & Elite only as add-on | Yes, with add-on | | Upsun WAF | Enterprise and Elite only | Yes | #### Billing From 7898556fb7653de8adc709ced6740a7b7907e455 Mon Sep 17 00:00:00 2001 From: Kemi-Elizabeth <97071326+Kemi-Elizabeth@users.noreply.github.com> Date: Fri, 22 Aug 2025 15:10:17 +0100 Subject: [PATCH 5/5] feat: removed use cases removed use cases table --- sites/platform/src/administration/organizations.md | 8 -------- sites/upsun/src/administration/organizations.md | 8 -------- 2 files changed, 16 deletions(-) diff --git a/sites/platform/src/administration/organizations.md b/sites/platform/src/administration/organizations.md index 35151f6c84..87246f1c8c 100644 --- a/sites/platform/src/administration/organizations.md +++ b/sites/platform/src/administration/organizations.md @@ -248,14 +248,6 @@ When creating a new organization, users will be able to select the organization | PCI DSS Level 1-compatible | Yes | Yes | | HIPAA | Enterprise and Elite only in specific regions | Coming soon | -#### Use cases - -| **Scenario** | **Upsun Fixed** | **Upsun Flex** | -|--------------|-----------------|----------------| -| Standard (single) app with few services, monolithic | All that is on fixed + (below) | | -| Multi-app, more services | Can be used | Best option | -| Decoupled CMS, eCommerce | Can be used | Best option | - ### Fixed and Flex FAQs #### What happens to my URL? diff --git a/sites/upsun/src/administration/organizations.md b/sites/upsun/src/administration/organizations.md index 5179475d26..d861c2c6c1 100644 --- a/sites/upsun/src/administration/organizations.md +++ b/sites/upsun/src/administration/organizations.md @@ -255,14 +255,6 @@ When creating a new organization, users will be able to select the organization | PCI DSS Level 1-compatible | Yes | Yes | | HIPAA | Enterprise and Elite only in specific regions | Coming soon | -#### Use cases - -| **Scenario** | **Upsun Fixed** | **Upsun Flex** | -|--------------|-----------------|----------------| -| Standard (single) app with few services, monolithic | All that is on fixed + (below) | | -| Multi-app, more services | Can be used | Best option | -| Decoupled CMS, eCommerce | Can be used | Best option | - ### Fixed and Flex FAQs #### What happens to my URL?