Skip to content

Commit c4e8ec4

Browse files
committed
Merge branch 'main' into nic/otel-instructions
2 parents 4faa7ec + 4cc97f3 commit c4e8ec4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

content/nic/logging-and-monitoring/opentelemetry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The following is an example of a OpenTelemetry collector running in your cluster
3030
otel-exporter-endpoint: "http://otel-collector.default.svc.cluster.local:4317"
3131
```
3232
33-
A complete ConfigMap example with all OpenTelemetry map options could look as follows:
33+
A complete ConfigMap example with all OpenTelemetry options could look as follows:
3434
3535
{{< ghcode "https://raw.githubusercontent.com/nginx/kubernetes-ingress/refs/heads/main/examples/shared-examples/otel/nginx-config.yaml" >}}
3636
@@ -52,7 +52,7 @@ otel-trace-in-http: "true"
5252

5353
You can configure OpenTelemetry on a per resource basis in NGINX Ingress Controller.
5454

55-
For this functionality, you must [enable snippets]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-snippets.md" >}}), using the `-enable-snippets` command-line argument.
55+
For this functionality, you must [enable snippets]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-snippets.md" >}}) with the `-enable-snippets` command-line argument.
5656

5757
Based on the state of global configuration, you can selectively enable or disable metrics for each resource.
5858

content/nic/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Lastly, in our previous v5.0.0 release, we removed support for OpenTracing. This
4848
[GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress),
4949
[Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress).
5050
- For NGINX Plus, use the 5.1.0 images from the F5 Container registry or build your own image using the 5.1.0 source code
51-
- For Helm, use version 2.2.0 of the chart.
51+
- For Helm, use version 2.2.1 of the chart.
5252

5353
### <i class="fa-solid fa-life-ring"></i> Supported Platforms
5454

0 commit comments

Comments
 (0)