diff --git a/_partials/_aws-features.md b/_partials/_aws-features.md
index 450d6c759a..1d6888439a 100644
--- a/_partials/_aws-features.md
+++ b/_partials/_aws-features.md
@@ -1,63 +1,60 @@
The available $PRICING_PLANs are:
-* **Free**: for small non-production projects.
* **$PERFORMANCE**: for cost-focused, smaller projects. No credit card required to start.
* **$SCALE**: for developers handling critical and demanding apps.
* **$ENTERPRISE**: for enterprises with mission-critical apps.
-
-
The features included in each [$PRICING_PLAN][pricing-plans] are:
-| Feature | Free | $PERFORMANCE | $SCALE | $ENTERPRISE |
-|---------------------------------------------------------------|-----------------------------------|----------------------------------------|------------------------------------------------|--------------------------------------------------|
-| **Compute and storage** | | | | |
-| Number of $SERVICE_SHORTs | Up to 2 free services | Up to 2 free and 4 standard services | Up to 2 free and and unlimited standard services | Up to 2 free and and unlimited standard services |
-| CPU limit per $SERVICE_SHORT | Shared | Up to 8 CPU | Up to 32 CPU | Up to 64 CPU |
-| Memory limit per $SERVICE_SHORT | Shared | Up to 32 GB | Up to 128 GB | Up to 256 GB |
-| Storage limit per $SERVICE_SHORT | 750 MB | Up to 16 TB | Up to 16 TB | Up to 64 TB |
-| Bottomless storage on S3 | | | Unlimited | Unlimited |
-| Independently scale compute and storage | | Standard services only | Standard services only | Standard services only |
-| **Data services and workloads** | | | |
-| Relational | ✓ | ✓ | ✓ | ✓ |
-| Time-series | ✓ | ✓ | ✓ | ✓ |
-| Vector search | ✓ | ✓ | ✓ | ✓ |
-| AI workflows (coming soon) | ✓ | ✓ | ✓ | ✓ |
-| Cloud SQL editor | 3 seats | 3 seats | 10 seats | 20 seats |
-| Charts | ✓ | ✓ | ✓ | ✓ |
-| Dashboards | | 2 | Unlimited | Unlimited |
-| **Storage and performance** | | | | |
-| IOPS | Shared | 3,000 - 5,000 | 5,000 - 8,000 | 5,000 - 8,000 |
-| Bandwidth (autoscales) | Shared | 125 - 250 Mbps | 250 - 500 Mbps | Up to 500 mbps |
-| I/O boost | | | Add-on:
Up to 16K IOPS, 1000 Mbps BW | Add-on:
Up to 32K IOPS, 4000 Mbps BW |
-| **Availability and monitoring** | | | | |
-| High-availability replicas
(Automated multi-AZ failover) | | ✓ | ✓ | ✓ |
-| Read replicas | | | ✓ | ✓ |
-| Cross-region backup | | | | ✓ |
-| Backup reports | | | 14 days | 14 days |
-| Point-in-time recovery and forking | 1 day | 3 days | 14 days | 14 days |
-| Performance insights | Limited | ✓ | ✓ | ✓ |
-| Metrics and log exporters | | | ✓ | ✓ |
-| **Security and compliance** | | | | |
-| Role-based access | ✓ | ✓ | ✓ | ✓ |
-| End-to-end encryption | ✓ | ✓ | ✓ | ✓ |
-| Private Networking (VPC) | | 1 multi-attach VPC | Unlimited multi-attach VPCs | Unlimited multi-attach VPCs |
-| AWS Transit Gateway | | | ✓ | ✓ |
-| [HIPAA compliance][hipaa-compliance] | | | | ✓ |
-| IP address allow list | 1 list with up to 10 IP addresses | 1 list with up to 10 IP addresses | Up to 10 lists with up to 10 IP addresses each | Up to 10 lists with up to 100 IP addresses each |
-| Multi-factor authentication | ✓ | ✓ | ✓ | ✓ |
-| Federated authentication (SAML) | | | | ✓ |
-| SOC 2 Type 2 report | | | ✓ | ✓ |
-| Penetration testing report | | | | ✓ |
-| Security questionnaire and review | | | | ✓ |
-| Pay by invoice | | Available at minimum spend | Available at minimum spend | ✓ |
-| [Uptime SLAs][commercial-sla] | | Standard | Standard | Enterprise |
-| **Support and technical services** | | | | |
-| Community support | ✓ | ✓ | ✓ | ✓ |
-| Email support | | ✓ | ✓ | ✓ |
-| Production support | | Add-on | Add-on | ✓ |
-| Named account manager | | | | ✓ |
-| JOIN services (Jumpstart Onboarding and INtegration) | | | Available at minimum spend | ✓ |
+| Feature | $PERFORMANCE | $SCALE | $ENTERPRISE |
+|---------------------------------------------------------------|----------------------------------------|------------------------------------------------|--------------------------------------------------|
+| **Compute and storage** | | | |
+| Number of $SERVICE_SHORTs | Up to 2 free and 4 standard services | Up to 2 free and and unlimited standard services | Up to 2 free and and unlimited standard services |
+| CPU limit per $SERVICE_SHORT | Up to 8 CPU | Up to 32 CPU | Up to 64 CPU |
+| Memory limit per $SERVICE_SHORT | Up to 32 GB | Up to 128 GB | Up to 256 GB |
+| Storage limit per $SERVICE_SHORT | Up to 16 TB | Up to 16 TB | Up to 64 TB |
+| Bottomless storage on S3 | | Unlimited | Unlimited |
+| Independently scale compute and storage | Standard services only | Standard services only | Standard services only |
+| **Data services and workloads** | | | |
+| Relational | ✓ | ✓ | ✓ |
+| Time-series | ✓ | ✓ | ✓ |
+| Vector search | ✓ | ✓ | ✓ |
+| AI workflows (coming soon) | ✓ | ✓ | ✓ |
+| Cloud SQL editor | 3 seats | 10 seats | 20 seats |
+| Charts | ✓ | ✓ | ✓ |
+| Dashboards | 2 | Unlimited | Unlimited |
+| **Storage and performance** | | | |
+| IOPS | 3,000 - 5,000 | 5,000 - 8,000 | 5,000 - 8,000 |
+| Bandwidth (autoscales) | 125 - 250 Mbps | 250 - 500 Mbps | Up to 500 mbps |
+| I/O boost | | Add-on:
Up to 16K IOPS, 1000 Mbps BW | Add-on:
Up to 32K IOPS, 4000 Mbps BW |
+| **Availability and monitoring** | | | |
+| High-availability replicas
(Automated multi-AZ failover) | ✓ | ✓ | ✓ |
+| Read replicas | | ✓ | ✓ |
+| Cross-region backup | | | ✓ |
+| Backup reports | | 14 days | 14 days |
+| Point-in-time recovery and forking | 3 days | 14 days | 14 days |
+| Performance insights | ✓ | ✓ | ✓ |
+| Metrics and log exporters | | ✓ | ✓ |
+| **Security and compliance** | | | |
+| Role-based access | ✓ | ✓ | ✓ |
+| End-to-end encryption | ✓ | ✓ | ✓ |
+| Private Networking (VPC) | 1 multi-attach VPC | Unlimited multi-attach VPCs | Unlimited multi-attach VPCs |
+| AWS Transit Gateway | | ✓ | ✓ |
+| [HIPAA compliance][hipaa-compliance] | | | ✓ |
+| IP address allow list | 1 list with up to 10 IP addresses | Up to 10 lists with up to 10 IP addresses each | Up to 10 lists with up to 100 IP addresses each |
+| Multi-factor authentication | ✓ | ✓ | ✓ |
+| Federated authentication (SAML) | | | ✓ |
+| SOC 2 Type 2 report | | ✓ | ✓ |
+| Penetration testing report | | | ✓ |
+| Security questionnaire and review | | | ✓ |
+| Pay by invoice | Available at minimum spend | Available at minimum spend | ✓ |
+| [Uptime SLAs][commercial-sla] | Standard | Standard | Enterprise |
+| **Support and technical services** | | | |
+| Community support | ✓ | ✓ | ✓ |
+| Email support | ✓ | ✓ | ✓ |
+| Production support | Add-on | Add-on | ✓ |
+| Named account manager | | | ✓ |
+| JOIN services (Jumpstart Onboarding and INtegration) | | Available at minimum spend | ✓ |
For a personalized quote, [get in touch with $COMPANY][contact-company].
diff --git a/_partials/_azure-features.md b/_partials/_azure-features.md
index 073d33109a..5023a4b8eb 100644
--- a/_partials/_azure-features.md
+++ b/_partials/_azure-features.md
@@ -1,60 +1,57 @@
The available $PRICING_PLANs are:
-* **Free**: for small non-production projects.
* **$PERFORMANCE**: for cost-focused, smaller projects. No credit card required to start.
* **$SCALE**: for developers handling critical and demanding apps.
* **$ENTERPRISE**: for enterprises with mission-critical apps.
-
-
The features included in each [$PRICING_PLAN][pricing-plans] are:
-| Feature | Free | $PERFORMANCE | $SCALE | $ENTERPRISE |
-|---------------------------------------------------------------|-----------------------------------|----------------------------------------|------------------------------------------------|--------------------------------------------------|
-| **Compute and storage** | | | | |
-| Number of $SERVICE_SHORTs | Up to 2 free services | Up to 2 free and 4 standard services | Up to 2 free and and unlimited standard services | Up to 2 free and and unlimited standard services |
-| CPU limit per $SERVICE_SHORT | Shared | Up to 8 CPU | Up to 32 CPU | Up to 64 CPU |
-| Memory limit per $SERVICE_SHORT | Shared | Up to 32 GB | Up to 128 GB | Up to 256 GB |
-| Storage limit per $SERVICE_SHORT | 750 MB | Up to 16 TB | Up to 16 TB | Up to 16 TB |
-| Bottomless blob storage | | | Unlimited | Unlimited |
-| Independently scale compute and storage | | Standard services only | Standard services only | Standard services only |
-| **Data services and workloads** | | | |
-| Relational | ✓ | ✓ | ✓ | ✓ |
-| Time-series | ✓ | ✓ | ✓ | ✓ |
-| Vector search | ✓ | ✓ | ✓ | ✓ |
-| AI workflows (coming soon) | ✓ | ✓ | ✓ | ✓ |
-| Cloud SQL editor | 3 seats | 3 seats | 10 seats | 20 seats |
-| Charts | ✓ | ✓ | ✓ | ✓ |
-| Dashboards | | 2 | Unlimited | Unlimited |
-| **Storage and performance** | | | | |
-| IOPS | Shared | 3,000 - 5,000 | 5,000 - 8,000 | 5,000 - 8,000 |
-| Bandwidth (autoscales) | Shared | 125 - 250 Mbps | 250 - 500 Mbps | Up to 500 mbps |
-| I/O boost | | | Add-on:
Up to 16K IOPS, 1000 Mbps BW | Add-on:
Up to 16K IOPS, 1000 Mbps BW |
-| **Availability and monitoring** | | | | |
-| High-availability replicas
(Automated multi-AZ failover) | | ✓ | ✓ | ✓ |
-| Read replicas | | | ✓ | ✓ |
-| Backup reports | | | 14 days | 14 days |
-| Point-in-time recovery and forking | 1 day | 3 days | 14 days | 14 days |
-| Performance insights | Limited | ✓ | ✓ | ✓ |
-| Metrics and log exporters | | | ✓ | ✓ |
-| **Security and compliance** | | | | |
-| Role-based access | ✓ | ✓ | ✓ | ✓ |
-| End-to-end encryption | ✓ | ✓ | ✓ | ✓ |
-| [HIPAA compliance][hipaa-compliance] | | | | ✓ |
-| IP address allow list | 1 list with up to 10 IP addresses | 1 list with up to 10 IP addresses | Up to 10 lists with up to 10 IP addresses each | Up to 10 lists with up to 100 IP addresses each |
-| Multi-factor authentication | ✓ | ✓ | ✓ | ✓ |
-| Federated authentication (SAML) | | | | ✓ |
-| SOC 2 Type 2 report | | | ✓ | ✓ |
-| Penetration testing report | | | | ✓ |
-| Security questionnaire and review | | | | ✓ |
-| Pay by invoice | | Available at minimum spend | Available at minimum spend | ✓ |
-| [Uptime SLAs][commercial-sla] | | Standard | Standard | Enterprise |
-| **Support and technical services** | | | | |
-| Community support | ✓ | ✓ | ✓ | ✓ |
-| Email support | | ✓ | ✓ | ✓ |
-| Production support | | Add-on | Add-on | ✓ |
-| Named account manager | | | | ✓ |
-| JOIN services (Jumpstart Onboarding and INtegration) | | | Available at minimum spend | ✓ |
+| Feature | $PERFORMANCE | $SCALE | $ENTERPRISE |
+|---------------------------------------------------------------|----------------------------------------|------------------------------------------------|--------------------------------------------------|
+| **Compute and storage** | | | |
+| Number of $SERVICE_SHORTs | Up to 2 free and 4 standard services | Up to 2 free and and unlimited standard services | Up to 2 free and and unlimited standard services |
+| CPU limit per $SERVICE_SHORT | Up to 8 CPU | Up to 32 CPU | Up to 64 CPU |
+| Memory limit per $SERVICE_SHORT | Up to 32 GB | Up to 128 GB | Up to 256 GB |
+| Storage limit per $SERVICE_SHORT | Up to 16 TB | Up to 16 TB | Up to 16 TB |
+| Bottomless blob storage | | Unlimited | Unlimited |
+| Independently scale compute and storage | Standard services only | Standard services only | Standard services only |
+| **Data services and workloads** | | | |
+| Relational | ✓ | ✓ | ✓ |
+| Time-series | ✓ | ✓ | ✓ |
+| Vector search | ✓ | ✓ | ✓ |
+| AI workflows (coming soon) | ✓ | ✓ | ✓ |
+| Cloud SQL editor | 3 seats | 10 seats | 20 seats |
+| Charts | ✓ | ✓ | ✓ |
+| Dashboards | 2 | Unlimited | Unlimited |
+| **Storage and performance** | | | |
+| IOPS | 3,000 - 5,000 | 5,000 - 8,000 | 5,000 - 8,000 |
+| Bandwidth (autoscales) | 125 - 250 Mbps | 250 - 500 Mbps | Up to 500 mbps |
+| I/O boost | | Add-on:
Up to 16K IOPS, 1000 Mbps BW | Add-on:
Up to 16K IOPS, 1000 Mbps BW |
+| **Availability and monitoring** | | | |
+| High-availability replicas
(Automated multi-AZ failover) | ✓ | ✓ | ✓ |
+| Read replicas | | ✓ | ✓ |
+| Backup reports | | 14 days | 14 days |
+| Point-in-time recovery and forking | 3 days | 14 days | 14 days |
+| Performance insights | ✓ | ✓ | ✓ |
+| Metrics and log exporters | | ✓ | ✓ |
+| **Security and compliance** | | | |
+| Role-based access | ✓ | ✓ | ✓ |
+| End-to-end encryption | ✓ | ✓ | ✓ |
+| [HIPAA compliance][hipaa-compliance] | | | ✓ |
+| IP address allow list | 1 list with up to 10 IP addresses | Up to 10 lists with up to 10 IP addresses each | Up to 10 lists with up to 100 IP addresses each |
+| Multi-factor authentication | ✓ | ✓ | ✓ |
+| Federated authentication (SAML) | | | ✓ |
+| SOC 2 Type 2 report | | ✓ | ✓ |
+| Penetration testing report | | | ✓ |
+| Security questionnaire and review | | | ✓ |
+| Pay by invoice | Available at minimum spend | Available at minimum spend | ✓ |
+| [Uptime SLAs][commercial-sla] | Standard | Standard | Enterprise |
+| **Support and technical services** | | | |
+| Community support | ✓ | ✓ | ✓ |
+| Email support | ✓ | ✓ | ✓ |
+| Production support | Add-on | Add-on | ✓ |
+| Named account manager | | | ✓ |
+| JOIN services (Jumpstart Onboarding and INtegration) | | Available at minimum spend | ✓ |
For a personalized quote, [get in touch with $COMPANY][contact-company].
diff --git a/_partials/_billing-for-inactive-services.md b/_partials/_billing-for-inactive-services.md
index 3a14272bf3..d1c093bc93 100644
--- a/_partials/_billing-for-inactive-services.md
+++ b/_partials/_billing-for-inactive-services.md
@@ -1,5 +1,5 @@
-You are charged for all active $SERVICE_SHORTs in your account, even if you are not actively using them. To reduce costs, pause or delete your unused $SERVICE_SHORTs.
+You are charged for all active standard $SERVICE_SHORTs in your account, even if you are not actively using them. To reduce costs, pause or delete your unused $SERVICE_SHORTs.
\ No newline at end of file
diff --git a/_partials/_cloud-connect-service.md b/_partials/_cloud-connect-service.md
index 54cfa6378c..604aefbd1b 100644
--- a/_partials/_cloud-connect-service.md
+++ b/_partials/_cloud-connect-service.md
@@ -1,5 +1,3 @@
-import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-free-plan.mdx";
-
1. **Check your $SERVICE_SHORT is running correctly**
@@ -16,8 +14,6 @@ import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-fre
-
-
1. In $CONSOLE, toggle `Data view`.
diff --git a/_partials/_cloud-free-trial.md b/_partials/_cloud-free-trial.md
index e7901966d2..e3621ec279 100644
--- a/_partials/_cloud-free-trial.md
+++ b/_partials/_cloud-free-trial.md
@@ -1,13 +1,11 @@
import FreeBeta from "versionContent/_partials/_free-plan-beta.mdx";
-Are you just starting out with $CLOUD_LONG? On our Free pricing plan, you can create up to 2 zero-cost $SERVICE_SHORTs with [limited resources][plan-features]. When a free $SERVICE_SHORT reaches the resource limit, it converts to a read-only state.
-
-
-
-Ready to try a more feature-rich paid plan? Activate a 30-day free trial of our $PERFORMANCE (no credit card required) or $SCALE plan. After your trial ends, we may remove your data unless you’ve added a payment method.
+Are you just starting out with $CLOUD_LONG? Activate a 30-day free trial of our $PERFORMANCE (no credit card required) or $SCALE plan. After your trial ends, we may remove your data unless you’ve added a payment method.
After you have completed your 30-day trial period, choose the
-[$PRICING_PLAN][plan-features] that suits your business and engineering needs. And even when you upgrade from the Free pricing plan, you can still have up to 2 zero-cost $SERVICE_SHORTs—or convert the ones you already have into standard ones, to have more resources.
+[$PRICING_PLAN][plan-features] that suits your business and engineering needs. And even when you upgrade from the trial, you can still have up to 2 free $SERVICE_SHORTs.
+
+
If you want to try out features in a higher $PRICING_PLAN before upgrading, contact us.
diff --git a/_partials/_devops-cli-get-started.md b/_partials/_devops-cli-get-started.md
index ba46ba0d45..36c52e7d91 100644
--- a/_partials/_devops-cli-get-started.md
+++ b/_partials/_devops-cli-get-started.md
@@ -1,6 +1,7 @@
import RESTPrereqs from "versionContent/_partials/_prereqs-cloud-account-only.mdx";
import CLIINSTALL from "versionContent/_partials/_devops-cli-install.mdx";
import CLIREF from "versionContent/_partials/_devops-cli-reference.mdx";
+import FreeBeta from "versionContent/_partials/_free-plan-beta.mdx";
$CLI_LONG is a command-line interface that you use to manage $CLOUD_LONG resources
including VPCs, services, read replicas, and related infrastructure. $CLI_LONG calls $REST_LONG to communicate with
@@ -31,19 +32,17 @@ Create a new $SERVICE_LONG using $CLI_LONG:
1. **Submit a $SERVICE_SHORT creation request**
- By default, $CLI_LONG creates a $SERVICE_SHORT for you that matches your [$PRICING_PLAN][pricing-plans]:
- * **$FREE**: shared CPU/memory and the `time-series` and `ai` capabilities (only available in `us-east-1` region)
- * **Paid $PRICING_PLAN**: 0.5 CPU and 2 GB memory with the `time-series` capability
+ By default, $CLI_LONG creates a $SERVICE_SHORT with 0.5 CPU and 2 GB memory with the `time-series` capability
+
```shell
tiger service create
```
To control the $SERVICE_SHORT configuration, use the [`service create` flags][cli-create-custom-service]. For
- example, to create a free service if you are in a paid $PRICING_PLAN, call
- `tiger service create --memory shared --cpu shared`.
+ example, to create a free service, call `tiger service create --memory shared --cpu shared`.
+
+
-
- Free services with shared CPU/memory are only available in the `us-east-1` region. Paid services can be created in any available AWS or Azure region using the `--region` flag.
-
+ Free services with shared CPU/memory are only available in the `us-east-1` region. Standard services can be created in any available AWS or Azure region using the `--region` flag.
$CLOUD_LONG creates a Development environment for you. That is, no delete protection, high-availability, spooling or
read replication. You see something like:
diff --git a/_partials/_free-plan-beta.md b/_partials/_free-plan-beta.md
index c3b1c412a1..fdfdaa55e7 100644
--- a/_partials/_free-plan-beta.md
+++ b/_partials/_free-plan-beta.md
@@ -1,5 +1,5 @@
-The Free pricing plan and services are currently in beta.
+Free services are currently in beta.
\ No newline at end of file
diff --git a/_partials/_not-available-in-free-plan.md b/_partials/_not-available-in-free-plan.md
deleted file mode 100644
index 30e92acb84..0000000000
--- a/_partials/_not-available-in-free-plan.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-This feature is not available under the Free pricing plan.
-
-
\ No newline at end of file
diff --git a/_partials/_services-intro.md b/_partials/_services-intro.md
index 66ef949385..8898a71e05 100644
--- a/_partials/_services-intro.md
+++ b/_partials/_services-intro.md
@@ -8,12 +8,10 @@ extensions.
Each $SERVICE_SHORT is associated with a project in $CLOUD_LONG. Each project can have multiple $SERVICE_SHORTs. Each user is a [member of one or more projects][projects].
-You create free and standard $SERVICE_SHORTs in $CONSOLE_LONG, depending on your [$PRICING_PLAN][pricing-plans]. A free $SERVICE_SHORT comes at zero cost and gives you limited resources to get to know $CLOUD_LONG. Once you are ready to try out more advanced features, you can switch to a paid plan and convert your free $SERVICE_SHORT to a standard one.
+You create free and standard $SERVICE_SHORTs in $CONSOLE_LONG. A standard $SERVICE_SHORT comes with the full range of features according to your $PRICING_PLAN. A free $SERVICE_SHORT comes at zero cost and gives you limited features and resources.
![$CLOUD_LONG pricing plans][cloud_long-pricing-plans]
-
-
To the $PG you know and love, $CLOUD_LONG adds the following capabilities:
- **Standard $SERVICE_SHORTs**:
@@ -33,13 +31,16 @@ To the $PG you know and love, $CLOUD_LONG adds the following capabilities:
_$PG with $TIMESCALE_DB and vector extensions_
- Free $SERVICE_SHORTs offer limited resources and a basic feature scope, perfect to get to know $CLOUD_LONG in a development environment.
+ Free $SERVICE_SHORTs come with pre-configured CPU and memory, are hosted in `us-east-1` region, and offer limited resources with a basic feature scope. This excludes connection pooling, replication, data tiering, exporters, metrics, VPC, and other features. Free $SERVICE_SHORTs are perfect for schema explorations, syntax validations, and other small-scale testing. Once you reach the storage limit, a free $SERVICE_SHORT enters a read-only state. You can [convert your free $SERVICE_SHORT][convert-to-free] to a standard one at any time.
+
+
You can [manage, pause, or delete][service-management] your $SERVICE_SHORT at any time from $CONSOLE.
[automatic-backups]: /use-timescale/:currentVersion:/backup-restore/
[cloud_long-pricing-plans]: https://assets.timescale.com/docs/images/tiger-cloud-console/tiger-pricing.svg
[connection-pooling]: /use-timescale/:currentVersion:/services/connection-pooling
+[convert-to-free]: /use-timescale/:currentVersion:/services/service-management/#convert-a-free-service-to-a-standard-one
[data-tiering]: /use-timescale/:currentVersion:/data-tiering/
[high-availability]: /use-timescale/:currentVersion:/ha-replicas/high-availability/
[how-plans-work]: /about/:currentVersion:/pricing-and-account-management/#how-your-bill-is-calculated
diff --git a/_partials/_upgrade-plan-monitor-usage.md b/_partials/_upgrade-plan-monitor-usage.md
index baee8f289a..071e5bb258 100644
--- a/_partials/_upgrade-plan-monitor-usage.md
+++ b/_partials/_upgrade-plan-monitor-usage.md
@@ -1,11 +1,7 @@
import BillingForInactiveServices from "versionContent/_partials/_billing-for-inactive-services.mdx";
-You can upgrade or downgrade between the Free, $PERFORMANCE, and $SCALE plans
-whenever you want using [$CONSOLE][cloud-login]. To downgrade to the Free plan, you must only have free services running in your project.
-
-If you switch your $PRICING_PLAN mid-month,
-your prices are prorated to when you switch. Your $SERVICE_SHORTs are not interrupted when you switch, so
-you can keep working without any hassle. To move to $ENTERPRISE, [get in touch with $COMPANY][contact-company].
+You can upgrade or downgrade between the $PERFORMANCE and $SCALE plans
+whenever you want using [$CONSOLE][cloud-login]. To move to $ENTERPRISE, [get in touch with $COMPANY][contact-company]. If you switch your $PRICING_PLAN mid-month, your prices are prorated to when you switch. Your $SERVICE_SHORTs are not interrupted when you switch, so you can keep working without any hassle.
## Monitor usage and costs
diff --git a/about/pricing-and-account-management.md b/about/pricing-and-account-management.md
index 0251b14a25..cee5061d08 100644
--- a/about/pricing-and-account-management.md
+++ b/about/pricing-and-account-management.md
@@ -18,7 +18,6 @@ import SupportPlans from "versionContent/_partials/_support-plans.mdx";
import BillingExample from "versionContent/_partials/_billing-example.mdx";
import ManagePricing from "versionContent/_partials/_manage-pricing-plan.mdx";
import BillingForInactiveServices from "versionContent/_partials/_billing-for-inactive-services.mdx";
-import FreeBeta from "versionContent/_partials/_free-plan-beta.mdx";
import DisaggregatedComputeStorage from "versionContent/_partials/_disaggregated-compute-storage.mdx";
import DisaggregatedComputeStorageAzure from "versionContent/_partials/_disaggregated-compute-storage-azure.mdx";
import AwsFeatures from "versionContent/_partials/_aws-features.mdx";
diff --git a/api/glossary.md b/api/glossary.md
index 1132a2430d..81231c454b 100644
--- a/api/glossary.md
+++ b/api/glossary.md
@@ -191,7 +191,7 @@ This glossary defines technical terms, concepts, and terminology used in $COMPAN
-**Free $SERVICE_SHORT**: a free instance of $CLOUD_LONG with limited resources. You can create up to two free $SERVICE_SHORTs under any $PRICING_PLAN. When a free $SERVICE_SHORT reaches the resource limit, it converts to the read-only state. You can convert a free $SERVICE_SHORT to a [standard one][standard-tiger-service-link] under paid $PRICING_PLANs.
+**Free $SERVICE_SHORT**: a free instance of $CLOUD_LONG with limited resources. You can create up to two free $SERVICE_SHORTs under any $PRICING_PLAN. When a free $SERVICE_SHORT reaches the resource limit, it converts to the read-only state. You can convert a free $SERVICE_SHORT to a [standard one][standard-tiger-service-link].
**FTP (File Transfer Protocol)**: a standard network protocol used for transferring files between a client and server on a computer network.
diff --git a/getting-started/run-queries-from-console.md b/getting-started/run-queries-from-console.md
index 81b9a48a74..6bcc73e243 100644
--- a/getting-started/run-queries-from-console.md
+++ b/getting-started/run-queries-from-console.md
@@ -6,7 +6,6 @@ content_group: Getting started
---
import WhereNext from "versionContent/_partials/_where-to-next.mdx";
-import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-free-plan.mdx";
# Run your queries from $CONSOLE
@@ -31,8 +30,6 @@ You use $DATA_MODE in $CONSOLE to write queries, visualize data, and share your
![$CONSOLE $DATA_MODE][console-data_mode]
-
-
To start using $DATA_MODE, open $CONSOLE and toggle `Data view`. This includes the following tabs:
- **Files**: browse all your personal and shared queries, dashboards, notebooks, and folders.
diff --git a/getting-started/try-key-features-timescale-products.md b/getting-started/try-key-features-timescale-products.md
index 77ea31193f..a59ca2aaf5 100644
--- a/getting-started/try-key-features-timescale-products.md
+++ b/getting-started/try-key-features-timescale-products.md
@@ -9,7 +9,6 @@ import HASetup from 'versionContent/_partials/_high-availability-setup.mdx';
import IntegrationPrereqs from "versionContent/_partials/_integration-prereqs.mdx";
import HypercoreIntroShort from "versionContent/_partials/_hypercore-intro-short.mdx";
import HypercoreDirectCompress from "versionContent/_partials/_hypercore-direct-compress.mdx";
-import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-free-plan.mdx";
import CreateHypertablePolicyNote from "versionContent/_partials/_create-hypertable-columnstore-policy-note.mdx";
import SupportPlans from "versionContent/_partials/_support-plans.mdx";
@@ -166,7 +165,7 @@ relational and time-series data from external files.
You query $HYPERTABLEs in exactly the same way as you would a relational $PG table.
Use one of the following SQL editors to run a query and see the data you uploaded:
- - **$DATA_MODE**: write queries, visualize data, and share your results in [$CONSOLE][portal-data-mode] for all your $SERVICE_LONGs.
+ - **$DATA_MODE**: write queries, visualize data, and share your results in [$CONSOLE][portal-data-mode] for all your $SERVICE_LONGs.
- **$SQL_EDITOR**: write, fix, and organize SQL faster and more accurately in [$CONSOLE][portal-ops-mode] for a $SERVICE_LONG.
- **psql**: easily run queries on your $SERVICE_LONGs or self-hosted $TIMESCALE_DB deployment from Terminal.
@@ -201,8 +200,6 @@ $CONSOLE. You can also do this using psql.
-
-
1. **In $CONSOLE, toggle `Data view` at the top right**
diff --git a/migrate/upload-file-using-console.md b/migrate/upload-file-using-console.md
index b2abe7758f..e05e9fb6d5 100644
--- a/migrate/upload-file-using-console.md
+++ b/migrate/upload-file-using-console.md
@@ -7,7 +7,6 @@ keywords: [import]
import ImportPrerequisitesCloudNoConnection from "versionContent/_partials/_prereqs-cloud-no-connection.mdx";
import EarlyAccessGeneral from "versionContent/_partials/_early_access.mdx";
-import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-free-plan.mdx";
import NotSupportedAzure from "versionContent/_partials/_not-supported-for-azure.mdx";
# Upload a file into your $SERVICE_SHORT using $CONSOLE_LONG
@@ -119,8 +118,6 @@ To upload a TXT or MD file to your $SERVICE_SHORT:
$CONSOLE_LONG enables you to upload CSV and Parquet files, including archives compressed using GZIP and ZIP, by connecting to an S3 bucket.
-
-
## Prerequisites
diff --git a/use-timescale/metrics-logging/monitoring.md b/use-timescale/metrics-logging/monitoring.md
index be1313fd9c..54b83d2b56 100644
--- a/use-timescale/metrics-logging/monitoring.md
+++ b/use-timescale/metrics-logging/monitoring.md
@@ -39,8 +39,6 @@ The following metrics are represented by graphs:
- Storage I/O, in ops/sec
- Storage bandwidth, in MiB/sec
-The [$FREE $PRICING_PLAN][pricing-plan-features] only includes storage metrics.
-
When you hit the limits:
- **For CPU and memory**: provision more for your $SERVICE_SHORT in `Operations` > `Compute and storage`.
diff --git a/use-timescale/services/change-resources.md b/use-timescale/services/change-resources.md
index 044d295a3b..755d066049 100644
--- a/use-timescale/services/change-resources.md
+++ b/use-timescale/services/change-resources.md
@@ -21,16 +21,18 @@ $SERVICE_LONGs at any time, with a short downtime.
## Update compute resources for a $SERVICE_SHORT
-You can change the CPU and memory allocation for your $SERVICE_SHORT at any time with
+You can change the CPU and memory allocation for your standard $SERVICE_SHORT at any time with
minimal downtime, usually less than a minute. The new resources become available as soon as
-the $SERVICE_SHORT restarts. You can change the CPU and memory allocation up or down, as frequently as required.
+the $SERVICE_SHORT restarts. You can change the CPU and memory allocation up or down, as frequently as required.
![Change resources][change-resources]
+To change the resources of a free $SERVICE_SHORT, first [convert it to a standard one][convert-to-standard].
+
Note that:
- For the 48 CPU / 192 GiB option, 6 CPU / 14 GiB is reserved for platform operations.
-- For the 64 CPU / 256 GiB option, 6 CPU / 16 GiB is reserved for platform operations.
+- For the 64 CPU / 256 GiB option, 6 CPU / 16 GiB is reserved for platform operations.
There is momentary downtime while the new compute settings are applied. In most cases, this is
less than a minute. However, before making changes to your $SERVICE_SHORT, best practice
@@ -67,7 +69,7 @@ settings are applied during an appropriate service window.
## Out of memory errors
-If you run intensive queries on your $SERVICE_SHORTs, you might
+If you run intensive queries on your standard $SERVICE_SHORTs, you might
encounter out of memory (OOM) errors. This occurs if your query consumes more
memory than is available.
@@ -97,8 +99,11 @@ operate normally.
```yml
2022-02-03 17:12:04 UTC [2253150]:TimescaleDB: tsdbadmin@tsdb,app=psql [53200] ERROR: out of memory
```
+
+If you encounter OOM errors on a free $SERVICE_SHORT, [convert it to a standard $SERVICE_SHORT][convert-to-standard], then increase its CPU and memory allocation as needed to resolve the memory pressure.
[change-resources]: https://assets.timescale.com/docs/images/tiger-on-azure/tiger-console-update-cpu-manually.png
[cloud-login]: https://console.cloud.timescale.com/
+[convert-to-standard]: /use-timescale/:currentVersion:/services/service-management/#convert-a-free-service-to-a-standard-one
[high-availability]: /use-timescale/:currentVersion:/ha-replicas/high-availability/
[services-portal]: https://console.cloud.timescale.com/dashboard/services
diff --git a/use-timescale/services/service-management.md b/use-timescale/services/service-management.md
index 67040f5eb3..e8abba7e79 100644
--- a/use-timescale/services/service-management.md
+++ b/use-timescale/services/service-management.md
@@ -109,6 +109,17 @@ To change the environment of an existing $SERVICE_SHORT:
+## Convert a free $SERVICE_SHORT to a standard one
+
+You can convert a free $SERVICE_SHORT to a standard one, to increase its resources. Note that it is only available if you haven't reached the quota on the number of standard services [according to your pricing plan][pricing].
+
+
+
+1. In [$CONSOLE][services-portal], select the $SERVICE_SHORT to update.
+1. Click `Operations` > `Environment` > `Convert service to standard` > `Yes, convert to standard`.
+
+
+
## Pause a $SERVICE_SHORT
You can pause a $SERVICE_SHORT if you want to stop it running temporarily. When you
@@ -124,3 +135,4 @@ $SERVICE_SHORT.
[maintenance-upgrades]: /use-timescale/:currentVersion:/upgrades/#minor-software-upgrades
[services-portal]: https://console.cloud.timescale.com/dashboard/services
+[pricing]: /about/:currentVersion:/pricing-and-account-management#features-included-in-each-pricing-plan
diff --git a/use-timescale/upgrades.md b/use-timescale/upgrades.md
index 5e080e9b9c..fa795a60fb 100644
--- a/use-timescale/upgrades.md
+++ b/use-timescale/upgrades.md
@@ -86,7 +86,7 @@ $TIMESCALE_DB manually:
1. **Upgrade $TIMESCALE_DB**
Either:
- - Click `SQL Editor` at the bottom, then run `ALTEREXTENSION timescaledb UPDATE`.
+ - Click `SQL Editor` at the bottom, then run `ALTER EXTENSION timescaledb UPDATE`.
- Click `⋮`, then `Pause` and `Resume` the service.