Skip to content

Commit

Permalink
Merge branch 'latest' into solugebefola-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Loquacity authored Aug 28, 2023
2 parents 8300f67 + fa97779 commit 3985344
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
client-payload: '{"branch": "${{ steps.timescale.outputs.DEV_FOLDER }}", "pr_number": "${{ env.PR_NUMBER }}"}'

- name: Write comment
uses: marocchino/sticky-pull-request-comment@f6a2580ed520ae15da6076e7410b088d1c5dddd9
uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
message: |
Expand Down
2 changes: 1 addition & 1 deletion _partials/_usage-based-storage-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ You are only charged for the storage space that you actually use. Make sure you
[compression][compression], a [data retention policy][data-retention], and
[data tiering][data-tiering], to help you manage costs.

[compression]: /use-timescale/:currentVersion:/compression/
[compression]: /use-timescale/:currentVersion:/compression/about-compression
[data-retention]: /use-timescale/:currentVersion:/data-retention/
[data-tiering]: /use-timescale/:currentVersion:/data-tiering/
23 changes: 6 additions & 17 deletions about/timescaledb-editions.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ tags: [learn, contribute]

There are two versions of TimescaleDB available:

* TimescaleDB with an Apache 2 licence
* TimescaleDB Apache 2 Edition
* TimescaleDB Community Edition

The TimescaleDB Apache 2 Edition is the version of TimescaleDB that is available
under the [Apache 2.0 license][apache-license]. This is a classic open source license,
meaning that it is completely unrestricted - anyone can take this code and offer it
as a service.

### TimescaleDB Apache 2 Edition
## TimescaleDB Apache 2 Edition

You can install TimescaleDB Apache 2 Edition on your own on-premises or cloud
infrastructure and run it for free.
Expand All @@ -29,17 +29,10 @@ main contributor.
You can modify the TimescaleDB Apache 2 Edition source code and run it for
production use.

TimescaleDB Apache 2 Edition is available from these service providers:
## TimescaleDB Community Edition

* [Azure Database for PostgreSQL][azure-database]
* [Digital Ocean][digital-ocean]
* [Aiven for PostgreSQL][aiven]
* [Neon. Serverless Postgres][neon]

### TimescaleDB Community Edition

TimescaleDB Community Edition is the latest, most updated version of TimescaleDB,
available under the
TimescaleDB Community Edition is the advanced, best, and most feature complete
version of TimescaleDB, available under the terms of the
[Timescale License (TSL)][timescale-license].

For more information about the Timescale license, see [this blog post][license-blog].
Expand All @@ -63,7 +56,7 @@ the TimescaleDB Community Edition source code and offer it as a service.
You can access a hosted version of TimescaleDB Community Edition through
[Timescale][timescale-cloud], which is a cloud-native platform for time-series.

### Feature comparison
## Feature comparison

<table>
<tr>
Expand Down Expand Up @@ -517,12 +510,8 @@ You can access a hosted version of TimescaleDB Community Edition through

<!-- vale Google.Units = NO -->

[aiven]: https://aiven.io/postgresql
[azure-database]: https://azure.microsoft.com/en-us/services/postgresql/?&ef_id=CjwKCAjwhOyJBhA4EiwAEcJdcWZ6_o9d5INkZvm1MGsOsinuXgDwV_ySL5vc34z3pyxxrP0R49J_8xoCVvIQAvD_BwE:G:s&OCID=AID2200277_SEM_CjwKCAjwhOyJBhA4EiwAEcJdcWZ6_o9d5INkZvm1MGsOsinuXgDwV_ySL5vc34z3pyxxrP0R49J_8xoCVvIQAvD_BwE:G:s&gclid=CjwKCAjwhOyJBhA4EiwAEcJdcWZ6_o9d5INkZvm1MGsOsinuXgDwV_ySL5vc34z3pyxxrP0R49J_8xoCVvIQAvD_BwE#overview
[digital-ocean]: https://docs.digitalocean.com/products/databases/postgresql/details/supported-extensions/
[license-blog]: https://blog.timescale.com/blog/building-open-source-business-in-cloud-era-v2/
[mst]: /mst/:currentVersion:
[timescale-cloud]: /use-timescale/:currentVersion:/services/
[timescale-license]: https://github.com/timescale/timescaledb/blob/master/tsl/LICENSE-TIMESCALE
[neon]: https://neon.tech/
[apache-license]: https://github.com/timescale/timescaledb/blob/master/LICENSE-APACHE
2 changes: 1 addition & 1 deletion getting-started/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ the guide, you learn how to:
1. [Create your first Timescale service][services-create]
1. [Connect to your service][services-connect]
1. [Ingest some real financial data into your database][ingest-data]
1. [Construct some interesting queries][queries]
1. [Construct some interesting queries][queries] <FeaturedCTA href="/getting-started/latest/queries/#try-it-out-code-block-1" data-tracking="cta-try-out-queries">Try out some <b>live queries</b></FeaturedCTA>
1. [Create and query a continuous aggregates][caggs]

When you have finished this guide, you might want to check out some
Expand Down
2 changes: 1 addition & 1 deletion getting-started/queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ LIMIT 10
SQL query against a live instance curated by Timescale.
</Highlight>

<TryItOutCodeBlock queryId="getting-started-srt-4-days" />
<TryItOutCodeBlock id="try-it-out-code-block-1" queryId="getting-started-srt-4-days" />

1. Type `q` to return to the `psql` prompt.

Expand Down
2 changes: 1 addition & 1 deletion self-hosted/replication-and-ha/configure-replication.md
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ check out [Patroni][patroni-github].
[configure-replication]: /self-hosted/:currentVersion:/replication-and-ha/configure-replication#configure-replication-and-recovery-settings
[create-base-backup]: /self-hosted/:currentVersion:/replication-and-ha/configure-replication#create-a-base-backup-on-the-replica
[create-replication-slots]: /self-hosted/:currentVersion:/replication-and-ha/configure-replication#create-replication-slots
[docker-postgres-scripts]: https://docs.docker.com/samples/library/postgres/#how-to-extend-this-image
[docker-postgres-scripts]: https://hub.docker.com/_/postgres/
[failover-docs]: https://www.postgresql.org/docs/current/static/warm-standby-failover.html
[patroni-github]: https://github.com/zalando/patroni
[pg-hba-docs]: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html
Expand Down
4 changes: 0 additions & 4 deletions use-timescale/compression/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ hypertables.

<UsageBasedStorage />

<Highlight type="warning">
Compression alters data on your disk, so always back up before you start.
</Highlight>

[backfill-historical]: /use-timescale/:currentVersion:/compression/backfill-historical-data/
[decompress-chunks]: /use-timescale/:currentVersion:/compression/decompress-chunks/
[modify-schema]: /use-timescale/:currentVersion:/compression/modify-a-schema/
Expand Down

0 comments on commit 3985344

Please sign in to comment.