Skip to content

Commit 1df7374

Browse files
authored
Merge branch 'main' into Update-docs-issue147
2 parents f4b624a + 02b0041 commit 1df7374

File tree

1,041 files changed

+3119
-1704
lines changed

Some content is hidden

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

1,041 files changed

+3119
-1704
lines changed

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
5959
call-docs-build-push:
6060
needs: prod-check-branch
61-
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@cc69def33942d819719164723b35b5163d838276 # v1.0.9
61+
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@285440f02d9967b62aeb1b7e0b5c2c70d4f950cf # v1.0.10
6262
with:
6363
production_url_path: ""
6464
preview_url_path: "${{ vars.PREVIEW_URL_PATH }}"

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
HUGO?=hugo
22
HUGO_VERSION?=$(shell hugo version 2>/dev/null | awk '{print $$2}' | cut -d '.' -f 2)
3-
HUGO_IMG?=hugomods/hugo:std-go-git-0.134.3
3+
HUGO_IMG?=hugomods/hugo:std-go-git-0.147.8
44

55
THEME_MODULE = github.com/nginxinc/nginx-hugo-theme
66

7-
ifeq ($(shell [ $(HUGO_VERSION) -gt 133 2>/dev/null ] && echo true || echo false), true)
8-
$(info Hugo is available and has a version greater than 133. Proceeding with build.)
7+
ifeq ($(shell [ $(HUGO_VERSION) -gt 146 2>/dev/null ] && echo true || echo false), true)
8+
$(info Hugo is available and has a version greater than 146. Proceeding with build.)
99
else
10-
$(warning Hugo is not available or using a version less than 134. Attempting to use docker. HUGO_VERSION=$(HUGO_VERSION))
10+
$(warning Hugo is not available or using a version less than 147. Attempting to use docker. HUGO_VERSION=$(HUGO_VERSION))
1111
HUGO=docker run --rm -it -v ${CURDIR}:/src -p 1313:1313 ${HUGO_IMG} /src/hugo-entrypoint.sh
1212
ifeq (, $(shell docker version 2> /dev/null))
13-
$(error Hugo (>0.134) or Docker are required to build the local previews.)
13+
$(error Hugo (>0.147) or Docker are required to build the local previews.)
1414
endif
1515
endif
1616

_banners/agent-v3-release.md

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

33

4-
F5 NGINX One Console does not currently support Agent 3.x. If you are using NGINX One Console in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
4+
F5 NGINX One Console and NGINX Instance Manager (NIM) do not currently support Agent 3.x. If you are using NGINX One Console or NGINX Instance Manager in your environment, upgrade to the latest Agent 2.x version by following the [Upgrade NGINX Agent](/nginx-agent/installation-upgrade/upgrade/) guide.
55

66
Please see the [Technical specifications](/nginx-agent/technical-specifications/) for product compatibility.
77

content/agent/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Changelog"
33
weight: 1200
44
toc: true
5-
docs: "DOCS-1093"
5+
nd-docs: "DOCS-1093"
66
---
77

88
{{< note >}}You can find the full changelog, contributor list and assets for NGINX Agent in the [GitHub repository](https://github.com/nginx/agent/releases).{{< /note >}}

content/agent/configuration/configuration-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Basic configuration
33
draft: false
44
weight: 100
55
toc: true
6-
docs: DOCS-1229
6+
nd-docs: DOCS-1229
77
type:
88
- how-to
99
---
@@ -50,7 +50,7 @@ server:
5050
# host of the control plane
5151
host: <FQDN>
5252
grpcPort: 443
53-
backoff: # note: default values are prepopulated
53+
backoff: # note: default values are prepopulated
5454
initial_interval: 100ms # Add the appropriate duration value here, for example, "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
5555
randomization_factor: 0.10 # Add the appropriate float value here, for example, 0.10
5656
multiplier: 1.5 # Add the appropriate float value here, for example, 1.5
@@ -88,7 +88,7 @@ metrics:
8888
report_interval: 1m
8989
collection_interval: 15s
9090
mode: aggregated
91-
backoff: # note: default values are prepopulated
91+
backoff: # note: default values are prepopulated
9292
initial_interval: 100ms # Add the appropriate duration value here, for example, "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
9393
randomization_factor: 0.10 # Add the appropriate float value here, for example, 0.10
9494
multiplier: 1.5 # Add the appropriate float value here, for example, 1.5
@@ -170,9 +170,9 @@ nginx-agent
170170

171171
### CLI Flags and Environment Variables
172172

173-
{{< warning >}}
173+
{{< warning >}}
174174

175-
Before version 2.35.0, the environment variables were prefixed with `NMS_` instead of `NGINX_AGENT_`.
175+
Before version 2.35.0, the environment variables were prefixed with `NMS_` instead of `NGINX_AGENT_`.
176176

177177
If you are upgrading from an older version, update your configuration accordingly.
178178

@@ -220,9 +220,9 @@ If you are upgrading from an older version, update your configuration accordingl
220220
<br>
221221

222222
{{<note>}}
223-
Use the `--config-dirs` command-line option, or the `config_dirs` key in the `nginx-agent.conf` file, to identify the directories NGINX Agent can read from or write to. This setting also defines the location to which you can upload config files when using a control plane.
223+
Use the `--config-dirs` command-line option, or the `config_dirs` key in the `nginx-agent.conf` file, to identify the directories NGINX Agent can read from or write to. This setting also defines the location to which you can upload config files when using a control plane.
224224

225-
NGINX Agent cannot write to directories outside the specified location when updating a config and cannot upload files to directories outside of the configured location.
225+
NGINX Agent cannot write to directories outside the specified location when updating a config and cannot upload files to directories outside of the configured location.
226226

227227
NGINX Agent follows NGINX configuration directives to file paths outside the designated directories and reads certificates' metadata. NGINX Agent uses the following directives:
228228

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ weight: 150
55
toc: true
66
type:
77
- how-to
8-
docs: DOCS-1678
8+
nd-docs: DOCS-1678
99
---
1010

1111
## Overview

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Add NGINX users to nginx-agent Group
33
draft: false
44
weight: 300
55
toc: true
6-
docs: DOCS-933
6+
nd-docs: DOCS-933
77
type:
88
- how-to
99
---

content/agent/configuration/encrypt-communication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Encrypt communication
33
toc: true
44
weight: 200
5-
docs: DOCS-802
5+
nd-docs: DOCS-802
66
---
77

88
## Overview

content/agent/configuration/health-checks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ weight: 400
55
toc: true
66
type:
77
- how-to
8-
docs: DOCS-1677
8+
nd-docs: DOCS-1677
99
---
1010

1111
## Overview

content/agent/contribute/community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Community and contribution
33
draft: false
44
weight: 100
55
toc: true
6-
docs: DOCS-1087
6+
nd-docs: DOCS-1087
77
type:
88
- how-to
99
---

0 commit comments

Comments
 (0)