Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Windows collector image; sync values files #355

Merged
merged 2 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## OpenTelemtry-Integration

### v0.0.49 / 2024-01-18

- [CHORE] Update Windows collector image to `v0.92.0`.
- [CHORE] Sync changes from main values file with Windows agent values file.

### v0.0.48 / 2024-01-17

- [FEATURE] Add support for specifying histogram buckets for span metrics preset.
Expand Down
2 changes: 1 addition & 1 deletion otel-integration/k8s-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: otel-integration
description: OpenTelemetry Integration
version: 0.0.48
version: 0.0.49
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
Expand Down
47 changes: 33 additions & 14 deletions otel-integration/k8s-helm/values-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ opentelemetry-agent-windows:
repository: coralogixrepo/opentelemetry-collector-contrib-windows
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "0.91.0"
tag: "0.92.0"
# When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
digest: ""
extraVolumes:
Expand Down Expand Up @@ -56,6 +56,14 @@ opentelemetry-agent-windows:
name: "coralogix-opentelemetry-agent-windows"
clusterRoleBinding:
name: "coralogix-opentelemetry-agent-windows"
priorityClass:
# Specifies whether a priorityClass should be created.
create: false
# The name of the clusterRole to use.
# If not set a name is generated using the fullname template.
name: ""
# Sets the priority value of the priority class.
priorityValue: 1000000000
hostNetwork: true
dnsPolicy: "ClusterFirstWithHostNet"

Expand All @@ -79,6 +87,9 @@ opentelemetry-agent-windows:
enabled: true
kubeletMetrics:
enabled: true
spanMetrics:
enabled: false
histogramBuckets: [10ms, 20ms, 50ms, 100ms, 200ms, 500ms, 1s, 2s, 5s]

config:
extensions:
Expand All @@ -88,6 +99,8 @@ opentelemetry-agent-windows:
endpoint: localhost:1777

receivers:
statsd:
endpoint: ${MY_POD_IP}:8125
otlp:
protocols:
grpc:
Expand Down Expand Up @@ -133,24 +146,14 @@ opentelemetry-agent-windows:
extract:
metadata:
- "k8s.namespace.name"
- "k8s.deployment.name"
# replace the below by `k8s.deployment.name` after https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23067
- "k8s.replicaset.name"
- "k8s.statefulset.name"
- "k8s.daemonset.name"
- "k8s.cronjob.name"
- "k8s.job.name"
- "k8s.pod.name"
- "k8s.node.name"
spanmetrics:
metrics_exporter: coralogix
dimensions:
- name: "k8s.deployment.name"
- name: "k8s.statefulset.name"
- name: "k8s.daemonset.name"
- name: "k8s.cronjob.name"
- name: "k8s.job.name"
- name: "k8s.container.name"
- name: "k8s.node.name"
- name: "k8s.namespace.name"
# Will get the k8s resource limits
memory_limiter: null

Expand All @@ -173,6 +176,10 @@ opentelemetry-agent-windows:

service:
telemetry:
resource:
# Supress this attribute, as we don't want the UUID of the collector to be sent,
# instead we rely on instance label generated by Prometheus receiver.
- service.instance.id:
logs:
level: "{{ .Values.global.logLevel }}"
encoding: json
Expand All @@ -196,12 +203,15 @@ opentelemetry-agent-windows:
- otlp
- prometheus
- hostmetrics
- statsd
traces:
exporters:
- coralogix
processors:
- k8sattributes
- resourcedetection/env
- resourcedetection/region
- memory_limiter
- spanmetrics
- batch
receivers:
- otlp
Expand All @@ -211,6 +221,9 @@ opentelemetry-agent-windows:
exporters:
- coralogix
processors:
- k8sattributes
- resourcedetection/env
- resourcedetection/region
- batch
receivers:
- otlp
Expand All @@ -226,6 +239,12 @@ opentelemetry-agent-windows:
memory: 2G

ports:
statsd:
enabled: true
containerPort: 8125
servicePort: 8125
hostPort: 8125
protocol: UDP
jaeger-binary:
enabled: true
containerPort: 6832
Expand Down
Loading