Merge branch 'docs-v2-issue563' into claude/organize-shortcode-template-kVuEv

Author: jstirnaman

.github/scripts/parse-pr-urls.js

@@ -51,7 +51,10 @@ function isValidUrlPath(path) {
   // Reject path traversal attempts
   if (path.includes('..')) return false;
 
-  // Reject paths with suspicious characters (includes ' to prevent JS injection)
+  // Reject paths with suspicious characters
+  // Note: Backticks are in this list, but the extraction regex stops AT backticks,
+  // so they act as delimiters rather than being included in paths
+  // (includes ' to prevent JS injection)
   if (/[<>"|{}`\\^[\]']/.test(path)) return false;
 
   // Reject URL-encoded characters (potential encoding attacks)
@@ -73,9 +76,13 @@ function isValidUrlPath(path) {
 function buildRelativePattern() {
   const namespaceAlternation = PRODUCT_NAMESPACES.join('|');
   // Match relative paths starting with known product prefixes
-  // Also captures paths in markdown links: [text](/influxdb3/core/)
+  // Captures paths in various contexts: markdown links, parentheses, backticks, etc.
+  // Delimiters: start of string, whitespace, ], ), (, or `
+  // Note: Backtick appears in both the delimiter list and negated character class
+  // for defense-in-depth - delimiter stops extraction, character class prevents
+  // any edge cases where backticks might slip through
   return new RegExp(
-    `(?:^|\\s|\\]|\\)|\\()(\\/(?:${namespaceAlternation})[^\\s)\\]>"']*)`,
+    `(?:^|\\s|\\]|\\)|\\(|\`)(\\/(?:${namespaceAlternation})[^\\s)\\]>"'\`]*)`,
     'gm'
   );
 }
@@ -130,14 +137,20 @@ export function extractDocsUrls(text) {
 /**
  * Normalize URL path to consistent format
  * @param {string} urlPath - URL path to normalize
- * @returns {string} - Normalized path with trailing slash
+ * @returns {string} - Normalized path with trailing slash, wildcards stripped
  */
 function normalizeUrlPath(urlPath) {
   // Remove anchor fragments
   let normalized = urlPath.split('#')[0];
   // Remove query strings
   normalized = normalized.split('?')[0];
-  // Ensure trailing slash
+  // Remove wildcard characters (* is often used to indicate "all pages")
+  // Do this BEFORE collapsing slashes to handle patterns like /path/*/
+  normalized = normalized.replace(/\*/g, '');
+  // Collapse multiple consecutive slashes into single slash
+  // This handles cases like /path/*/ → /path// → /path/
+  normalized = normalized.replace(/\/+/g, '/');
+  // Ensure trailing slash (important for Hugo's URL structure)
   if (!normalized.endsWith('/')) {
     normalized += '/';
   }

.github/scripts/test-parse-pr-urls.js

@@ -140,10 +140,12 @@ test('Special characters: pipes and brackets', () => {
   assertEquals(result, [], 'Should reject paths with curly braces');
 });
 
-test('Special characters: backticks', () => {
+test('Special characters: backticks are delimiters', () => {
+  // Backticks act as delimiters, stopping URL extraction
+  // This prevents command substitution injection
   const text = '/influxdb3/`whoami`/';
   const result = extractDocsUrls(text);
-  assertEquals(result, [], 'Should reject paths with backticks');
+  assertEquals(result, ['/influxdb3/'], 'Should truncate at backtick delimiter');
 });
 
 test('Special characters: single quotes truncate at extraction', () => {
@@ -252,6 +254,36 @@ test('Normalization: removes query string', () => {
   assertEquals(result, ['/influxdb3/core/'], 'Should remove query string');
 });
 
+test('Normalization: strips wildcard from path', () => {
+  const text = '/influxdb3/enterprise/*';
+  const result = extractDocsUrls(text);
+  assertEquals(result, ['/influxdb3/enterprise/'], 'Should strip wildcard character');
+});
+
+test('Normalization: strips wildcard in middle of path', () => {
+  const text = '/influxdb3/*/admin/';
+  const result = extractDocsUrls(text);
+  assertEquals(result, ['/influxdb3/admin/'], 'Should strip wildcard from middle of path');
+});
+
+test('Normalization: strips multiple wildcards', () => {
+  const text = '/influxdb3/*/admin/*';
+  const result = extractDocsUrls(text);
+  assertEquals(result, ['/influxdb3/admin/'], 'Should strip all wildcard characters');
+});
+
+test('Wildcard in markdown-style notation', () => {
+  const text = '**InfluxDB 3 Enterprise pages** (`/influxdb3/enterprise/*`)';
+  const result = extractDocsUrls(text);
+  assertEquals(result, ['/influxdb3/enterprise/'], 'Should extract and normalize path with wildcard in backticks');
+});
+
+test('Wildcard in parentheses', () => {
+  const text = 'Affects pages under (/influxdb3/enterprise/*)';
+  const result = extractDocsUrls(text);
+  assertEquals(result, ['/influxdb3/enterprise/'], 'Should extract and normalize path with wildcard in parentheses');
+});
+
 // Test deduplication
 test('Deduplication: same URL multiple times', () => {
   const text = `

content/enterprise_influxdb/v1/_index.md

@@ -10,7 +10,7 @@ menu:
 weight: 1
 ---
 
-InfluxDB Enterprise provides a time series database designed to handle high write and query loads and offers highly scalable clusters on your infrastructure with a management UI. Use for DevOps monitoring, IoT sensor data, and real-time analytics. Check out the key features that make InfluxDB Enterprise a great choice for working with time series data.
+InfluxDB Enterprise provides a time series database designed to handle high write and query loads and offers highly scalable clusters on your infrastructure with a management UI. Use for DevOps monitoring, IoT sensor data, and real-time analytics.
 
 {{< influxdb/cloud1-note >}}
 

content/influxdb/cloud/sign-up.md

@@ -1,7 +1,7 @@
 ---
 title: Sign up for InfluxDB Cloud
 description: >
-  InfluxDB Cloud is a fully managed and hosted version of InfluxDB 2.0, the time series
+  InfluxDB Cloud (TSM) is a fully managed and hosted version of InfluxDB 2.x, the time series
   platform purpose-built to collect, store, process and visualize metrics and events.
 menu:
   influxdb_cloud:
@@ -12,7 +12,7 @@ aliases:
   - /influxdb/v2/cloud/get-started/
 ---
 
-InfluxDB Cloud is a fully managed and hosted version of InfluxDB, designed to collect, store, process, and visualize metrics and events.
+InfluxDB Cloud (TSM) is a fully managed and hosted version of InfluxDB 2.x, designed to collect, store, process, and visualize metrics and events.
 
   > [!Note]
   > #### New InfluxDB Cloud signups use InfluxDB 3

content/influxdb/v1/about_the_project/release-notes.md

@@ -1,6 +1,6 @@
 ---
 title: InfluxDB v1 release notes
-description: Important changes and and what's new in each version of InfluxDB OSS.
+description: Important features, fixes, and updates in each version of InfluxDB OSS v1.
 menu:
   influxdb_v1:
     name: Release notes
@@ -76,7 +76,7 @@ of InfluxDB v1 workloads to InfluxDB 3.
 > 
 > The last public release of InfluxDB v1 was v1.8.10. Upgrading from v1.8.10 to
 > v1.11.7 is a large jump and should be done with care. Consider doing
-> one or more of the the following before upgrading:
+> one or more of the following before upgrading:
 > 
 > - [Back up your data](/influxdb/v1/administration/backup_and_restore/)
 > - Create a clone of your current InfluxDB using InfluxDB 1.11 with identical
@@ -98,7 +98,7 @@ of InfluxDB v1 workloads to InfluxDB 3.
   - Optimize `SHOW FIELD KEY CARDINALITY`.
   - `SHOW TAG VALUES` returns results from one specific retention policy.
   - Support `WITH KEY` clause in with `SHOW TAG KEYS`.
-  - Support Hyper Log Log operators: `count_hll`, `sum_hll`, `merge_hll`.
+  - Support Hyper Log operators: `count_hll`, `sum_hll`, `merge_hll`.
   - Use `count_hll` for `SHOW SERIES CARDINALITY` queries.
 - **Logging improvements:**
   - Log slow queries even without query logging enabled.

content/influxdb/v1/introduction/_index.md

@@ -1,12 +1,12 @@
 ---
-title: Learn about InfluxDB OSS
-description: Tasks to complete to get up and running with InfluxDB OSS.
+title: Learn about InfluxDB OSS 1.x
+description: Get up and running with InfluxDB OSS v{{< current-version >}}.
 menu:
   influxdb_v1:
     name: Introduction
     weight: 20
 ---
 
-To get up and running with the open source (OSS) version of InfluxDB, complete the following tasks:
+To get up and running with InfluxDB OSS v{{< current-version >}}, complete the following:
 
 {{< children hlevel="h2" >}}

content/influxdb/v1/introduction/download.md

@@ -1,5 +1,5 @@
 ---
-title: Download InfluxDB OSS
+title: Download InfluxDB OSS v1
 menu:
   influxdb_v1:
     name: Download InfluxDB
@@ -9,9 +9,10 @@ aliases:
   - /influxdb/v1/introduction/downloading/
 ---
 
-Download the latest InfluxDB open source (OSS) release at the [InfluxData download page](https://www.influxdata.com/downloads/). 
+Download the latest InfluxDB open source (OSS) release at the [InfluxData Downloads page](https://www.influxdata.com/downloads/). 
 
-1. Scroll to the bottom of the [`downloads page`](https://www.influxdata.com/downloads/) and click **Are you interested in InfluxDB 1.x Open Source?** to expand the 1.x options. 
-2. Under **Are you interested in InfluxDB 1.x Open Source?**, select the version of InfluxDB you want to download.
-3. Under the **Platform** dropdown menu, select your operating system.
-4. Execute the provided download commands.
+1. Scroll to the bottom of the [downloads page](https://www.influxdata.com/downloads/) and click **2** to navigate to the second page of products.
+2. Under **InfluxDB OSS 1.x**, select:
+   - your **Platform** (operating system) and
+   - the **Version** of InfluxDB you want to download.
+3. Run the provided commands to download and install InfluxDB.

content/influxdb/v1/introduction/get-started/_index.md

@@ -1,6 +1,6 @@
 ---
-title: Get started with InfluxDB OSS
-description: Get started with InfluxDB OSS. Learn how to create databases, write data, and query your time series data.
+title: Get started with InfluxDB OSS v1
+description: Get started with InfluxDB OSS v{{< current-version >}}. Learn how to create databases, write data, and query your time series data.
 aliases:
   - /influxdb/v1/introduction/getting_started/
   - /influxdb/v1/introduction/getting-started/
@@ -13,7 +13,7 @@ alt_links:
   v2: /influxdb/v2/get-started/
 ---
 
-With InfluxDB open source (OSS) [installed](/influxdb/v1/introduction/installation), you're ready to start working with time series data.
+With InfluxDB [installed](/influxdb/v1/introduction/installation), you're ready to start working with time series data.
 This guide uses the `influx` [command line interface](/influxdb/v1/tools/shell/) (CLI), which is included with InfluxDB
 and provides direct access to the database.
 The CLI communicates with InfluxDB through the HTTP API on port `8086`.

content/influxdb/v1/introduction/install.md

@@ -1,6 +1,6 @@
 ---
-title: Install InfluxDB OSS
-description: Install, start, and configure InfluxDB OSS.
+title: Install InfluxDB OSS v1
+description: Install, start, and configure InfluxDB OSS v{{< current-version >}}.
 menu:
   influxdb_v1:
     name: Install InfluxDB
@@ -12,7 +12,7 @@ alt_links:
   v2: /influxdb/v2/install/
 ---
 
-This page provides directions for installing, starting, and configuring InfluxDB open source (OSS).
+Install, start, and configure InfluxDB open source (OSS) v{{< current-version >}}.
 
 ## InfluxDB OSS installation requirements
 
@@ -144,7 +144,7 @@ sudo systemctl start influxdb
 
 {{% tab-content %}}
 
-There are RPM packages provided by openSUSE Build Service for SUSE Linux users:
+For SUSE Linux users, openSUSE Build Service provides RPM packages:
 
 ```bash
 # add go repository
@@ -280,24 +280,61 @@ internal defaults.
 Note that the local configuration file does not need to include every
 configuration setting.
 
-There are two ways to launch InfluxDB with your configuration file:
+Use one of the following methods to launch InfluxDB OSS v1 with your configuration file:
 
-* Point the process to the correct configuration file by using the `-config`
-option:
+- **CLI flag**: Pass the `-config` flag with the path to your configuration file:
 
     ```bash
     influxd -config /etc/influxdb/influxdb.conf
     ```
-* Set the environment variable `INFLUXDB_CONFIG_PATH` to the path of your
-configuration file and start the process.
-For example:
+- **Environment variable**: Set the `INFLUXDB_CONFIG_PATH` environment variable to the path of your
+configuration file and start the process--for example:
 
-    ```
-    echo $INFLUXDB_CONFIG_PATH
-    /etc/influxdb/influxdb.conf
+    {{< code-tabs-wrapper >}}
+{{% code-tabs %}}
+[Linux/macOS (bash/zsh)](#)
+[Linux/macOS (persistent)](#)
+[Windows (PowerShell)](#)
+[Windows (CMD)](#)
+{{% /code-tabs %}}
+{{% code-tab-content %}}
+```bash
+# Set the environment variable for the current session
+export INFLUXDB_CONFIG_PATH=/etc/influxdb/influxdb.conf
 
-    influxd
-    ```
+# Start InfluxDB
+influxd
+```
+{{% /code-tab-content %}}
+{{% code-tab-content %}}
+```bash
+# Add to ~/.bashrc or ~/.zshrc for persistence
+echo 'export INFLUXDB_CONFIG_PATH=/etc/influxdb/influxdb.conf' >> ~/.bashrc
+source ~/.bashrc
+
+# Start InfluxDB
+influxd
+```
+{{% /code-tab-content %}}
+{{% code-tab-content %}}
+```powershell
+# Set the environment variable for the current session
+$env:INFLUXDB_CONFIG_PATH = "C:\Program Files\InfluxDB\influxdb.conf"
+
+# Start InfluxDB
+influxd
+```
+{{% /code-tab-content %}}
+{{% code-tab-content %}}
+```cmd
+REM Set the environment variable for the current session
+set INFLUXDB_CONFIG_PATH=C:\Program Files\InfluxDB\influxdb.conf
+
+REM Start InfluxDB
+influxd
+```
+{{% /code-tab-content %}}
+    {{< /code-tabs-wrapper >}}
 
 InfluxDB first checks for the `-config` option and then for the environment
 variable.
@@ -314,9 +351,8 @@ See the [Configuration](/influxdb/v1/administration/config/) documentation for m
 
 Make sure the directories in which data and the [write ahead log](/influxdb/v1/concepts/glossary#wal-write-ahead-log) (WAL) are stored are writable for the user running the `influxd` service.
 
-{{% note %}}
-**Note:** If the data and WAL directories are not writable, the `influxd` service will not start.
-{{% /note %}}
+> [!Important]
+> If the data and WAL directories are not writable, the `influxd` service will not start.
 
 The user running the `influxd` process should have the following permissions for
 directories in the [InfluxDB file system](/influxdb/v1//concepts/file-system-layout/):

content/influxdb/v1/introduction/install/docker.md

@@ -1,7 +1,7 @@
 ---
 title: Install and run InfluxDB using Docker
 description: >
-  Install and run InfluxDB OSS v1.x using Docker. Configure and operate InfluxDB in a Docker container.
+  Install and run InfluxDB OSS v{{< current-version >}} using Docker. Configure and operate InfluxDB in a Docker container.
 menu:
   influxdb_v1:
     name: Use Docker 
@@ -20,7 +20,7 @@ alt_links:
   v2: /influxdb/v2/install/use-docker-compose/
 ---
 
-Install and run InfluxDB OSS v1.x using Docker containers.
+Install and run InfluxDB OSS v{{< current-version >}} using Docker containers.
 This guide covers Docker installation, configuration, and initialization options.
 
 - [Install and run InfluxDB](#install-and-run-influxdb)