Grafana configuration screenshot and instructions update

content/enterprise_influxdb/v1/tools/grafana.md

@@ -14,122 +14,111 @@ canonical: /influxdb/v2/tools/grafana/
 Use [Grafana](https://grafana.com/) or [Grafana Cloud](https://grafana.com/products/cloud/)
 to visualize data from your **InfluxDB Enterprise** cluster.
 
-{{% 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 %}}
-
-1.  [Set up an InfluxDB Enterprise cluster](/enterprise_influxdb/v1/introduction/installation/).
-2.  [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
-    [download and install Grafana](https://grafana.com/grafana/download).
-3.  Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
-    [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
-    <http://localhost:3000> in your browser.
-4.  In the left navigation of the Grafana UI, expand the **Connections** section
-    and click **Add new connection**.
-5.  Select **InfluxDB** from the list of available data sources and click
-    **Add data source**.
-6.  On the **Data Source configuration page**, enter a **name** for your InfluxDB data source.
-7.  In the **Query Language** drop-down menu, select one of the query languages
-    supported by InfluxDB {{< current-version >}} (InfluxQL or Flux):
-
-    {{% note %}}
-SQL is only supported in InfluxDB 3.
-    {{% /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](/enterprise_influxdb/v1/flux/installation/)
+>   in your InfluxDB data nodes.
 
-{{< tabs-wrapper >}}
-{{% tabs %}}
-[InfluxQL](#)
-[Flux](#)                 
-{{% /tabs %}}
-<!--------------------------- BEGIN INFLUXQL CONTENT -------------------------->
-{{% tab-content %}}
-## Configure Grafana to use InfluxQL
+- [Install Grafana](#install-grafana)
+- [Create an InfluxDB data source](#create-an-influxdb-data-source)
+- [Query and visualize data](#query-and-visualize-data)
 
-With **InfluxQL** selected as the query language in your InfluxDB data source settings:
+## Install Grafana
 
-1. Under **HTTP**, enter the following:
+1. [Set up an InfluxDB Enterprise cluster](/enterprise_influxdb/v1/introduction/installation/).
+2. [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
+   [download and install Grafana](https://grafana.com/grafana/download).
+3. Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
+   [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
+   <http://localhost:3000> in your browser.
 
-    - **URL**: Your **InfluxDB Enterprise URL** or **load balancer URL**.
+> [!Note]
+> #### 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.
 
-        ```sh
-        http://localhost:8086
-        ```
+## Create an InfluxDB data source
 
-2. Under **InfluxDB Details**, enter the following:
+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
 
-    - **Database**: your database name
-    - **User**: your InfluxDB username _(if [authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/))_
-    - **Password**: your InfluxDB password _(if [authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/))_
-    - **HTTP Method**: Select **GET** or **POST** _(for differences between the two,
-      see the [query HTTP endpoint documentation](/enterprise_influxdb/v1/tools/api/#query-http-endpoint))_
+   The InfluxDB configuration page displays with four numbered sections in the left sidebar:
 
-3. Provide a **[Min time interval](https://grafana.com/docs/grafana/latest/datasources/influxdb/#min-time-interval)**
-   (default is 10s).
+   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
 
-    {{< img-hd src="/img/influxdb/v1-tools-grafana-influxql.png" />}}
+   The InfluxDB configuration page displays with four numbered sections in the left sidebar.
 
-4. Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns
-   the result of the test.
+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**
 
-{{% /tab-content %}}
-<!---------------------------- END INFLUXQL CONTENT --------------------------->
-<!----------------------------- BEGIN FLUX CONTENT ---------------------------->
-{{% tab-content %}}
-## Configure Grafana to use Flux
+   After selecting your query language, section 2 (Database settings) displays fields specific to your selection.
+
+### Configure database settings
 
-With **Flux** selected as the query language in your InfluxDB data source,
-configure your InfluxDB connection:
+The fields in this section change based on your query language selection.
 
-1.  Ensure [Flux is enabled](/enterprise_influxdb/v1/flux/installation/) in
-    your InfluxDB Enterprise data nodes.
+{{< tabs-wrapper >}}
+{{% tabs %}}
+[InfluxQL](#)
+[Flux](#)                 
+{{% /tabs %}}
+{{% tab-content %}}
+<!--------------------------- BEGIN INFLUXQL CONTENT -------------------------->
 
-2.  Under **HTTP**, enter the following:
+## Configure Grafana to use InfluxQL
 
-    - **URL**: Your **InfluxDB Enterprise URL** or **load balancer URL**.
+When you select **InfluxQL** as the query language, configure the following:
 
-        ```sh
-        http://localhost:8086
-        ```
+- **Database**: Your database name
+- **User**: Your InfluxDB username _(if [authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/))_
+- **Password**: Your InfluxDB password _(if [authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/))_
 
-3.  Under **InfluxDB Details**, enter the following:
+{{< img-hd src="/img/influxdb3/enterprise-v1-grafana-product-dropdown-flux.png" alt="InfluxQL configuration for InfluxDB Enterprise 1.x" />}}
 
-    - **Organization**: Provide an arbitrary value.
-    - **Token**: If [InfluxDB authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/),
-      provide your InfluxDB username and password using the following syntax:
+Click **Save & Test**. Grafana attempts to connect to InfluxDB Enterprise and returns the result of the test.
 
-      ```sh
-      # Syntax
-      username:password
+<!---------------------------- END INFLUXQL CONTENT --------------------------->
+{{% /tab-content %}}
+{{% tab-content %}}
+<!----------------------------- BEGIN FLUX CONTENT ---------------------------->
 
-      # Example
-      johndoe:mY5uP3rS3crE7pA5Sw0Rd
-      ```
+## Configure Grafana to use Flux
 
-      If authentication is not enabled, leave blank.
+When you select **Flux** as the query language, configure the following:
 
-    - **Default Bucket**: Provide a default database and retention policy combination
-      using the following syntax:
+1. Ensure [Flux is enabled](/enterprise_influxdb/v1/flux/installation/) in your InfluxDB Enterprise data nodes.
 
-      ```sh
-      # Syntax
-      database-name/retention-policy-name
+2. Configure the database settings:
 
-      # Examples
-      example-db/example-rp
-      telegraf/autogen
-      ```
+   - **Organization**: Provide an arbitrary value (InfluxDB Enterprise 1.x does not use organizations)
+   - **Default Bucket**: Provide a default database and retention policy 
+   - **Token**: If [InfluxDB authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/)
 
-    - **Min time interval**: [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
+{{< img-hd src="/img/influxdb3/enterprise-v1-grafana-product-dropdown-flux.png" alt="Flux configuration for InfluxDB Enterprise 1.x" />}}
 
-      {{< img-hd src="/img/influxdb/v1-tools-grafana-flux.png" />}}
+Click **Save & Test**. Grafana attempts to connect to InfluxDB Enterprise and returns the result of the test.
 
-3. Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns
-   the result of the test.
-{{% /tab-content %}}
 <!------------------------------ END FLUX CONTENT ----------------------------->
+{{% /tab-content %}}
 {{< /tabs-wrapper >}}
+
+## Query and visualize data
+
+With your InfluxDB connection configured, use Grafana to query and visualize time series data.
+
+For more information, see:
+- [Grafana documentation](https://grafana.com/docs/grafana/latest/)
+- [Get started with Flux](/flux/v0/get-started/)

content/influxdb/v1/tools/grafana.md

@@ -25,112 +25,92 @@ to visualize data from your **InfluxDB v1.11** instance.
   in your InfluxDB configuration file.
 {{% /note %}}
 
-1.  [Start InfluxDB](/influxdb/v1/introduction/get-started/).
-2.  [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
-    [download and install Grafana](https://grafana.com/grafana/download).
-3.  Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
-    [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
-    <http://localhost:3000> in your browser.
-4.  In the left navigation of the Grafana UI, expand the **Connections** section
-    and click **Add new connection**.
-5.  Select **InfluxDB** from the list of available data sources and click
-    **Add data source**.
-6.  On the **Data Source configuration page**, enter a **name** for your InfluxDB data source.
-7.  In the **Query Language** drop-down menu, select one of the query languages
-    supported by InfluxDB {{< current-version >}} (InfluxQL or Flux):
-
-    {{% note %}}
-SQL is only supported in InfluxDB 3.
-    {{% /note %}}
+- [Install Grafana](#install-grafana)
+- [Create an InfluxDB data source](#create-an-influxdb-data-source)
+- [Query and visualize data](#query-and-visualize-data)
 
-{{< tabs-wrapper >}}
-{{% tabs %}}
-[InfluxQL](#)
-[Flux](#)                 
-{{% /tabs %}}
-<!--------------------------- BEGIN INFLUXQL CONTENT -------------------------->
-{{% tab-content %}}
-## Configure Grafana to use InfluxQL
+## Install Grafana
 
-With **InfluxQL** selected as the query language in your InfluxDB data source settings:
+1. [Start InfluxDB](/influxdb/v1/introduction/get-started/).
+2. [Sign up for Grafana Cloud](https://grafana.com/products/cloud/) or
+   [download and install Grafana](https://grafana.com/grafana/download).
+3. Visit your **Grafana Cloud user interface** (UI) or, if running Grafana locally,
+   [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
+   <http://localhost:3000> in your browser.
 
-1. Under **HTTP**, enter the following:
+{{% note %}}
+SQL is only supported in InfluxDB 3.
+{{% /note %}}
 
-    - **URL**: Your **InfluxDB URL**.
+## Create an InfluxDB data source
 
-        ```sh
-        http://localhost:8086
-        ```
+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
 
-2. Under **InfluxDB Details**, enter the following:
+   The InfluxDB configuration page displays with four numbered sections in the left sidebar.
 
-    - **Database**: your database name
-    - **User**: your InfluxDB username _(if [authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/))_
-    - **Password**: your InfluxDB password _(if [authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/))_
-    - **HTTP Method**: Select **GET** or **POST** _(for differences between the two,
-      see the [query HTTP endpoint documentation](/influxdb/v1/tools/api/#query-http-endpoint))_
+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**
 
-3. Provide a **[Min time interval](https://grafana.com/docs/grafana/latest/datasources/influxdb/#min-time-interval)**
-   (default is 10s).
+   After selecting your query language, section 2 (Database settings) displays fields specific to your selection.
 
-    {{< img-hd src="/img/influxdb/v1-tools-grafana-influxql.png" />}}
+### Configure database settings
 
-4. Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns
-   the result of the test.
+The fields in this section change based on your query language selection.
 
-{{% /tab-content %}}
-<!---------------------------- END INFLUXQL CONTENT --------------------------->
-<!----------------------------- BEGIN FLUX CONTENT ---------------------------->
+{{< tabs-wrapper >}}
+{{% tabs %}}
+[InfluxQL](#)
+[Flux](#)                 
+{{% /tabs %}}
 {{% tab-content %}}
-## Configure Grafana to use Flux
-
-With **Flux** selected as the query language in your InfluxDB data source,
-configure your InfluxDB connection:
-
-1. Ensure [Flux is enabled](/influxdb/v1/flux/installation/) in InfluxDB.
+<!--------------------------- BEGIN INFLUXQL CONTENT -------------------------->
 
-2. Under **HTTP**, enter the following:
+## Configure Grafana to use InfluxQL
 
-    - **URL**: Your **InfluxDB URL**.
+When you select **InfluxQL** as the query language, configure the following:
 
-        ```sh
-        http://localhost:8086
-        ```
+- **Database**: Your database name
+- **User**: Your InfluxDB username _(if [authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/)); leave blank if authentication is disabled._
+- **Password**: Your InfluxDB password _(if [authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/)); leave blank if authentication is disabled._
 
-3.  Under **InfluxDB Details**, enter the following:
+{{< img-hd src="/img/influxdb3/OSS-v1-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for InfluxDB OSS 1.x" />}}
 
-    - **Organization**: Provide an arbitrary value.
-    - **Token**: If [InfluxDB authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/),
-      provide your InfluxDB username and password using the following syntax:
+Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns the result of the test.
 
-      ```sh
-      # Syntax
-      username:password
+<!---------------------------- END INFLUXQL CONTENT --------------------------->
+{{% /tab-content %}}
+{{% tab-content %}}
+<!----------------------------- BEGIN FLUX CONTENT ---------------------------->
 
-      # Example
-      johndoe:mY5uP3rS3crE7pA5Sw0Rd
-      ```
+## Configure Grafana to use Flux
 
-      If authentication is not enabled, leave blank.
+When you select **Flux** as the query language, configure the following:
 
-    - **Default Bucket**: Provide a default database and retention policy combination
-      using the following syntax:
+1. Ensure [Flux is enabled](/influxdb/v1/flux/installation/) in your InfluxDB configuration file.
 
-      ```sh
-      # Syntax
-      database-name/retention-policy-name
+2. Configure the database settings:
 
-      # Examples
-      example-db/example-rp
-      telegraf/autogen
-      ```
+   - **Organization**: Provide an arbitrary value (InfluxDB 1.x does not use organizations)
+   - **Default Bucket**: Provide a default database and retention policy
+   - **Token**: If [InfluxDB authentication is enabled](/influxdb/v1/administration/authentication_and_authorization/) provide your InfluxDB username and password
 
-    - **Min time interval**: [Grafana minimum time interval](https://grafana.com/docs/grafana/latest/features/datasources/influxdb/#min-time-interval).
+{{< img-hd src="/img/influxdb3/OSS-v1-grafana-product-dropdown-flux.png" alt="Flux configuration for InfluxDB OSS 1.x" />}}
 
-      {{< img-hd src="/img/influxdb/v1-tools-grafana-flux.png" />}}
+Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns the result of the test.
 
-3. Click **Save & Test**. Grafana attempts to connect to InfluxDB and returns
-   the result of the test.
-{{% /tab-content %}}
 <!------------------------------ END FLUX CONTENT ----------------------------->
+{{% /tab-content %}}
 {{< /tabs-wrapper >}}
+
+## Query and visualize data
+
+With your InfluxDB connection configured, use Grafana to query and visualize time series data.
+
+For more information, see:
+- [Grafana documentation](https://grafana.com/docs/grafana/latest/)
+- [Get started with Flux](/flux/v0/get-started/)

content/influxdb3/core/visualize-data/grafana.md

@@ -17,9 +17,7 @@ alt_links:
   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/
-source: /shared/influxdb3-visualize/grafana.md
+source: /content/shared/v3-process-data/visualize/grafana.md
 ---
 
-<!--
-The content of this page is at content/shared/influxdb3-visualize/grafana.md
--->
+<!-- SOURCE: /content/shared/v3-process-data/visualize/grafana.md -->