Skip to content

Commit 3586349

Browse files
committed
Merge branch 'ngf-release-2.0' into ngf/use-case-ia
2 parents 4bd66ed + 6efaafa commit 3586349

File tree

94 files changed

+736
-1349
lines changed

Some content is hidden

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

94 files changed

+736
-1349
lines changed

_banners/eos-cltr.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{< banner "warning" "End of Sale Notice:" >}}
2+
<br>
3+
F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Controller Application Delivery Module, <strong>effective January 1, 2024</strong>.
4+
<br><br>
5+
F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. <strong>License renewals are not available after September 30, 2024.</strong>
6+
<br><br>
7+
See our <a href="https://my.f5.com/manage/s/article/K000137993">End of Sale announcement</a> for more details
8+
{{</ banner >}}

_banners/eos-mesh.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{< banner "warning" "End of Sale Notice:" >}}
2+
<br>
3+
F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Management Suite API Connectivity Manager Module, <strong>effective January 1, 2024</strong>.
4+
<br><br>
5+
F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. <strong>License renewals are not available after September 30, 2024.</strong>
6+
<br><br>
7+
See our <a href="https://my.f5.com/manage/s/article/K000137989">End of Sale announcement</a> for more details.
8+
{{</ banner >}}

_banners/ngf-2.0-release.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{< banner "notice" "NGINX Gateway Fabric 2.0 is now available" >}}
2+
3+
NGINX Gateway Fabric 2.0 has released! Follow [this guide]({{< ref "/ngf/upgrading-ngf.md" >}}) to upgrade from 1.x to 2.0.
4+
5+
For 1.x, checkout [an older version](https://github.com/nginx/documentation/commit/0be97114d93be0f44acff8711f31bf0b6448dd94) of documentation.
6+
7+
{{< /banner >}}

_banners/upgrade-r33.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{{< banner "caution" "NGINX Plus R33 requires NGINX Instance Manager 2.18 or later" >}}
2+
If your NGINX data plane instances are running NGINX Plus R33 or later, you must upgrade to NGINX Instance Manager 2.18 or later to support usage reporting. NGINX Plus R33 instances must report usage data to the F5 licensing endpoint or NGINX Instance Manager. Otherwise, they will stop processing traffic.
3+
<br><br>
4+
For more details about usage reporting and enforcement, see [About solution licenses](../../../../solutions/about-subscription-licenses)
5+
{{</ banner >}}

content/controller/_index.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ title: F5 NGINX Controller
55
weight: 2100
66
cascade:
77
logo: "NGINX-Controller-product-icon-RGB.svg"
8-
type: "ctlr-eos"
98
noindex: true
9+
banner:
10+
enabled: true
11+
type: deprecation
12+
md: _banners/eos-cltr.md
1013
url: /nginx-controller/
1114
---
1215

content/includes/nginx-one/add-file/existing-ssl-bundle.md

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

5-
With this option, You can incorporate [Managed certificates]({{< ref "/nginx-one/how-to/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
5+
With this option, you can incorporate [Managed certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
66
In the **Choose Certificate** drop-down, select the managed certificate of your choice, and select **Add**. You can then:
77

88
1. Review details of the certificate. The next steps depend on whether the certificate is a CA bundle or a certificate / key pair.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
docs:
3+
files:
4+
- content/nginx-one/connect-instances/add-instance.md
5+
- content/nginx-one/getting-started.md
6+
---
7+
8+
You can add an instance to NGINX One Console in the following ways:
9+
10+
- Directly, under **Instances**
11+
- Indirectly, by selecting a Config Sync Group, and selecting **Add Instance to Config Sync Group**
12+
13+
In either case, NGINX One Console gives you a choice for data plane keys:
14+
15+
- Create a new key
16+
- Use an existing key
17+
18+
NGINX One Console takes the option you use, and adds the data plane key to a command that you'd use to register your target instance. You should see the command in the **Add Instance** screen in the console.
19+
20+
Connect to the host where your NGINX instance is running. Run the provided command to [install NGINX Agent]({{< ref "/nginx-one/getting-started#install-nginx-agent" >}}) dependencies and packages on that host.
21+
22+
```bash
23+
curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="<data_plane_key>" sh -s -- -y
24+
```
25+
26+
Once the process is complete, you can configure that instance in your NGINX One Console.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
docs:
3+
files:
4+
- content/nginx-one/metrics/enable-metrics.md
5+
- content/nginx-one/getting-started.md
6+
---
7+
8+
Navigating the dashboard:
9+
10+
- **Drill down into specifics**: For in-depth information on a specific metric, like expiring certificates, click on the relevant link in the metric's card to go to a detailed overview page.
11+
- **Refine metric timeframe**: Metrics show the last hour's data by default. To view data from a different period, select the time interval you want from the drop-down menu.
12+
13+
<span style="display: inline-block; margin-top: 20px; margin-bottom: 50px;">
14+
{{< img src="nginx-one/images/nginx-one-dashboard.png">}}
15+
</span>
16+
17+
{{<bootstrap-table "table table-striped table-bordered">}}
18+
**NGINX One dashboard metrics**
19+
| Metric | Description | Details |
20+
|---|---|---|
21+
| <i class="fas fa-heartbeat"></i> **Instance availability** | Understand the operational status of your NGINX instances. | - **Online**: The NGINX instance is actively connected and functioning properly. <br> - **Offline**: NGINX Agent is connected but the NGINX instance isn't running, isn't installed, or can't communicate with NGINX Agent. <br> - **Unavailable**: The connection between NGINX Agent and NGINX One has been lost or the instance has been decommissioned. <br> - **Unknown**: The current state can't be determined at the moment. |
22+
| <i class="fas fa-code-branch"></i> **NGINX versions by instance** | See which NGINX versions are in use across your instances. | |
23+
| <i class="fas fa-desktop"></i> **Operating systems** | Find out which operating systems your instances are running on. | |
24+
| <i class="fas fa-certificate"></i> **Certificates** | Monitor the status of your SSL certificates to know which are expiring soon and which are still valid. | |
25+
| <i class="fas fa-cogs"></i> **Config recommendations** | Get configuration recommendations to optimize your instances' settings. | |
26+
| <i class="fas fa-shield-alt"></i> **CVEs (Common Vulnerabilities and Exposures)** | Evaluate the severity and number of potential security threats in your instances. | - **Major**: Indicates a high-severity threat that needs immediate attention. <br> - **Medium**: Implies a moderate threat level. <br> - **Minor** and **Low**: Represent less critical issues that still require monitoring. <br> - **Other**: Encompasses any threats that don't fit the standard categories. |
27+
| <i class="fas fa-microchip"></i> **CPU utilization** | Track CPU usage trends and pinpoint instances with high CPU demand. | |
28+
| <i class="fas fa-memory"></i> **Memory utilization** | Watch memory usage patterns to identify instances using significant memory. | |
29+
| <i class="fas fa-hdd"></i> **Disk space utilization** | Monitor how much disk space your instances are using and identify those nearing capacity. | |
30+
| <i class="fas fa-exclamation-triangle"></i> **Unsuccessful response codes** | Look for instances with a high number of HTTP server errors and investigate their error codes. | |
31+
| <i class="fas fa-tachometer-alt"></i> **Top network usage** | Review the network usage and bandwidth consumption of your instances. | |
32+
33+
{{</bootstrap-table>}}
34+
35+
36+
37+
38+
39+

content/mesh/_index.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ description: 'NGINX Service Mesh is a fully integrated lightweight service mesh
55
environments.
66
77
'
8+
url: /nginx-service-mesh/
89
cascade:
9-
type: mesh-eos
1010
noindex: true
11-
url: /nginx-service-mesh/
11+
banner:
12+
enabled: true
13+
type: deprecation
14+
md: _banners/eos-mesh.md
1215
---
1316

content/ngf/_index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
---
22
title: "NGINX Gateway Fabric"
33
url: /nginx-gateway-fabric/
4+
cascade:
5+
banner:
6+
enabled: true
7+
type: deprecation
8+
start-date: 2025-05-30
9+
md: /_banners/ngf-2.0-release.md
410
---

0 commit comments

Comments
 (0)