Support changing pod collector annotations #451
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpkrohling
reviewed
Oct 5, 2021
| @@ -46,7 +46,7 @@ func DaemonSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem | |||
| Template: corev1.PodTemplateSpec{ | |||
| ObjectMeta: metav1.ObjectMeta{ | |||
| Labels: labels, | |||
| Annotations: otelcol.Annotations, | |||
There was a problem hiding this comment.
Could you also add an entry to the changelog (perhaps after this is merged?) about this? This can be considered a breaking change.
There was a problem hiding this comment.
You mean like a separate PR after this? I can do that. I could also add it to changelog right now under (unreleased) version if that's ok?
indrekj
force-pushed
the
pod-annotations
branch
from
8697a3f to
efad706
Compare
jpkrohling
approved these changes
Oct 5, 2021
|
Looks good to me. It would be even better if you could add a new e2e test, which serves as an example as well. Like this: https://github.com/open-telemetry/opentelemetry-operator/tree/main/tests/e2e/smoke-statefulset |
indrekj
force-pushed
the
pod-annotations
branch
from
efad706 to
7306fde
Compare
This allows setting podAnnotations, e.g:
```
---
apiVersion: opentelemetry.io/v1alpha1
kind: OpenTelemetryCollector
metadata:
name: opentelemetry
annotations:
foo: "this won't be applied to pods"
spec:
mode: deployment
podAnnotations:
ad.datadoghq.com/otc-container.check_names: '["openmetrics"]'
ad.datadoghq.com/otc-container.init_configs: '[{}]'
ad.datadoghq.com/otc-container.instances: |-
[
{
"prometheus_url": "http://%%host%%:8888/metrics",
"namespace": "opentelemetry.collector",
"metrics": [
{"otelcol_exporter_queue_size": "exporter.queue_size"},
{"otelcol_exporter_send_failed_spans": "exporter.send_failed_spans"},
{"otelcol_exporter_sent_spans": "exporter.sent_spans"},
]
}
]
# ...
```
Fixes open-telemetry#426
indrekj
force-pushed
the
pod-annotations
branch
from
7306fde to
5148b55
Compare
|
@jpkrohling Added e2e test as well. |
jpkrohling
approved these changes
Oct 6, 2021
|
Looks great, thanks! |
shree007
pushed a commit
to shree007/opentelemetry-operator
that referenced
this pull request
Dec 12, 2021
This allows setting podAnnotations, e.g:
```
---
apiVersion: opentelemetry.io/v1alpha1
kind: OpenTelemetryCollector
metadata:
name: opentelemetry
annotations:
foo: "this won't be applied to pods"
spec:
mode: deployment
podAnnotations:
ad.datadoghq.com/otc-container.check_names: '["openmetrics"]'
ad.datadoghq.com/otc-container.init_configs: '[{}]'
ad.datadoghq.com/otc-container.instances: |-
[
{
"prometheus_url": "http://%%host%%:8888/metrics",
"namespace": "opentelemetry.collector",
"metrics": [
{"otelcol_exporter_queue_size": "exporter.queue_size"},
{"otelcol_exporter_send_failed_spans": "exporter.send_failed_spans"},
{"otelcol_exporter_sent_spans": "exporter.sent_spans"},
]
}
]
# ...
```
Fixes open-telemetry#426
ItielOlenick
pushed a commit
to ItielOlenick/opentelemetry-operator
that referenced
this pull request
May 1, 2024
This allows setting podAnnotations, e.g:
```
---
apiVersion: opentelemetry.io/v1alpha1
kind: OpenTelemetryCollector
metadata:
name: opentelemetry
annotations:
foo: "this won't be applied to pods"
spec:
mode: deployment
podAnnotations:
ad.datadoghq.com/otc-container.check_names: '["openmetrics"]'
ad.datadoghq.com/otc-container.init_configs: '[{}]'
ad.datadoghq.com/otc-container.instances: |-
[
{
"prometheus_url": "http://%%host%%:8888/metrics",
"namespace": "opentelemetry.collector",
"metrics": [
{"otelcol_exporter_queue_size": "exporter.queue_size"},
{"otelcol_exporter_send_failed_spans": "exporter.send_failed_spans"},
{"otelcol_exporter_sent_spans": "exporter.sent_spans"},
]
}
]
# ...
```
Fixes open-telemetry#426
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows setting podAnnotations, e.g:
Fixes #426