Merge branch 'master' into fix/flux_cardinality_description

content/chronograf/v1/administration/managing-security.md

@@ -1,7 +1,8 @@
 ---
 title: Manage Chronograf security
 description: Manage Chronograf security with OAuth 2.0 providers.
-aliases: /chronograf/v1/administration/security-best-practices/
+aliases:
+  - /chronograf/v1/administration/security-best-practices/
 menu:
   chronograf_v1:
     name: Manage Chronograf security

content/chronograf/v1/troubleshooting/frequently-asked-questions.md

@@ -6,6 +6,8 @@ menu:
     name: Frequently asked questions (FAQs)
     weight: 10
     parent: Troubleshoot
+aliases:
+  - /chronograf/latest/guides/transition-web-admin-interface/
 ---
 
 ## How do I connect Chronograf to an InfluxDB Enterprise cluster?

content/enterprise_influxdb/v1/concepts/glossary.md

@@ -449,8 +449,8 @@ Related entries: [tsm](#tsm-time-structured-merge-tree)
 
 ## web console
 
-Legacy user interface for the InfluxDB Enterprise.
+Legacy user interface for InfluxDB Enterprise.
 
 This interface has been deprecated. We recommend using [Chronograf](/chronograf/v1/introduction/).
 
-If you are transitioning from the Enterprise Web Console to Chronograf, see how to [transition from the InfluxDB Web Admin Interface](/chronograf/v1/guides/transition-web-admin-interface/).
+If you are transitioning from the Enterprise Web Console to Chronograf, see how to [connect Chronograf to an InfluxDB Enterprise cluster](/chronograf/v1/troubleshooting/frequently-asked-questions/#how-do-i-connect-chronograf-to-an-influxdb-enterprise-cluster).

content/enterprise_influxdb/v1/guides/query_data.md

@@ -1,14 +1,13 @@
 ---
 title: Query data with the InfluxDB API
 description: Query data with Flux and InfluxQL in the InfluxDB API.
-alias:
-  -/docs/v1.8/query_language/querying_data/
 menu:
   enterprise_influxdb_v1:
     weight: 20
     parent: Guides
 aliases:
   - /enterprise_influxdb/v1/guides/querying_data/
+  - /docs/v1.8/query_language/querying_data/
 v2: /influxdb/v2/query-data/
 ---
 

content/influxdb/cloud-serverless/query-data/troubleshoot-and-optimize/optimize-queries.md

@@ -86,7 +86,7 @@ less efficient.
 
 Use the following tools to analyze and troubleshoot queries and find performance bottlenecks:
 
-- [Analyze a query plan](/influxdb/cloud-serverless/query-data/analyze-query-plan/)
+- [Analyze a query plan](/influxdb/cloud-serverless/query-data/troubleshoot-and-optimize/analyze-query-plan/)
 - [Enable trace logging for a query](#enable-trace-logging-for-a-query)
 
 ### Enable trace logging for a query

content/influxdb/cloud/api-guide/influxdb-1x/_index.md

@@ -11,7 +11,7 @@ weight: 104
 influxdb/cloud/tags: [influxql, query, write]
 related:
   - /influxdb/cloud/query-data/influxql
-alias:
+aliases:
   - /influxdb/cloud/reference/api/influxdb-1x/
 ---
 

content/influxdb/cloud/api-guide/influxdb-1x/dbrp.md

@@ -13,7 +13,7 @@ related:
   - /influxdb/cloud/reference/api/influxdb-1x/write
   - /influxdb/cloud/api/#tag/DBRPs, InfluxDB v2 API /dbrps endpoint
   - /influxdb/cloud/query-data/influxql/
-alias:
+aliases:
   - /influxdb/cloud/reference/api/influxdb-1x/dbrp/
 ---
 

content/influxdb/cloud/api-guide/influxdb-1x/query.md

@@ -15,7 +15,7 @@ list_code_example: |
   </pre>
 related:
   - /influxdb/cloud/query-data/influxql
-alias:
+aliases:
   - /influxdb/cloud/reference/api/influxdb-1x/query/
 ---
 

content/influxdb/cloud/api-guide/influxdb-1x/write.md

@@ -16,7 +16,7 @@ list_code_example: |
   </pre>
 related:
   - /influxdb/cloud/reference/syntax/line-protocol
-alias:
+aliases:
   - /influxdb/cloud/reference/api/influxdb-1x/write/
 ---
 

content/influxdb/cloud/write-data/bulk-ingest-cloud.md

@@ -9,11 +9,11 @@ menu:
   influxdb_cloud:
     name: Bulk ingest historical data
     parent: Write data
-alias:
+aliases:
   - /influxdb/v2/write-data/bulk-ingest-cloud
 ---
 
-To upload a large amount **(10GB or greater)** of previously existing *historical*
+To upload a large amount **(10 GB or greater)** of previously existing *historical*
 data into InfluxDB Cloud, contact [InfluxData Support](https://support.influxdata.com/) for assistance.
 We’ll review your ingest rate limits, volume, and existing
 [data schema](/influxdb/cloud/reference/key-concepts/data-schema) to ensure the

content/influxdb/v1/about_the_project/_index.md

@@ -2,8 +2,8 @@
 title: About InfluxDB OSS
 description: >
   Release notes, licenses, contribution guidelines, and third-party software details for InfluxDB.
-alias:
-  -/docs/v1.8/about/
+aliases:
+  - /docs/v1.8/about/
 menu:
   influxdb_v1:
     name: About the project

content/influxdb/v1/guides/query_data.md

@@ -1,7 +1,7 @@
 ---
 title: Query data with the InfluxDB API
 description: Query data with Flux and InfluxQL in the InfluxDB API.
-alias:
+aliases:
   -/docs/v1.8/query_language/querying_data/
 menu:
   influxdb_v1:

content/influxdb/v2/api-guide/influxdb-1x/dbrp.md

@@ -13,7 +13,7 @@ related:
   - /influxdb/v2/reference/api/influxdb-1x/write
   - /influxdb/v2/api/#tag/DBRPs, InfluxDB v2 API /dbrps endpoint
   - /influxdb/v2/query-data/influxql/
-alias:
+aliases:
   - /influxdb/v2/reference/api/influxdb-1x/dbrp/
 ---
 

content/influxdb/v2/api-guide/influxdb-1x/query.md

@@ -15,7 +15,7 @@ list_code_example: |
   </pre>
 related:
   - /influxdb/v2/query-data/influxql
-alias:
+aliases:
   - /influxdb/v2/reference/api/influxdb-1x/query/
 ---
 

content/influxdb/v2/api-guide/influxdb-1x/write.md

@@ -16,7 +16,7 @@ list_code_example: |
   </pre>
 related:
   - /influxdb/v2/reference/syntax/line-protocol
-alias:
+aliases:
   - /influxdb/v2/reference/api/influxdb-1x/write/
 ---
 

content/influxdb/v2/query-data/flux/_index.md

@@ -7,7 +7,7 @@ menu:
   influxdb_v2:
     name: Query with Flux
     parent: Query data
-alias:
+aliases:
   - /influxdb/v2/query-data/guides/
 ---
 

content/influxdb/v2/reference/internals/data-retention.md

@@ -32,7 +32,7 @@ configuration option.
 - [When does data actually get deleted?](#when-does-data-actually-get-deleted)
 
 ## Bucket retention period
-A **bucket retention period** is the [duration](/influxdb/v2/glossary/#duration) of time that a bucket retains data.
+A **bucket retention period** is the [duration](/influxdb/v2/reference/glossary/#duration) of time that a bucket retains data.
 Retention periods can be infinite or as short as an hour.
 [Points](/influxdb/v2/reference/glossary/#point) in a bucket with timestamps
 beyond the defined retention period (relative to now) are _eligible_ for deletion.

content/influxdb/v2/write-data/no-code/load-data.md

@@ -17,7 +17,6 @@ Load data from the following sources in the InfluxDB user interface (UI):
 - [Line protocol](#load-data-using-line-protocol)
 - [Client libraries](#load-data-from-a-client-library-in-the-ui)
 - [Telegraf plugins](#load-data-from-a-telegraf-plugin-in-the-ui)
-- {{% cloud-only %}}[Native MQTT subscriptions](#set-up-a-native-mqtt-subscription){{% /cloud-only %}}
 
 ### Load CSV or line protocol in UI
 
@@ -76,11 +75,16 @@ Load CSV or line protocol data by uploading a file or pasting the data manually
    - **Create a new configuration**: Enter a configuration name and select an output bucket, and then click **Continue Configuring**.
    - **Add to an existing configuration**: Select an existing Telegraf configuration to add this plugin to, and then click **Add to Existing Config**.
 5. Provide a **Telegraf Configuration Name** and an optional **Telegraf Configuration Description**.
-6. Adjust configuration settings as needed. To find configuration settings for a specific plugin, see [Telegraf plugins](/telegraf/latest/plugins/).
-7. Click **Save and Test**.
-8. The **Test Your Configuration** page provides instructions for how to start
+6. Adjust configuration settings as needed.
+   The configuration includes settings for the [InfluxDB v2 output plugin](/telegraf/v1/plugins/#output-influxdb_v2) to write to your bucket.
+   To find configuration settings for a specific plugin, see [Telegraf plugins](/telegraf/latest/plugins/).
+7. Click **Save and Test**. Your input plugin configuration is appended to the default agent settings and the InfluxDB output plugin configuration.
+8.  The **Test Your Configuration** page provides instructions for how to start
    Telegraf using the generated configuration.
    _See [Start Telegraf](/influxdb/cloud/write-data/no-code/use-telegraf/auto-config/#start-telegraf) below for detailed information about what each step does._
-9. Once Telegraf is running, click **Listen for Data** to confirm Telegraf is successfully sending data to InfluxDB.
+9.  Once Telegraf is running, click **Listen for Data** to confirm Telegraf is successfully sending data to InfluxDB.
    Once confirmed, a **Connection Found!** message appears.
-10. Click **Finish**. Your Telegraf configuration name and the associated bucket name appear in the list of Telegraf configurations.
+10. Click **Finish**.
+    Your Telegraf configuration name and the associated bucket name appear in the list of Telegraf configurations.
+11. To view or edit the configuration, click the configuration name.
+12. To view default settings used to write data to InfluxDB, click **InfluxDB Output Plugin**.

content/platform/install-and-deploy/install/oss-install.md

@@ -2,7 +2,8 @@
 title: Install the InfluxData 1.x TICK stack (OSS)
 list_title: TICK stack (OSS)
 description: Install and configure the open source InfluxData 1.x TICK stack – Telegraf, InfluxDB, Chronograf, and Kapacitor.
-alias: /platform/installation/oss-install
+aliases:
+  - /platform/installation/oss-install
 menu:
   platform:
     name: TICK stack (OSS)