From 3b15b4b312c8cb8bda6c90617d3d0fd99fef03ea Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Tue, 13 Aug 2024 10:11:05 -0600
Subject: [PATCH 1/9] Release influxctl v2.9.5

---
 data/products.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/products.yml b/data/products.yml
index ffa90729a..134a69d0c 100644
--- a/data/products.yml
+++ b/data/products.yml
@@ -55,7 +55,7 @@ influxdb_cloud_dedicated:
   list_order: 3
   latest: cloud-dedicated
   link: "https://www.influxdata.com/contact-sales-form/"
-  latest_cli: 2.9.4
+  latest_cli: 2.9.5
   placeholder_host: cluster-id.a.influxdb.io
 
 influxdb_clustered:

From 97a50d41fe39ac4980eeb6b1689c3f4e79a8e57d Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Tue, 13 Aug 2024 10:26:19 -0600
Subject: [PATCH 2/9] update change log

---
 .../reference/release-notes/influxctl.md            | 12 ++++++++++++
 .../clustered/reference/release-notes/influxctl.md  | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md b/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
index a01c3c7f8..d69d6c7ca 100644
--- a/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
+++ b/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
@@ -11,6 +11,18 @@ menu:
 weight: 202
 ---
 
+## v2.9.5 {date="2024-08-13"}
+
+### Bug Fixes
+
+- Introduce auth login and logout commands.
+
+### Dependency Updates
+
+- Update `github.com/urfave/cli/v2` from 2.27.2 to 2.27.4
+- Update `golang.org/x/mod` from 0.19.0 to 0.20.0
+- Update `golang.org/x/oauth2` from 0.21.0 to 0.22.0
+
 ## v2.9.4 {date="2024-07-25"}
 
 ### Bug Fixes
diff --git a/content/influxdb/clustered/reference/release-notes/influxctl.md b/content/influxdb/clustered/reference/release-notes/influxctl.md
index 9f6c0ce8d..6d3100194 100644
--- a/content/influxdb/clustered/reference/release-notes/influxctl.md
+++ b/content/influxdb/clustered/reference/release-notes/influxctl.md
@@ -12,6 +12,19 @@ weight: 202
 canonical: /influxdb/cloud-dedicated/reference/release-notes/influxctl/
 ---
 
+## v2.9.5 {date="2024-08-13"}
+
+### Bug Fixes
+
+- Introduce auth login and logout commands.
+- Attempt to refresh OAuth tokens when refresh token is present.
+
+### Dependency Updates
+
+- Update `github.com/urfave/cli/v2` from 2.27.2 to 2.27.4
+- Update `golang.org/x/mod` from 0.19.0 to 0.20.0
+- Update `golang.org/x/oauth2` from 0.21.0 to 0.22.0
+
 ## v2.9.4 {date="2024-07-25"}
 
 ### Bug Fixes

From 689df6e0805e3464360924b07403a9396c8b78e8 Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Tue, 13 Aug 2024 10:40:15 -0600
Subject: [PATCH 3/9] Add auth subcommand

---
 .../reference/cli/influxctl/_index.md         |  1 +
 .../reference/cli/influxctl/auth/_index.md    | 33 +++++++++++++++++++
 .../reference/cli/influxctl/auth/login.md     | 29 ++++++++++++++++
 .../reference/cli/influxctl/auth/logout.md    | 27 +++++++++++++++
 .../reference/cli/influxctl/_index.md         |  1 +
 .../reference/cli/influxctl/auth/_index.md    | 33 +++++++++++++++++++
 .../reference/cli/influxctl/auth/login.md     | 29 ++++++++++++++++
 .../reference/cli/influxctl/auth/logout.md    | 27 +++++++++++++++
 8 files changed, 180 insertions(+)
 create mode 100644 content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
 create mode 100644 content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
 create mode 100644 content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
 create mode 100644 content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
 create mode 100644 content/influxdb/clustered/reference/cli/influxctl/auth/login.md
 create mode 100644 content/influxdb/clustered/reference/cli/influxctl/auth/logout.md

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
index 583c11985..c70501c47 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
@@ -32,6 +32,7 @@ influxctl [flags] [command]
 
 | Command                                                                     | Description                            |
 | :-------------------------------------------------------------------------- | :------------------------------------- |
+| [auth](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/)             | Login or logout of InfluxDB v3         |
 | [cluster](/influxdb/cloud-dedicated/reference/cli/influxctl/cluster/)       | List InfluxDB v3 cluster information   |
 | [database](/influxdb/cloud-dedicated/reference/cli/influxctl/database/)     | Manage InfluxDB v3 databases           |
 | [help](/influxdb/cloud-dedicated/reference/cli/influxctl/help/)             | Output `influxctl` help information    |
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
new file mode 100644
index 000000000..8550c38a0
--- /dev/null
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -0,0 +1,33 @@
+---
+title: influxctl auth
+description: >
+  The `influxctl auth` command and its subcommands provide the ability to
+  login and logout.
+menu:
+  influxdb_clustered:
+    parent: influxctl
+weight: 201
+---
+
+The `influxctl auth` command and its subcommands provide information about
+{{< product-name omit="Clustered" >}} clusters.
+
+## Usage
+
+```sh
+influxctl auth [subcommand] [subcommand options] [arguments...]
+```
+
+## Subcommands
+
+| Subcommand                                                               | Description                     |
+| :----------------------------------------------------------------------- | :------------------------------ |
+| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Login with InfluxData Auth0 or InfluxDB Clustered identity provider |
+| [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Remove local tokens             |
+| help, h                                                                  | Output command help             |
+
+## Flags
+
+| Flag |          | Description         |
+| :--- | :------- | :------------------ |
+| `-h` | `--help` | Output command help |
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
new file mode 100644
index 000000000..b79748676
--- /dev/null
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
@@ -0,0 +1,29 @@
+---
+title: influxctl auth login
+description: >
+  The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
+  Clustered identity provider
+menu:
+  influxdb_clustered:
+    parent: influxctl auth
+weight: 301
+---
+
+The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
+Clustered identity provider
+
+## Usage
+
+```sh
+influxctl auth login
+```
+
+## Flags
+
+| Flag |            | Description                                   |
+| :--- | :--------- | :-------------------------------------------- |
+| `-h` | `--help`   | Output command help                           |
+
+{{% caption %}}
+_Also see [`influxctl` global flags](/influxdb/cloud-dedicated/reference/cli/influxctl/#global-flags)._
+{{% /caption %}}
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
new file mode 100644
index 000000000..01bc973e1
--- /dev/null
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
@@ -0,0 +1,27 @@
+---
+title: influxctl auth logout
+description: >
+  The `influxctl auth logout` command removes local tokens
+menu:
+  influxdb_clustered:
+    parent: influxctl auth
+weight: 301
+---
+
+The `influxctl auth logout` command removes local tokens
+
+## Usage
+
+```sh
+influxctl auth logout
+```
+
+## Flags
+
+| Flag |            | Description                                   |
+| :--- | :--------- | :-------------------------------------------- |
+| `-h` | `--help`   | Output command help                           |
+
+{{% caption %}}
+_Also see [`influxctl` global flags](/influxdb/cloud-dedicated/reference/cli/influxctl/#global-flags)._
+{{% /caption %}}
diff --git a/content/influxdb/clustered/reference/cli/influxctl/_index.md b/content/influxdb/clustered/reference/cli/influxctl/_index.md
index ba60c8071..e4ab6b575 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/_index.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/_index.md
@@ -32,6 +32,7 @@ influxctl [flags] [command]
 
 | Command                                                               | Description                            |
 | :-------------------------------------------------------------------- | :------------------------------------- |
+| [auth](/influxdb/clustered/reference/cli/influxctl/auth/)             | Login or logout of InfluxDB v3         |
 | [cluster](/influxdb/clustered/reference/cli/influxctl/cluster/)       | List InfluxDB v3 cluster information   |
 | [database](/influxdb/clustered/reference/cli/influxctl/database/)     | Manage InfluxDB v3 databases           |
 | [help](/influxdb/clustered/reference/cli/influxctl/help/)             | Output `influxctl` help information    |
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
new file mode 100644
index 000000000..6fa172b27
--- /dev/null
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
@@ -0,0 +1,33 @@
+---
+title: influxctl auth
+description: >
+  The `influxctl auth` command and its subcommands provide the ability to
+  login and logout.
+menu:
+  influxdb_clustered:
+    parent: influxctl
+weight: 201
+---
+
+The `influxctl auth` command and its subcommands provide information about
+{{< product-name omit="Clustered" >}} clusters.
+
+## Usage
+
+```sh
+influxctl auth [subcommand] [subcommand options] [arguments...]
+```
+
+## Subcommands
+
+| Subcommand                                                         | Description                     |
+| :----------------------------------------------------------------- | :------------------------------ |
+| [login](/influxdb/clustered/reference/cli/influxctl/auth/login/)   | Login with InfluxData Auth0 or InfluxDB Clustered identity provider |
+| [logout](/influxdb/clustered/reference/cli/influxctl/auth/logout/) | Remove local tokens             |
+| help, h                                                            | Output command help             |
+
+## Flags
+
+| Flag |          | Description         |
+| :--- | :------- | :------------------ |
+| `-h` | `--help` | Output command help |
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
new file mode 100644
index 000000000..014275f64
--- /dev/null
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
@@ -0,0 +1,29 @@
+---
+title: influxctl auth login
+description: >
+  The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
+  Clustered identity provider
+menu:
+  influxdb_clustered:
+    parent: influxctl auth
+weight: 301
+---
+
+The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
+Clustered identity provider
+
+## Usage
+
+```sh
+influxctl auth login
+```
+
+## Flags
+
+| Flag |            | Description                                   |
+| :--- | :--------- | :-------------------------------------------- |
+| `-h` | `--help`   | Output command help                           |
+
+{{% caption %}}
+_Also see [`influxctl` global flags](/influxdb/clustered/reference/cli/influxctl/#global-flags)._
+{{% /caption %}}
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
new file mode 100644
index 000000000..9ea73ee9d
--- /dev/null
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
@@ -0,0 +1,27 @@
+---
+title: influxctl auth logout
+description: >
+  The `influxctl auth logout` command removes local tokens
+menu:
+  influxdb_clustered:
+    parent: influxctl auth
+weight: 301
+---
+
+The `influxctl auth logout` command removes local tokens
+
+## Usage
+
+```sh
+influxctl auth logout
+```
+
+## Flags
+
+| Flag |            | Description                                   |
+| :--- | :--------- | :-------------------------------------------- |
+| `-h` | `--help`   | Output command help                           |
+
+{{% caption %}}
+_Also see [`influxctl` global flags](/influxdb/clustered/reference/cli/influxctl/#global-flags)._
+{{% /caption %}}

From ad81cc9c9859d152cf2aa4f5544720e0044e7ed8 Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Tue, 13 Aug 2024 12:19:59 -0600
Subject: [PATCH 4/9] remove unnecessary omit

---
 .../cloud-dedicated/reference/cli/influxctl/auth/_index.md      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
index 8550c38a0..a6c280aa4 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -10,7 +10,7 @@ weight: 201
 ---
 
 The `influxctl auth` command and its subcommands provide information about
-{{< product-name omit="Clustered" >}} clusters.
+{{< product-name >}} clusters.
 
 ## Usage
 

From 7b53f28296e5f1d9a7c0d7d02ca1b077186f1ed9 Mon Sep 17 00:00:00 2001
From: Joshua Powers <powersj@fastmail.com>
Date: Thu, 15 Aug 2024 09:15:26 -0600
Subject: [PATCH 5/9] Apply suggestions from code review

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>
---
 .../cloud-dedicated/reference/cli/influxctl/_index.md     | 2 +-
 .../reference/cli/influxctl/auth/_index.md                | 4 ++--
 .../cloud-dedicated/reference/cli/influxctl/auth/login.md | 8 ++++----
 .../reference/cli/influxctl/auth/logout.md                | 4 ++--
 .../clustered/reference/cli/influxctl/auth/login.md       | 7 +++++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
index c70501c47..1aad420ea 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/_index.md
@@ -32,7 +32,7 @@ influxctl [flags] [command]
 
 | Command                                                                     | Description                            |
 | :-------------------------------------------------------------------------- | :------------------------------------- |
-| [auth](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/)             | Login or logout of InfluxDB v3         |
+| [auth](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/)             | Log in to or log out of InfluxDB v3         |
 | [cluster](/influxdb/cloud-dedicated/reference/cli/influxctl/cluster/)       | List InfluxDB v3 cluster information   |
 | [database](/influxdb/cloud-dedicated/reference/cli/influxctl/database/)     | Manage InfluxDB v3 databases           |
 | [help](/influxdb/cloud-dedicated/reference/cli/influxctl/help/)             | Output `influxctl` help information    |
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
index a6c280aa4..abd908ba5 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -22,8 +22,8 @@ influxctl auth [subcommand] [subcommand options] [arguments...]
 
 | Subcommand                                                               | Description                     |
 | :----------------------------------------------------------------------- | :------------------------------ |
-| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Login with InfluxData Auth0 or InfluxDB Clustered identity provider |
-| [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Remove local tokens             |
+| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Log in using InfluxData Auth0 or an InfluxDB Clustered identity provider |
+| [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Remove local authorization tokens to log out of an InfluxDB cluster            |
 | help, h                                                                  | Output command help             |
 
 ## Flags
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
index b79748676..364a007c4 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
@@ -1,16 +1,16 @@
 ---
 title: influxctl auth login
 description: >
-  The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
+  The `influxctl auth login` command lets a user log in to an InfluxDB cluster using InfluxData Auth0 or an InfluxDB
   Clustered identity provider
 menu:
-  influxdb_clustered:
+  influxdb_cloud_dedicated:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
-Clustered identity provider
+The `influxctl auth login` command lets a user log in to an {{< product-name >}}
+cluster using InfluxData Auth0.
 
 ## Usage
 
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
index 01bc973e1..578400201 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
@@ -1,14 +1,14 @@
 ---
 title: influxctl auth logout
 description: >
-  The `influxctl auth logout` command removes local tokens
+  The `influxctl auth logout` command logs out a user by removing local authorization tokens
 menu:
   influxdb_clustered:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth logout` command removes local tokens
+The `influxctl auth logout` command logs out a user by removing local authorization tokens.
 
 ## Usage
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
index 014275f64..0d4fc7f0b 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
@@ -3,7 +3,8 @@ title: influxctl auth login
 description: >
   The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
   Clustered identity provider
-menu:
+  The `influxctl auth login` command lets a user log in to an InfluxDB cluster using
+  the cluster's configured identity provider.
   influxdb_clustered:
     parent: influxctl auth
 weight: 301
@@ -11,7 +12,9 @@ weight: 301
 
 The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
 Clustered identity provider
-
+The `influxctl auth login` command lets a user log in to an
+{{< product-name omit="Clustered" >}} cluster using the cluster's configured
+identity provider.  
 ## Usage
 
 ```sh

From f536f56ee5750a6868db7283868868125ee8435e Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Thu, 15 Aug 2024 13:40:56 -0600
Subject: [PATCH 6/9] more updates for 2.9.6, change log, and make messages
 more clustered/dedicated specific

---
 .../reference/cli/influxctl/auth/_index.md               | 4 ++--
 .../reference/cli/influxctl/auth/login.md                | 4 ++--
 .../reference/cli/influxctl/auth/logout.md               | 2 +-
 .../cloud-dedicated/reference/release-notes/influxctl.md | 6 ++++++
 .../clustered/reference/cli/influxctl/auth/_index.md     | 2 +-
 .../clustered/reference/cli/influxctl/auth/login.md      | 9 ++++-----
 .../clustered/reference/release-notes/influxctl.md       | 6 ++++++
 data/products.yml                                        | 2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
index abd908ba5..0c87fb7e0 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -4,7 +4,7 @@ description: >
   The `influxctl auth` command and its subcommands provide the ability to
   login and logout.
 menu:
-  influxdb_clustered:
+  influxdb_cloud_dedicated:
     parent: influxctl
 weight: 201
 ---
@@ -22,7 +22,7 @@ influxctl auth [subcommand] [subcommand options] [arguments...]
 
 | Subcommand                                                               | Description                     |
 | :----------------------------------------------------------------------- | :------------------------------ |
-| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Log in using InfluxData Auth0 or an InfluxDB Clustered identity provider |
+| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Log in using InfluxData Auth0   |
 | [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Remove local authorization tokens to log out of an InfluxDB cluster            |
 | help, h                                                                  | Output command help             |
 
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
index 364a007c4..ea3f60a0d 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
@@ -1,8 +1,8 @@
 ---
 title: influxctl auth login
 description: >
-  The `influxctl auth login` command lets a user log in to an InfluxDB cluster using InfluxData Auth0 or an InfluxDB
-  Clustered identity provider
+  The `influxctl auth login` command lets a user log in to an InfluxDB cluster using
+  {{< product-name omit="Clustered" >}} identity provider
 menu:
   influxdb_cloud_dedicated:
     parent: influxctl auth
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
index 578400201..28f47a6c1 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
@@ -3,7 +3,7 @@ title: influxctl auth logout
 description: >
   The `influxctl auth logout` command logs out a user by removing local authorization tokens
 menu:
-  influxdb_clustered:
+  influxdb_cloud_dedicated:
     parent: influxctl auth
 weight: 301
 ---
diff --git a/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md b/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
index d69d6c7ca..25c8ecadb 100644
--- a/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
+++ b/content/influxdb/cloud-dedicated/reference/release-notes/influxctl.md
@@ -11,6 +11,12 @@ menu:
 weight: 202
 ---
 
+## v2.9.6 {date="2024-08-15"}
+
+### Bug Fixes
+
+- Update query to wait for EOF on stdin instead of the first newline.
+
 ## v2.9.5 {date="2024-08-13"}
 
 ### Bug Fixes
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
index 6fa172b27..618ac65d6 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
@@ -22,7 +22,7 @@ influxctl auth [subcommand] [subcommand options] [arguments...]
 
 | Subcommand                                                         | Description                     |
 | :----------------------------------------------------------------- | :------------------------------ |
-| [login](/influxdb/clustered/reference/cli/influxctl/auth/login/)   | Login with InfluxData Auth0 or InfluxDB Clustered identity provider |
+| [login](/influxdb/clustered/reference/cli/influxctl/auth/login/)   | Login with InfluxDB Clustered identity provider |
 | [logout](/influxdb/clustered/reference/cli/influxctl/auth/logout/) | Remove local tokens             |
 | help, h                                                            | Output command help             |
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
index 0d4fc7f0b..3d0ce0dd9 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
@@ -1,10 +1,9 @@
 ---
 title: influxctl auth login
 description: >
-  The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
-  Clustered identity provider
-  The `influxctl auth login` command lets a user log in to an InfluxDB cluster using
-  the cluster's configured identity provider.
+  The `influxctl auth login` command lets a user log in to an InfluxDB cluster
+  using the cluster's configured identity provider.
+menu:
   influxdb_clustered:
     parent: influxctl auth
 weight: 301
@@ -14,7 +13,7 @@ The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
 Clustered identity provider
 The `influxctl auth login` command lets a user log in to an
 {{< product-name omit="Clustered" >}} cluster using the cluster's configured
-identity provider.  
+identity provider.
 ## Usage
 
 ```sh
diff --git a/content/influxdb/clustered/reference/release-notes/influxctl.md b/content/influxdb/clustered/reference/release-notes/influxctl.md
index 6d3100194..ca796a532 100644
--- a/content/influxdb/clustered/reference/release-notes/influxctl.md
+++ b/content/influxdb/clustered/reference/release-notes/influxctl.md
@@ -12,6 +12,12 @@ weight: 202
 canonical: /influxdb/cloud-dedicated/reference/release-notes/influxctl/
 ---
 
+## v2.9.6 {date="2024-08-15"}
+
+### Bug Fixes
+
+- Update query subcommand to wait for EOF on stdin instead of the first newline.
+
 ## v2.9.5 {date="2024-08-13"}
 
 ### Bug Fixes
diff --git a/data/products.yml b/data/products.yml
index 6df545d95..b31095028 100644
--- a/data/products.yml
+++ b/data/products.yml
@@ -55,7 +55,7 @@ influxdb_cloud_dedicated:
   list_order: 3
   latest: cloud-dedicated
   link: "https://www.influxdata.com/contact-sales-form/"
-  latest_cli: 2.9.5
+  latest_cli: 2.9.6
   placeholder_host: cluster-id.a.influxdb.io
 
 influxdb_clustered:

From 20b76dea7678c7e014a042023f85f032cf285c9f Mon Sep 17 00:00:00 2001
From: Joshua Powers <powersj@fastmail.com>
Date: Fri, 16 Aug 2024 07:09:01 -0600
Subject: [PATCH 7/9] Apply suggestions from code review

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>
---
 .../cloud-dedicated/reference/cli/influxctl/auth/_index.md | 4 ++--
 .../cloud-dedicated/reference/cli/influxctl/auth/login.md  | 2 +-
 .../cloud-dedicated/reference/cli/influxctl/auth/logout.md | 6 ++++--
 .../influxdb/clustered/reference/cli/influxctl/_index.md   | 2 +-
 .../clustered/reference/cli/influxctl/auth/_index.md       | 2 +-
 .../clustered/reference/cli/influxctl/auth/login.md        | 7 ++-----
 .../clustered/reference/cli/influxctl/auth/logout.md       | 7 ++++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
index 0c87fb7e0..a0391815e 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -22,8 +22,8 @@ influxctl auth [subcommand] [subcommand options] [arguments...]
 
 | Subcommand                                                               | Description                     |
 | :----------------------------------------------------------------------- | :------------------------------ |
-| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Log in using InfluxData Auth0   |
-| [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Remove local authorization tokens to log out of an InfluxDB cluster            |
+| [login](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login/)   | Log in to an InfluxDB cluster using InfluxData Auth0 |
+| [logout](/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout/) | Log out of an InfluxDB cluster; remove local authorization tokens |
 | help, h                                                                  | Output command help             |
 
 ## Flags
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
index ea3f60a0d..f457cd7ee 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
@@ -9,7 +9,7 @@ menu:
 weight: 301
 ---
 
-The `influxctl auth login` command lets a user log in to an {{< product-name >}}
+The `influxctl auth login` command lets a user log in to an {{< product-name omit="Clustered" >}}
 cluster using InfluxData Auth0.
 
 ## Usage
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
index 28f47a6c1..00ef24e34 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
@@ -1,14 +1,16 @@
 ---
 title: influxctl auth logout
 description: >
-  The `influxctl auth logout` command logs out a user by removing local authorization tokens
+  The `influxctl auth logout` command lets a user logout of an InfluxDB 
+  cluster; removes the user's local authorization tokens.  
 menu:
   influxdb_cloud_dedicated:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth logout` command logs out a user by removing local authorization tokens.
+The `influxctl auth logout` command lets a user logout of an {{< product-name omit="Clustered" >}} 
+cluster; removes the user's local authorization tokens.
 
 ## Usage
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/_index.md b/content/influxdb/clustered/reference/cli/influxctl/_index.md
index e4ab6b575..a7c0bc8ee 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/_index.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/_index.md
@@ -32,7 +32,7 @@ influxctl [flags] [command]
 
 | Command                                                               | Description                            |
 | :-------------------------------------------------------------------- | :------------------------------------- |
-| [auth](/influxdb/clustered/reference/cli/influxctl/auth/)             | Login or logout of InfluxDB v3         |
+| [auth](/influxdb/clustered/reference/cli/influxctl/auth/)             | Log in to or log out of InfluxDB v3     |
 | [cluster](/influxdb/clustered/reference/cli/influxctl/cluster/)       | List InfluxDB v3 cluster information   |
 | [database](/influxdb/clustered/reference/cli/influxctl/database/)     | Manage InfluxDB v3 databases           |
 | [help](/influxdb/clustered/reference/cli/influxctl/help/)             | Output `influxctl` help information    |
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
index 618ac65d6..235073f95 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
@@ -22,7 +22,7 @@ influxctl auth [subcommand] [subcommand options] [arguments...]
 
 | Subcommand                                                         | Description                     |
 | :----------------------------------------------------------------- | :------------------------------ |
-| [login](/influxdb/clustered/reference/cli/influxctl/auth/login/)   | Login with InfluxDB Clustered identity provider |
+| [login](/influxdb/clustered/reference/cli/influxctl/auth/login/)   | Log in to an InfluxDB cluster using the cluster's identity provider |
 | [logout](/influxdb/clustered/reference/cli/influxctl/auth/logout/) | Remove local tokens             |
 | help, h                                                            | Output command help             |
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
index 3d0ce0dd9..a0a6a068c 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
@@ -9,11 +9,8 @@ menu:
 weight: 301
 ---
 
-The `influxctl auth login` command logins with InfluxData Auth0 or InfluxDB
-Clustered identity provider
-The `influxctl auth login` command lets a user log in to an
-{{< product-name omit="Clustered" >}} cluster using the cluster's configured
-identity provider.
+The `influxctl auth login` command lets a user log in to an {{< product-name omit="Clustered" >}}
+cluster using the cluster's configured identity provider. 
 ## Usage
 
 ```sh
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
index 9ea73ee9d..8e12c0643 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
@@ -1,15 +1,16 @@
 ---
 title: influxctl auth logout
 description: >
-  The `influxctl auth logout` command removes local tokens
+  The `influxctl auth logout` command lets a user logout of an InfluxDB 
+  cluster; removes the user's local authorization tokens.
 menu:
   influxdb_clustered:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth logout` command removes local tokens
-
+The `influxctl auth logout` command lets a user logout of an {{< product-name omit="Clustered" >}}
+cluster; removes the user's local authorization tokens.
 ## Usage
 
 ```sh

From 86b7821c04d8547fdd2035fe9206ea8b823d7250 Mon Sep 17 00:00:00 2001
From: Joshua Powers <powersj@fastmail.com>
Date: Fri, 16 Aug 2024 12:17:09 -0600
Subject: [PATCH 8/9] Apply suggestions from code review

Co-authored-by: Jason Stirnaman <jstirnaman@influxdata.com>
---
 .../cloud-dedicated/reference/cli/influxctl/auth/_index.md | 7 +++----
 .../clustered/reference/cli/influxctl/auth/_index.md       | 7 +++----
 .../clustered/reference/cli/influxctl/auth/login.md        | 1 +
 .../clustered/reference/cli/influxctl/auth/logout.md       | 1 +
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
index a0391815e..5c85ff584 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/_index.md
@@ -1,16 +1,15 @@
 ---
 title: influxctl auth
 description: >
-  The `influxctl auth` command and its subcommands provide the ability to
-  login and logout.
+  The `influxctl auth` command and its subcommands let a user
+  log in to and log out of an InfluxDB cluster.
 menu:
   influxdb_cloud_dedicated:
     parent: influxctl
 weight: 201
 ---
 
-The `influxctl auth` command and its subcommands provide information about
-{{< product-name >}} clusters.
+The `influxctl auth` command and its subcommands let a user log in to and log out of an {{< product-name omit="Clustered" >}} cluster.
 
 ## Usage
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
index 235073f95..eca4679ca 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/_index.md
@@ -1,16 +1,15 @@
 ---
 title: influxctl auth
 description: >
-  The `influxctl auth` command and its subcommands provide the ability to
-  login and logout.
+  The `influxctl auth` command and its subcommands let a user
+  log in to and log out of an InfluxDB cluster.
 menu:
   influxdb_clustered:
     parent: influxctl
 weight: 201
 ---
 
-The `influxctl auth` command and its subcommands provide information about
-{{< product-name omit="Clustered" >}} clusters.
+The `influxctl auth` command and its subcommands let a user log in to and log out of an {{< product-name omit="Clustered" >}} cluster.
 
 ## Usage
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
index a0a6a068c..d021037d3 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/login.md
@@ -11,6 +11,7 @@ weight: 301
 
 The `influxctl auth login` command lets a user log in to an {{< product-name omit="Clustered" >}}
 cluster using the cluster's configured identity provider. 
+
 ## Usage
 
 ```sh
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
index 8e12c0643..9a724b570 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
@@ -11,6 +11,7 @@ weight: 301
 
 The `influxctl auth logout` command lets a user logout of an {{< product-name omit="Clustered" >}}
 cluster; removes the user's local authorization tokens.
+
 ## Usage
 
 ```sh

From ab663998011e4fe9d269690870b6711de275d065 Mon Sep 17 00:00:00 2001
From: Joshua Powers <powersj@fastmail.com>
Date: Mon, 19 Aug 2024 10:21:21 -0600
Subject: [PATCH 9/9] Apply suggestions from code review

Co-authored-by: Scott Anderson <sanderson@users.noreply.github.com>
---
 .../cloud-dedicated/reference/cli/influxctl/auth/login.md | 2 +-
 .../reference/cli/influxctl/auth/logout.md                | 8 ++++----
 .../clustered/reference/cli/influxctl/auth/logout.md      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
index f457cd7ee..f30d7b76c 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/login.md
@@ -2,7 +2,7 @@
 title: influxctl auth login
 description: >
   The `influxctl auth login` command lets a user log in to an InfluxDB cluster using
-  {{< product-name omit="Clustered" >}} identity provider
+  the InfluxDB Cloud Dedicated identity provider.
 menu:
   influxdb_cloud_dedicated:
     parent: influxctl auth
diff --git a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
index 00ef24e34..1d3b96f53 100644
--- a/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/cloud-dedicated/reference/cli/influxctl/auth/logout.md
@@ -1,16 +1,16 @@
 ---
 title: influxctl auth logout
 description: >
-  The `influxctl auth logout` command lets a user logout of an InfluxDB 
-  cluster; removes the user's local authorization tokens.  
+  The `influxctl auth logout` command lets a user log out of an InfluxDB 
+  cluster and removes the user's local authorization tokens.  
 menu:
   influxdb_cloud_dedicated:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth logout` command lets a user logout of an {{< product-name omit="Clustered" >}} 
-cluster; removes the user's local authorization tokens.
+The `influxctl auth logout` command lets a user log out of an {{< product-name omit="Clustered" >}} 
+cluster and removes the user's local authorization tokens.
 
 ## Usage
 
diff --git a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
index 9a724b570..92a768d04 100644
--- a/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
+++ b/content/influxdb/clustered/reference/cli/influxctl/auth/logout.md
@@ -1,16 +1,16 @@
 ---
 title: influxctl auth logout
 description: >
-  The `influxctl auth logout` command lets a user logout of an InfluxDB 
-  cluster; removes the user's local authorization tokens.
+  The `influxctl auth logout` command lets a user log out of an InfluxDB 
+  cluster and removes the user's local authorization tokens.
 menu:
   influxdb_clustered:
     parent: influxctl auth
 weight: 301
 ---
 
-The `influxctl auth logout` command lets a user logout of an {{< product-name omit="Clustered" >}}
-cluster; removes the user's local authorization tokens.
+The `influxctl auth logout` command lets a user log out of an {{< product-name omit="Clustered" >}}
+cluster and removes the user's local authorization tokens.
 
 ## Usage