Skip to content

Commit 6cf7793

Browse files
committed
Merge remote-tracking branch 'origin' into epic-472-port-nginx-one-labs
2 parents 9f6eb21 + cad1d20 commit 6cf7793

File tree

276 files changed

+28202
-2204
lines changed

Some content is hidden

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

276 files changed

+28202
-2204
lines changed

.github/workflows/build-push.yml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Build and deploy (docs)
22
on:
3+
repository_dispatch:
4+
types: [trigger-preview-build]
35
workflow_call:
46
inputs:
57
environment:
@@ -31,22 +33,22 @@ on:
3133
type: string
3234
pull_request:
3335
branches:
34-
- "*"
36+
- "**"
3537
push:
3638
branches:
3739
- "main"
3840

3941
env:
4042
FRONT_DOOR_USERNAME: ${{ secrets.FRONT_DOOR_USERNAME }}
4143
FRONT_DOOR_PASSWORD: ${{ secrets.FRONT_DOOR_PASSWORD }}
42-
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
44+
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
4345
jobs:
4446
prod-check-branch:
4547
runs-on: ubuntu-24.04
4648
steps:
4749
- name: Output variables
4850
run: |
49-
echo "Environment: ${{ inputs.environment }}"
51+
echo "Environment: ${{ inputs.environment || github.event.client_payload.environment }}"
5052
echo "Branch: ${{ github.ref }}"
5153
- name: Checks to see that main branch is selected if deploying to prod
5254
if: ${{ inputs.environment == 'prod' && github.ref != 'refs/heads/main' }}
@@ -63,14 +65,33 @@ jobs:
6365
docs_source_path: "public"
6466
docs_build_path: "./"
6567
doc_type: "hugo"
66-
environment: ${{inputs.environment}}
68+
environment: ${{ inputs.environment || github.event.client_payload.environment }}
6769
force_hugo_theme_version: ${{inputs.hugo_theme_override}}
6870
auto_deploy_branch: "main"
6971
auto_deploy_env: "prod"
7072
secrets:
7173
AZURE_CREDENTIALS: ${{secrets.AZURE_CREDENTIALS_DOCS}}
7274
AZURE_KEY_VAULT: ${{secrets.AZURE_KEY_VAULT_DOCS}}
7375

76+
trigger-theme-slack-notification:
77+
if: github.event_name == 'repository_dispatch'
78+
needs: call-docs-build-push
79+
runs-on: ubuntu-latest
80+
permissions: read-all
81+
steps:
82+
- name: Trigger 'Slack notification for new theme release' workflow in 'nginx-hugo-theme' repo.
83+
run: |
84+
curl -L \
85+
-X POST \
86+
-H "Accept: application/vnd.github+json" \
87+
-H "Authorization: Bearer ${{ secrets.THEME_SLACK_FLOW_PAT }}" \
88+
-H "X-GitHub-Api-Version: 2022-11-28" \
89+
"https://api.github.com/repos/${{ secrets.OWNER }}/${{ secrets.REPO }}/dispatches" \
90+
-d "{\"event_type\": \"trigger-slack-notification\", \"client_payload\": {\"previewURL\": \"${{ env.PREVIEW_URL }}\", \"author\": \"${{ github.event.client_payload.author}}\", \"tag_name\": \"${{ github.event.client_payload.tag_name }}\", \"release_name\": \"${{ github.event.client_payload.release_name }}\"}}"
91+
env:
92+
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
93+
94+
7495
lighthouseci:
7596
if: github.event.pull_request
7697
needs: call-docs-build-push

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: Upload SARIF results to code scanning
59-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
59+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
6060
with:
6161
sarif_file: results.sarif

CLOSED_CONTRIBUTIONS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To create closed content, add the closed repository as a remote to the main repo
3333
```shell
3434
cd documentation
3535
git remote add internal [email protected]:<closed-url>.git
36-
git fetch
36+
git fetch --all
3737
```
3838

3939
Check out the remote `main` branch, and use it to create a feature branch. **Ensure that you prefix all branch names with `internal/`**
@@ -64,4 +64,4 @@ git merge internal/internal/feature
6464
git push origin
6565
```
6666

67-
Once the content changes have been merged in the open repository, they will synchronize back to the closed repository.
67+
Once the content changes have been merged in the open repository, they will synchronize back to the closed repository.

archetypes/concept.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@ This guide provides an overview of <concept>, which is used <for/in> <action 1>,
2222

2323
It is an example of a <other concept>, and is closely related to <third concept>.
2424

25-
---
26-
2725
## Background
2826

2927
[//]: # "Explain what the concept is. If possible, relate it to another commonly known concept or software."
3028
[//]: # "This relates the new idea to the reader using their existing knowledge, helping their understanding of it and thus what its purpose is in context."
3129

32-
---
33-
3430
## Use cases
3531

3632
[//]: # "Name the individual use case sections after the actual use case itself, e.g 'Route traffic between applications'"
@@ -56,7 +52,6 @@ Starting from the <top/left> of the diagram, you can see that <thing> is connect
5652

5753
### Use case 2
5854

59-
---
6055

6156
## Conclusion
6257

@@ -65,8 +60,6 @@ Starting from the <top/left> of the diagram, you can see that <thing> is connect
6560
[//]: # "Since each use case provides links to additional documents, you may not need to link to more,"
6661
[//]: # "or even include the final 'See also' section."
6762

68-
---
69-
7063
## See also
7164

72-
[//]: # "Link to related documents, such as concepts, reference material or similar use cases."
65+
[//]: # "Link to related documents, such as reference material or task instructions."

archetypes/default.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ nd-product:
2020

2121
This guide explains how to <X> with <Y>. In involves the use of <A>, <B> and <C>, demonstrating how <X> works with an example <Z>.
2222

23-
---
24-
2523
## Before you begin
2624

2725
[//]: # "List everything someone will need installed or configured before it's required. Link directly to installation guides where possible."
@@ -34,8 +32,6 @@ To complete this guide, you will need the following prerequisites:
3432

3533
[//]: # "Note the style of link for requirement two: keep the markdown extension. Links are resolved from the root of the documentation folder, often /site."
3634

37-
---
38-
3935
## Step 1
4036

4137
[//]: # "Explain the initial step: this is usually creating or configuring a resource. Sub-steps may not be necessary, depending on complexity."
@@ -51,38 +47,29 @@ To complete this guide, you will need the following prerequisites:
5147

5248
[//]: # "Sub-steps are ways of breaking steps into even smaller sections. Each step or sub-step should focus on one thing at a time: a user should be able to stop at the end of section and come back afterwards without leaving their software in a non-functional state."
5349

54-
---
55-
5650
### Sub-step 2
5751

5852
[//]: # "A useful final sub-step for a given section is some kind of verification or testing, so the reader is confident the steps have been successful."
5953

60-
---
61-
6254
## Step 2
6355

6456
[//]: # "Explain any additional steps required. If the how-to guide involves multiple components, each component can have its own step for delineation."
6557

6658
### Sub-step 1
6759

68-
---
6960

7061
### Sub-step 2
7162

72-
---
7363

7464
## Step 3
7565

7666
[//]: # "The final step of a how-to guide is usually a final test, and summarizes all of the previous steps taken to accomplish the purpose of the guide."
7767

7868
### Sub-step 1
7969

80-
---
8170

8271
### Sub-step 2
8372

84-
---
85-
86-
## See also
73+
## Next steps
8774

88-
[//]: # "Link to related documents, such as concepts, reference material or similar use cases."
75+
[//]: # "Link to the most common use cases after this specific instruction. For example. configuration usually follows installation."

archetypes/tutorial.md

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ By the end of the tutorial, you should have enough working knowledge of <thing>
2929

3030
<thing> is a common use for <product>: it enables the ability to use <feature 1>, <feature 2> and <feature 3>, which are important when configuring <product> for <use case>.
3131

32-
---
33-
3432
## Before you begin
3533

3634
[//]: # "List everything someone will need installed or configured before it's required. Link directly to installation guides where possible."
@@ -43,8 +41,6 @@ To complete this guide, you will need the following prerequisites:
4341

4442
[//]: # "Note the style of link for requirement two: keep the markdown extension. Links are resolved from the root of the documentation folder, often /site."
4543

46-
---
47-
4844
## Step 1
4945

5046
[//]: # "The text immediately following a heading in a tutorial should likely explain a concept to build a mental model of what the reader is about to do."
@@ -61,8 +57,6 @@ The first thing required for setting up <thing> is <step name>. This is the <ser
6157

6258
Starting from the <top/left> of the diagram, you can see that <thing> is connected to <other thing>: this relationship is established when configuring <parameter> as part of <file name>.
6359

64-
---
65-
6660
### Sub-step 1
6761

6862
[//]: # "The sub-steps of a tutorial should show the exact steps a reader should take to accomplish an action, and what to expect when doing so."
@@ -87,34 +81,25 @@ To verify the creation of <component>, you can also inspect information about it
8781
<the output of that command, possibly truncated and with changed IPs or domains>
8882
```
8983

90-
---
91-
9284
### Sub-step 2
9385

94-
---
95-
9686
## Step 2
9787

9888
[//]: # "Explain any additional steps required. If the tutorial involves multiple components, each component can have its own step for delineation."
9989

100-
---
101-
10290
### Sub-step 1
10391

104-
---
10592

10693
### Sub-step 2
10794

108-
---
10995

11096
## Conclusion
11197

11298
[//]: # "Summarize everything that the reader will have learned and accomplished by the end of this tutorial."
11399
[//]: # "It should fulfill the promise made by the introductory paragraph at the top of the document."
114100
[//]: # "You may wish to link to another tutorial as the next logical step, but that could also be part of the 'See also' section."
115101

116-
---
117102

118-
## See also
103+
## Next steps
119104

120-
[//]: # "Link to related documents, such as concepts, reference material or similar use cases."
105+
[//]: # "Link to related documents, such as concepts, reference material or specific use cases."

config/_default/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ enableGitInfo = true
4747
"taxonomyTerm"
4848
]
4949
taxonomiesExcludedFromSitemap = ["tags", "categories", "doctypes"]
50-
50+
unitversion= "1.34.1"
51+
unitversionv= "v1.34.1"
5152
#logo = ""
5253

5354
# Version lists; used by the versions shortcode

content/agent/configuration/configuration-overview.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ server:
5151
host: <FQDN>
5252
grpcPort: 443
5353
backoff: # note: default values are prepopulated
54-
initial_interval: 100ms # Add the appropriate duration value here, e.g., "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
55-
randomization_factor: 0.10 # Add the appropriate float value here, e.g., 0.10
56-
multiplier: 1.5 # Add the appropriate float value here, e.g., 1.5
57-
max_interval: 1m # Add the appropriate duration value here, e.g., "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
58-
max_elapsed_time: 0 # Add the appropriate duration value here, e.g., "0" for indefinite "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
54+
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
55+
randomization_factor: 0.10 # Add the appropriate float value here, for example, 0.10
56+
multiplier: 1.5 # Add the appropriate float value here, for example, 1.5
57+
max_interval: 1m # Add the appropriate duration value here, for example, "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
58+
max_elapsed_time: 0 # Add the appropriate duration value here, for example, "0" for indefinite "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
5959
# tls options
6060
tls:
6161
# enable tls in the nginx-agent setup for grpcs
@@ -89,11 +89,11 @@ metrics:
8989
collection_interval: 15s
9090
mode: aggregated
9191
backoff: # note: default values are prepopulated
92-
initial_interval: 100ms # Add the appropriate duration value here, e.g., "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
93-
randomization_factor: 0.10 # Add the appropriate float value here, e.g., 0.10
94-
multiplier: 1.5 # Add the appropriate float value here, e.g., 1.5
95-
max_interval: 1m # Add the appropriate duration value here, e.g., "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
96-
max_elapsed_time: 0 # Add the appropriate duration value here, e.g., "0" for indefinite "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
92+
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
93+
randomization_factor: 0.10 # Add the appropriate float value here, for example, 0.10
94+
multiplier: 1.5 # Add the appropriate float value here, for example, 1.5
95+
max_interval: 1m # Add the appropriate duration value here, for example, "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
96+
max_elapsed_time: 0 # Add the appropriate duration value here, for example, "0" for indefinite "100ms" for 100 milliseconds, "5s" for 5 seconds, "1m" for 1 minute, "1h" for 1 hour
9797
9898
# OSS NGINX default config path
9999
# path to aux file dirs can also be added
@@ -193,7 +193,7 @@ If you are upgrading from an older version, update your configuration accordingl
193193
| `--features` | `NGINX_AGENT_FEATURES` | Specifies a comma-separated list of features enabled for the agent. Default: *[registration, nginx-config-async, nginx-ssl-config, nginx-counting, metrics, dataplane-status, process-watcher, file-watcher, activity-events, agent-api]* |
194194
| `--ignore-directives` | | Specifies a comma-separated list of directives to ignore for sensitive info.|
195195
| `--instance-group` | `NGINX_AGENT_INSTANCE_GROUP` | Sets the instance's group value. |
196-
| `--log-level` | `NGINX_AGENT_LOG_LEVEL` | Sets the logging level (e.g., panic, fatal, error, info, debug, trace). Default: *info* |
196+
| `--log-level` | `NGINX_AGENT_LOG_LEVEL` | Sets the logging level (for example, panic, fatal, error, info, debug, trace). Default: *info* |
197197
| `--log-path` | `NGINX_AGENT_LOG_PATH` | Specifies the path to output log messages. |
198198
| `--metrics-bulk-size` | `NGINX_AGENT_METRICS_BULK_SIZE` | Specifies the number of metrics reports collected before sending data. Default: *20* |
199199
| `--metrics-collection-interval` | `NGINX_AGENT_METRICS_COLLECTION_INTERVAL` | Sets the interval for metrics collection. Default: *15s* |

content/amplify/faq/nginx-amplify-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ If you don't see the new system or NGINX in the web interface, or (some) metrics
8282

8383
3. NGINX Amplify Agent is running under the same user as your NGINX worker processes.
8484

85-
4. The NGINX instance is started with an absolute path. Currently, NGINX Amplify Agent **can't** detect NGINX instances launched with a relative path (e.g., "./nginx").
85+
4. The NGINX instance is started with an absolute path. Currently, NGINX Amplify Agent **can't** detect NGINX instances launched with a relative path (for example, "./nginx").
8686

8787
5. The [user ID that is used by NGINX Amplify Agent and NGINX ]({{< ref "/amplify/nginx-amplify-agent/install/configuring-amplify-agent#overriding-the-effective-user-id" >}}), can run *ps(1)* to see all system processes. If *ps(1)* is restricted for non-privileged users, NGINX Amplify Agent won't be able to find and properly detect the NGINX master process.
8888

content/amplify/nginx-amplify-agent/configuration-analysis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ docs: DOCS-961
88

99
F5 NGINX Amplify Agent can automatically find all relevant NGINX configuration files, parse them, extract their logical structure, and send the associated JSON data to the Amplify backend for further analysis and reporting. For more information on configuration analysis, please see the [Analyzer]({{< ref "/amplify/user-interface/analyzer.md" >}})) documentation.
1010

11-
After NGINX Amplify Agent finds a particular NGINX configuration, it then automatically starts to keep track of its changes. When a change is detected with NGINX — e.g., a master process restarts, or the NGINX config is edited, an update is sent to the Amplify backend.
11+
After NGINX Amplify Agent finds a particular NGINX configuration, it then automatically starts to keep track of its changes. When a change is detected with NGINX — for example, a master process restarts, or the NGINX config is edited, an update is sent to the Amplify backend.
1212

1313
{{< note >}} NGINX Amplify Agent never sends the raw unprocessed config files to the backend system. In addition, the following directives in the NGINX configuration are never analyzed — and their parameters aren't exported to the SaaS backend:
1414
[ssl_certificate_key](http://nginx.org/en/docs/mail/ngx_mail_ssl_module.html#ssl_certificate_key), [ssl_client_certificate](http://nginx.org/en/docs/mail/ngx_mail_ssl_module.html#ssl_client_certificate), [ssl_password_file](http://nginx.org/en/docs/mail/ngx_mail_ssl_module.html#ssl_password_file), [ssl_stapling_file](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_stapling_file), [ssl_trusted_certificate](http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_trusted_certificate), [auth_basic_user_file](http://nginx.org/en/docs/http/ngx_http_auth_basic_module.html#auth_basic_user_file), [secure_link_secret](http://nginx.org/en/docs/http/ngx_http_secure_link_module.html#secure_link_secret).{{< /note >}}

0 commit comments

Comments
 (0)