Merge efd964e into 206a55d

docs/account-management/billing-overview.md

@@ -6,15 +6,13 @@ Description: This page explains billing details for Semaphore and provides infor
 
 Semaphore Cloud offers flexible pricing plans that allow you to choose the resources you need to power your CI/CD solution. With no limits on the number of seats, machine minutes, or artifacts you use, you can easily scale your setup as your team grows.
 
-Each plan comes with a monthly subscription cost and includes access to all the basic resources you need. Any additional costs, such as extra machine time, storage and egress, seats, or add-ons, will be calculated daily and added to your monthly bill.
-
 ## How Spending is Calculated
 
 In addition to subscription cost, your monthly bill is determined by your usage of the following four groups of resources:
 
-- **Machine Time** - the cost of using Semaphore Cloud machines or self-hosted agents (calculated by the minute)
+- **Machine Time** - the cost of using Semaphore Cloud machines (calculated by the minute)
 - **Storage and Egress** - the cost of storing and downloading your build artifacts
-- **Seats** - the cost of additional team members using Semaphore
+- **Seats** - the cost of additional team members using Semaphore (charged only on Hybrid plans)
 - **Add-ons** - additional features or services offered by Semaphore Cloud (e.g. priority support, a dedicated cache server)
 
 You can monitor your monthly spending at any time on the Plans & Billing page within the app. Please note that spending data may take up to 24 hours to update.
@@ -39,12 +37,7 @@ Each cloud machine type has its own **price per minute**, listed in the table be
 
 #### Self-hosted agents spending
 
-[Self-hosted agents](/ci-cd-environment/self-hosted-agents-overview/) are only available on certain plans, and each plan is allotted a certain amount of free minutes per month:
-
-- **Startup plan** - 60,000 minutes
-- **Scaleup plan** - 180,000 minutes
-
-For any usage that exceeds these allotted minutes, there is an additional charge of **$0.0005 per minute**.
+[Self-hosted agents](/ci-cd-environment/self-hosted-agents-overview/) are only available on Hybrid plans, and are not additionally charged in any way.
 
 #### Monitoring and optimizing machine spending
 
@@ -114,6 +107,7 @@ To ensure that you are not generating unnecessary traffic, make sure to:
 - Don’t use artifacts to store and pull large Docker images (if you are on our _Enterprise plan_ ask our support team about the Semaphore Private Docker registry)
 
 ### Seats
+Seats are only charged in Hybrid plans and do not accumulate any charges in Cloud plans.
 
 Seats are calculated by aggregating all unique organization members and non-members during a billing period. Members are unique users who were assigned a role in the Semaphore organization and non-members are unique users who haven't been assigned a role but have triggered Semaphore builds through git commits.
 
@@ -139,14 +133,4 @@ Semaphore offers add-ons for Startup and Scaleup plans to enhance your CI/CD exp
 - **Dedicated Container Registry** - Offers 400 GB of storage with 10 Gb/s network (improving the speed of your Docker-based builds by storing your images in the same infrastructure that your jobs run on) cost: **$400,00 per month**
 - **Advanced & Premium Support** - Enhances your technical and account support with options for **24x5** and **24x7 SLA** along with additional benefits
 
-The cost of any enabled add-ons will be automatically added to your monthly bill at the start of each billing period.
-
-For more information on available add-ons and how to enable them, please visit our [add-ons page](/account-management/add-ons/).
-
-## See also
-
-- [Billing FAQ](/account-management/billing-faq/)
-- [Free and OpenSource plans](/account-management/free-and-open-source-plans/)
-- [Startup plan](/account-management/startup-plan/)
-- [Scaleup plan](/account-management/scaleup-plan/)
-- [Legacy plans](/account-management/legacy-plans/)
+The cost of any enabled add-ons will be automatically added to your monthly bill at the start of each billing period.

docs/ci-cd-environment/aws-support.md

@@ -4,8 +4,6 @@ Description: This guide describes how to set up a fleet of self-hosted agents in
 
 # AWS support
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 If you intend to run your agents on AWS, the [agent-aws-stack][agent-aws-stack] can help you deploy an auto-scaling fleet of agents on your AWS account.
 
 ## Features

docs/ci-cd-environment/configure-self-hosted-agent.md

@@ -4,7 +4,7 @@ Description: This guide describes the various different configuration options fo
 
 # Configuring a self-hosted agent
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 An agent can be configured in three ways:
 

docs/ci-cd-environment/install-self-hosted-agent.md

@@ -4,7 +4,7 @@ Description: This guide describes how to install a self-hosted agent on various
 
 # Installing a self-hosted agent
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 The Semaphore agent is open source and can be found [here][agent repo]. Before installing it on your machine, you need to make sure the following requirements are also available:
 

docs/ci-cd-environment/job-environment.md

@@ -4,7 +4,7 @@ Description: This guide describes how commands in a job are executed and how job
 
 # Job environment
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 The commands in a job are executed differently depending on the operating system where the Semaphore agent is running:
 

docs/ci-cd-environment/kubernetes-support.md

@@ -4,7 +4,7 @@ Description: This guide describes how to set up a fleet of self-hosted agents in
 
 # Kubernetes support
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 If you intend to run your agents on a Kubernetes cluster, the Semaphore custom controller Helm chart provided [here][helm-charts] can help you deploy an on-demand fleet of agents on your Kubernetes cluster.
 

docs/ci-cd-environment/machine-types.md

@@ -33,8 +33,6 @@ Implementation details:
 
 ### E2 Generation
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 The `e2` series machines offer a balance of compute, memory, and cost. It is a good choice for most applications.
 
 | Machine name  | Virtual CPUs <sup>1</sup> | Memory <sup>2</sup> | Disk <sup>3</sup> |
@@ -50,8 +48,6 @@ Implementation details:
 
 ### F1 Generation
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 The `f1` series machines are built for compute-intensive jobs. These machines deliver the highest performance.
 
 | Machine name  | Virtual CPUs <sup>1</sup> | Memory <sup>2</sup> | Disk <sup>3</sup> |
@@ -67,8 +63,6 @@ Implementation details:
 
 ### R1 Generation
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 !!! warning "`r1` machines are currently in the Technical Preview stage. If you're interested in trying them out, please contact our support team."
 
 The `r1` series machines are built on ARM architecture.

docs/ci-cd-environment/self-hosted-agent-types.md

@@ -4,7 +4,7 @@ Description: This guide describes how to create and use a self-hosted agent type
 
 # Using self-hosted agent types
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 Before running and using self-hosted agents in your pipelines, you need to register a new agent type in your organization.
 

docs/ci-cd-environment/self-hosted-agents-overview.md

@@ -4,7 +4,7 @@ Description: This guide gives a brief overview of self-hosted agents and how the
 
 # Self-hosted agents overview
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 Semaphore allows you to run your jobs in an environment which is controlled by your team. This is achieved through the use of self-hosted agents. Additionally, compared to a hosted platform, self-hosted agents offer more control over hardware, operating system versions, and the available software. This is benefitial because you can run the agents anywhere you want: physical or virtual machines, containers, or in the cloud.
 

docs/ci-cd-environment/set-up-caching-on-aws-s3.md

@@ -4,7 +4,7 @@ Description: This guide describes how to set up the cache CLI to work with an AW
 
 # Setting up caching with AWS S3
 
-!!! plans "Available on: <span class="plans-box">[Free & OS](/account-management/discounts/)</span> <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
+!!! plans "Available on: <span class="plans-box">[Startup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span> <span class="plans-box">[Scaleup - Hybrid]([/account-management/discounts/](https://semaphoreci.com/pricing))</span>"
 
 When running a Semaphore agent in a self-hosted environment, cache storage in hosted jobs is not available. However, you can use an AWS S3 bucket to store our cache dependencies instead. In order to do so, the cache CLI needs access to perform a few actions on an S3 bucket in your AWS account.
 

docs/ci-cd-environment/ubuntu-22.04-arm-image.md

@@ -4,8 +4,6 @@ Description: The ubuntu2204 ARM image is a customized image based on Ubuntu 22.0
 
 # Ubuntu 22.04 ARM Image
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 !!! warning "The `ubuntu2204` ARM image is in the Technical Preview stage. Documentation and the image itself are subject to change."
 
 The `ubuntu2204` ARM image is a customized image based on [Ubuntu 22.04 LTS](https://wiki.ubuntu.com/JammyJellyfish/ReleaseNotes), which has been

docs/essentials/deployment-targets.md

@@ -4,8 +4,6 @@ Description: Extend your Continuous Deployment process with access control, conf
 
 # Deployment Targets
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 **Deployment Targets** allow you to apply strict conditions for who can start individual pipelines and under which conditions. 
 Using them, you have the ability to control who has the ability to start specific promoted pipelines
 or select git references (branches and tags). 

docs/essentials/flaky-tests.md

@@ -3,8 +3,6 @@ Description: Flaky tests on Semaphore are tests which have different states with
 ---
 # Flaky Tests
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 Flaky test detection helps identify and manage unreliable tests in a test suite.
 By detecting flaky tests, development teams can take specific actions to address
 these issues and improve the overall reliability of their testing pipeline.

docs/essentials/parameterized-promotions.md

@@ -4,8 +4,6 @@ Description: Use parameterized promotions to improve code reusability and to dyn
 
 # Parameterized Promotions
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 The **parameterized promotions** feature allows users to pass parameters to promotion
 pipelines. You can do this either via a form in the UI,
 via the Semaphore API, or on auto-promotions by setting up default values.

docs/essentials/using-secrets.md

@@ -32,8 +32,6 @@ Likewise, restricting debug jobs will prevent unauthorized users from starting a
 
 ### Project-level secrets
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 Project-level secrets are a feature available to organizations on 
 the Startup plan or higher. 
 These secrets are intended to securely store sensitive information, 

docs/score/custom-dashboards.md

@@ -3,8 +3,6 @@ Description: A Custom Dashboard can be created for the purpose of viewing your p
 ---
 # Custom Dashboards
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 Custom Dashboards allow you to create your own visualization of your project's metrics.
 You can add any metric available on the Insights page to your Dashboard.
 

docs/score/organization-health.md

@@ -4,8 +4,6 @@ Description: Organization Health shows an aggregation of your organization's met
 
 # Organization Health
 
-!!! plans "Available on: <span class="plans-box">Scaleup</span>"
-
 Organization Health provides an overview of all your project metrics in one place. For example,
 you can see the lowest-performing projects for the last 30 days, which can help you spot potential problems and
 find optimization opportunities across your organization.

docs/score/project-insights.md

@@ -3,8 +3,6 @@ Description: Project Insights are a set of metrics that provide a granular view
 ---
 # Project Insights
 
-!!! plans "Available on: <span class="plans-box">Startup</span> <span class="plans-box">Scaleup</span>"
-
 Project Insights provide metrics about your projects' development performance, speed, and reliability. For example, you can
 see the percentage of passed tests for the last few days in the whole project or your main branch.
 

mkdocs.yml

@@ -205,14 +205,8 @@ nav:
     - Semaphore Changelog: reference/semaphore-changelog.md
     - Glossary: reference/glossary.md
   - Account Management:
-    - Plans & Billing:
-      - Billing Overview: account-management/billing-overview.md
-      - Billing FAQ: account-management/billing-faq.md
-      - Free and Open Source: account-management/free-and-open-source-plans.md
-      - Startup plan: account-management/startup-plan.md
-      - Scaleup plan: account-management/scaleup-plan.md
-      - Legacy plans: account-management/legacy-plans.md
-      - Add-ons: account-management/add-ons.md
+    - Billing Overview: account-management/billing-overview.md
+    - Billing FAQ: account-management/billing-faq.md
     - Organizations: account-management/organizations.md
     - Permission levels: account-management/permission-levels.md
     - Connecting GitHub with Semaphore: account-management/connecting-github-and-semaphore.md