Skip to content

Commit 8709c4f

Browse files
authored
Merge branch 'main' into secure-your-fleet-r2
2 parents 0ef83db + e9c7fb2 commit 8709c4f

File tree

11 files changed

+284
-283
lines changed

11 files changed

+284
-283
lines changed

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Run analysis
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif

content/agent/configuration/configure-nginx-agent-features.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ weight: 150
55
toc: true
66
type:
77
- how-to
8+
docs: DOCS-1678
89
---
910

1011
## Overview
@@ -47,7 +48,7 @@ The following table lists the NGINX Agent features.
4748
ssh user@your-nginx-instance
4849
```
4950

50-
2. **Edit NGINX Agent configuration:**
51+
2. **Edit NGINX Agent configuration:**
5152

5253
```
5354
sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -60,7 +61,7 @@ The following table lists the NGINX Agent features.
6061
- metrics
6162
- metrics-throttle
6263
- dataplane-status
63-
```
64+
```
6465

6566
4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
6667

@@ -73,7 +74,7 @@ Once the steps have been completed, users will be able to view metrics data bein
7374
ssh user@your-nginx-instance
7475
```
7576

76-
2. **Edit NGINX Agent configuration:**
77+
2. **Edit NGINX Agent configuration:**
7778

7879
```
7980
sudo vim /etc/nginx-agent/nginx-agent.conf
@@ -86,9 +87,9 @@ Once the steps have been completed, users will be able to view metrics data bein
8687
- nginx-config-async
8788
- dataplane-status
8889
- file-watcher
89-
```
90+
```
9091

9192
4. **Restart the NGINX Agent service:** Restart the NGINX Agent service to enable changes.
9293

93-
Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent.
94+
Once the steps have been completed, users will be able to publish NGINX configurations but metrics data will not be collected by the NGINX Agent.
9495

content/agent/configuration/health-checks.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ weight: 400
55
toc: true
66
type:
77
- how-to
8+
docs: DOCS-1677
89
---
910

1011
## Overview

content/includes/nim/tech-specs/nim-app-protect-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NGINX Instance Manager supports the following versions of [NGINX App Protect WAF
88

99
| NGINX Instance Manager | NGINX App Protect WAF |
1010
|------------------------|------------------------------------|
11-
| 2.17.0–2.19.1 | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
11+
| 2.17.0–2.19.2 | Release 4.8.0–4.14.0, 5.1.0–5.6.0 |
1212
| 2.15.1–2.16.0 | Release 4.8.0–4.10.0 |
1313
| 2.14.1–2.15.0 | Release 4.4.0–4.7.0 |
1414
| 2.13.0–2.14.0 | Release 4.3.0–4.5.0 |

content/nginx-one/connect-instances/connect-nginx-plus-container-images-to-nginx-one.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ sudo docker run \
107107

108108
For more details, see:
109109

110-
- [Deploying NGINX and NGINX Plus on Docker](https://docs.nginx.com/nginx/admin-guide/installing-nginx/installing-nginx-docker/)
111-
- [Full List of Agent Environment Variables](https://docs.nginx.com/nginx-agent/configuration/configuration-overview/#nginx-agent-environment-variables)
112-
- [NGINX One Data Plane Keys](https://docs.nginx.com/nginx-one/how-to/data-plane-keys/create-manage-data-plane-keys/)
110+
- [Deploying NGINX and NGINX Plus on Docker]({{< ref "/nginx/admin-guide/installing-nginx/installing-nginx-docker.md" >}})
111+
- [Full List of Agent Environment Variables]({{< ref "/agent/configuration/configuration-overview.md#cli-flags-and-environment-variables" >}})
112+
- [NGINX One Data Plane Keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
113113
- [My F5 Knowledge Article](https://my.f5.com/manage/s/article/K000090257)

content/nginx/directives.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ url: /nginx/directives
55
weight: 700
66
---
77

8-
<!-- this is dummy doc is used to create a list page entry that redirects users to the directive index in the .org docs. The redirect is configured in netlify.toml -->
8+
<!-- this is dummy doc is used to create a list page entry that redirects users to the directive index in the .org docs. The redirect is configured in azure-redirects-base -->

content/nginx/releases.md

Lines changed: 252 additions & 268 deletions
Large diffs are not rendered by default.

content/nginx/variables.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: NGINX Variables Index
3+
url: /nginx/variables
4+
weight: 800
5+
---
6+
7+
<!-- this is dummy doc is used to create a list page entry that redirects users to the variables index in the .org docs. The redirect is configured in azure-redirects-base -->
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
title: Troubleshooting guide
3+
toc: false
4+
url: /nginxaas/azure/troubleshooting
5+
weight: 700
6+
---
7+
8+
<!-- this dummy doc is used to create a list page entry that redirects users to the troubleshooting guide in the F5 knowledge base. The redirect is configured in azure-redirects-base -->

content/nim/disconnected/offline-install-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sudo bash install-nim-bundle.sh \
6666
-k <path/to/private.key> \
6767
-m offline \
6868
-d <distribution> \
69-
-v <version> \
69+
-v <version>
7070
```
7171

7272
<br>

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)