Skip to content

Commit

Permalink
[opentelemetry-integration] Narrow down metrics service host back to …
Browse files Browse the repository at this point in the history
…pod ip (#131)

Fixes ES-411.

This is a rollback of the changes in #121.

As mentioned in the release notes, since the release v0.116.0 of the OTEL Operator this shouldn't break anything and we have nothing special to document.
  • Loading branch information
douglascamata authored Jan 2, 2025
1 parent a6e55f3 commit bd236d0
Show file tree
Hide file tree
Showing 104 changed files with 153 additions and 146 deletions.
7 changes: 7 additions & 0 deletions charts/opentelemetry-collector/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## OpenTelemetry Collector

### v0.102.0 / 2025-01-02

- [Fix] Revert the change in metrics telemetry service host from `0.0.0.0` to `${env:MY_POD_IP}`
since https://github.com/open-telemetry/opentelemetry-operator/pull/3531 is merged and released.
If you are using the OpenTelemetry Operator and the Collector CRD, please update the Operator to
version `0.116.0` or later.

### v0.101.0 / 2024-12-31

- [Feat] Add job name to pod association for k8s attributes.
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.101.0
version: 0.102.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -96,4 +96,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -131,4 +131,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5347ee8ef7fb545373f4098a0a4603424158c5a9aac7e59c43fec70167c4ba82
checksum/config: c3b683e251142f72d5adaed6bc43e2e251413b5ffb455a6e5bc49e87a36b2e0c

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: af0f2b089fa1ef4e9a839083f44b9db5a3026def5579b64698aa20ebf84230ad
checksum/config: d2b5ead226317f5004c1e7a08161046e983a2c26d201199ef324361058fdc077

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -148,4 +148,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 2d3412434a0dc3ea89bfb06006cf58dd1fd553b530a4c84094ecc0b57e54b489
checksum/config: 20d2b80f84563a2cadc95998348a8553a0c0ce9096755a8786251d0ff9aaf512

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -83,4 +83,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: c4956ccc57c4b8c0cdb7a92db8f353f56e720f24b8b3d472143c9f1eb57680ce
checksum/config: f9b3439ff7bc444b1c3853b4d11efc4bbd282decc026d8a625d9f16ba4bc0f94

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -83,4 +83,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: c4956ccc57c4b8c0cdb7a92db8f353f56e720f24b8b3d472143c9f1eb57680ce
checksum/config: f9b3439ff7bc444b1c3853b4d11efc4bbd282decc026d8a625d9f16ba4bc0f94

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -465,4 +465,4 @@ data:
- forward/db
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: a6a81dfbea4aa3f25ffbe906def8602f08a0bd04535c8e76743e9d253927fd77
checksum/config: 1dc93c24ac259d074d9af4724c257f98305e5c757005900465fbfd7d2f416edb

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector-targetallocator
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector-targetallocator
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down Expand Up @@ -87,4 +87,4 @@ data:
- zipkin
telemetry:
metrics:
address: 0.0.0.0:8888
address: ${env:MY_POD_IP}:8888
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector-target-allocator
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: feebc5c3b332b263691b8ca45a26bee16c68e222170106e4b1c43b7f1bdb9b5c
checksum/config: 070afbffa5a7fef947454e322b2e05640d242226d8adacb82bd54efe449273ea

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand All @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 27fc6f86afbcd72d21d4e5170b003c4babb0ca8775c272d7e7f581b95756842a
checksum/config: 95a31f20bb869c03ceac595771d859210b706135a82b59a6ec82f8c2a0c6d065

labels:
app.kubernetes.io/name: opentelemetry-collector-target-allocator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-targetallocator
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.101.0
helm.sh/chart: opentelemetry-collector-0.102.0
app.kubernetes.io/name: opentelemetry-collector-target-allocator
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.115.1"
Expand Down
Loading

0 comments on commit bd236d0

Please sign in to comment.