diff --git a/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md b/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md
index c932e2f0b..d0f94cbf6 100644
--- a/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md
+++ b/content/influxdb/cloud/query-data/execute-queries/query-demo-data.md
@@ -25,7 +25,7 @@ types of demo data that let you explore and familiarize yourself with InfluxDB C
{{% note %}}
#### Free to use and read-only
- InfluxDB Cloud demo data buckets are **free to use** and are **_not_ subject to
- [Free Plan rate limits](influxdb/cloud/account-management/limits/#free-plan-rate-limits) rate limits**.
+ [Free Plan rate limits](/influxdb/cloud/account-management/limits/#free-plan-rate-limits) rate limits**.
- Demo data buckets are **read-only**. You cannot write data into demo data buckets.
{{% /note %}}
diff --git a/content/influxdb3/core/admin/distinct-value-cache/_index.md b/content/influxdb3/core/admin/distinct-value-cache/_index.md
index cdf0b5837..5e9004280 100644
--- a/content/influxdb3/core/admin/distinct-value-cache/_index.md
+++ b/content/influxdb3/core/admin/distinct-value-cache/_index.md
@@ -16,4 +16,5 @@ source: /shared/influxdb3-admin/distinct-value-cache/_index.md
---
+// SOURCE content/shared/influxdb3-admin/distinct-value-cache/_index.md
+-->
diff --git a/content/influxdb3/core/admin/last-value-cache/_index.md b/content/influxdb3/core/admin/last-value-cache/_index.md
index 20013f73b..2560c1ead 100644
--- a/content/influxdb3/core/admin/last-value-cache/_index.md
+++ b/content/influxdb3/core/admin/last-value-cache/_index.md
@@ -17,4 +17,5 @@ source: /shared/influxdb3-admin/last-value-cache/_index.md
---
+// SOURCE content/shared/influxdb3-admin/last-value-cache/_index.md
+-->
diff --git a/content/influxdb3/core/admin/tokens/_index.md b/content/influxdb3/core/admin/tokens/_index.md
index 6ace87894..c4604b078 100644
--- a/content/influxdb3/core/admin/tokens/_index.md
+++ b/content/influxdb3/core/admin/tokens/_index.md
@@ -1,7 +1,7 @@
---
title: Manage tokens
description: >
- Manage tokens to authenticate and authorize access to resources and data in an {{< product-name >}} instance.
+ Manage tokens to authenticate and authorize access to server actions, resources, and data in an {{< product-name >}} instance.
menu:
influxdb3_core:
parent: Administer InfluxDB
@@ -11,4 +11,4 @@ source: /shared/influxdb3-admin/tokens/_index.md
>
\ No newline at end of file
+-->
\ No newline at end of file
diff --git a/content/influxdb3/core/admin/tokens/admin/_index.md b/content/influxdb3/core/admin/tokens/admin/_index.md
index ac5510003..f776fca98 100644
--- a/content/influxdb3/core/admin/tokens/admin/_index.md
+++ b/content/influxdb3/core/admin/tokens/admin/_index.md
@@ -11,9 +11,9 @@ menu:
name: Admin tokens
weight: 101
influxdb3/core/tags: [tokens]
-source: /shared/influxdb3-admin/tokens/_index.md
+source: /shared/influxdb3-admin/tokens/admin/_index.md
---
\ No newline at end of file
diff --git a/content/influxdb3/core/admin/tokens/admin/create.md b/content/influxdb3/core/admin/tokens/admin/create.md
index fe1abbe5e..498c6cdef 100644
--- a/content/influxdb3/core/admin/tokens/admin/create.md
+++ b/content/influxdb3/core/admin/tokens/admin/create.md
@@ -2,7 +2,7 @@
title: Create an admin token
description: >
Use the [`influxdb3 create token --admin` command](/influxdb3/core/reference/cli/influxdb3/create/token/)
- or the [HTTP API](/influxdb3/core/api/v3/)
+ or the HTTP API [`/api/v3/configure/token/admin`](/influxdb3/core/api/v3/#operation/PostCreateAdminToken) endpoint
to create an [admin token](/influxdb3/core/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
An admin token grants access to all actions on the server.
menu:
diff --git a/content/influxdb3/core/admin/tokens/admin/regenerate.md b/content/influxdb3/core/admin/tokens/admin/regenerate.md
index fe7038826..f8e8d7ab9 100644
--- a/content/influxdb3/core/admin/tokens/admin/regenerate.md
+++ b/content/influxdb3/core/admin/tokens/admin/regenerate.md
@@ -2,10 +2,9 @@
title: Regenerate an admin token
description: >
Use the [`influxdb3 create token --admin` command](/influxdb3/core/reference/cli/influxdb3/create/token/)
- or the [HTTP API](/influxdb3/core/api/v3/)
- to regenerate an [admin token](/influxdb3/core/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
- An admin token grants access to all actions on the server.
- Regenerating an admin token deactivates the previous token.
+ or the HTTP API [`/api/v3/configure/token/admin/regenerate`](/influxdb3/core/api/v3/#operation/PostRegenerateAdminToken) endpoint
+ to regenerate an [operator token](/influxdb3/core/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
+ Regenerating an operator token deactivates the previous token.
menu:
influxdb3_core:
parent: Admin tokens
@@ -14,8 +13,15 @@ list_code_example: |
##### CLI
```bash
influxdb3 create token --admin \
- --token ADMIN_TOKEN \
--regenerate
+ OPERATOR_TOKEN
+ ```
+ #### HTTP API
+ ```bash
+ curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin/regenerate" \
+ --header 'Authorization Bearer OPERATOR_TOKEN' \
+ --header 'Accept: application/json'
+ --header 'Content-Type: application/json'
```
source: /shared/influxdb3-admin/tokens/admin/regenerate.md
---
diff --git a/content/influxdb3/core/install.md b/content/influxdb3/core/install.md
index 08535f63a..a423ff48c 100644
--- a/content/influxdb3/core/install.md
+++ b/content/influxdb3/core/install.md
@@ -12,7 +12,7 @@ alt_links:
- [System Requirements](#system-requirements)
- [Quick install](#quick-install)
-- [Download {{< product-name >}} binaries](#download-influxdb-3-{{< product-key >}}-binaries)
+- [Download {{% product-name %}} binaries](#download-influxdb-3-{{< product-key >}}-binaries)
- [Docker image](#docker-image)
## System Requirements
@@ -79,7 +79,7 @@ source ~/.zshrc
{{% /code-tab-content %}}
{{< /code-tabs-wrapper >}}
-## Download {{< product-name >}} binaries
+## Download {{% product-name %}} binaries
{{< tabs-wrapper >}}
{{% tabs %}}
diff --git a/content/influxdb3/core/reference/cli/influxdb3/_index.md b/content/influxdb3/core/reference/cli/influxdb3/_index.md
index efa782e42..221e4e654 100644
--- a/content/influxdb3/core/reference/cli/influxdb3/_index.md
+++ b/content/influxdb3/core/reference/cli/influxdb3/_index.md
@@ -103,7 +103,7 @@ influxdb3 -h
influxdb3 --help
```
-### Run the {{< product-name >}} server with extra verbose logging
+### Run the {{% product-name %}} server with extra verbose logging
@@ -114,7 +114,7 @@ influxdb3 serve -v \
--node-id my-host-01
```
-### Run {{< product-name >}} with debug logging using LOG_FILTER
+### Run {{% product-name %}} with debug logging using LOG_FILTER
diff --git a/content/influxdb3/core/reference/cli/influxdb3/create/token.md b/content/influxdb3/core/reference/cli/influxdb3/create/token/_index.md
similarity index 60%
rename from content/influxdb3/core/reference/cli/influxdb3/create/token.md
rename to content/influxdb3/core/reference/cli/influxdb3/create/token/_index.md
index a27d89942..c85988446 100644
--- a/content/influxdb3/core/reference/cli/influxdb3/create/token.md
+++ b/content/influxdb3/core/reference/cli/influxdb3/create/token/_index.md
@@ -5,11 +5,11 @@ description: >
menu:
influxdb3_core:
parent: influxdb3 create
- name: influxdb3 create token
+ name: influxdb3 create token
weight: 400
-source: /shared/influxdb3-cli/create/token.md
+source: /shared/influxdb3-cli/create/token/_index.md
---
\ No newline at end of file
diff --git a/content/influxdb3/core/reference/cli/influxdb3/create/token/admin.md b/content/influxdb3/core/reference/cli/influxdb3/create/token/admin.md
new file mode 100644
index 000000000..a2646e4ec
--- /dev/null
+++ b/content/influxdb3/core/reference/cli/influxdb3/create/token/admin.md
@@ -0,0 +1,15 @@
+---
+title: influxdb3 create token admin
+description: >
+ The `influxdb3 create token admin` command creates an operator token or named admin token with full administrative privileges for server actions.
+menu:
+ influxdb3_core:
+ parent: influxdb3 create token
+ name: influxdb3 create token admin
+weight: 400
+source: /shared/influxdb3-cli/create/token/admin.md
+---
+
+
\ No newline at end of file
diff --git a/content/influxdb3/enterprise/admin/license.md b/content/influxdb3/enterprise/admin/license.md
index 38f6ac503..cb1f1bf37 100644
--- a/content/influxdb3/enterprise/admin/license.md
+++ b/content/influxdb3/enterprise/admin/license.md
@@ -153,7 +153,7 @@ existing license if it's still valid.
environment variable
7. If no license is found, the server won't start
-#### Example: Start the {{< product-name >}} server with your license email:
+#### Example: Start the {{% product-name %}} server with your license email:
{{< code-tabs-wrapper >}}
{{% code-tabs %}}
@@ -187,7 +187,7 @@ influxdb3 serve \
{{% /code-tab-content %}}
{{< /code-tabs-wrapper >}}
-#### Example: Start the {{< product-name >}} server with your license file:
+#### Example: Start the {{% product-name %}} server with your license file:
{{< code-tabs-wrapper >}}
{{% code-tabs %}}
diff --git a/content/influxdb3/enterprise/admin/tokens/_index.md b/content/influxdb3/enterprise/admin/tokens/_index.md
index 85bfad732..6c9a079ea 100644
--- a/content/influxdb3/enterprise/admin/tokens/_index.md
+++ b/content/influxdb3/enterprise/admin/tokens/_index.md
@@ -1,7 +1,7 @@
---
title: Manage tokens
description: >
- Manage tokens to authenticate and authorize access to resources and data in an {{< product-name >}} instance.
+ Manage tokens to authenticate and authorize access to server actions, resources, and data in an {{< product-name >}} instance.
menu:
influxdb3_enterprise:
parent: Administer InfluxDB
diff --git a/content/influxdb3/enterprise/admin/tokens/admin/create.md b/content/influxdb3/enterprise/admin/tokens/admin/create.md
index 64530b6ef..9c821b4ab 100644
--- a/content/influxdb3/enterprise/admin/tokens/admin/create.md
+++ b/content/influxdb3/enterprise/admin/tokens/admin/create.md
@@ -2,8 +2,8 @@
title: Create an admin token
description: >
Use the [`influxdb3 create token --admin` command](/influxdb3/enterprise/reference/cli/influxdb3/create/token/)
- or the [HTTP API](/influxdb3/enterprise/api/v3/)
- to create an [admin token](/influxdb3/enterprise/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
+ or the HTTP API [`/api/v3/configure/token/admin`](/influxdb3/enterprise/api/v3/#operation/PostCreateAdminToken)
+ endpoint to create an operator or named [admin token](/influxdb3/enterprise/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
An admin token grants access to all actions on the server.
menu:
influxdb3_enterprise:
@@ -12,13 +12,15 @@ weight: 201
list_code_example: |
##### CLI
```bash
- influxdb3 create token --admin
+ influxdb3 create token --admin --name TOKEN_NAME
```
#### HTTP API
```bash
curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin" \
- --header 'Accept: application/json' \
- --header 'Content-Type: application/json'
+ --header 'Authorization Bearer ADMIN_TOKEN' \
+ --json '{
+ "name": "TOKEN_NAME"
+ }'
```
alt_links:
cloud-dedicated: /influxdb3/cloud-dedicated/admin/tokens/create-token/
diff --git a/content/influxdb3/enterprise/admin/tokens/admin/regenerate.md b/content/influxdb3/enterprise/admin/tokens/admin/regenerate.md
index f595ce3b5..7da106f73 100644
--- a/content/influxdb3/enterprise/admin/tokens/admin/regenerate.md
+++ b/content/influxdb3/enterprise/admin/tokens/admin/regenerate.md
@@ -1,10 +1,9 @@
---
-title: Regenerate an admin token
+title: Regenerate an operator admin token
description: >
Use the [`influxdb3 create token --admin` command](/influxdb3/enterprise/reference/cli/influxdb3/create/token/)
or the [HTTP API](/influxdb3/enterprise/api/v3/)
- to regenerate an [admin token](/influxdb3/enterprise/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
- An admin token grants access to all actions on the server.
+ to regenerate an [operator token](/influxdb3/enterprise/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
Regenerating an admin token deactivates the previous token.
menu:
influxdb3_enterprise:
@@ -14,9 +13,15 @@ list_code_example: |
##### CLI
```bash
influxdb3 create token --admin \
- --token ADMIN_TOKEN \
+ --token OPERATOR_TOKEN \
--regenerate
```
+
+ #### HTTP API
+ ```bash
+ curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin/regenerate" \
+ --header 'Authorization Bearer OPERATOR_TOKEN'
+ ```
source: /shared/influxdb3-admin/tokens/admin/regenerate.md
---
diff --git a/content/influxdb3/enterprise/admin/tokens/resource/_index.md b/content/influxdb3/enterprise/admin/tokens/resource/_index.md
index 2d66b6888..2e9aecb80 100644
--- a/content/influxdb3/enterprise/admin/tokens/resource/_index.md
+++ b/content/influxdb3/enterprise/admin/tokens/resource/_index.md
@@ -3,7 +3,7 @@ title: Manage resource tokens
seotitle: Manage resource tokens in {{< product-name >}}
description: >
Manage resource tokens in your {{< product-name >}} instance.
- Resource tokens grant fine-grained permissions on resources, such as databases
+ Resource tokens grant permissions on specific resources, such as databases
and system information endpoints in your {{< product-name >}} instance.
Database resource tokens allow for actions like writing and querying data.
menu:
@@ -15,13 +15,12 @@ influxdb3/enterprise/tags: [tokens]
---
Manage resource tokens in your {{< product-name >}} instance.
-Resource tokens grant fine-grained permissions on resources, such as databases
-and system information endpoints in your {{< product-name >}} instance.
-
-- **Databases**: Database tokens allow for actions like writing and querying data.
+Resource tokens provide scoped access to specific resources:
-- **System resources**: System information tokens allow read access to server runtime statistics and health.
- Access controls for system information API endpoints help prevent information leaks and attacks (such as DoS).
+- **Database tokens**: provide access to specific databases for actions like writing and querying data
+- **System tokens**: provide access to system-level resources, such as API endpoints for server runtime statistics and health.
+
+Resource tokens are user-defined and available only in {{% product-name %}}.
{{< children depth="1" >}}
diff --git a/content/influxdb3/enterprise/install.md b/content/influxdb3/enterprise/install.md
index 90ae37ae1..3893d08d1 100644
--- a/content/influxdb3/enterprise/install.md
+++ b/content/influxdb3/enterprise/install.md
@@ -12,7 +12,7 @@ alt_links:
- [System Requirements](#system-requirements)
- [Quick install](#quick-install)
-- [Download {{< product-name >}} binaries](#download-influxdb-3-{{< product-key >}}-binaries)
+- [Download {{% product-name %}} binaries](#download-influxdb-3-{{< product-key >}}-binaries)
- [Docker image](#docker-image)
## System Requirements
@@ -79,7 +79,7 @@ source ~/.zshrc
{{% /code-tab-content %}}
{{< /code-tabs-wrapper >}}
-## Download {{< product-name >}} binaries
+## Download {{% product-name %}} binaries
{{< tabs-wrapper >}}
{{% tabs %}}
diff --git a/content/influxdb3/enterprise/reference/cli/influxdb3/_index.md b/content/influxdb3/enterprise/reference/cli/influxdb3/_index.md
index 46eaaff51..db57936cb 100644
--- a/content/influxdb3/enterprise/reference/cli/influxdb3/_index.md
+++ b/content/influxdb3/enterprise/reference/cli/influxdb3/_index.md
@@ -108,7 +108,7 @@ influxdb3 -h
influxdb3 --help
```
-### Run the {{< product-name >}} server with extra verbose logging
+### Run the {{% product-name %}} server with extra verbose logging
@@ -120,7 +120,7 @@ influxdb3 serve -v \
--cluster-id my-cluster-01
```
-### Run {{< product-name >}} with debug logging using LOG_FILTER
+### Run {{% product-name %}} with debug logging using LOG_FILTER
diff --git a/content/influxdb3/enterprise/reference/cli/influxdb3/create/token.md b/content/influxdb3/enterprise/reference/cli/influxdb3/create/token.md
deleted file mode 100644
index 968bbde4c..000000000
--- a/content/influxdb3/enterprise/reference/cli/influxdb3/create/token.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: influxdb3 create token
-description: >
- The `influxdb3 create token` command creates a new authentication token.
-menu:
- influxdb3_enterprise:
- parent: influxdb3 create
- name: influxdb3 create token
-weight: 400
-source: /shared/influxdb3-cli/create/token.md
----
-
-
diff --git a/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/_index.md b/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/_index.md
index daffcce7d..1411c22bf 100644
--- a/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/_index.md
+++ b/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/_index.md
@@ -1,19 +1,16 @@
---
title: influxdb3 create token
description: >
- The `influxdb3 create token` command creates an admin token or a resource (fine-grained
- permissions) token for authenticating and authorizing actions in an {{% product-name %}} instance.
+ The `influxdb3 create token` command creates an admin token or a scoped resource token for authenticating and authorizing actions in an {{% product-name %}} instance.
menu:
influxdb3_enterprise:
parent: influxdb3
name: influxdb3 create token
weight: 300
-aliases:
- - /influxdb3/enterprise/reference/cli/influxdb3/create/token/admin/
-source: /shared/influxdb3-cli/create/token.md
+source: /shared/influxdb3-cli/create/token/_index.md
---
\ No newline at end of file
diff --git a/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/admin.md b/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/admin.md
new file mode 100644
index 000000000..7c4bab6bc
--- /dev/null
+++ b/content/influxdb3/enterprise/reference/cli/influxdb3/create/token/admin.md
@@ -0,0 +1,15 @@
+---
+title: influxdb3 create token admin
+description: >
+ The `influxdb3 create token admin` command creates an operator token or named admin token with full administrative privileges for server actions.
+menu:
+ influxdb3_enterprise:
+ parent: influxdb3 create token
+ name: influxdb3 create token admin
+weight: 400
+source: /shared/influxdb3-cli/create/token/admin.md
+---
+
+
\ No newline at end of file
diff --git a/content/influxdb3/enterprise/reference/internals/authentication.md b/content/influxdb3/enterprise/reference/internals/authentication.md
index 95ebeac5a..1df9cc97f 100644
--- a/content/influxdb3/enterprise/reference/internals/authentication.md
+++ b/content/influxdb3/enterprise/reference/internals/authentication.md
@@ -14,5 +14,5 @@ source: /shared/influxdb3-internals-reference/authentication.md
---
\ No newline at end of file
+// SOURCE content/shared/influxdb3-internals-reference/authentication.md
+-->
\ No newline at end of file
diff --git a/content/shared/influxdb3-admin/distinct-value-cache/_index.md b/content/shared/influxdb3-admin/distinct-value-cache/_index.md
index a21f2bd76..0a5ef6324 100644
--- a/content/shared/influxdb3-admin/distinct-value-cache/_index.md
+++ b/content/shared/influxdb3-admin/distinct-value-cache/_index.md
@@ -4,7 +4,7 @@ values of one or more columns in a table, improving the performance of
queries that return distinct tag and field values.
The DVC is an in-memory cache that stores distinct values for specific columns
-in a table. When you create an DVC, you can specify what columns' distinct
+in a table. When you create a DVC, you can specify what columns' distinct
values to cache, the maximum number of distinct value combinations to cache, and
the maximum age of cached values. A DVC is associated with a table, which can
have multiple DVCs.
@@ -68,11 +68,17 @@ similar to this:
DVCs are stored in memory; the larger the cache, the more memory your InfluxDB 3
node requires to maintain it. Consider the following:
+- [Cache data loading](#cache-data-loading)
- [High cardinality limits](#high-cardinality-limits)
{{% show-in "core" %}}
- [Distinct Value Caches are flushed when the server stops](#distinct-value-caches-are-flushed-when-the-server-stops)
{{% /show-in %}}
+## Cache data loading
+
+On cache creation, {{% product-name %}} loads historical data into the cache.
+On restart, the server automatically reloads cache data.
+
### High cardinality limits
“Cardinality” refers to the number of unique key column combinations in your
diff --git a/content/shared/influxdb3-admin/distinct-value-cache/create.md b/content/shared/influxdb3-admin/distinct-value-cache/create.md
index d0e4e69ea..c897c0dbf 100644
--- a/content/shared/influxdb3-admin/distinct-value-cache/create.md
+++ b/content/shared/influxdb3-admin/distinct-value-cache/create.md
@@ -95,12 +95,10 @@ Replace the following:
- {{% code-placeholder-key %}}`DVC_NAME`{{% /code-placeholder-key %}}:
a unique name for the DVC
-> [!Note]
-> #### Values are cached on write
->
-> Values are cached on write. When you create a cache, it will not cache
-> previously written points, only newly written points.
->
+
+The cache imports the distinct values from the table and starts caching them.
+
+> [!Important]
> #### DVC size and persistence
>
> The DVC is stored in memory, so it's important to consider the size and
diff --git a/content/shared/influxdb3-admin/last-value-cache/_index.md b/content/shared/influxdb3-admin/last-value-cache/_index.md
index 5ced5aab5..7b473c2d3 100644
--- a/content/shared/influxdb3-admin/last-value-cache/_index.md
+++ b/content/shared/influxdb3-admin/last-value-cache/_index.md
@@ -81,11 +81,17 @@ similar to the following:
LVCs are stored in memory; the larger the cache, the more memory your InfluxDB 3 node requires to
maintain it. Consider the following:
+- [Cache data loading](#cache-data-loading)
- [High cardinality key columns](#high-cardinality-key-columns)
- [Value count](#value-count)
{{% show-in "core" %}}
- [Last Value Caches are flushed when the server stops](#last-value-caches-are-flushed-when-the-server-stops)
-{{% /show-in %}}lue-columns)
+{{% /show-in %}}
+
+## Cache data loading
+
+On cache creation, {{% product-name %}} loads historical data into the cache.
+On restart, the server automatically reloads cache data.
### High cardinality key columns
diff --git a/content/shared/influxdb3-admin/last-value-cache/create.md b/content/shared/influxdb3-admin/last-value-cache/create.md
index 4a439ffc4..febc66f83 100644
--- a/content/shared/influxdb3-admin/last-value-cache/create.md
+++ b/content/shared/influxdb3-admin/last-value-cache/create.md
@@ -109,12 +109,9 @@ Replace the following:
- {{% code-placeholder-key %}}`LVC_NAME`{{% /code-placeholder-key %}}:
a unique name for the LVC
-> [!Note]
-> #### Values are cached on write
->
-> Values are cached on write. When you create a cache, it will not cache
-> previously written points, only newly written points.
->
+The cache imports the distinct values from the table and starts caching them.
+
+> [!Important]
> #### LVC size and persistence
>
> The LVC is stored in memory, so it's important to consider the size and persistence
diff --git a/content/shared/influxdb3-admin/tokens/_index.md b/content/shared/influxdb3-admin/tokens/_index.md
index 35f4da85a..2ab0675ae 100644
--- a/content/shared/influxdb3-admin/tokens/_index.md
+++ b/content/shared/influxdb3-admin/tokens/_index.md
@@ -1,66 +1,70 @@
-Manage tokens to authenticate and authorize access to resources and data in your {{< product-name >}} instance.
+Manage tokens to authenticate and authorize access to server actions, resources, and data in your {{< product-name >}} instance.
## Provide your token
-Before running CLI commands or making HTTP API requests, you must provide a valid token to authenticate.
+If you start the {{< product-name >}} server with authentication enabled (the default), future server actions (CLI commands and HTTP API requests) require a valid token for authorization.
+
+The first admin token you create is the _operator_ token (named `_admin`), which has full administrative privileges.
+You can use the operator token to authenticate your requests and manage additional authorization tokens.
+
The mechanism for providing your token depends on the client you use to interact with {{% product-name %}}--for example:
{{< tabs-wrapper >}}
-
{{% tabs %}}
[influxdb3 CLI](#influxdb3-cli-auth)
[cURL](#curl-auth)
{{% /tabs %}}
-
{{% tab-content %}}
-When using the `influxdb3` CLI, you can use the `--token` option to provide your authorization token.
+When using the `influxdb3` CLI, you can set the `INFLUXDB3_AUTH_TOKEN` environment variable to automatically provide your
+authorization token to all `influxdb3` commands--for example:
-{{% code-placeholders "YOUR_TOKEN" %}}
+{{% code-placeholders "YOUR_AUTH_TOKEN" %}}
+```bash
+# Export your token as an environment variable
+export INFLUXDB3_AUTH_TOKEN=YOUR_AUTH_TOKEN
+
+# Run an influxdb3 command
+influxdb3 query \
+ --database DATABASE_NAME \
+ "SELECT * FROM 'DATABASE_NAME' WHERE time > now() - INTERVAL '10 minutes'"
+```
+{{% /code-placeholders %}}
+
+To specify a token in the command and override the environment variable, pass the `--token` option with your authorization token--for example:
+
+{{% code-placeholders "YOUR_AUTH_TOKEN" %}}
```bash
# Include the --token option in your influxdb3 command
influxdb3 query \
- --token YOUR_TOKEN \
- --database example-db \
- "SELECT * FROM 'example-table' WHERE time > now() - INTERVAL '10 minutes'"
+ --token YOUR_AUTH_TOKEN \
+ --database DATABASE_NAME \
+ "SELECT * FROM 'DATABASE_NAME' WHERE time > now() - INTERVAL '10 minutes'"
```
{{% /code-placeholders %}}
You can also set the `INFLUXDB3_AUTH_TOKEN` environment variable to automatically provide your
authorization token to all `influxdb3` commands.
-{{% code-placeholders "YOUR_TOKEN" %}}
-```bash
-# Export your token as an environment variable
-export INFLUXDB3_AUTH_TOKEN=YOUR_TOKEN
-
-# Run an influxdb3 command without the --token option
-influxdb3 query \
- --database example-db \
- "SELECT * FROM 'example-table' WHERE time > now() - INTERVAL '10 minutes'"
-```
-{{% /code-placeholders %}}
-
-Replace `YOUR_TOKEN` with your authorization token.
-
{{% /tab-content %}}
-
{{% tab-content %}}
-{{% code-placeholders "AUTH_TOKEN" %}}
+{{% code-placeholders "YOUR_AUTH_TOKEN" %}}
```bash
# Add your token to the HTTP Authorization header
curl "http://{{< influxdb/host >}}/api/v3/query_sql" \
- --header "Authorization: Bearer AUTH_TOKEN" \
- --data-urlencode "db=example-db" \
- --data-urlencode "q=SELECT * FROM 'example-table' WHERE time > now() - INTERVAL '10 minutes'"
+ --header "Authorization: Bearer YOUR_AUTH_TOKEN" \
+ --data-urlencode "db=DATABASE_NAME" \
+ --data-urlencode "q=SELECT * FROM 'DATABASE_NAME' WHERE time > now() - INTERVAL '10 minutes'"
```
{{% /code-placeholders %}}
-Replace `AUTH_TOKEN` with your actual InfluxDB 3 token.
-
{{% /tab-content %}}
-
{{< /tabs-wrapper >}}
+Replace the following with your values:
+
+- {{% code-placeholder-key %}}`YOUR_AUTH_TOKEN`{{% /code-placeholder-key %}}: your {{% token-link %}}
+- {{% code-placeholder-key %}}`DATABASE_NAME`{{% /code-placeholder-key %}}: the name of the database you want to query
+
{{< children hlevel="h2" readmore=true hr=true >}}
diff --git a/content/shared/influxdb3-admin/tokens/admin/_index.md b/content/shared/influxdb3-admin/tokens/admin/_index.md
index da3e84112..ba8b9ac1d 100644
--- a/content/shared/influxdb3-admin/tokens/admin/_index.md
+++ b/content/shared/influxdb3-admin/tokens/admin/_index.md
@@ -1,2 +1,27 @@
-
-{{< children hlevel="h2" readmore=true hr=true >}}
\ No newline at end of file
+
+Manage {{< product-name omit="Clustered" >}} admin tokens to authorize server actions, `influxdb3` CLI commands, and HTTP API endpoints for your {{< product-name omit="Clustered" >}} instance.
+Administrative (_admin_) tokens provide full system access and management capabilities for your {{< product-name omit="Clustered" >}} instance.
+{{% show-in "core" %}}
+Admin tokens can create, edit, and delete other admin tokens.
+{{% /show-in %}}
+{{% show-in "enterprise" %}}
+Admin tokens can create, edit, and delete other admin tokens, as well as manage [resource tokens](/influxdb3/version/admin/tokens/resource/).
+{{% /show-in %}}
+
+{{% product-name omit="Clustered" %}} supports two types of admin tokens:
+
+- **Operator token**: A system-generated administrative token with the name `_admin`.
+ - Cannot be edited or deleted
+ - Never expires
+ - Cannot be recreated if lost (future functionality)
+ - Can be regenerated using the CLI
+
+- **Named admin token**: User-defined administrative tokens with full admin permissions.
+ - Can be created, edited, and deleted
+ - Support expiration dates
+ - Cannot modify or remove the operator token
+
+An {{% product-name omit="Clustered" %}} instance can have one operator token and unlimited named admin tokens.
+
+{{< children hlevel="h2" readmore=true hr=true >}}
diff --git a/content/shared/influxdb3-admin/tokens/admin/create.md b/content/shared/influxdb3-admin/tokens/admin/create.md
index 093d5091a..d63014c26 100644
--- a/content/shared/influxdb3-admin/tokens/admin/create.md
+++ b/content/shared/influxdb3-admin/tokens/admin/create.md
@@ -1,18 +1,36 @@
-
Use the [`influxdb3 create token --admin` subcommand](/influxdb3/version/reference/cli/influxdb3/create/token/)
-or the [HTTP API](/influxdb3/version/api/v3/)
-to create an [admin token](/influxdb3/version/admin/tokens/admin/) for your {{< product-name omit="Clustered" >}} instance.
-An admin token grants full access to all actions for your InfluxDB 3 instance.
+with the `--name` option or the HTTP API [`/api/v3/configure/token/admin`](/influxdb3/version/api/v3/) endpoint
+to create an admin token for your {{< product-name omit="Clustered" >}} instance.
+An admin token grants full access to all actions for your InfluxDB 3 instance and can be referenced by its name.
+
+{{% product-name omit="Clustered" %}} supports two types of admin tokens:
+- **Operator token**: A system-generated administrative token with the name `_admin`.
+ - Cannot be edited or deleted
+ - Never expires
+ - Cannot be recreated if lost (future functionality)
+ - Can be regenerated using the CLI
+- **Named admin token**: User-defined administrative tokens with full admin permissions.
+ - Can be created, edited, and deleted
+ - Support expiration dates
+ - Cannot modify or remove the operator token
+
+An {{% product-name omit="Clustered" %}} instance can have one operator token and unlimited named admin tokens.
+
+[Create an operator token](#create-an-operator-token)
+[Create a named admin token](#create-a-named-admin-token)
> [!Note]
> #### Store secure tokens in a secret store
>
> Token strings are returned _only_ on token creation.
> We recommend storing database tokens in a **secure secret store**.
-> Anyone with access to the admin token has full control over your {{< product-name >}} instance.
-> If you lose the admin token string, you must regenerate the token.
+> Anyone with access to the named admin token has full control over your {{< product-name >}} instance.
+> If you lose the named admin token string, you must regenerate the token.
-## Create an admin token
+## Create an operator token
+
+The first admin token your create for your {{% product-name %}}
+instance is the operator token.
{{< tabs-wrapper >}}
{{% tabs %}}
@@ -20,27 +38,71 @@ An admin token grants full access to all actions for your InfluxDB 3 instance.
[HTTP API](#use-the-http-api)
{{% /tabs %}}
{{% tab-content %}}
-
-Use the `influxdb3 create token --admin` command:
+Use the `influxdb3 create token --admin` command without a token name:
```bash
influxdb3 create token --admin
```
-The output contains the token string in plain text.
-
-To use the token as the default for later commands, and to persist the token
-across sessions, assign the token string to the `INFLUXDB3_AUTH_TOKEN` environment variable.
{{% /tab-content %}}
{{% tab-content %}}
-Use the following endpoint to create an admin token:
+Use the following endpoint to create an operator token:
{{% api-endpoint method="POST" endpoint="/api/v3/configure/token/admin" api-ref="/influxdb3/version/api/v3/#operation/PostCreateAdminToken" %}}
```bash
curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin" \
---header 'Accept: application/json' \
---header 'Content-Type: application/json'
```
+
{{% /tab-content %}}
{{< /tabs-wrapper >}}
+
+The output contains the token string in plain text.
+
+## Create a named admin token
+
+{{< tabs-wrapper >}}
+{{% tabs %}}
+[CLI](#use-the-influxdb3-cli)
+[HTTP API](#use-the-http-api)
+{{% /tabs %}}
+{{% tab-content %}}
+Use the `influxdb3 create token --admin` command with a token name:
+
+{{% code-placeholders "TOKEN_NAME|ADMIN_TOKEN" %}}
+```bash
+influxdb3 create token --admin --token ADMIN_TOKEN --name "TOKEN_NAME"
+```
+{{% /code-placeholders %}}
+
+Replace the following with your values:
+
+- {{% code-placeholder-key %}}`ADMIN_TOKEN`{{% /code-placeholder-key %}}: your existing operator or named admin token
+- {{% code-placeholder-key %}}`TOKEN_NAME`{{% /code-placeholder-key %}}: the name you want to assign to the new admin token
+
+The output contains the token string in plain text.
+
+{{% /tab-content %}}
+{{% tab-content %}}
+Use the following endpoint to create a named admin token:
+
+{{% api-endpoint method="POST" endpoint="/api/v3/configure/token/admin" api-ref="/influxdb3/version/api/v3/#operation/PostCreateAdminToken" %}}
+
+```bash
+curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin" \
+ --header 'Authorization Bearer ADMIN_TOKEN' \
+ --json '{
+ "name": "TOKEN_NAME"
+ }'
+```
+Replace the following with your values:
+
+- {{% code-placeholder-key %}}`ADMIN_TOKEN`{{% /code-placeholder-key %}}: your existing operator or named admin token
+- {{% code-placeholder-key %}}`TOKEN_NAME`{{% /code-placeholder-key %}}: the name you want to assign to the new admin token
+
+The response body contains the token string in plain text.
+{{% /tab-content %}}
+{{< /tabs-wrapper >}}
+
+_To use the token as the default for later commands, and to persist the token
+across sessions, assign the token string to the `INFLUXDB3_AUTH_TOKEN` environment variable._
diff --git a/content/shared/influxdb3-admin/tokens/admin/list.md b/content/shared/influxdb3-admin/tokens/admin/list.md
index 8bb72a3a4..ac2732cff 100644
--- a/content/shared/influxdb3-admin/tokens/admin/list.md
+++ b/content/shared/influxdb3-admin/tokens/admin/list.md
@@ -12,8 +12,7 @@ data and resources in your InfluxDB 3 instance.
> #### Required permissions
>
> Listing admin tokens requires a valid InfluxDB {{% token-link "admin" %}}{{% show-in "enterprise" %}} or a token with read access to the `_internal` system database{{% /show-in %}}.
-> For more information about providing a token, see [provide your token](/influxdb3/version/admin/tokens/#provide-your-token).
-
+> For more information, see how to [provide your token](/influxdb3/version/admin/tokens/#provide-your-token).
## List all tokens
diff --git a/content/shared/influxdb3-admin/tokens/admin/regenerate.md b/content/shared/influxdb3-admin/tokens/admin/regenerate.md
index d7c3f194e..76ac054c5 100644
--- a/content/shared/influxdb3-admin/tokens/admin/regenerate.md
+++ b/content/shared/influxdb3-admin/tokens/admin/regenerate.md
@@ -1,54 +1,45 @@
-Use the `influxdb3` CLI or the HTTP API to regenerate an admin token.
+Use the `influxdb3` CLI or the HTTP API to regenerate the operator (`_admin`) token for your {{% product-name %}} instance.
Regenerate a token to rotate it as part of your security practices or if you suspect
the token has been compromised.
-{{< show-in "enterprise" >}}
-Regenerating an admin token deactivates the previous token,
+Regenerating the operator token deactivates the previous token,
stores the SHA512 hash and metadata of the new token, and returns the new token string.
-{{< /show-in >}}
-{{< show-in "core" >}}
-Regenerating the admin token deactivates the previous token, updates the `_admin` token
-SHA512 hash and metadata, and returns the new token string.
-{{< /show-in >}}
-
-An admin token grants access to all actions on the server.
## Prerequisite
-To regenerate a token, you need the current token string.
+To regenerate an operator token, you need the current token string.
-## Use the CLI or HTTP API to regenerate an admin token
+## Use the CLI or HTTP API to regenerate the operator token
> [!Important]
-> #### Securely store your token
->
-> InfluxDB lets you view the token string only when you create the token.
-> Store your token in a secure location, as you cannot retrieve it from the database later.
-> InfluxDB 3 stores only the token's hash and metadata in the catalog.
+> #### Regenerating the operator token
+> Regenerating the operator token invalidates the previous token.
+> Make sure to update any applications or scripts that use the operator token.
+
+To regenerate the operator token, use the [`influxdb3 serve create token` command] with the `--admin` and `--regenerate` flags:
{{< tabs-wrapper >}}
{{% tabs %}}
-[CLI](#cli-regenerate-admin-token)
-[HTTP API](#http-api-regenerate-admin-token)
+[CLI](#cli-regenerate)
+[HTTP API](#http-api-regenerate)
{{% /tabs %}}
{{% tab-content %}}
Use the `--regenerate` flag with the
-`influxdb3 create token --admin` subcommand--for example:
+[`influxdb3 create token --admin`](/influxdb3/version/reference/cli/influxdb3/create/token/) subcommand--for example:
-{{% code-placeholders "ADMIN_TOKEN" %}}
+{{% code-placeholders "OPERATOR_TOKEN" %}}
```bash
influxdb3 create token --admin \
- --token ADMIN_TOKEN \
--regenerate
+ OPERATOR_TOKEN
```
{{% /code-placeholders %}}
In your command,
-replace {{% code-placeholder-key %}}`ADMIN_TOKEN`{{% /code-placeholder-key %}}
-with the current token string.
+replace {{% code-placeholder-key %}}`OPERATOR_TOKEN`{{% /code-placeholder-key %}}
+with the current operator (`_admin`) token string.
-The CLI asks for confirmation before regenerating the token.
The output contains the new token string and InfluxDB deactivates the previous token string.
{{% /tab-content %}}
@@ -58,20 +49,31 @@ Use the following HTTP API endpoint:
{{% api-endpoint method="POST" endpoint="/api/v3/configure/token/admin/regenerate" api-ref="/influxdb3/version/api/v3/configure/token/admin/regenerate" %}}
-In your request, send an `Authorization` header with your current admin token string
+In your request, send an `Authorization` header with your current operator token string
--for example:
-{{% code-placeholders "ADMIN_TOKEN" %}}
+{{% code-placeholders "OPERATOR_TOKEN" %}}
```bash
curl -X POST "http://{{< influxdb/host >}}/api/v3/configure/token/admin/regenerate" \
- --header "Authorization: Bearer ADMIN_TOKEN" \
+ --header "Authorization: Bearer OPERATOR_TOKEN" \
--header "Accept: application/json"
```
{{% /code-placeholders %}}
-In your command, replace {{% code-placeholder-key %}}`ADMIN_TOKEN`{{% /code-placeholder-key %}} with the current token string.
+In your command, replace {{% code-placeholder-key %}}`OPERATOR_TOKEN`{{% /code-placeholder-key %}} with the current token string.
-The output contains the new token string and InfluxDB deactivates the previous token string.
+The response body contains the new operator token string in plain text, and InfluxDB deactivates the previous token string.
{{% /tab-content %}}
{{< /tabs-wrapper >}}
+
+To use the token as the default for later commands, and to persist the token
+across sessions, assign the token string to the `INFLUXDB3_AUTH_TOKEN` environment variable.
+
+## Important considerations
+
+- Regenerating the operator token invalidates the previous token.
+- If you lose the operator token, there is no recovery mechanism.
+- `--regenerate` only works for the operator token. You can't use the `--regenerate` flag with the `influxdb3 create token --admin` command to regenerate a named admin token.
+- Ensure that you update any applications or scripts that use the operator token with the new token string.
+- Always store your operator token securely and consider implementing proper secret management practices.
diff --git a/content/shared/influxdb3-cli/create/token.md b/content/shared/influxdb3-cli/create/token.md
deleted file mode 100644
index ff49fee36..000000000
--- a/content/shared/influxdb3-cli/create/token.md
+++ /dev/null
@@ -1,65 +0,0 @@
-The `influxdb3 create token` command creates a new authentication token. This returns the raw token string. Use it to authenticate future CLI commands and API requests.
-
-> [!Important]
-> InfluxDB displays the raw token string only once. Be sure to copy and securely store it.
-
-## Usage
-
-
-
-```bash
-influxdb3 create token