Skip to content

Commit

Permalink
Merge branch 'latest' into vperez/update-timescaledb-parallel-copy-do…
Browse files Browse the repository at this point in the history
…cumentation
  • Loading branch information
billy-the-fish authored Jan 15, 2025
2 parents 0856199 + e329017 commit 7efdb7f
Show file tree
Hide file tree
Showing 21 changed files with 166 additions and 286 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy-lambdas.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Deploy redirects to lambda

on:
push:
paths:
Expand Down
4 changes: 2 additions & 2 deletions _partials/_grafana-connect.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import IntegrationPrereqs from "versionContent/_partials/_integration-prereqs.md

* Install [self-managed Grafana][grafana-self-managed] or sign up for [Grafana Cloud][grafana-cloud].

## Add your $SERVICE_SHORT or database as a data source
## Add your $SERVICE_SHORT as a data source

To connect the data in your $SERVICE_SHORT to Grafana:

Expand Down Expand Up @@ -37,4 +37,4 @@ To connect the data in your $SERVICE_SHORT to Grafana:
[grafana-cloud]: https://grafana.com/get/
[cloud-login]: https://console.cloud.timescale.com/
[create-service]: /getting-started/:currentVersion:/services/
[connection-info]: /use-timescale/:currentVersion:/integrations/query-admin/find-connection-details/
[connection-info]: /use-timescale/:currentVersion:/integrations/find-connection-details/
2 changes: 1 addition & 1 deletion _partials/_integration-prereqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Before integrating:

[create-service]: /getting-started/:currentVersion:/services/
[enable-timescaledb]: /self-hosted/:currentVersion:/install/
[connection-info]: /use-timescale/:currentVersion:/integrations/query-admin/find-connection-details/
[connection-info]: /use-timescale/:currentVersion:/integrations/find-connection-details/
43 changes: 0 additions & 43 deletions lambda/csp.js

This file was deleted.

45 changes: 0 additions & 45 deletions lambda/index.mjs

This file was deleted.

66 changes: 53 additions & 13 deletions lambda/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ module.exports = [
},
{
from: "/tutorials/latest/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/observability-alerting/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/grafana/",
},
{
from: "/tutorials/latest/howto-monitor-django-prometheus",
Expand Down Expand Up @@ -605,27 +605,27 @@ module.exports = [
{ from: "/tutorials", to: "https://docs.timescale.com/tutorials/latest/" },
{
from: "/use-timescale/latest/connecting/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/",
},
{
from: "/use-timescale/latest/connecting/about-connecting",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/about-connecting/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/find-connection-details/",
},
{
from: "/use-timescale/latest/connecting/about-psql/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/about-psql/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/psql/",
},
{
from: "/use-timescale/latest/connecting/dbeaver/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/dbeaver/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/dbeaver/",
},
{
from: "/use-timescale/latest/connecting/pgadmin/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/pgadmin/",
},
{
from: "/use-timescale/latest/connecting/psql/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/query-admin/about-psql/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/psql/",
},
{
from: "/use-timescale/latest/data-tiering/move-data/",
Expand Down Expand Up @@ -721,7 +721,7 @@ module.exports = [
},
{
from: "/using-timescaledb/visualizing-data",
to: "https://docs.timescale.com/use-timescale/latest/integrations/observability-alerting/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/grafana/",
},
{
from: "/use-timescale/latest/account-management/",
Expand Down Expand Up @@ -759,15 +759,15 @@ module.exports = [
},
{
from: "/timescaledb/latest/tutorials/grafana/visualizations/pie-chart/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/observability-alerting/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/grafana/",
},
{
from: "/promscale/latest/about-promscale/#promscale-schema-for-metric-data",
to: "https://docs.timescale.com/",
},
{
from: "/promscale/latest/visualize-data/grafana",
to: "https://docs.timescale.com/use-timescale/latest/integrations/observability-alerting/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/grafana/",
},
{
from: "/install/latest/self-hosted/installation-redhat/#where-to-next",
Expand All @@ -783,7 +783,7 @@ module.exports = [
},
{
from: "/timescaledb/latest/tutorials/grafana/grafana-variables/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/observability-alerting/grafana/",
to: "https://docs.timescale.com/use-timescale/latest/integrations/grafana/",
},
{
from: "/clustering/using-timescaledb/update-db",
Expand Down Expand Up @@ -822,7 +822,47 @@ module.exports = [
to: "https://github.com/timescale/timescaledb-extras/blob/master/backfill.sql",
},
{
from: "/use-timescale/unexistent-path",
to: "https://github.com/timescale",
from: '/use-timescale/latest/integrations/observability-alerting/grafana/installation/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/grafana/',
},
{
from: '/use-timescale/latest/integrations/observability-alerting/grafana/geospatial-dashboards/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/grafana/',
},
{
from: '/use-timescale/latest/integrations/observability-alerting/grafana/create-dashboard-and-panel/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/grafana/',
},
{
from: '/use-timescale/latest/integrations/query-admin/about-psql/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/psql/',
},
{
from: '/use-timescale/latest/integrations/query-admin/about-connecting/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/find-connection-details/',
},
{
from: '/use-timescale/latest/integrations/query-admin/azure-data-studio/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/azure-data-studio/',
},
{
from: '/use-timescale/latest/integrations/query-admin/dbeaver/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/dbeaver/',
},
{
from: '/use-timescale/latest/integrations/query-admin/pgadmin/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/pgadmin/',
},
{
from: '/use-timescale/latest/integrations/query-admin/qstudio/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/qstudio/',
},
{
from: '/use-timescale/latest/integrations/config-deploy/terraform/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/terraform/',
},
{
from: '/use-timescale/latest/integrations/observability-alerting/tableau/',
to: 'https://docs.timescale.com/use-timescale/latest/integrations/tableau/',
},
];
4 changes: 2 additions & 2 deletions use-timescale/ingest-data/ingest-telegraf.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,6 @@ see the [PostgreQL output plugin][output-plugin].
[output-plugin]: https://github.com/influxdata/telegraf/blob/release-1.24/plugins/outputs/postgresql/README.md
[install-telegraf]: https://docs.influxdata.com/telegraf/v1.21/introduction/installation/
[create-service]: /getting-started/latest/
[connect-timescaledb]: /use-timescale/:currentVersion:/integrations/query-admin/about-connecting/
[grafana]: /use-timescale/:currentVersion:/integrations/observability-alerting/grafana/
[connect-timescaledb]: /use-timescale/:currentVersion:/integrations/find-connection-details/
[grafana]: /use-timescale/:currentVersion:/integrations/grafana/
[about-hypertables]: /use-timescale/:currentVersion:/hypertables/about-hypertables/
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ keywords: [connect]

# Connect to Timescale using Azure Data Studio

Azure Data Studio is a cross-platform database tool for data professionals using
on-premises and cloud data platforms on Windows, macOS, and Linux.
Azure Data Studio is an open-source, cross-platform hybrid data analytics tool designed to simplify the data landscape.

## Before you begin

Expand Down
13 changes: 0 additions & 13 deletions use-timescale/integrations/config-deploy/index.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ keywords: [connect]

# Connect to Timescale using DBeaver

[DBeaver][dbeaver] is a free and open source database tool that is available for
Microsoft Windows, Apple macOS, and many Linux versions. DBeaver provides a
powerful SQL editor, administration features, ability to migrate data and
[DBeaver][dbeaver] is a free cross-platform database tool for developers, database administrators, analysts, and everyone working with data. DBeaver provides a powerful SQL editor, administration features, ability to migrate data and
schema, and the ability to monitor database connection sessions. You can connect
to Timescale hosted on your local machine or on a remote server or a Timescale
service.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ To connect to your $SERVICE_SHORT or self-hosted database, you need at least the
- Password
- Database name

Find the connection details based on your installation type.
Find the connection details based on your deployment type:

<Tabs label="Connection details">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords: [Grafana, visualizations, analytics, monitoring]

import GrafanaConnect from "versionContent/_partials/_grafana-connect.mdx";

# Grafana
# Integrate Grafana and Timescale Cloud

[Grafana](https://grafana.com/docs/) enables you to query, visualize, alert on, and explore your metrics, logs, and traces wherever they’re stored.

Expand All @@ -22,6 +22,8 @@ view into the performance of a system, and each dashboard consists of one or
more panels, which represent information about a specific metric related to
that system.

To create a new dashboard:

<Procedure>

1. **On the `Dashboards` page, click `New` and select `New dashboard`**
Expand All @@ -48,7 +50,7 @@ that system.

## Use the time filter function

Grafana time-series panels include a time filter.
Grafana time-series panels include a time filter:

<Procedure>

Expand Down Expand Up @@ -165,9 +167,9 @@ tutorial as a starting point.

Add thresholds for 7 and 10, to mark rides over 7 and 10 miles in different colors, respectively.

You now have a visualization that looks like this:
You now have a visualization that looks like this:

![Timescale and Grafana integration](https://assets.timescale.com/docs/images/timescale-grafana-integration.png)
![Timescale and Grafana integration](https://assets.timescale.com/docs/images/timescale-grafana-integration.png)


</Procedure>
Expand Down
Loading

0 comments on commit 7efdb7f

Please sign in to comment.