Merge pull request #6457 from influxdata/update-grafana-screenshots

chore(grafana): update grafana screenshots, remove unused images

.husky/_/pre-commit

@@ -33,9 +33,6 @@ call_lefthook()
     then
       "$dir/node_modules/lefthook/bin/index.js" "$@"
     
-    elif go tool lefthook -h >/dev/null 2>&1
-    then
-      go tool lefthook "$@"
     elif bundle exec lefthook -h >/dev/null 2>&1
     then
       bundle exec lefthook "$@"
@@ -45,21 +42,12 @@ call_lefthook()
     elif pnpm lefthook -h >/dev/null 2>&1
     then
       pnpm lefthook "$@"
-    elif swift package lefthook >/dev/null 2>&1
+    elif swift package plugin lefthook >/dev/null 2>&1
     then
-      swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
+      swift package --disable-sandbox plugin lefthook "$@"
     elif command -v mint >/dev/null 2>&1
     then
       mint run csjones/lefthook-plugin "$@"
-    elif uv run lefthook -h >/dev/null 2>&1
-    then
-      uv run lefthook "$@"
-    elif mise exec -- lefthook -h >/dev/null 2>&1
-    then
-      mise exec -- lefthook "$@"
-    elif devbox run lefthook -h >/dev/null 2>&1
-    then
-      devbox run lefthook "$@"
     else
       echo "Can't find lefthook in PATH"
     fi

.husky/_/pre-push

@@ -33,9 +33,6 @@ call_lefthook()
     then
       "$dir/node_modules/lefthook/bin/index.js" "$@"
     
-    elif go tool lefthook -h >/dev/null 2>&1
-    then
-      go tool lefthook "$@"
     elif bundle exec lefthook -h >/dev/null 2>&1
     then
       bundle exec lefthook "$@"
@@ -45,21 +42,12 @@ call_lefthook()
     elif pnpm lefthook -h >/dev/null 2>&1
     then
       pnpm lefthook "$@"
-    elif swift package lefthook >/dev/null 2>&1
+    elif swift package plugin lefthook >/dev/null 2>&1
     then
-      swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
+      swift package --disable-sandbox plugin lefthook "$@"
     elif command -v mint >/dev/null 2>&1
     then
       mint run csjones/lefthook-plugin "$@"
-    elif uv run lefthook -h >/dev/null 2>&1
-    then
-      uv run lefthook "$@"
-    elif mise exec -- lefthook -h >/dev/null 2>&1
-    then
-      mise exec -- lefthook "$@"
-    elif devbox run lefthook -h >/dev/null 2>&1
-    then
-      devbox run lefthook "$@"
     else
       echo "Can't find lefthook in PATH"
     fi

.husky/_/prepare-commit-msg

@@ -33,9 +33,6 @@ call_lefthook()
     then
       "$dir/node_modules/lefthook/bin/index.js" "$@"
     
-    elif go tool lefthook -h >/dev/null 2>&1
-    then
-      go tool lefthook "$@"
     elif bundle exec lefthook -h >/dev/null 2>&1
     then
       bundle exec lefthook "$@"
@@ -45,21 +42,12 @@ call_lefthook()
     elif pnpm lefthook -h >/dev/null 2>&1
     then
       pnpm lefthook "$@"
-    elif swift package lefthook >/dev/null 2>&1
+    elif swift package plugin lefthook >/dev/null 2>&1
     then
-      swift package --build-path .build/lefthook --disable-sandbox lefthook "$@"
+      swift package --disable-sandbox plugin lefthook "$@"
     elif command -v mint >/dev/null 2>&1
     then
       mint run csjones/lefthook-plugin "$@"
-    elif uv run lefthook -h >/dev/null 2>&1
-    then
-      uv run lefthook "$@"
-    elif mise exec -- lefthook -h >/dev/null 2>&1
-    then
-      mise exec -- lefthook "$@"
-    elif devbox run lefthook -h >/dev/null 2>&1
-    then
-      devbox run lefthook "$@"
     else
       echo "Can't find lefthook in PATH"
     fi

content/enterprise_influxdb/v1/tools/grafana.md

@@ -113,6 +113,15 @@ to visualize data from your **InfluxDB Enterprise** cluster.
    [start Grafana](https://grafana.com/docs/grafana/latest/installation/) and visit
    <http://localhost:3000> in your browser.
 
+> [!Note]
+> #### Grafana 12.2+
+>
+> The instructions below are for **Grafana 12.2+** with the `newInfluxDSConfigPageDesign`
+> feature flag enabled. This introduces 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 selection in [URL and authentication](#configure-url-and-authentication).
+
 > [!Note]
 > #### Using Grafana Cloud with a local InfluxDB instance
 >
@@ -147,7 +156,7 @@ In the **URL and authentication** section, configure the following:
 
 ### Configure database settings
 
-The fields in this section change based on your query language selection in [URL and authentication](#configure-url-authentication).
+The fields in this section change based on your query language selection in [URL and authentication](#configure-url-and-authentication).
 
 {{< tabs-wrapper >}}
 {{% tabs %}}
@@ -165,7 +174,7 @@ When you select **InfluxQL** as the query language, configure the following:
 - **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/))_
 
-{{< img-hd src="/img/influxdb3/enterprise-v1-grafana-product-dropdown-flux.png" alt="InfluxQL configuration for InfluxDB Enterprise 1.x" />}}
+{{< img-hd src="/img/grafana/enterprise-influxdb-v1-grafana-influxql.png" alt="InfluxQL configuration for InfluxDB Enterprise 1.x" />}}
 
 Click **Save & Test**. Grafana attempts to connect to InfluxDB Enterprise and returns the result of the test.
 
@@ -186,7 +195,7 @@ When you select **Flux** as the query language, configure the following:
    - **Default Bucket**: Provide a default database and retention policy 
    - **Token**: If [InfluxDB authentication is enabled](/enterprise_influxdb/v1/administration/authentication_and_authorization/)
 
-{{< img-hd src="/img/influxdb3/enterprise-v1-grafana-product-dropdown-flux.png" alt="Flux configuration for InfluxDB Enterprise 1.x" />}}
+{{< img-hd src="/img/grafana/enterprise-influxdb-v1-grafana-flux.png" alt="Flux configuration for InfluxDB Enterprise 1.x" />}}
 
 Click **Save & Test**. Grafana attempts to connect to InfluxDB Enterprise and returns the result of the test.
 

content/influxdb/v1/tools/grafana.md

@@ -26,9 +26,19 @@ to visualize data from your {{% product-name %}} instance.
 > [!Note]
 > {{< influxdb-version-detector >}}
 
+> [!Note]
+> #### Grafana 12.2+
+>
+> The instructions below are for **Grafana 12.2+** with the `newInfluxDSConfigPageDesign`
+> feature flag enabled. This introduces 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 selection in [URL and authentication](#configure-url-and-authentication).
+
 > [!Note]
 > #### Required
-> - The instructions in this guide require **Grafana Cloud** or **Grafana v10.3+**.
+> - The instructions below are for **Grafana 12.2+** with the `newInfluxDSConfigPageDesign`
+>   feature flag enabled. This introduces the newest version of the InfluxDB core plugin.
 >   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/)
@@ -145,7 +155,7 @@ In the **URL and authentication** section, configure the following:
 
 ### Configure database settings
 
-The fields in this section change based on your query language selection in [URL and authentication](#configure-url-authentication).
+The fields in this section change based on your query language selection in [URL and authentication](#configure-url-and-authentication).
 
 {{< tabs-wrapper >}}
 {{% tabs %}}

content/shared/influxdb-v2/tools/grafana.md

@@ -5,7 +5,12 @@ to visualize data from your **InfluxDB {{< current-version >}}** instance.
 > {{< influxdb-version-detector >}}
 
 > [!Note]
-> The instructions in this guide require **Grafana Cloud** or **Grafana 10.3+**.
+> #### Grafana 12.2+
+>
+> The instructions below are for **Grafana 12.2+** with the `newInfluxDSConfigPageDesign`
+> feature flag enabled. This introduces the newest version of the InfluxDB core plugin.
+> The interface dynamically adapts based on your product and query language
+> selection in [URL and authentication](#configure-url-and-authentication).
 
 - [Install Grafana](#install-grafana)
 - [Create an InfluxDB data source](#create-an-influxdb-data-source)
@@ -132,7 +137,7 @@ In the **URL and authentication** section, configure the following:
 
 ### Configure database settings
 
-The fields in this section change based on your query language selection in [URL and authentication](#configure-url-authentication).
+The fields in this section change based on your query language selection in [URL and authentication](#configure-url-and-authentication).
 
 {{< tabs-wrapper >}}
 {{% tabs %}}
@@ -150,8 +155,8 @@ When you select **Flux** as the query language, configure the following:
 - **Default Bucket**: The default [bucket](/influxdb/v2/admin/buckets/) to use in Flux queries
 - **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/influxdb-v2-cloud-flux.png" alt="Flux configuration for InfluxDB Cloud (TSM)" />}}{{% /show-in %}}
+{{% show-in "v2" %}}{{< img-hd src="/img/grafana/influxdb-v2-grafana-influxql-flux.png" alt="Flux configuration for InfluxDB OSS 2.x" />}}{{% /show-in %}}
+{{% show-in "cloud" %}}{{< img-hd src="/img/grafana/influxdb-cloud-grafana-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.
 
@@ -186,8 +191,8 @@ Configure the following fields:
 - **User**: Your [v1 authorization username](#create-v1-authorizations)
 - **Password**: Your [v1 authorization password](#create-v1-authorizations)
 
-{{% show-in "v2" %}}{{< img-hd src="/img/influxdb/OSS-v2-grafana-product-dropdown-influxql.png" alt="InfluxQL configuration for InfluxDB OSS 2.x with DBRP warning" />}}{{% /show-in %}}
-{{% show-in "cloud" %}}{{< img-hd src="/img/influxdb/influxdb-v2-cloud-influxql.png" alt="InfluxQL configuration for InfluxDB Cloud (TSM) with v1 auth" />}}{{% /show-in %}}
+{{% show-in "v2" %}}{{< img-hd src="/img/grafana/influxdb-v2-grafana-influxql.png" alt="InfluxQL configuration for InfluxDB OSS 2.x with DBRP warning" />}}{{% /show-in %}}
+{{% show-in "cloud" %}}{{< img-hd src="/img/grafana/influxdb-cloud-grafana-influxql.png" alt="InfluxQL configuration for InfluxDB Cloud (TSM) with v1 auth" />}}{{% /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.
 

content/shared/v3-process-data/visualize/grafana.md

@@ -110,17 +110,18 @@ Use the plugin to query and visualize data from {{< product-name >}} with
 both SQL and InfluxQL.
 
 > [!Note]
-> #### Grafana 10.3+
+> #### Grafana 12.2+
 >
-> The instructions below are for **Grafana 10.3+** which introduced the newest
-> version of the InfluxDB core plugin.
+> The instructions below are for **Grafana 12.2+** with the `newInfluxDSConfigPageDesign`
+> feature flag enabled. This introduces 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 selection in [URL and authentication](#configure-url-authentication)s.
+> as {{< product-name >}}, and the interface dynamically adapts based on your
+> product and query language selection in [URL and authentication](#configure-url-and-authentication).
 
 ## Before you begin
 
 **Prerequisites:**
-- Grafana 10.3 or later
+- Grafana 12.2 or later
 - Administrator role in Grafana
 - {{% show-in "cloud-serverless" %}}An [API token](/influxdb3/version/admin/tokens/) with read access to the bucket{{% /show-in %}}{{% show-in "cloud-dedicated,clustered" %}}A [database token](/influxdb3/version/admin/tokens/#database-tokens) with read access to the database{{% /show-in %}}{{% show-in "core,enterprise" %}}Your {{% token-link "admin" "database" %}} with read access to the database{{% /show-in %}}
 
@@ -153,7 +154,7 @@ In the **URL and authentication** section, configure the following:
 
 ### Configure database settings
 
-The fields in this section change based on your query language selection in [URL and authentication](#configure-url-authentication).
+The fields in this section change based on your query language selection in [URL and authentication](#configure-url-and-authentication).
 
 {{< tabs-wrapper >}}
 {{% tabs %}}
@@ -171,10 +172,22 @@ When you select **SQL** as the query language, configure the following fields:
 
 - **Token**: {{% show-in "cloud-serverless" %}}An [API token](/influxdb3/version/admin/tokens/) with read access to the bucket{{% /show-in %}}{{% show-in "cloud-dedicated,clustered" %}}A [database token](/influxdb3/version/admin/tokens/#database-tokens) with read access to the database{{% /show-in %}}{{% show-in "core,enterprise" %}}Your {{% token-link "admin" "database" %}} with read access to the database{{% /show-in %}}
 
-{{% show-in "cloud-serverless" %}}{{< img-hd src="/img/influxdb3/cloud-serverless-grafana-product-dropdown-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
-{{% show-in "cloud-dedicated" %}}{{< img-hd src="/img/influxdb3/cloud-dedicated-grafana-product-dropdown-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
-{{% show-in "clustered" %}}{{< img-hd src="/img/influxdb3/cluster-grafana-product-dropdown-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
-{{% show-in "core, enterprise" %}}{{< img-hd src="/img/influxdb3/enterprise-v3-grafana-product-dropdown-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "cloud-serverless" %}}{{< img-hd src="/img/grafana/influxdb3-cloud-serverless-grafana-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "cloud-dedicated" %}}{{< img-hd src="/img/grafana/influxdb3-cloud-dedicated-grafana-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "clustered" %}}{{< img-hd src="/img/grafana/influxdb3-clustered-grafana-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "core" %}}{{< img-hd src="/img/grafana/influxdb3-core-grafana-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "enterprise" %}}{{< img-hd src="/img/grafana/influxdb3-enterprise-grafana-sql.png" alt="SQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+
+{{% show-in "core,enterprise,clustered" %}}
+#### Use SQL without TLS/SSL
+If using SQL to query {{% product-name %}} without TLS/SSL, enable the 
+**Insecure Connection** option in your InfluxDB datasource configuration:
+
+1. Under **Database settings**, enable **Advanced Database Settings**.
+2. Enable **Insecure Connection**.
+
+{{% img-hd src="/img/grafana/grafana-sql-insecure-connection.png" alt="Query InfluxDB using SQL without TLS/SSL" /%}}
+{{% /show-in %}}
 
 > [!Important]
 > #### Grafana queries through a proxy require HTTP/2
@@ -216,11 +229,11 @@ When you select **InfluxQL** as the query language, configure the following fiel
 
 - **HTTP Method**: Select **POST** (recommended) or **GET**
 
-{{% 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 %}}
-<!-- Grafana hasn't added Core as a product option yet -->
-{{% 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 %}}
+{{% show-in "cloud-serverless" %}}{{< img-hd src="/img/grafana/influxdb3-cloud-serverless-grafana-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}}
+{{% show-in "cloud-dedicated" %}}{{< img-hd src="/img/grafana/influxdb3-cloud-dedicated-grafana-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}}
+{{% show-in "clustered" %}}{{< img-hd src="/img/grafana/influxdb3-clustered-grafana-influxql.png" alt="InfluxQL configuration for {{% product-name %}} with DBRP warning" />}}{{% /show-in %}}
+{{% show-in "core" %}}{{< img-hd src="/img/grafana/influxdb3-core-grafana-influxql.png" alt="InfluxQL configuration for {{% product-name %}}" />}}{{% /show-in %}}
+{{% show-in "enterprise" %}}{{< img-hd src="/img/grafana/influxdb3-enterprise-grafana-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.