Skip to content

Commit bbd417f

Browse files
authored
Merge branch 'main' into feat-n1c-ngf-api
2 parents 8fe57dd + 1677c96 commit bbd417f

File tree

9 files changed

+122
-20
lines changed

9 files changed

+122
-20
lines changed

.github/workflows/coveo.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
"type": "User",
4242
"name": "anonymous",
4343
"provider": "Email Security Provider"
44-
},
45-
{
46-
"type": "User",
47-
"name": "[email protected]",
48-
"provider": "Email Security Provider"
4944
}
5045
]
5146
}')

_banners/ngf-2.0-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
NGINX Gateway Fabric {{< version-ngf >}} is now available.
44

5-
NGINX Gateway Fabric {{< version-ngf >}} has released! Follow [these instructions]({{< ref "/ngf/install/upgrade-version.md#upgrade-from-v1x-to-v2x" >}}) to upgrade from 1.x to 2.0.
5+
Follow [these instructions]({{< ref "/ngf/install/upgrade-version.md#upgrade-from-v1x-to-v2x" >}}) to upgrade from 1.x to 2.0.
66

77
For 1.x, checkout [an older version]({{< ref "/ngf/install/upgrade-version.md#access-nginx-gateway-fabric-1x-documentation" >}}) of documentation.
88

content/nginx/releases.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ NGINX Plus R35 is a feature release:
5353

5454
- Security: SMTP Authentication process memory over-read. This vulnerability in the NGINX `ngx_mail_smtp_module` may allow an unauthenticated attacker to trigger buffer over-read, resulting in worker process memory disclosure to the authentication server ([CVE-2025-53859](https://www.cve.org/CVERecord?id=CVE-2025-53859)).
5555

56+
{{< call-out "note" "Learn more" >}}For highlights of all new features and enhancements in this release, see the [NGINX Plus R35 release blog](https://community.f5.com/kb/technicalarticles/f5-nginx-plus-r35-release-now-available/342962).{{< /call-out >}}
57+
5658

5759
NGINX Plus R35 is supported on:
5860

@@ -82,9 +84,6 @@ NGINX Plus R35 is supported on:
8284
- SLES 15 SP6 is now required
8385
- the [ACME]({{< ref "/nginx/admin-guide/dynamic-modules/acme.md" >}}) dynamic module is new in this release.
8486

85-
More information: [Announcing NGINX Plus R35](https://community.f5.com/kb/TechnicalArticles/f5-nginx-plus-r35-release-now-available/342962)
86-
87-
8887
## NGINX Plus Release 34 (R34) {#r34}
8988
_April 01, 2025_<br/>
9089
_Based on NGINX Open Source 1.27.4_
@@ -104,6 +103,8 @@ NGINX Plus R34 is a feature release:
104103

105104
- Security: insufficient check in virtual servers handling with TLSv1.3 SNI allowed to reuse SSL sessions in a different virtual server, to bypass client SSL certificates verification ([CVE-2025-23419](http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2025-23419)).
106105

106+
{{< call-out "note" "Learn more" >}}For highlights of all new features and enhancements in this release, see the [NGINX Plus R34 release blog](https://community.f5.com/kb/technicalarticles/f5-nginx-plus-r34-release-now-available/340300).{{< /call-out >}}
107+
107108
NGINX Plus R34 is supported on:
108109

109110
{{<bootstrap-table "table table-striped table-bordered table-sm">}}
@@ -130,9 +131,6 @@ NGINX Plus R34 is supported on:
130131
- Ubuntu 20.04 is deprecated
131132
- the [OpenTracing]({{< ref "/nginx/admin-guide/dynamic-modules/opentracing.md" >}}) dynamic module is no longer available. It is recommended to use the [OpenTelemetry Distributed Tracing]({{< ref "/nginx/admin-guide/dynamic-modules/opentelemetry.md" >}}) module, which incorporates all the features of the OpenTracing module.
132133

133-
More information: [Announcing NGINX Plus R34](https://community.f5.com/kb/technicalarticles/f5-nginx-plus-r34-release-now-available/340300)
134-
135-
136134
### NGINX Plus R34 Update {#r34_p1}
137135

138136
NGINX Plus R34 P1<br/>
@@ -185,6 +183,9 @@ The argument is a file name in the `SSLKEYLOGFILE` format compatible with Wiresh
185183

186184
- Added initial support for Post Quantum Cryptography.
187185

186+
{{< call-out "note" "Learn more" >}}For highlights of all new features and enhancements in this release, see the [NGINX Plus R33 release blog](https://community.f5.com/kb/technicalarticles/f5-nginx-plus-r33-release-now-available/336403).{{< /call-out >}}
187+
188+
188189
{{<bootstrap-table "table table-striped table-bordered table-sm">}}
189190
| Distribution | Versions |
190191
|----------------------------------|-----------------------------------|
@@ -213,9 +214,6 @@ The argument is a file name in the `SSLKEYLOGFILE` format compatible with Wiresh
213214
- support for s390x architecture removed
214215
- the [Lua]({{< ref "/nginx/admin-guide/dynamic-modules/lua.md" >}}) module is no longer available for SUSE Linux Enterprise Server 12
215216

216-
More information: [Announcing NGINX Plus R33](https://community.f5.com/kb/technicalarticles/announcing-nginx-plus-r33-release/336403)
217-
218-
219217
### NGINX Plus R33 Updates {#r33_p1}
220218

221219
NGINX Plus R33 P1<br/>

content/nim/_index.md

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,116 @@
22
title: NGINX Instance Manager
33
description: Track and control NGINX Open Source and NGINX Plus instances.
44
url: /nginx-instance-manager/
5+
nd-landing-page: true
56
cascade:
67
logo: "NGINX-Instance-Manager-product-icon.svg"
78
---
89

10+
## About
11+
[//]: # "These are Markdown comments to guide you through document structure. Remove them as you go, as well as any unnecessary sections."
12+
[//]: # "Use underscores for _italics_, and double asterisks for **bold**."
13+
[//]: # "Backticks are for `monospace`, used sparingly and reserved mostly for executable names - they can cause formatting problems. Avoid them in tables: use italics instead."
14+
15+
F5 NGINX Instance Manager gives you a centralized way to manage NGINX Open Source and NGINX Plus instances across your environment. It’s ideal for disconnected or air-gapped deployments, with no need for internet access or external cloud services. Use NGINX Instance Manager to organize and group instances, apply and version configuration files, monitor metrics and logs, and manage certificates securely and efficiently.
16+
17+
NGINX Instance Manager is part of NGINX One, which includes [NGINX One components](#nginx-one-components).
18+
19+
## Featured content
20+
[//]: # "You can add a maximum of three cards: any extra will not display."
21+
[//]: # "One card will take full width page: two will take half width each. Three will stack like an inverse pyramid."
22+
[//]: # "Some examples of content could be the latest release note, the most common install path, and a popular new feature."
23+
24+
{{<card-layout>}}
25+
{{<card-section showAsCards="true" isFeaturedSection="true">}}
26+
{{<card title="Deploy in a disconnected environment" titleUrl="/nginx-instance-manager/disconnected" icon="unplug" isFullSize="true">}}
27+
Run NGINX Instance Manager in air-gapped or offline systems
28+
{{</card >}}
29+
{{<card title="Manage NGINX instances" titleUrl="/nginx-instance-manager/nginx-instances" >}}
30+
Add instances, group them for config reuse, and manage certificates
31+
{{</card>}}
32+
{{<card title="Manage NGINX configs" titleUrl="/nginx-instance-manager/nginx-configs" >}}
33+
Stage, version, and publish configs. Use templates to stay consistent.
34+
{{</card>}}
35+
{{</card-section>}}
36+
{{</card-layout>}}
37+
38+
39+
### Set up and configure NGINX Instance Manager
40+
41+
{{<card-layout>}}
42+
{{<card-section showAsCards="true" >}}
43+
{{<card title="Administer your platform" titleUrl="/nginx-instance-manager/admin-guide" >}}
44+
Add licenses, set up user access and roles, and back up your NGINX Instance Manager deployment.
45+
{{</card>}}
46+
{{<card title="Configure your system" titleUrl="/nginx-instance-manager/system-configuration/" >}}
47+
Set platform behavior, enable high availability, and secure traffic. Use Vault and ClickHouse if needed.
48+
{{</card>}}
49+
{{</card-section>}}
50+
{{</card-layout>}}
51+
52+
53+
### Monitor and secure your environment
54+
55+
{{<card-layout>}}
56+
{{<card-section showAsCards="true" >}}
57+
{{<card title="Monitor metrics and events" titleUrl="/nginx-instance-manager/monitoring/" >}}
58+
Track performance, system health, and changes using built-in metrics, logs, and the REST API.
59+
{{</card>}}
60+
{{<card title="Secure with NGINX App Protect WAF" titleUrl="/nginx-instance-manager/nginx-app-protect/" >}}
61+
Apply WAF policies and monitor activity from a centralized view.
62+
{{</card>}}
63+
{{</card-section>}}
64+
{{</card-layout>}}
65+
66+
67+
### More information
68+
69+
{{<card-layout>}}
70+
{{<card-section showAsCards="true" >}}
71+
{{<card title="Deploy in connected environments" titleUrl="/nginx-instance-manager/deploy/">}}
72+
Install NGINX Instance Manager using Docker, Kubernetes, or traditional infrastructure with internet access.
73+
{{</ card >}}
74+
{{<card title="Get to know NGINX Instance Manager" titleUrl="/nginx-instance-manager/fundamentals/">}}
75+
Check system requirements, explore the dashboard, and learn how to access and use the REST API.
76+
{{</ card >}}
77+
{{<card title="View release notes and updates" titleUrl="/nginx-instance-manager/releases/" icon="clock-alert">}}
78+
Get details on new features, bug fixes, and known issues.
79+
{{</card>}}
80+
{{</card-section>}}
81+
{{</card-layout>}}
82+
83+
84+
## NGINX One components
85+
[//]: # "You can add any extra content for the page here, such as additional cards, diagrams or text."
86+
87+
{{<card-layout>}}
88+
{{< card-section title="Kubernetes Solutions">}}
89+
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon.png">}}
90+
Kubernetes traffic management with API gateway, identity, and observability features.
91+
{{</ card >}}
92+
{{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric/" brandIcon="NGINX-product-icon.png">}}
93+
Next generation Kubernetes connectivity using the Gateway API.
94+
{{</ card >}}
95+
{{</ card-section >}}
96+
{{< card-section title="Cloud Console Option">}}
97+
{{< card title="NGINX One Console" titleUrl="/nginx-one/" brandIcon="NGINX-One-product-icon.svg">}}
98+
Manage, monitor, and secure your NGINX fleet from a centralized web-based interface.
99+
{{</ card >}}
100+
{{</ card-section >}}
101+
{{< card-section title="Modern App Delivery">}}
102+
{{< card title="NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon-RGB.png">}}
103+
The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.
104+
{{</ card >}}
105+
{{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-product-icon.png">}}
106+
The open source all-in-one load balancer, content cache, and web server
107+
{{</ card >}}
108+
{{</ card-section >}}
109+
{{< card-section title="Security">}}
110+
{{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon.png">}}
111+
Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.
112+
{{</ card >}}
113+
{{< card title="NGINX App Protect DoS" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon.png">}}
114+
Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.
115+
{{</ card >}}
116+
{{</ card-section >}}
117+
{{</card-layout>}}

content/nim/monitoring/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Monitoring
2+
title: Monitor metrics and events
33
weight: 60
44
url: /nginx-instance-manager/monitoring/
55
---
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: NGINX App Protect WAF
2+
title: Secure with NGINX App Protect WAF
33
weight: 90
44
url: /nginx-instance-manager/nginx-app-protect/
55
---

content/nim/nginx-configs/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: NGINX configs
2+
title: Manage NGINX configs
33
weight: 15
44
url: /nginx-instance-manager/nginx-configs/
55
weight: 70
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: NGINX instances
2+
title: Manage NGINX instances
33
weight: 80
44
url: /nginx-instance-manager/nginx-instances/
55
---

content/nim/system-configuration/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: System configuration
2+
title: Configure your system
33
weight: 50
44
url: /nginx-instance-manager/system-configuration/
55

0 commit comments

Comments
 (0)