diff --git a/content/enterprise_influxdb/v1/tools/grafana.md b/content/enterprise_influxdb/v1/tools/grafana.md index 3d7ff5e97..5fc445a54 100644 --- a/content/enterprise_influxdb/v1/tools/grafana.md +++ b/content/enterprise_influxdb/v1/tools/grafana.md @@ -8,6 +8,12 @@ menu: name: Grafana weight: 60 parent: Tools +alt_links: + core: /influxdb3/core/visualize-data/grafana/ + enterprise: /influxdb3/enterprise/visualize-data/grafana/ + cloud-serverless: /influxdb3/cloud-serverless/process-data/visualize/grafana/ + cloud-dedicated: /influxdb3/cloud-dedicated/process-data/visualize/grafana/ + clustered: /influxdb3/clustered/process-data/visualize/grafana/ canonical: /influxdb/v2/tools/grafana/ --- @@ -39,32 +45,20 @@ to visualize data from your **InfluxDB Enterprise** cluster. > #### Query language support > - InfluxQL is supported in InfluxDB Enterprise v1.8.x and later. > - Flux is supported in InfluxDB Enterprise v1.8.1 and later. -> - SQL is only supported in InfluxDB 3. +> - SQL is only supported in InfluxDB 3. For more information, see how to [get started with InfluxDB 3 Enterprise](/influxdb3/enterprise/get-started/). ## Create an InfluxDB data source 1. In your Grafana interface, click **Connections** in the left sidebar 2. Click **Data sources** -3. In the **Data sources** page, click **Add new data source** -4. In the **Add data source** page, locate and click the **InfluxDB** card - - The InfluxDB configuration page displays with four numbered sections in the left sidebar: - - 1. **URL and authentication** - 2. **Database settings** - 3. **Private data source connect** - 4. **Save & test** -5. Click **Add new connection** -6. Locate and click the **InfluxDB** card - - The InfluxDB configuration page displays with four numbered sections in the left sidebar. - -7. **Name**: Enter a descriptive name for your data source -8. **URL**: Enter your InfluxDB Enterprise URL or load balancer URL: `http://localhost:8086` -9. **Product**: From the dropdown, select **InfluxDB Enterprise 1.x** -10. **Query Language**: Select **InfluxQL** or **Flux** - - After selecting your query language, section 2 (Database settings) displays fields specific to your selection. +3. Click **Add new connection** +4. Search for and select **InfluxDB**. The InfluxDB data source configuration page displays. +5. In the **Settings** tab, configure the following: + + - **Name**: A descriptive name for your data source + - **URL**: Your server or load balancer URL--for example, `https://{{< influxdb/host >}}` + - **Product**: From the dropdown, select **InfluxDB Enterprise 1.x** + - **Query Language**: Select **InfluxQL** or **Flux** ### Configure database settings diff --git a/content/influxdb/v1/tools/grafana.md b/content/influxdb/v1/tools/grafana.md index 44735ea42..48c6a65cc 100644 --- a/content/influxdb/v1/tools/grafana.md +++ b/content/influxdb/v1/tools/grafana.md @@ -10,20 +10,24 @@ menu: parent: Tools alt_links: v2: /influxdb/v2/tools/grafana/ + core: /influxdb3/core/visualize-data/grafana/ + enterprise: /influxdb3/enterprise/visualize-data/grafana/ + cloud-serverless: /influxdb3/cloud-serverless/process-data/visualize/grafana/ + cloud-dedicated: /influxdb3/cloud-dedicated/process-data/visualize/grafana/ + clustered: /influxdb3/clustered/process-data/visualize/grafana/ canonical: /influxdb/v2/tools/grafana/ --- Use [Grafana](https://grafana.com/) or [Grafana Cloud](https://grafana.com/products/cloud/) to visualize data from your **InfluxDB v1.11** instance. -{{% note %}} -#### Required -- The instructions in this guide require **Grafana Cloud** or **Grafana v10.3+**. - For information about using InfluxDB with other versions of Grafana, - see the [Grafana documentation](https://grafana.com/docs/grafana/latest/datasources/influxdb/). -- To use **Flux**, use **InfluxDB 1.8.1+** and [enable Flux](/influxdb/v1/flux/installation/) - in your InfluxDB configuration file. -{{% /note %}} +> [!Note] +> #### Required +> - The instructions in this guide require **Grafana Cloud** or **Grafana v10.3+**. +> For information about using InfluxDB with other versions of Grafana, +> see the [Grafana documentation](https://grafana.com/docs/grafana/latest/datasources/influxdb/). +> - To use **Flux**, use **InfluxDB 1.8.1+** and [enable Flux](/influxdb/v1/flux/installation/) +> in your InfluxDB configuration file. - [Install Grafana](#install-grafana) - [Create an InfluxDB data source](#create-an-influxdb-data-source) @@ -38,25 +42,22 @@ to visualize data from your **InfluxDB v1.11** instance. [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit in your browser. -{{% note %}} -SQL is only supported in InfluxDB 3. -{{% /note %}} +> [!Note] +> SQL is only supported in InfluxDB 3. +> For more information, see how to [get started with InfluxDB 3 Core](/influxdb3/core/get-started/). ## Create an InfluxDB data source 1. In your Grafana interface, click **Connections** in the left sidebar 2. Click **Data sources** 3. Click **Add new connection** -4. Locate and click the **InfluxDB** card +4. Search for and select **InfluxDB**. The InfluxDB data source configuration page displays. +5. In the **Settings** tab, configure the following: - The InfluxDB configuration page displays with four numbered sections in the left sidebar. - -5. **Name**: Enter a descriptive name for your data source -6. **URL**: Enter your InfluxDB URL: `http://localhost:8086` -7. **Product**: From the dropdown, select **InfluxDB OSS 1.x** -8. **Query Language**: Select **InfluxQL** or **Flux** - - After selecting your query language, section 2 (Database settings) displays fields specific to your selection. + - **Name**: A descriptive name for your data source + - **URL**: Your server URL--for example, `https://{{< influxdb/host >}}` + - **Product**: From the dropdown, select **InfluxDB OSS 1.x** + - **Query Language**: Select **InfluxQL** or **Flux** ### Configure database settings diff --git a/content/influxdb3/core/visualize-data/grafana.md b/content/influxdb3/core/visualize-data/grafana.md index e6e22ec15..b4fc89c67 100644 --- a/content/influxdb3/core/visualize-data/grafana.md +++ b/content/influxdb3/core/visualize-data/grafana.md @@ -11,12 +11,14 @@ menu: parent: Visualize data influxdb3/core/tags: [query, visualization] alt_links: - v1: /influxdb/v1/tools/grafana/ - v2: /influxdb/v2/tools/grafana/ - cloud: /influxdb/cloud/tools/grafana/ + enterprise: /influxdb3/enterprise/visualize-data/grafana/ + enterprise_v1: /enterprise_influxdb/v1/tools/grafana/ cloud-serverless: /influxdb3/cloud-serverless/process-data/visualize/grafana/ cloud-dedicated: /influxdb3/cloud-dedicated/process-data/visualize/grafana/ clustered: /influxdb3/clustered/process-data/visualize/grafana/ + v1: /influxdb/v1/tools/grafana/ + v2: /influxdb/v2/tools/grafana/ + cloud: /influxdb/cloud/tools/grafana/ source: /content/shared/v3-process-data/visualize/grafana.md --- diff --git a/content/influxdb3/enterprise/visualize-data/grafana.md b/content/influxdb3/enterprise/visualize-data/grafana.md index 61fda611e..583451001 100644 --- a/content/influxdb3/enterprise/visualize-data/grafana.md +++ b/content/influxdb3/enterprise/visualize-data/grafana.md @@ -11,12 +11,14 @@ menu: parent: Visualize data influxdb3/enterprise/tags: [query, visualization] alt_links: - v1: /influxdb/v1/tools/grafana/ - v2: /influxdb/v2/tools/grafana/ - cloud: /influxdb/cloud/tools/grafana/ + core: /influxdb3/core/visualize-data/grafana/ cloud-serverless: /influxdb3/cloud-serverless/process-data/visualize/grafana/ cloud-dedicated: /influxdb3/cloud-dedicated/process-data/visualize/grafana/ clustered: /influxdb3/clustered/process-data/visualize/grafana/ + enterprise_v1: /enterprise_influxdb/v1/tools/grafana/ + v1: /influxdb/v1/tools/grafana/ + v2: /influxdb/v2/tools/grafana/ + cloud: /influxdb/cloud/tools/grafana/ source: /content/shared/v3-process-data/visualize/grafana.md --- diff --git a/content/shared/influxdb-v2/tools/grafana.md b/content/shared/influxdb-v2/tools/grafana.md index d59644e19..e7c149e19 100644 --- a/content/shared/influxdb-v2/tools/grafana.md +++ b/content/shared/influxdb-v2/tools/grafana.md @@ -1,9 +1,8 @@ Use [Grafana](https://grafana.com/) or [Grafana Cloud](https://grafana.com/products/cloud/) to visualize data from your **InfluxDB {{< current-version >}}** instance. -{{% note %}} -The instructions in this guide require **Grafana Cloud** or **Grafana 10.3+**. -{{% /note %}} +> [!Note] +> The instructions in this guide require **Grafana Cloud** or **Grafana 10.3+**. - [Install Grafana](#install-grafana) - [Create an InfluxDB data source](#create-an-influxdb-data-source) @@ -18,26 +17,34 @@ The instructions in this guide require **Grafana Cloud** or **Grafana 10.3+**. [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit in your browser. - {{% note %}} -SQL is only supported in InfluxDB 3. - {{% /note %}} +> [!Note] +> SQL is only supported in InfluxDB 3. +> {{% show-in "v2" %}}For more information, see how to [get-started with InfluxDB 3 Core](/influxdb3/core/get-started/).{{% /show-in %}}{{% show-in "cloud" %}}For more information, see how to upgrade to [InfluxDB Cloud Serverless](/influxdb/cloud/upgrade/v2-to-cloud/).{{% /show-in %}} + +## Quick reference + +| Configuration | Value | +|:------------- |:----- | +| **Product selection** | {{% show-in "v2" %}}**InfluxDB OSS 2.x**{{% /show-in %}}{{% show-in "cloud" %}}**InfluxDB Cloud (TSM)**{{% /show-in %}} | +| **URL** | {{% show-in "v2" %}}[Server URL](/influxdb/v2/reference/urls/)--for example, `https://{{< influxdb/host >}}`{{% /show-in %}}{{% show-in "cloud" %}}[Region URL](/influxdb/cloud/reference/regions/)--for example, `https://us-east-2-1.aws.cloud2.influxdata.com`{{% /show-in %}} | +| **Query languages** | Flux, InfluxQL | +| **Authentication** | API token or v1 username/password | +| **Organization** | Organization name or ID (Flux only) | +| **Default Bucket** | Default bucket for Flux queries (Flux only) | +| **Database** | Database name mapped to bucket (InfluxQL only) | ## Create an InfluxDB data source 1. In your Grafana interface, click **Connections** in the left sidebar 2. Click **Data sources** 3. Click **Add new connection** -4. Locate and click the **InfluxDB** card +4. Search for and select **InfluxDB**. The InfluxDB data source configuration page displays. +5. In the **Settings** tab, configure the following: - The InfluxDB configuration page displays with four numbered sections in the left sidebar. - -5. **Name**: Enter a descriptive name for your data source -6. **URL**: Enter your [InfluxDB URL](/influxdb/v2/reference/urls/): http://localhost:8086 - -7. **Product**: From the dropdown, select {{% show-in "v2" %}}**InfluxDB OSS 2.x**{{% /show-in %}}{{% show-in "cloud" %}}**InfluxDB Cloud (TSM)**{{% /show-in %}} -8. **Query Language**: Select **Flux** or **InfluxQL** - - After selecting your query language, section 2 (Database settings) displays fields specific to your selection. + - **Name**: A descriptive name for your data source + - **URL**: Your {{% show-in "v2" %}}[server URL](/influxdb/v2/reference/urls/)--for example, `https://{{< influxdb/host >}}`{{% /show-in %}}{{% show-in "cloud" %}}[region URL](/influxdb/cloud/reference/regions/)--for example, `https://us-east-2-1.aws.cloud2.influxdata.com`{{% /show-in %}} + - **Product**: From the dropdown, select {{% show-in "v2" %}}**InfluxDB OSS 2.x**{{% /show-in %}}{{% show-in "cloud" %}}**InfluxDB Cloud (TSM)**{{% /show-in %}} + - **Query Language**: Select **Flux** or **InfluxQL** ### Configure database settings @@ -60,7 +67,7 @@ When you select **Flux** as the query language, configure the following: - **Token**: Your InfluxDB [API token](/influxdb/v2/admin/tokens/) {{% show-in "v2" %}}{{< img-hd src="/img/influxdb/OSS-v2-grafana-product-dropdown-flux.png" alt="Flux configuration for InfluxDB OSS 2.x" />}}{{% /show-in %}} -{{% show-in "cloud" %}}{{< img-hd src="/img/influxdb/cloud-tools-grafana-flux.png" alt="Flux configuration for InfluxDB Cloud (TSM)" />}}{{% /show-in %}} +{{% show-in "cloud" %}}{{< img-hd src="/img/influxdb/influxdb-v2-cloud-flux.png" alt="Flux configuration for InfluxDB Cloud (TSM)" />}}{{% /show-in %}} Click **Save & Test**. Grafana attempts to connect to {{% show-in "v2" %}}InfluxDB OSS 2.x{{% /show-in %}}{{% show-in "cloud" %}}InfluxDB Cloud{{% /show-in %}} and returns the results of the test. @@ -130,10 +137,9 @@ Provide: - `--bucket-id:` Bucket ID - `--default:` (Optional) Make this the default retention policy for the database -{{% note %}} -**Repeat for each DBRP combination** -Each unique database and retention policy combination used by Grafana must be mapped to an InfluxDB OSS 2.x bucket. -{{% /note %}} +> [!Note] +> **Repeat for each DBRP combination** +> Each unique database and retention policy combination used by Grafana must be mapped to an InfluxDB OSS 2.x bucket. For more information, see [Database and retention policy mapping](/influxdb/v2/api-guide/influxdb-1x/dbrp/). diff --git a/content/shared/influxdb3-visualize/grafana.md b/content/shared/influxdb3-visualize/grafana.md deleted file mode 100644 index 22aaebe00..000000000 --- a/content/shared/influxdb3-visualize/grafana.md +++ /dev/null @@ -1,185 +0,0 @@ -Use [Grafana](https://grafana.com/) to query and visualize data from -{{% product-name %}}. - -> [Grafana] enables you to query, visualize, alert on, and explore your metrics, -> logs, and traces wherever they are stored. -> [Grafana] provides you with tools to turn your time-series database (TSDB) -> data into insightful graphs and visualizations. -> -> {{% cite %}}-- [Grafana documentation](https://grafana.com/docs/grafana/latest/introduction/){{% /cite %}} - - -> [!Note] -> {{< influxdb-version-detector >}} - -- [Install Grafana or login to Grafana Cloud](#install-grafana-or-login-to-grafana-cloud) -- [InfluxDB data source](#influxdb-data-source) -- [Before you begin](#before-you-begin) -- [Create an InfluxDB data source](#create-an-influxdb-data-source) -- [Query InfluxDB with Grafana](#query-influxdb-with-grafana) -- [Build visualizations with Grafana](#build-visualizations-with-grafana) - -## Install Grafana or login to Grafana Cloud - -If using the open source version of **Grafana**, follow the -[Grafana installation instructions](https://grafana.com/docs/grafana/latest/setup-grafana/installation/) -to install Grafana for your operating system. -If using **Grafana Cloud**, login to your Grafana Cloud instance. - -## InfluxDB data source - -The InfluxDB data source plugin is included in the Grafana core distribution. -Use the plugin to query and visualize data from {{< product-name >}} with -both SQL and InfluxQL. - -> [!Note] -> #### Grafana 10.3+ -> -> The instructions below are for **Grafana 10.3+** which introduced the newest -> version of the InfluxDB core plugin. -> The updated plugin includes **SQL support** for InfluxDB 3-based products such -> as {{< product-name >}}, and the interface dynamically adapts based on your product and query language selections. - - -## Before you begin - -**Prerequisites:** -- Grafana 10.3 or later -- Administrator role in Grafana -- {{% product-name %}} instance and [database token](/influxdb3/version/admin/tokens/#database-tokens) - -## Create an InfluxDB data source - -1. In your Grafana interface, click **Connections** in the left sidebar -2. Click **Data sources** -3. Click **Add new data source** -4. Under **Time series databases**, select **InfluxDB** - -The configuration form displays with four numbered sections. Section 2 (Database settings) displays different fields based on your query language selection. - -5. **Name**: Enter a descriptive name for your data source -6. **URL**: Enter your {{% product-name %}} cluster URL: `https://{{< influxdb/host >}}` -7. **Product**: From the dropdown, select **InfluxDB Enterprise 3.x** -8. **Query Language**: Select **SQL** or **InfluxQL** - -### Configure database settings - -The fields in this section change based on your query language selection. - -{{< tabs-wrapper >}} -{{% tabs %}} -[SQL](#) -[InfluxQL](#) -{{% /tabs %}} -{{% tab-content %}} - - -When you select **SQL** as the query language, configure the following: - -- **Database**: Your [database](/influxdb3/version/admin/databases/) name -- **Token**: A [database token](/influxdb3/version/admin/tokens/#database-tokens) with read access to the database - - {{< img-hd src="/img/influxdb3/enterprise-v3-grafana-product-dropdown-sql.png" alt="Grafana InfluxDB data source for InfluxDB 3 that uses SQL" />}} - - -{{% /tab-content %}} -{{% tab-content %}} - - -When you select **InfluxQL** as the query language, configure the following: - -- **Database**: Your [database](/influxdb3/version/admin/databases/) name -- **User**: Enter a username. -- **Password**: A [database token](/influxdb3/version/admin/tokens/#database-tokens) with read access to the database -- **HTTP Method**: Select **POST** (recommended) or **GET** - - {{< img-hd src="/img/influxdb3/enterprise-v3-grafana-product-dropdown-influxql.png" alt="Grafana InfluxDB data source for InfluxDB 3 that uses InfluxQL" />}} - - -{{% /tab-content %}} -{{< /tabs-wrapper >}} - -## Query InfluxDB with Grafana - -After you [configure and save an InfluxDB datasource](#create-an-influxdb-data-source), -use Grafana to build, run, and inspect queries against {{< product-name >}}. - -{{< tabs-wrapper >}} -{{% tabs %}} -[SQL](#) -[InfluxQL](#) -{{% /tabs %}} -{{% tab-content %}} - - -> [!Note] -> {{% sql/sql-schema-intro %}} -> To learn more, see [Query Data](/influxdb3/version/query-data/sql/). - -1. Click **Explore**. -2. In the dropdown, select the saved InfluxDB data source to query. -3. Use the SQL query form to build your query: - - - **Table**: Select the measurement to query. - - **Column**: Select one or more fields and tags to return as columns in query results. - - With SQL, select the `time` column to include timestamps with the data. - Grafana relies on the `time` column to correctly graph time series data. - - - _**Optional:**_ Toggle **filter** to generate **WHERE** clause statements. - - **WHERE**: Configure condition expressions to include in the `WHERE` clause. - - - _**Optional:**_ Toggle **group** to generate **GROUP BY** clause statements. - - - **GROUP BY**: Select columns to group by. - If you include an aggregation function in the **SELECT** list, - you must group by one or more of the queried columns. - SQL returns the aggregation for each group. - - - {{< req text="Recommended" color="green" >}}: - Toggle **order** to generate **ORDER BY** clause statements. - - - **ORDER BY**: Select columns to sort by. - You can sort by time and multiple fields or tags. - To sort in descending order, select **DESC**. - -4. {{< req text="Recommended" color="green" >}}: Change format to **Time series**. - - - Use the **Format** dropdown to change the format of the query results. - For example, to visualize the query results as a time series, select **Time series**. - -5. Click **Run query** to execute the query. - - -{{% /tab-content %}} -{{% tab-content %}} - - -1. Click **Explore**. -2. In the dropdown, select the **InfluxDB** data source that you want to query. -3. Use the InfluxQL query form to build your query: - - - **FROM**: Select the measurement that you want to query. - - **WHERE**: To filter the query results, enter a conditional expression. - - **SELECT**: Select fields to query and an aggregate function to apply to each. - The aggregate function is applied to each time interval defined in the - `GROUP BY` clause. - - **GROUP BY**: By default, Grafana groups data by time to downsample results - and improve query performance. - You can also add other tags to group by. - -4. Click **Run query** to execute the query. - - -{{% /tab-content %}} -{{< /tabs-wrapper >}} - -{{< youtube "rSsouoNsNDs" >}} - -To learn about query management and inspection in Grafana, see the -[Grafana Explore documentation](https://grafana.com/docs/grafana/latest/explore/). - -## Build visualizations with Grafana - -For a comprehensive walk-through of creating visualizations with -Grafana, see the [Grafana documentation](https://grafana.com/docs/grafana/latest/). diff --git a/content/shared/v3-process-data/visualize/grafana.md b/content/shared/v3-process-data/visualize/grafana.md index c590d29d2..c4eb318ec 100644 --- a/content/shared/v3-process-data/visualize/grafana.md +++ b/content/shared/v3-process-data/visualize/grafana.md @@ -48,9 +48,9 @@ both SQL and InfluxQL. | Configuration | Value | |:------------- |:----- | | **Product selection** | {{% hide-in "core,enterprise" %}}**{{% product-name %}}**{{% /hide-in %}}{{% show-in "core" %}}**InfluxDB Core 3.x**{{% /show-in %}}{{% show-in "enterprise" %}}**InfluxDB Enterprise 3.x**{{% /show-in %}} | -| **Default URL** | {{% show-in "core, enterprise" %}}`http://localhost:8181`{{% /show-in %}}{{% show-in "cloud-serverless, cloud-dedicated, clustered" %}}`https://{{< influxdb/host >}}`{{% /show-in %}} | +| **URL** | {{% show-in "cloud-dedicated,clustered" %}} Cluster URL{{% /show-in %}}{{% show-in "cloud-serverless" %}} [Region URL](/influxdb3/cloud-serverless/reference/regions/)--for example, `https://us-west-2-1.aws.cloud2.influxdata.com`{{% /show-in %}}{{% show-in "core,enterprise" %}}Server URL{{% /show-in %}}{{% hide-in "cloud-serverless" %}}--for example, `https://{{< influxdb/host >}}`{{% /hide-in %}} | | **Query languages** | SQL (requires HTTP/2), InfluxQL | -| **Authentication** | {{% show-in "cloud-serverless" %}}Required (API token){{% /show-in %}}{{% show-in "core" %}}Optional (admin token){{% /show-in %}}{{% show-in "enterprise" %}}Optional (admin or database token){{% /show-in %}}{{% show-in "cloud-dedicated, clustered" %}}Required (database token){{% /show-in %}} | +| **Authentication** | {{% show-in "cloud-serverless" %}}Required (API token){{% /show-in %}}{{% show-in "core" %}}Admin token (if authentication is enabled){{% /show-in %}}{{% show-in "enterprise" %}}Admin or database token (if authentication is enabled){{% /show-in %}}{{% show-in "cloud-dedicated, clustered" %}}Required (database token){{% /show-in %}} | | **Database/Bucket** | {{% show-in "cloud-serverless" %}}Bucket name{{% /show-in %}}{{% hide-in "cloud-serverless" %}}Database name{{% /hide-in %}} | ## Create an InfluxDB data source @@ -61,8 +61,8 @@ both SQL and InfluxQL. 4. Search for and select **InfluxDB**. The InfluxDB data source configuration page displays. 5. In the **Settings** tab, configure the following: - - **Name**: Enter a descriptive name for your data source - - **URL**: Enter your {{% product-name %}}{{% show-in "cloud-dedicated, clustered" %}} cluster URL{{% /show-in %}}{{% show-in "cloud-serverless" %}} region URL{{% /show-in %}}{{% show-in "core, enterprise" %}} instance URL{{% /show-in %}}: `https://{{< influxdb/host >}}` + - **Name**: A descriptive name for your data source + - **URL**: Your {{% product-name %}}{{% show-in "cloud-dedicated,clustered" %}} cluster URL{{% /show-in %}}{{% show-in "cloud-serverless" %}} [region URL](/influxdb3/cloud-serverless/reference/regions/)--for example, `https://us-west-2-1.aws.cloud2.influxdata.com`{{% /show-in %}}{{% show-in "core,enterprise" %}} server URL{{% /show-in %}}{{% hide-in "cloud-serverless" %}}--for example, `https://{{< influxdb/host >}}`{{% /hide-in %}} - **Product**: From the dropdown, select {{% hide-in "core,enterprise" %}}**{{% product-name %}}**{{% /hide-in %}}{{% show-in "core" %}}**InfluxDB Core 3.x**{{% /show-in %}}{{% show-in "enterprise" %}}**InfluxDB Enterprise 3.x**{{% /show-in %}} - **Query Language**: Select **SQL** or **InfluxQL** @@ -125,7 +125,7 @@ When you select **InfluxQL** as the query language, configure the following fiel - **Database**: {{% show-in "cloud-serverless" %}}The database name mapped to your InfluxDB bucket.{{% /show-in %}}{{% hide-in "cloud-serverless" %}}Your [database](/influxdb3/version/admin/databases/) name.{{% /hide-in %}} -- **User**: Enter a username (can be any non-empty value). +- **User**: A username (can be any non-empty value). - **Password**: {{% show-in "cloud-serverless" %}}Your [API token](/influxdb3/version/admin/tokens/) with read access to the bucket.{{% /show-in %}}{{% hide-in "cloud-serverless" %}}Your [database token](/influxdb3/version/admin/tokens/#database-tokens) with read access to the database.{{% /hide-in %}} @@ -134,7 +134,8 @@ When you select **InfluxQL** as the query language, configure the following fiel {{% show-in "cloud-serverless" %}}{{< img-hd src="/img/influxdb3/cloud-serverless-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}} {{% show-in "cloud-dedicated" %}}{{< img-hd src="/img/influxdb3/cloud-dedicated-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}} {{% show-in "clustered" %}}{{< img-hd src="/img/influxdb3/cluster-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}} -{{% show-in "core, enterprise" %}}{{< img-hd src="/img/influxdb3/enterprise-v3-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}} + +{{% show-in "enterprise" %}}{{< img-hd src="/img/influxdb3/enterprise-v3-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}} Click **Save & test**. Grafana attempts to connect to {{% product-name %}} and returns the result of the test. diff --git a/static/img/influxdb/cloud-tools-grafana-flux.png b/static/img/influxdb/cloud-tools-grafana-flux.png deleted file mode 100644 index ac6e63de0..000000000 Binary files a/static/img/influxdb/cloud-tools-grafana-flux.png and /dev/null differ diff --git a/static/img/influxdb/cloud-tools-grafana-influxql.png b/static/img/influxdb/cloud-tools-grafana-influxql.png deleted file mode 100644 index f3e8f7422..000000000 Binary files a/static/img/influxdb/cloud-tools-grafana-influxql.png and /dev/null differ diff --git a/static/img/influxdb/influxdb-v2-cloud-flux.png b/static/img/influxdb/influxdb-v2-cloud-flux.png new file mode 100644 index 000000000..90866f33c Binary files /dev/null and b/static/img/influxdb/influxdb-v2-cloud-flux.png differ diff --git a/static/img/influxdb/v1-tools-grafana-flux.png b/static/img/influxdb/v1-tools-grafana-flux.png deleted file mode 100644 index 1ad98c315..000000000 Binary files a/static/img/influxdb/v1-tools-grafana-flux.png and /dev/null differ diff --git a/static/img/influxdb/v1-tools-grafana-influxql.png b/static/img/influxdb/v1-tools-grafana-influxql.png deleted file mode 100644 index 80f2372f4..000000000 Binary files a/static/img/influxdb/v1-tools-grafana-influxql.png and /dev/null differ diff --git a/static/img/influxdb/v2-tools-grafana-flux.png b/static/img/influxdb/v2-tools-grafana-flux.png deleted file mode 100644 index 276a5e516..000000000 Binary files a/static/img/influxdb/v2-tools-grafana-flux.png and /dev/null differ diff --git a/static/img/influxdb/v2-tools-grafana-influxql.png b/static/img/influxdb/v2-tools-grafana-influxql.png deleted file mode 100644 index d51a3fee0..000000000 Binary files a/static/img/influxdb/v2-tools-grafana-influxql.png and /dev/null differ