Skip to content

Conversation

@tetianakravchenko
Copy link
Contributor

@tetianakravchenko tetianakravchenko commented Oct 10, 2024

In this PR:

  1. Set service.name:

1.1. container with name: prometheus-server - has a service.name : server - that is set from pod labels:

kubectl describe pod prometheus-server-server-64ddbf6c85-r7tk5 | grep "Labels:" -a5
...
Labels:           app.kubernetes.io/component=server
                  app.kubernetes.io/instance=prometheus-server
                  app.kubernetes.io/managed-by=Helm
                  app.kubernetes.io/name=prometheus
                  app.kubernetes.io/part-of=prometheus
                  app.kubernetes.io/version=v2.54.1
Screenshot 2024-10-11 at 12 42 43

1.2. rest of pods have k8s.container.name = service.name (screenshot above)

  1. Set service.version based on app.kubernetes.io/version label (screenshot above)
  2. remove redundant fields: resource.attributes.app.label.component and resource.attributes.app.label.version
  3. Add drop_origin: true parameter for the elasticinframetrics processor

Signed-off-by: Tetiana Kravchenko <[email protected]>
Signed-off-by: Tetiana Kravchenko <[email protected]>
Signed-off-by: Tetiana Kravchenko <[email protected]>
Signed-off-by: Tetiana Kravchenko <[email protected]>
- "k8s.pod.ip"
- "k8s.pod.uid"
- "k8s.pod.start_time"
- "k8s.container.name"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is not needed. Can you confirm?
I will also double check

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the logs pipeline, this field will be provided by the filelog receiver container operator.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gizas you are right removed 58860b3

Copy link
Contributor

@rogercoll rogercoll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: Tetiana Kravchenko <[email protected]>
@tetianakravchenko tetianakravchenko merged commit 4807a3b into elastic:main Oct 11, 2024
1 check passed
@tetianakravchenko tetianakravchenko deleted the add-drop_original branch October 11, 2024 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants