Skip to content

Commit 7c28b95

Browse files
committed
Merge branch 'main' into ngf-release-2.3
2 parents a45ec16 + 0f211cc commit 7c28b95

File tree

203 files changed

+555
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+555
-558
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ content/nim/* @nginx/nim-docs-approvers
5353
content/nginx/* @nginx/plus-docs-approvers
5454

5555
# NGINX One
56-
content/nginx-one/* @nginx/one-docs-approvers
56+
content/nginx-one-console/* @nginx/one-docs-approvers
5757

File renamed without changes.
File renamed without changes.

.github/labeler.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ product/nginx-plus:
5555
- 'content/nginx/**'
5656
- 'content/includes/nginx-plus/**'
5757

58-
product/nginx-one:
58+
product/nginx-one-console:
5959
- changed-files:
6060
- any-glob-to-any-file:
61-
- 'content/nginx-one/**'
62-
- 'content/includes/nginx-one/**'
61+
- 'content/nginx-one-console/**'
62+
- 'content/includes/nginx-one-console/**'
6363

6464
product/nginxaas-azure:
6565
- changed-files:

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: Upload SARIF results to code scanning
59-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
59+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
6060
with:
6161
sarif_file: results.sarif

_banners/agent-v2-note.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{{< banner "notice" "You are viewing NGINX Agent version 2 documentation" >}}
2+
This set of documentation is for **NGINX Agent version 2.x**.
3+
4+
For NGINX Agent 3.x content visit the [NGINX One Console documentation]({{< ref "/nginx-one-console/agent/overview/about/" >}})
5+
{{< /banner >}}

_banners/agent-v3-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{< banner "notice" "NGINX Agent 3.0 is now available" >}}
22

3-
The documentation in this section is for **NGINX Agent version 2.x**. For NGINX Agent 3.x content visit the [NGINX One Console documentation]({{< ref "/nginx-one/agent/" >}})
3+
The documentation in this section is for **NGINX Agent version 2.x**. For NGINX Agent 3.x content visit the [NGINX One Console documentation]({{< ref "/nginx-one-console/agent/" >}})
44

55
F5 NGINX Instance Manager (NIM) does not currently support NGINX Agent 3.x. NGINX Instance Manager customers can upgrade to the latest NGINX Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
66

_banners/eol-amplify.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ NGINX Amplify support ends on January 31, 2026. To continue monitoring your NGIN
66

77
1. [Contact the F5 NGINX Sales team](https://www.f5.com/products/get-f5/f5-nginx-products-and-packaging) to get an NGINX One subscription, if you don’t already have one.
88
2. [Uninstall the NGINX Amplify agent]({{< ref "/amplify/nginx-amplify-agent/install/uninstalling-amplify-agent.md" >}}).
9-
3. [Follow the NGINX One Console getting started guide]({{< ref "/nginx-one/getting-started.md" >}}).
9+
3. [Follow the NGINX One Console getting started guide]({{< ref "/nginx-one-console/getting-started.md" >}}).
1010

1111
[Professional Services](https://www.f5.com/services) are available to support your transition. Additional fees may apply.
1212
{{</ banner >}}

content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Learn how to deliver, manage, and protect your applications using F
77
Learn how to deliver, manage, and protect your applications using F5 NGINX products.
88

99
{{<card-section showAsCards="true" title="F5 NGINX One">}}
10-
{{<card title="F5 NGINX One Console" titleUrl="/nginx-one/" brandIcon="NGINX-One-product-icon.svg" isLanding="true">}}
10+
{{<card title="F5 NGINX One Console" titleUrl="/nginx-one-console/" brandIcon="NGINX-One-product-icon.svg" isLanding="true">}}
1111
Monitor your infrastructure, address security vulnerabilities, and assess the health of your NGINX fleet, all from a single console.
1212
{{</card >}}
1313
{{<card title="F5 NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon.svg" isLanding="true">}}

content/agent/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ cascade:
77
enabled: true
88
type: deprecation
99
start-date: 2025-05-29
10-
end-date: 2025-09-09
11-
md: /_banners/agent-v3-release.md
10+
end-date: 2026-09-09
11+
md: /_banners/agent-v2-note.md
1212
# The subtitle displays directly underneath the heading of a given page
1313
nd-subtitle:
1414
# Indicates that this is a custom landing page

0 commit comments

Comments
 (0)