Merge branch 'hashicorp:main' into vault/run-vault-as-zcx-cluster

Author: Shobhit-IBM

.github/workflows/algolia-prod.yml

@@ -22,7 +22,7 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
-      - run: npm i
+      - run: npm ci
       - run: npm run prebuild -- --get-real-file-changed-metadata --build-algolia-index
       - run: npm run algolia
         env:

.github/workflows/build-pr-preview.yml

@@ -2,6 +2,10 @@ name: Build Preview
 run-name: 'Build Preview for "${{ github.event.pull_request.title }}" (#${{ github.event.pull_request.number }})'
 
 on:
+  # 1: Change this to `pull_request` to see changes while testing this file in a PR.
+  # 2: This is because `pull_request_target` only works from the context of the base branch
+  #    https://docs.github.com/en/actions/reference/workflows-and-actions/events-that-trigger-workflows#pull_request_target
+  # 3: Change this back to `pull_request_target` before merge for security reasons
   pull_request_target:
     types: [opened, synchronize]
   # Hello Security 👋, we are checking to make sure forked repo PR changed paths are only in content/** inside the job security-check.
@@ -105,20 +109,11 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
-      - name: Generate cache manifest
-        run: git ls-files -z -- '*.js' '*.mjs' '*.ts' '*.tsx' '*.mdx' '*.json' | xargs -0 git hash-object > cache-key.txt
-
-      - name: Use cache
+      - name: Cache Next.js build
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
         with:
-          path: |
-            ~/.npm
-            ${{ github.workspace }}/.next/cache
-          # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('cache-key.txt') }}
-          # If source files changed but packages didn't, rebuild from a prior cache.
-          restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+          path: ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-nextjs-build-${{ hashFiles('package-lock.json', 'next.config.js') }}
 
       - name: Install Vercel CLI
         run: npm i --global vercel@latest
@@ -187,17 +182,6 @@ jobs:
         with:
           repository: hashicorp/dev-portal
           path: ./unified-docs-frontend-preview
-      - name: Use cache
-        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
-        with:
-          path: |
-            ~/.npm
-            ${{ github.workspace }}/unified-docs-frontend-preview/.next/cache
-          # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx', '**/*.mdx') }}
-          # If source files changed but packages didn't, rebuild from a prior cache.
-          restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
 
       - name: Setup Node.js
         uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
@@ -206,6 +190,12 @@ jobs:
           cache-dependency-path: 'unified-docs-frontend-preview/package-lock.json'
           node-version-file: 'unified-docs-frontend-preview/package.json'
 
+      - name: Cache Next.js build
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+        with:
+          path: ${{ github.workspace }}/unified-docs-frontend-preview/.next/cache
+          key: ${{ runner.os }}-nextjs-build-devportal-${{ hashFiles('unified-docs-frontend-preview/package-lock.json', 'unified-docs-frontend-preview/next.config.js') }}
+
       - name: Setup Vercel CLI
         run: npm i --global vercel@latest
 

.github/workflows/copy-cloud-docs-for-tfe.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Generate version-metadata for workflow
         working-directory: '${{github.workspace}}/new-docs-pr'
         run: |
-          npm i
+          npm ci
           npm run prebuild -- --only-build-version-metadata
 
       - name: Create the new TFE version folder for RELEASE PR

.github/workflows/deploy-udr.yml

@@ -27,17 +27,11 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
-      - name: Use cache
+      - name: Cache Next.js build
         uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
         with:
-          path: |
-            ~/.npm
-            ${{ github.workspace }}/.next/cache
-          # Generate a new cache whenever packages or source files change.
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.js', '**/*.mjs', '**/*.ts', '**/*.tsx', '**/*.mdx') }}
-          # If source files changed but packages didn't, rebuild from a prior cache.
-          restore-keys: |
-            ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
+          path: ${{ github.workspace }}/.next/cache
+          key: ${{ runner.os }}-nextjs-build-${{ hashFiles('package-lock.json', 'next.config.js') }}
 
       - name: Install Vercel CLI
         run: npm install --global vercel@latest

.github/workflows/sync-docs-for-tfe.yml

@@ -83,7 +83,7 @@ jobs:
       - name: Generate version-metadata for workflow
         working-directory: '${{github.workspace}}/new-docs'
         run: |
-          npm i
+          npm ci
           npm run prebuild -- --only-build-version-metadata
 
       - name: Checkout HCPTF-diff for new docs version DIFF PR

.github/workflows/test-and-lint.yml

@@ -28,7 +28,7 @@ jobs:
           cache: 'npm'
           node-version-file: 'package.json'
 
-      - run: npm i
+      - run: npm ci
       - run: npm run test
 
   lint:
@@ -46,7 +46,7 @@ jobs:
           node-version-file: 'package.json'
 
       - name: Install Dependencies
-        run: npm i
+        run: npm ci
 
       - name: Run lint check
         run: npm run lint

content/consul/v1.22.x/content/api-docs/agent/index.mdx

@@ -660,7 +660,7 @@ The corresponding CLI command is [`consul join`](/consul/commands/join).
 
 ### Path Parameters
 
-- `address` `(string: <required>)` - Specifies the address of the other agent to join.
+- `address` `(string: <required>)` - Specifies the address of the other agent to join. You can specifiy either an IPv4 or an IPv6 address.
 
 ### Query Parameters
 

content/consul/v1.22.x/content/api-docs/agent/service.mdx

@@ -628,7 +628,12 @@ The `/agent/service/register` endpoint supports camel case and _snake case_ for
   This field takes precedence over the `ns` query parameter,
   one of several [other methods to specify the namespace](#methods-to-specify-namespace).
 
-- `Port` `(int: 0)` - Specifies the port of the service.
+- `Port` `(int: 0)` - Specifies the port of the service. This field is mutually exclusive with the `Ports` field. You can use this field in both service discovery and service mesh use cases.
+
+- `Ports` `(array<Port>: nil)` - Specifies multiple ports for a service. This field is mutually exclusive with the `Port` field. Consul supports multi-port services for service discovery use cases only. For an example service definition, refer to [Multi-port service definition](#multi-port-service-definition). You can specify the following values:
+  - `name` `(string: "")` - Specifies a name for the port. This value is addressable with Consul DNS.
+  - `port` `(int: 0)` - Specifies a numeric port where the service is available. 
+  - `default` `(bool: false)` - Sets a port as the default service when a port is not included. 
 
 - `Kind` `(string: "")` - The kind of service. Defaults to `""`, which is a
   typical Consul service. You can specify the following values: 

content/consul/v1.22.x/content/api-docs/operator/audit.mdx

@@ -0,0 +1,68 @@
+---
+layout: api
+page_title: Audit - Operator - HTTP API
+description: |-
+  The /operator/audit endpoints expose audit log information via Consul's HTTP API.
+---
+
+# Audit logs - Operator HTTP API
+
+<EnterpriseAlert />
+
+The `/operator/audit` endpoints provide tools to interact with Consul's audit 
+logging subsystem through Consul's HTTP API.
+
+The audit logging functionality described here is available only in
+[Consul Enterprise](https://www.hashicorp.com/products/consul/) version 1.8.0 and
+later. 
+
+Refer to the [audit logging documentation](/consul/docs/monitor/log/audit) for workflow guidance and additional information.
+
+## Calculate data hash
+
+This endpoint calculates the hash of the data used by the audit log hash function and salt.
+
+| Method | Path                           | Produces           |
+| ------ | ------------------------------ | ------------------ |
+| `POST` | `/operator/audit-hash`         | `application/json` |
+
+The following table shows this endpoint's support for
+[blocking queries](/consul/api-docs/features/blocking),
+[consistency modes](/consul/api-docs/features/consistency),
+[agent caching](/consul/api-docs/features/caching), and
+[required ACLs](/consul/api-docs/api-structure#authentication).
+
+| Blocking Queries | Consistency Modes | Agent Caching | ACL Required    |
+| ---------------- | ----------------- | ------------- | --------------- |
+| `NO`             | `none`            | `none`        | `operator:read` |
+
+The corresponding CLI command is [`consul operator audit hash`](/consul/commands/operator/audit#hash).
+
+### JSON request body schema
+
+- `Input` `(string: <required>)` - Specifies the input string to hash.
+
+### Sample payload
+
+```json
+{
+  "Input": "test"
+}
+```
+
+### Sample request
+
+```shell-session
+$ curl \
+    --request POST \
+    --data @payload.json \
+    http://127.0.0.1:8500/v1/operator/audit-hash
+```
+
+### Sample response
+
+```json
+{
+  "Hash": "hmac_sha256:794c39dbc00d4714740199fe79982d02bbc5d303ab73149dfabc1244e3df3d4c"
+}
+```

content/consul/v1.22.x/content/api-docs/operator/utilization.mdx

@@ -0,0 +1,92 @@
+---
+layout: api
+page_title: Utilization - Operator - HTTP API
+description: |-
+  The /operator/utilization endpoints generate a Consul utilization bundle for license reporting.
+---
+
+# Utilization - Operator HTTP API
+
+<EnterpriseAlert />
+
+The `/operator/utilization` endpoints provide tools to generate a Consul utilization bundle for license reporting.
+
+Refer to the [Manual license utilization reporting documentation](/consul/docs/enterprise/license/reporting#manual-license-utilization-reporting) for more information.
+
+## Generate utilization bundle
+
+This endpoint generates a Consul utilization bundle for license reporting.
+
+| Method | Path                           | Produces           |
+| ------ | ------------------------------ | ------------------ |
+| `GET` | `/operator/utilization`         | `application/json` |
+
+The following table shows this endpoint's support for
+[blocking queries](/consul/api-docs/features/blocking),
+[consistency modes](/consul/api-docs/features/consistency),
+[agent caching](/consul/api-docs/features/caching), and
+[required ACLs](/consul/api-docs/api-structure#authentication).
+
+| Blocking Queries | Consistency Modes | Agent Caching | ACL Required    |
+| ---------------- | ----------------- | ------------- | --------------- |
+| `NO`             | `none`            | `none`        | `operator:read` |
+
+The corresponding CLI command is [`consul operator utilization`](/consul/commands/operator/utilization).
+
+
+### Query parameters
+
+- `message`  `(string: "")` - Optional context that is logged with the utilization export.
+
+- `today_only` `(bool: false)` - Include only the most recent utilization snapshot.
+
+- `send_report` `(bool: false)` - Automatically send the utilization report to HashiCorp.
+
+### Sample request
+
+```shell-session
+$ curl \
+    http://127.0.0.1:8500/v1/operator/utilization
+```
+
+### Sample response
+
+```json
+{
+  "version": "2",
+  "mode": "manual",
+  "timestamp": "2025-10-09T15:23:48.354524388Z",
+  "signature": "9ea44420679b3776d1636acbe9ec1f636a58bd4a5b7f2b215cc2958084ded505",
+  "checksum": 17512992959032736032,
+  "snapshots": [
+    {
+      "snapshot_version": 2,
+      "id": "0001MEFMW4B0G5JJHKQN4T9RCE",
+      "timestamp": "2025-10-09T15:23:48.348542971Z",
+      "schema_version": "2.0.0",
+      "product": "consul",
+      "process_id": "01K6FXJDTFBQQP5B3RAXRFRB1K",
+      "metrics": {
+        "consul.billable.nodes": {
+          "key": "consul.billable.nodes",
+          "value": 7,
+          "mode": "write"
+        },
+        "consul.billable.service_instances": {
+          "key": "consul.billable.service_instances",
+          "value": 4,
+          "mode": "write"
+        }
+      },
+      "product_version": "1.22.0-rc1+ent",
+      "license_id": "642088be-c801-c34a-bb5c-e70d4feb18fe",
+      "checksum": 18094916709627403007,
+      "metadata": {
+        "billing_start": "2021-09-30T00:00:00Z",
+        "cluster_id": "dc1"
+      }
+    }
+  ]
+}
+```
+