Skip to content

Commit

Permalink
Add possibility to disable metrics coming from OTC (#994)
Browse files Browse the repository at this point in the history
* Disable metrics port

* Disable creation of metrics instance in otc

* Disable metrics by default

* Move configuration to otelcol

* Update README.md

* Enable metrics by default
  • Loading branch information
mat-rumian committed Oct 22, 2020
1 parent 010786e commit a5c698f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions deploy/helm/sumologic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ Parameter | Description | Default
`otelcol.deployment.replicas` | Set the number of OpenTelemetry Collector replicas. | `1`
`otelcol.deployment.resources.limits.memory` | Sets the OpenTelemetry Collector memory limit. | `2Gi`
`otelcol.deployment.priorityClassName` | Priority class name for OpenTelemetry Collector log pods. | `Nil`
`otelcol.metrics_enabled` | Enable or disable generation of the metrics from Collector. | `false`
`otelcol.config.service.pipelines.traces.receivers` | Sets the list of enabled receivers. | `{jaeger, opencensus, otlp, zipkin}`
`otelcol.config.exporters.zipkin.timeout` | Sets the Zipkin (default) exporter timeout. Append the unit, e.g. `s` when setting the parameter | `5s`
`otelcol.config.exporters.logging.loglevel` | When tracing debug logging exporter is enabled, sets the verbosity level. Use either `info` or `debug`. | `info`
Expand Down
3 changes: 3 additions & 0 deletions deploy/helm/sumologic/templates/otelcol-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ spec:
command:
- "/otelcontribcol"
- "--config=/conf/traces.otelcol.conf.yaml"
{{- if eq .Values.otelcol.metrics_enabled false }}
- "--metrics-level=none"
{{- end }}
- {{ printf "--mem-ballast-size-mib=%s" .Values.otelcol.deployment.memBallastSizeMib }}
env:
- name: GOGC
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/otelcol-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ spec:
- name: jaeger-thrift-binary # Default endpoint for Jaeger Thrift Binary receiver.
port: 6832
protocol: UDP
{{- if eq .Values.otelcol.metrics_enabled true }}
- name: metrics # Default endpoint for querying metrics.
port: 8888
{{- end }}
- name: zipkin # Default endpoint for Zipkin receiver.
port: 9411
- name: jaeger-grpc # Default endpoint for Jaeger gRPC
Expand Down
3 changes: 3 additions & 0 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,9 @@ otelcol:
pullPolicy: IfNotPresent
# To enable collecting all logs, set to false
logLevelFilter: true
# Metrics from Collector
metrics_enabled: true
# Collector configuration
config:
receivers:
jaeger:
Expand Down

0 comments on commit a5c698f

Please sign in to comment.