Skip to content

Commit 6288c64

Browse files
committed
Merge branch 'waf/port-more-features' of github.com:nginx/documentation into waf/port-more-features
2 parents 03d3dad + dd04cd8 commit 6288c64

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

content/nginx-one/agent/configure-instances/configure-agent-features.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ The following table lists the NGINX Agent features:
2626
| ------------------- | --------------------------------------------------------------------------- | ------- |
2727
| configuration | Full read/write management of configurations, controlled by DataPlaneConfig ConfigMode. | On |
2828
| certificates | Inclusion of public keys and other certificates in the configurations toggled by DataPlaneConfig CertMode | Off |
29-
| connection | Sends an initial connection message reporting instance information on presence of Command ServerConfig Host and Port | On |
3029
| file-watcher | Monitoring of file changes in the allowed directories list and references from product configs. | On |
31-
| agent-api | REST API for NGINX Agent. | Off |
3230
| metrics | Full metrics reporting. | On |
3331
| > metrics-host | Host-level metrics (cpu, disk, load, fs, memory, network, paging). | On |
3432
| > metrics-container | Container-level metrics from cgroup information. | On |
@@ -46,15 +44,15 @@ You can enable or disable features using several configuration sources:
4644
Enable features at launch:
4745

4846
```shell
49-
./nginx-agent --features=connection,configuration,metrics,file-watcher,agent-api
47+
./nginx-agent --features=configuration,metrics,file-watcher
5048
```
5149

5250
### Environment variables
5351

5452
Use environment variables for containerized deployments:
5553

5654
```shell
57-
export NGINX_AGENT_FEATURES="connection,configuration,metrics,file-watcher,agent-api"
55+
export NGINX_AGENT_FEATURES="configuration,metrics,file-watcher"
5856
```
5957

6058
### Configuration file
@@ -63,11 +61,9 @@ Define features in the `nginx-agent.conf` file:
6361

6462
```yaml
6563
features:
66-
- connection
6764
- configuration
6865
- metrics
6966
- file-watcher
70-
- agent-api
7167
```
7268
7369
## Use cases

content/nginx/technical-specs.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,27 @@ NGINX Plus is available only as a binary; it is not distributed as source code.
2323
Dynamic modules are supported on the [same distributions as NGINX Plus](#supported-distributions), unless noted otherwise in the table below.
2424

2525
{{<bootstrap-table "table table-striped table-bordered">}}
26-
| Module | Distribution and details |
27-
|-------------------|-----------------------------------------------------------------------------------------------------------|
28-
| [AppProtect]({{< ref "/nap-waf/v5/admin-guide/install.md" >}}) | AlmaLinux: **Not supported**<br>Alpine Linux 3.17 & 3.18: **Not supported**<br>Alpine Linux 3.19: **x86_64 only**<br>Amazon Linux 2: **Not supported**<br>Amazon Linux 2023: **x86_64 only**<br>Debian 11 & 12: **x86_64 only**<br>FreeBSD: **Not supported**<br>Oracle Linux 8: **x86_64 only**<br>RHEL 8 & 9: **x86_64 only**<br>Rocky Linux 8: **Not supported**<br>Rocky Linux 9: **x86_64 only**<br>SLES: **Not supported**<br>Ubuntu 20.04: **Not supported**<br>Ubuntu 22.04 & 24.04: **x86_64 only** |
29-
| [GeoIP]({{< ref "/nginx/admin-guide/dynamic-modules/geoip.md" >}}) | Amazon Linux 2023 **Not supported**<br>RHEL/Oracle Linux/AlmaLinux/Rocky Linux 8.0+, 9, RHEL 10: **Not supported**<br>FreeBSD: **Not supported** |
30-
| [GeoIP2]({{< ref "/nginx/admin-guide/dynamic-modules/geoip2.md" >}}) | Amazon Linux 2: **Not supported** |
31-
| [HA-Keepalived]({{< ref "/nginx/admin-guide/high-availability/ha-keepalived-nodes.md#configuring-keepalived-for-an-additional-passive-node" >}}) | FreeBSD: **Not supported**<br>Alpine Linux: **Not supported**<br>Amazon Linux 2: **Not supported**<br>Amazon Linux 2023: **Not supported** |
32-
| [NGINX sync]({{< ref "/nginx/admin-guide/high-availability/configuration-sharing.md#installing-nginx-sync-on-the-primary-machine" >}}) | FreeBSD: **Not supported**<br>Alpine Linux: **Not supported** |
33-
| [OpenTelemetry]({{< ref "/nginx/admin-guide/dynamic-modules/opentelemetry.md" >}})| Amazon Linux 2: **Not supported**<br>SLES: **Not supported** | |
26+
| Distribution | **Module:** [AppProtect]({{< ref "/nap-waf/v5/admin-guide/install.md" >}}) | **Module:** [GeoIP]({{< ref "/nginx/admin-guide/dynamic-modules/geoip.md" >}}) | **Module:** [GeoIP2]({{< ref "/nginx/admin-guide/dynamic-modules/geoip2.md" >}}) | **Module:** [HA-Keepalived]({{< ref "/nginx/admin-guide/high-availability/ha-keepalived-nodes.md#configuring-keepalived-for-an-additional-passive-node" >}}) | **Module:** [NGINX sync]({{< ref "/nginx/admin-guide/high-availability/configuration-sharing.md#installing-nginx-sync-on-the-primary-machine" >}}) | **Module:** [OpenTelemetry]({{< ref "/nginx/admin-guide/dynamic-modules/opentelemetry.md" >}}) |
27+
|--------------|------------|-------|---------|---------------|------------|---------------|
28+
| **AlmaLinux** |||||||
29+
| **Alpine Linux 3.17 & 3.18** |||||||
30+
| **Alpine Linux 3.19, 3.20, 3.21, 3.22** | ✓ (x86_64 only) ||||||
31+
| **Amazon Linux 2** |||||||
32+
| **Amazon Linux 2023** | ✓ (x86_64 only) ||||||
33+
| **Debian 11 & 12** | ✓ (x86_64 only) ||||||
34+
| **FreeBSD** |||||||
35+
| **Oracle Linux 8** | ✓ (x86_64 only) ||||||
36+
| **RHEL 8 & 9** | ✓ (x86_64 only) ||||||
37+
| **Rocky Linux 8** |||||||
38+
| **Rocky Linux 9** | ✓ (x86_64 only) ||||||
39+
| **SLES** |||||||
40+
| **Ubuntu 20.04** |||||||
41+
| **Ubuntu 22.04 & 24.04** | ✓ (x86_64 only) ||||||
3442
{{</bootstrap-table>}}
3543

3644
---
3745

46+
3847
## Supported SSL/TLS versions
3948

4049
NGINX Plus supports the following SSL/TLS protocols:

0 commit comments

Comments
 (0)