Skip to content

Commit 5432195

Browse files
atovpekoatovpeko
committed
resolve conflicts
1 parent f4a0de9 commit 5432195

File tree

9 files changed

+107
-56
lines changed

9 files changed

+107
-56
lines changed

‎_partials/_cloud-installation-azure.md‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
1-
## Create a $ACCOUNT_LONG
1+
import CreateAccountConsole from "versionContent/_partials/_create-account-console.mdx";
22

33
You create a $ACCOUNT_LONG to manage your $SERVICE_SHORTs and data in a centralized and efficient manner in $CONSOLE. From there, you can create and delete $SERVICE_SHORTs, run queries, manage access and billing, integrate other services, contact support, and more.
44

5-
To set up $CLOUD_LONG:
6-
7-
<Procedure>
8-
9-
1. **Sign up for a 30-day free trial**
10-
11-
Open [Sign up for $CLOUD_LONG][timescale-signup] and add your details, then click `Start your free trial`. You receive a confirmation email in your inbox.
12-
13-
1. **In the confirmation email, click the link supplied and sign in to [$CONSOLE][tsc-portal]**
14-
15-
1. **Answer the requirements questions**
16-
17-
Your answers help us optimize $SERVICE_LONGs for your use cases.
18-
19-
</Procedure>
5+
<CreateAccountConsole />
206

217
[tsc-portal]: https://console.cloud.timescale.com/
228
[timescale-website]: https://www.timescale.com/

‎_partials/_cloud-installation.md‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Create a $ACCOUNT_LONG
1+
import CreateAccountConsole from "versionContent/_partials/_create-account-console.mdx";
22

33
You create a $ACCOUNT_LONG to manage your $SERVICE_SHORTs and data in a centralized and efficient manner in $CONSOLE. From there, you can create and delete $SERVICE_SHORTs, run queries, manage access and billing, integrate other services, contact support, and more.
44

@@ -8,23 +8,7 @@ You create a $ACCOUNT_LONG to manage your $SERVICE_SHORTs and data in a centrali
88

99
You create a standalone account to manage $CLOUD_LONG as a separate unit in your infrastructure, which includes separate billing and invoicing.
1010

11-
<Procedure>
12-
13-
To set up $CLOUD_LONG:
14-
15-
1. **Sign up for a 30-day free trial**
16-
17-
Open [Sign up for $CLOUD_LONG][timescale-signup] and add your details, then click `Start your free trial`. You receive a confirmation email in your inbox.
18-
19-
1. **Confirm your email address**
20-
21-
In the confirmation email, click the link supplied.
22-
23-
1. **Select the [pricing plan][pricing-plans]**
24-
25-
You are now logged into $CONSOLE_LONG. You can change the pricing plan to better accommodate your growing needs on the [`Billing` page][console-billing].
26-
27-
</Procedure>
11+
<CreateAccountConsole />
2812

2913
</Tab>
3014

‎_partials/_create-account-console.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Procedure>
2+
3+
To set up $CLOUD_LONG:
4+
5+
1. **Sign up for a 30-day free trial**
6+
7+
Open [Sign up for $CLOUD_LONG][timescale-signup] and add your details, then click `Start your free trial`. You receive a confirmation email in your inbox.
8+
9+
1. **Confirm your email address**
10+
11+
In the confirmation email, click the link supplied.
12+
13+
1. **Select the [pricing plan][pricing-plans]**
14+
15+
You are now logged into $CONSOLE_LONG. You can change the pricing plan to better accommodate your growing needs on the [`Billing` page][console-billing].
16+
17+
</Procedure>
18+
19+
[timescale-signup]: https://console.cloud.timescale.com/signup
20+
[console-billing]: https://console.cloud.timescale.com/dashboard/billing/plans
21+
[pricing-plans]: /about/:currentVersion:/pricing-and-account-management/

‎_partials/_create-service.md‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Procedure>
22

3-
1. In the [$SERVICE_SHORT creation page][create-service], choose the capability to match your business needs: `Real-time analytics`, `AI-focused`, or `Hybrid applications`.
3+
3. In the [$SERVICE_SHORT creation page][create-service], click `+ New service`.
44

5-
![Create a $SERVICE_LONG](https://assets.timescale.com/docs/images/tiger-cloud-console/create-tiger-service.png)
5+
Follow the wizard to configure your $SERVICE_SHORT depending on its type.
66

7-
To create a plain $PG $SERVICE_SHORT, without any additional capabilities, click `Looking for plain PostgreSQL?` in the top right.
8-
9-
1. Follow the next steps in `Create a service` to configure the cloud, region, compute size, environment, availability, connectivity, and $SERVICE_SHORT name. Then click `Create service`.
7+
1. Click `Create service`.
108

119
Your $SERVICE_SHORT is constructed and ready to use in a few seconds.
1210

@@ -15,10 +13,7 @@
1513
This file contains the passwords and configuration information you need to connect to your $SERVICE_SHORT using the
1614
$CONSOLE $DATA_MODE, from the command line, or using third-party database administration tools.
1715

18-
If you choose to go directly to the $SERVICE_SHORT overview, [Connect to your $SERVICE_SHORT][connect-to-your-service]
19-
shows you how to connect.
20-
21-
</Procedure>
16+
</Procedure>
2217

2318
[create-service]: https://console.cloud.timescale.com/dashboard/create_services
2419
[connect-to-your-service]: /getting-started/:currentVersion:/services/#connect-to-your-service

‎_partials/_service-overview-azure.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import NotAvailableFreePlan from "versionContent/_partials/_not-available-in-free-plan.mdx";
2+
13
You manage your $SERVICE_LONGs and interact with your data in $CONSOLE using the following modes:
24

35
| **$OPS_MODE_CAP** | **$DATA_MODE_CAP** |
46
|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
57
| ![$CONSOLE $OPS_MODE][ops-mode] | ![$CONSOLE $DATA_MODE][data-mode] |
6-
| **You use the $OPS_MODE to:** <ul> <li>Ensure data security with high availability and $READ_REPLICAs</li> <li>Save money with columnstore compression</li> <li>Enable $PG extensions to add extra functionality</li> <li>Perform day-to-day administration</li> </ul> | **Powered by $POPSQL, you use the $DATA_MODE to:** <ul> <li>Write queries with autocomplete</li> <li>Visualize data with charts and dashboards</li> <li>Schedule queries and dashboards for alerts or recurring reports</li> <li>Share queries and dashboards</li> <li>Interact with your data on auto-pilot with SQL assistant</li></ul> |
8+
| **You use the $OPS_MODE to:** <ul> <li>Ensure data security with high availability and $READ_REPLICAs</li> <li>Save money with columnstore compression</li> <li>Enable $PG extensions to add extra functionality</li> <li>Perform day-to-day administration</li> </ul> | **Powered by $POPSQL, you use the $DATA_MODE to:** <ul> <li>Write queries with autocomplete</li> <li>Visualize data with charts and dashboards</li> <li>Schedule queries and dashboards for alerts or recurring reports</li> <li>Share queries and dashboards</li> <li>Interact with your data on auto-pilot with SQL assistant</li></ul><NotAvailableFreePlan /> |
79

810
[ops-mode]: https://assets.timescale.com/docs/images/tiger-cloud-console/ops-mode-overview-tiger-console.png
911
[data-mode]: https://assets.timescale.com/docs/images/tiger-cloud-console/tiger-console-data-mode.png

‎_partials/_services-intro-azure.mdx‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import FreeBeta from "versionContent/_partials/_free-plan-beta.mdx";
2+
3+
A $SERVICE_LONG is a single optimized $PG instance extended with innovations in the database engine and cloud
4+
infrastructure to deliver speed without sacrifice. A $SERVICE_LONG is 10-1000x faster at scale! It
5+
is ideal for applications requiring strong data consistency, complex relationships, and advanced querying capabilities.
6+
Get ACID compliance, extensive SQL support, JSON handling, and extensibility through custom functions, data types, and
7+
extensions.
8+
9+
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][rbac].
10+
11+
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.
12+
13+
![$CLOUD_LONG pricing plans](https://assets.timescale.com/docs/images/tiger-cloud-console/tiger-pricing.svg)
14+
15+
<FreeBeta />
16+
17+
To the $PG you know and love, $CLOUD_LONG adds the following capabilities:
18+
19+
- **Standard $SERVICE_SHORTs**:
20+
21+
- _Real-time analytics_: store and query [time-series data][what-is-time-series] at scale for
22+
real-time analytics and other use cases. Get faster time-based queries with $HYPERTABLEs, $CAGGs, and columnar storage. Save money by compressing data into the $COLUMNSTORE and deleting old data with automated policies.
23+
- _AI-focused_: build AI applications from start to scale. Get fast and accurate similarity search
24+
with the pgvector and pgvectorscale extensions.
25+
- _Hybrid applications_: get a full set of tools to develop applications that combine time-based data and AI.
26+
27+
All standard $SERVICE_LONGs include the tooling you expect for production and developer environments: [live migration][live-migration],
28+
[automatic backups and PITR][automatic-backups], [high availability][high-availability], [$READ_REPLICAs][readreplica], [data forking][operations-forking], [connection pooling][connection-pooling],
29+
[usage-based storage][how-plans-work], secure in-$CONSOLE [SQL editing][in-console-editors], $SERVICE_SHORT [metrics][metrics]
30+
and [insights][insights],&nbsp;[streamlined maintenance][maintain-upgrade],&nbsp;and much more. $CLOUD_LONG continuously monitors your $SERVICE_SHORTs and prevents common $PG out-of-memory crashes.
31+
32+
- **Free $SERVICE_SHORTs**:
33+
34+
_$PG with $TIMESCALE_DB and vector extensions_
35+
36+
Free $SERVICE_SHORTs offer limited resources and a basic feature scope, perfect to get to know $CLOUD_LONG in a development environment.
37+
38+
[what-is-time-series]: https://www.timescale.com/blog/time-series-database-an-explainer#what-is-a-time-series-database
39+
[create-service]: /getting-started/:currentVersion:/services/
40+
[live-migration]: /migrate/:currentVersion:/live-migration/
41+
[automatic-backups]: /use-timescale/:currentVersion:/backup-restore/
42+
[high-availability]: /use-timescale/:currentVersion:/ha-replicas/high-availability/
43+
[readreplica]: /use-timescale/:currentVersion:/ha-replicas/read-scaling/
44+
[operations-forking]: /use-timescale/:currentVersion:/services/service-management/#fork-a-service
45+
[connection-pooling]: /use-timescale/:currentVersion:/services/connection-pooling
46+
[data-tiering]: /use-timescale/:currentVersion:/data-tiering/
47+
[how-plans-work]: /about/:currentVersion:/pricing-and-account-management/#how-plans-work
48+
[in-console-editors]: /getting-started/:currentVersion:/run-queries-from-console/
49+
[metrics]: /use-timescale/:currentVersion:/metrics-logging/monitoring/#metrics
50+
[insights]: /use-timescale/:currentVersion:/metrics-logging/monitoring/#insights
51+
[maintain-upgrade]: /use-timescale/:currentVersion:/upgrades/
52+
[pricing-plans]: /about/:currentVersion:/pricing-and-account-management/
53+
[rbac]: /use-timescale/:currentVersion:/security/members/

‎_partials/_services-intro.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import FreeBeta from "versionContent/_partials/_free-plan-beta.mdx";
22

3-
A $SERVICE_LONG is a single optimised $PG instance extended with innovations in the database engine and cloud
3+
A $SERVICE_LONG is a single optimized $PG instance extended with innovations in the database engine and cloud
44
infrastructure to deliver speed without sacrifice. A $SERVICE_LONG is 10-1000x faster at scale! It
55
is ideal for applications requiring strong data consistency, complex relationships, and advanced querying capabilities.
66
Get ACID compliance, extensive SQL support, JSON handling, and extensibility through custom functions, data types, and

‎getting-started/get-started-devops-as-code.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ tags:
1111
- security
1212
- services
1313
- authentication
14+
products: [cloud]
1415
---
1516

1617
import RESTGS from "versionContent/_partials/_devops-rest-api-get-started.mdx";

‎getting-started/services.md‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ products: [cloud]
55
content_group: Getting started
66
---
77

8-
import Install from "versionContent/_partials/_cloud-installation.mdx";
9-
import InstallAzure from "versionContent/_partials/_cloud-installation-azure.mdx";
10-
import Connect from "versionContent/_partials/_cloud-connect-service.mdx";
8+
import CloudIntro from "versionContent/_partials/_cloud-intro.mdx";
119
import ServiceIntro from "versionContent/_partials/_services-intro.mdx";
12-
import CreateService from "versionContent/_partials/_create-service.mdx";
1310
import ServiceOverview from "versionContent/_partials/_service-overview.mdx";
14-
import ServiceOverviewAzure from "versionContent/_partials/_service-overview-azure.mdx";
15-
import CloudIntro from "versionContent/_partials/_cloud-intro.mdx";
16-
import CloudIntroAzure from "versionContent/_partials/_cloud-intro-azure.mdx";
17-
import WhereNext from "versionContent/_partials/_where-to-next.mdx";
1811
import StartUsingCloud from "versionContent/_partials/_start-using-cloud.mdx";
12+
import Install from "versionContent/_partials/_cloud-installation.mdx";
13+
import CreateService from "versionContent/_partials/_create-service.mdx";
14+
import Connect from "versionContent/_partials/_cloud-connect-service.mdx";
15+
import WhereNext from "versionContent/_partials/_where-to-next.mdx";
16+
17+
import InstallAzure from "versionContent/_partials/_cloud-installation-azure.mdx";
18+
import ServiceIntroAzure from "versionContent/_partials/_services-intro-azure.mdx";
19+
import ServiceOverviewAzure from "versionContent/_partials/_service-overview-azure.mdx";
1920
import StartUsingCloudAzure from "versionContent/_partials/_start-using-cloud-azure.mdx";
2021

2122
# Create a $SERVICE_LONG
@@ -34,9 +35,11 @@ import StartUsingCloudAzure from "versionContent/_partials/_start-using-cloud-az
3435

3536
<StartUsingCloud />
3637

38+
## Create a $ACCOUNT_LONG
39+
3740
<Install />
3841

39-
## Create a $SERVICE_LONG
42+
## Create a $SERVICE_SHORT
4043

4144
Now that you have an active $ACCOUNT_LONG, you create and manage your $SERVICE_SHORTs in $CONSOLE. When you create a $SERVICE_SHORT, you effectively create a blank $PG database with additional $CLOUD_LONG features available under your $PRICING_PLAN. You then add or migrate your data into this database.
4245

@@ -54,15 +57,21 @@ To run queries and perform other operations, connect to your $SERVICE_SHORT:
5457

5558
<Tab title="Tiger Cloud on Azure" label="azure-cloud">
5659

57-
<CloudIntroAzure />
60+
<CloudIntro />
61+
62+
## What is a $SERVICE_LONG?
63+
64+
<ServiceIntroAzure />
5865

5966
<ServiceOverviewAzure />
6067

6168
<StartUsingCloudAzure />
6269

70+
## Create a $ACCOUNT_LONG
71+
6372
<InstallAzure />
6473

65-
## Create a $SERVICE_LONG
74+
## Create a $SERVICE_SHORT
6675

6776
Now that you have an active $ACCOUNT_LONG, you create and manage your $SERVICE_SHORTs in $CONSOLE. When you create a $SERVICE_SHORT, you effectively create a blank $PG database with additional $CLOUD_LONG features available under your $PRICING_PLAN. You then add or migrate your data into this database.
6877

0 commit comments

Comments
 (0)