Skip to content

Commit 75c77e5

Browse files
authored
Metrics: Disable by default. (#12095)
1 parent c9aa724 commit 75c77e5

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

charts/ingress-nginx/templates/_params.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
{{- if .Values.controller.watchIngressWithoutClass }}
5555
- --watch-ingress-without-class=true
5656
{{- end }}
57-
{{- if not .Values.controller.metrics.enabled }}
57+
{{- if .Values.controller.metrics.enabled }}
5858
- --enable-metrics={{ .Values.controller.metrics.enabled }}
5959
{{- end }}
6060
{{- if .Values.controller.enableTopologyAwareRouting }}

charts/ingress-nginx/tests/controller-daemonset_test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ tests:
1515
path: metadata.name
1616
value: RELEASE-NAME-ingress-nginx-controller
1717

18-
- it: should create a DaemonSet with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
18+
- it: should create a DaemonSet with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
1919
set:
2020
controller.kind: DaemonSet
21-
controller.metrics.enabled: false
21+
controller.metrics.enabled: true
2222
asserts:
2323
- contains:
2424
path: spec.template.spec.containers[0].args
25-
content: --enable-metrics=false
25+
content: --enable-metrics=true
2626

27-
- it: should create a DaemonSet without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
27+
- it: should create a DaemonSet without argument `--enable-metrics=true` if `controller.metrics.enabled` is false
2828
set:
2929
controller.kind: DaemonSet
30-
controller.metrics.enabled: true
30+
controller.metrics.enabled: false
3131
asserts:
3232
- notContains:
3333
path: spec.template.spec.containers[0].args
34-
content: --enable-metrics=false
34+
content: --enable-metrics=true
3535

3636
- it: should create a DaemonSet with argument `--controller-class=k8s.io/ingress-nginx-internal` if `controller.ingressClassResource.controllerValue` is "k8s.io/ingress-nginx-internal"
3737
set:

charts/ingress-nginx/tests/controller-deployment_test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ tests:
4343
- exists:
4444
path: spec.replicas
4545

46-
- it: should create a Deployment with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
46+
- it: should create a Deployment with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
4747
set:
48-
controller.metrics.enabled: false
48+
controller.metrics.enabled: true
4949
asserts:
5050
- contains:
5151
path: spec.template.spec.containers[0].args
52-
content: --enable-metrics=false
52+
content: --enable-metrics=true
5353

54-
- it: should create a Deployment without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
54+
- it: should create a Deployment without argument `--enable-metrics=true` if `controller.metrics.enabled` is false
5555
set:
56-
controller.metrics.enabled: true
56+
controller.metrics.enabled: false
5757
asserts:
5858
- notContains:
5959
path: spec.template.spec.containers[0].args
60-
content: --enable-metrics=false
60+
content: --enable-metrics=true
6161

6262
- it: should create a Deployment with argument `--controller-class=k8s.io/ingress-nginx-internal` if `controller.ingressClassResource.controllerValue` is "k8s.io/ingress-nginx-internal"
6363
set:

docs/user-guide/cli-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ They are set in the container spec of the `ingress-nginx-controller` Deployment
2424
| `--dynamic-configuration-retries` | Number of times to retry failed dynamic configuration before failing to sync an ingress. (default 15) |
2525
| `--election-id` | Election id to use for Ingress status updates. (default "ingress-controller-leader") |
2626
| `--election-ttl` | Duration a leader election is valid before it's getting re-elected, e.g. `15s`, `10m` or `1h`. (Default: 30s) |
27-
| `--enable-metrics` | Enables the collection of NGINX metrics. (default true) |
27+
| `--enable-metrics` | Enables the collection of NGINX metrics. (Default: false) |
2828
| `--enable-ssl-chain-completion` | Autocomplete SSL certificate chains with missing intermediate CA certificates. Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed. (default false)|
2929
| `--enable-ssl-passthrough` | Enable SSL Passthrough. (default false) |
3030
| `--disable-leader-election` | Disable Leader Election on Nginx Controller. (default false) |

pkg/flags/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ extension for this to succeed.`)
174174
`Customized address (or addresses, separated by comma) to set as the load-balancer status of Ingress objects this controller satisfies.
175175
Requires the update-status parameter.`)
176176

177-
enableMetrics = flags.Bool("enable-metrics", true,
177+
enableMetrics = flags.Bool("enable-metrics", false,
178178
`Enables the collection of NGINX metrics.`)
179179
metricsPerHost = flags.Bool("metrics-per-host", true,
180180
`Export metrics per-host.`)

0 commit comments

Comments
 (0)