Skip to content

Commit b6c1c3f

Browse files
committed
feat: Remove duplicate includes folder, update frontmatter
This commit removes an accidental duplicate of the includes folder, and updates the frontmatter of every single page in the documentation set. They are now all consistent in their fields and formatting, and a handful of IA or heading changes have been made as low-hanging fruit to bring the documentation set closer to full consistency.
1 parent a13962f commit b6c1c3f

Some content is hidden

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

46 files changed

+436
-341
lines changed

content/ngf/changelog.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

content/ngf/get-started.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
---
22
title: Get started
3-
toc: true
43
weight: 200
4+
toc: true
5+
type: how-to
6+
product: NGF
57
docs: DOCS-000
68
---
79

content/ngf/how-to/control-plane-configuration.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Control plane configuration"
3-
toc: true
2+
title: Control plane configuration
43
weight: 400
4+
toc: true
55
type: how-to
66
product: NGF
77
docs: DOCS-1416
@@ -26,6 +26,8 @@ Additionally, the control plane updates the status of the resource (if it exists
2626

2727
**For a full list of configuration options that can be set, see the `NginxGateway spec` in the [API reference]({{< ref "/ngf/reference/api.md" >}}).**
2828

29+
---
30+
2931
## Viewing and Updating the Configuration
3032

3133
{{< note >}} For the following examples, the name `ngf-config` should be updated to the name of the resource created for your installation.{{< /note >}}

content/ngf/how-to/data-plane-configuration.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Data plane configuration"
3-
toc: true
2+
title: Data plane configuration
43
weight: 500
4+
toc: true
55
type: how-to
66
product: NGF
77
docs: DOCS-000
@@ -23,11 +23,13 @@ When installed using the Helm chart, the NginxProxy resource is named `<release-
2323

2424
{{< note >}} Some global configuration also requires an [associated policy]({{< ref "/ngf/overview/custom-policies.md" >}}) to fully enable a feature (such as [tracing]({{< ref "/ngf/how-to/monitoring/tracing.md" >}}), for example). {{< /note >}}
2525

26+
---
27+
2628
## Viewing and Updating the Configuration
2729

2830
If the `NginxProxy` resource already exists, you can view and edit it.
2931

30-
{{< note >}} For the following examples, the name `ngf-proxy-config` should be updated to the name of the resource created for your installation.{{< /note >}}
32+
{{< note >}} For the following examples, the name `ngf-proxy-config` should be updated to the name of the resource created for your installation. {{< /note >}}
3133

3234
To view the current configuration:
3335

@@ -63,7 +65,9 @@ Status:
6365

6466
If everything is valid, the `ResolvedRefs` condition should be `True`. Otherwise, you will see an `InvalidParameters` condition in the status.
6567

66-
## Manually Creating the Configuration
68+
---
69+
70+
## Manually create the configuration
6771

6872
If the `NginxProxy` resource doesn't exist, you can create it and attach it to the GatewayClass.
6973

@@ -115,7 +119,9 @@ Status:
115119

116120
If everything is valid, the `ResolvedRefs` condition should be `True`. Otherwise, you will see an `InvalidParameters` condition in the status.
117121

118-
## Configure the Data Plane Log Level
122+
---
123+
124+
## Configure the data plane log level
119125

120126
You can use the `NginxProxy` resource to dynamically configure the Data Plane Log Level.
121127

@@ -141,6 +147,8 @@ To view the full list of supported log levels, see the `NginxProxy spec` in the
141147
be [run with NGINX in debug mode](#run-nginx-gateway-fabric-with-nginx-in-debug-mode) upon startup through the addition
142148
of a few arguments. {{</ note >}}
143149

150+
---
151+
144152
### Run NGINX Gateway Fabric with NGINX in debug mode
145153

146154
To run NGINX Gateway Fabric with NGINX in debug mode, follow the [installation document]({{< ref "/ngf/installation/installing-ngf" >}}) with these additional steps:
@@ -160,6 +168,8 @@ as arguments and add `/bin/sh` as the command. The deployment manifest should lo
160168
...
161169
```
162170

171+
---
172+
163173
## Configure PROXY protocol and RewriteClientIP settings
164174

165175
When a request is passed through multiple proxies or load balancers, the client IP is set to the IP address of the server that last handled the request. To preserve the original client IP address, you can configure `RewriteClientIP` settings in the `NginxProxy` resource. `RewriteClientIP` has the fields: _mode_, _trustedAddresses_ and _setIPRecursively_.

content/ngf/how-to/monitoring/dashboard.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
---
2-
title: "NGINX Plus dashboard"
2+
title: NGINX Plus dashboard
33
weight: 300
44
toc: true
5-
docs: "DOCS-1417"
5+
type: how-to
6+
product: NGF
7+
docs: DOCS-1417
68
---
79

810
Learn how to view the NGINX Plus dashboard to see real-time metrics.
911

12+
---
13+
1014
## Overview
1115

1216
The NGINX Plus dashboard offers a real-time live activity monitoring interface that shows key load and performance metrics of your server infrastructure. The dashboard is enabled by default for NGINX Gateway Fabric deployments that use NGINX Plus as the data plane. The dashboard is available on port 8765.
@@ -25,4 +29,4 @@ The dashboard will look like this:
2529

2630
{{< img src="/ngf/img/nginx-plus-dashboard.png" alt="">}}
2731

28-
{{< note >}}The [API](https://nginx.org/en/docs/http/ngx_http_api_module.html) used by the dashboard for metrics is also accessible using the `/api` path. {{< /note >}}
32+
{{< note >}} The [API](https://nginx.org/en/docs/http/ngx_http_api_module.html) used by the dashboard for metrics is also accessible using the `/api` path. {{< /note >}}

content/ngf/how-to/monitoring/prometheus.md

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
---
2-
title: "Prometheus metrics"
3-
weight: 100
2+
title: Monitoring with Prometheus and Grafana
3+
weight: 200
44
toc: true
5-
docs: "DOCS-1418"
5+
type: how-to
6+
product: NGF
7+
docs: DOCS-1418
68
---
79

810
This document describes how to monitor NGINX Gateway Fabric using Prometheus and Grafana. It explains installation and configuration, as well as what metrics are available.
911

12+
---
13+
1014
## Overview
1115

1216
NGINX Gateway Fabric metrics are displayed in [Prometheus](https://prometheus.io/) format. These metrics are served through a metrics server orchestrated by the controller-runtime package on HTTP port `9113`. When installed, Prometheus automatically scrapes this port and collects metrics. [Grafana](https://grafana.com/) can be used for rich visualization of these metrics.
1317

14-
{{<call-out "important" "Security note for metrics">}}
18+
{{< call-out "important" "Security note for metrics" >}}
1519
Metrics are served over HTTP by default. Enabling HTTPS will secure the metrics endpoint with a self-signed certificate. When using HTTPS, adjust the Prometheus Pod scrape settings by adding the `insecure_skip_verify` flag to handle the self-signed certificate. For further details, refer to the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#tls_config).
16-
{{</call-out>}}
20+
{{< /call-out >}}
21+
22+
---
1723

1824
## Installing Prometheus and Grafana
1925

20-
{{< note >}}These installations are for demonstration purposes and have not been tuned for a production environment.{{< /note >}}
26+
{{< note >}} These installations are for demonstration purposes and have not been tuned for a production environment. {{< /note >}}
2127

2228
### Prometheus
2329

@@ -35,8 +41,9 @@ kubectl port-forward -n monitoring svc/prometheus-server 9090:80 &
3541

3642
Visit [http://127.0.0.1:9090](http://127.0.0.1:9090) to view the dashboard.
3743

38-
### Grafana
44+
---
3945

46+
### Grafana
4047

4148
```shell
4249
helm repo add grafana https://grafana.github.io/helm-charts
@@ -58,6 +65,8 @@ The username for login is `admin`. The password can be acquired by running:
5865
kubectl get secret -n monitoring grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo
5966
```
6067

68+
---
69+
6170
#### Configuring Grafana
6271

6372
In the Grafana UI menu, go to `Connections` then `Data sources`. Add your Prometheus service (`http://prometheus-server.monitoring.svc`) as a data source.
@@ -66,6 +75,8 @@ Download the following sample dashboard and Import as a new Dashboard in the Gra
6675

6776
- {{< download "grafana-dashboard.json" "ngf-grafana-dashboard.json" >}}
6877

78+
---
79+
6980
## Available metrics in NGINX Gateway Fabric
7081

7182
NGINX Gateway Fabric provides a variety of metrics for monitoring and analyzing performance. These metrics are categorized as follows:
@@ -76,6 +87,8 @@ NGINX metrics cover specific NGINX operations such as the total number of accept
7687

7788
These metrics use the `nginx_gateway_fabric` namespace and include the `class` label, indicating the NGINX Gateway class. For example, `nginx_gateway_fabric_connections_accepted{class="nginx"}`.
7889

90+
---
91+
7992
### NGINX Gateway Fabric metrics
8093

8194
Metrics specific to NGINX Gateway Fabric include:
@@ -88,6 +101,8 @@ Metrics specific to NGINX Gateway Fabric include:
88101

89102
All these metrics are under the `nginx_gateway_fabric` namespace and include a `class` label set to the Gateway class of NGINX Gateway Fabric. For example, `nginx_gateway_fabric_nginx_reloads_total{class="nginx"}`.
90103

104+
---
105+
91106
### Controller-runtime metrics
92107

93108
Provided by the [controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) library, these metrics include:
@@ -96,6 +111,8 @@ Provided by the [controller-runtime](https://github.com/kubernetes-sigs/controll
96111
- Go runtime metrics such as the number of Go routines, garbage collection duration, and Go version.
97112
- Controller-specific metrics, including reconciliation errors per controller, length of the reconcile queue, and reconciliation latency.
98113

114+
---
115+
99116
## Change the default metrics configuration
100117

101118
You can configure monitoring metrics for NGINX Gateway Fabric using Helm or Manifests.
@@ -104,10 +121,14 @@ You can configure monitoring metrics for NGINX Gateway Fabric using Helm or Mani
104121

105122
If you're setting up NGINX Gateway Fabric with Helm, you can adjust the `metrics.*` parameters to fit your needs. For detailed options and instructions, see the [Helm README](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md).
106123

124+
---
125+
107126
### Using Kubernetes manifests
108127

109128
For setups using Kubernetes manifests, change the metrics configuration by editing the NGINX Gateway Fabric manifest that you want to deploy. You can find some examples in the [deploy](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/deploy) directory.
110129

130+
---
131+
111132
#### Disabling metrics
112133

113134
If you need to disable metrics:
@@ -149,6 +170,8 @@ To change the default port for metrics:
149170
<...>
150171
```
151172

173+
---
174+
152175
#### Enabling HTTPS for metrics
153176

154177
For enhanced security with HTTPS:

content/ngf/how-to/monitoring/tracing.md

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
---
2-
title: "Tracing"
3-
weight: 200
2+
title: Configure tracing
3+
weight: 100
44
toc: true
5-
docs: "DOCS-000"
5+
type: how-to
6+
product: NGF
7+
docs: DOCS-000
68
---
79

8-
Learn how to configure tracing in NGINX Gateway Fabric.
10+
This guide explains how to enable tracing on HTTPRoutes in NGINX Gateway Fabric using the OpenTelemetry Collector. Jaeger is used to process and collect the traces.
11+
12+
---
913

1014
## Overview
1115

12-
NGINX Gateway Fabric supports tracing using [OpenTelemetry](https://opentelemetry.io/). The official [NGINX OpenTelemetry Module](https://github.com/nginxinc/nginx-otel) instruments the NGINX data plane to export traces to a configured collector. Tracing data can be used with an OpenTelemetry Protocol (OTLP) exporter, such as the [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector). This collector can then export data to one or more upstream collectors like [Jaeger](https://www.jaegertracing.io/), [DataDog](https://docs.datadoghq.com/tracing/), and many others. This is called the [Agent model](https://opentelemetry.io/docs/collector/deployment/agent/).
16+
NGINX Gateway Fabric supports tracing using [OpenTelemetry](https://opentelemetry.io/).
17+
18+
The official [NGINX OpenTelemetry Module](https://github.com/nginxinc/nginx-otel) instruments the NGINX data plane to export traces to a configured collector. Tracing data can be used with an OpenTelemetry Protocol (OTLP) exporter, such as the [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector).
19+
20+
This collector can then export data to one or more upstream collectors like [Jaeger](https://www.jaegertracing.io/), [DataDog](https://docs.datadoghq.com/tracing/), and many others. This is called the [Agent model](https://opentelemetry.io/docs/collector/deployment/agent/).
1321

14-
This guide explains how to enable tracing on HTTPRoutes using NGINX Gateway Fabric. It uses the OpenTelemetry Collector and Jaeger to process and collect the traces.
22+
---
1523

1624
## Install the collectors
1725

@@ -56,6 +64,8 @@ kubectl port-forward -n tracing svc/jaeger 16686:16686 &
5664

5765
Visit [http://127.0.0.1:16686](http://127.0.0.1:16686) to view the dashboard.
5866

67+
---
68+
5969
## Enable tracing
6070

6171
To enable tracing, you must configure two resources:
@@ -68,6 +78,8 @@ To enable tracing, you must configure two resources:
6878

6979
For all the possible configuration options for these resources, see the [API reference]({{< ref "/ngf/reference/api.md" >}}).
7080

81+
---
82+
7183
### Install NGINX Gateway Fabric with global tracing configuration
7284

7385
{{< note >}}Ensure that you [install the Gateway API resources]({{< ref "/ngf/installation/installing-ngf/helm.md#installing-the-gateway-api-resources" >}}).{{< /note >}}
@@ -167,6 +179,8 @@ Save the public IP address and port of NGINX Gateway Fabric into shell variables
167179

168180
You can now create the application, route, and tracing policy.
169181

182+
---
183+
170184
### Create the application and route
171185

172186
Create the basic **coffee** application:
@@ -261,6 +275,8 @@ URI: /coffee
261275

262276
You shouldn't see any information from the [Jaeger dashboard](http://127.0.0.1:16686) yet: you need to create the `ObservabilityPolicy`.
263277

278+
---
279+
264280
### Create the ObservabilityPolicy
265281

266282
To enable tracing for the coffee HTTPRoute, create the following policy:
@@ -329,7 +345,9 @@ Select a trace to view the attributes.
329345

330346
The trace includes the attribute from the global NginxProxy resource as well as the attribute from the ObservabilityPolicy.
331347

332-
## Further reading
348+
---
349+
350+
## See also
333351

334352
- [Custom policies]({{< relref "/ngf/overview/custom-policies.md" >}}): learn about how NGINX Gateway Fabric custom policies work.
335353
- [API reference]({{< relref "/ngf/reference/api.md" >}}): all configuration fields for the policies mentioned in this guide

0 commit comments

Comments
 (0)