Introduce join_standard_tags setting #6253
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
`join_standard_tags` enables label joins for standard tags captured from the following labels: - `tags.datadoghq.com/version` - `tags.datadoghq.com/env` - `tags.datadoghq.com/service` Metrics are being enriched for the following objects: Pod, Deployment, ReplicaSet, DaemonSet, StatefulSet, Job, CronJob.
xornivore
force-pushed
the
xornivore/ksm-join-standard-tags
branch
from
893b95b to
d921f76
Compare
ahmed-mez
reviewed
Apr 6, 2020
Comment on lines
376
to
434
| { | ||
| "kube_pod_labels": { | ||
| "labels_to_match": ["pod", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_deployment_labels": { | ||
| "labels_to_match": ["deployment", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_replicaset_labels": { | ||
| "labels_to_match": ["replicaset", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_daemonset_labels": { | ||
| "labels_to_match": ["daemonset", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_statefulset_labels": { | ||
| "labels_to_match": ["statefulset", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_job_labels": { | ||
| "labels_to_match": ["job", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| "kube_cronjob_labels": { | ||
| "labels_to_match": ["cronjob", "namespace"], | ||
| "labels_to_get": [ | ||
| "label_tags_datadoghq_com_env", | ||
| "label_tags_datadoghq_com_service", | ||
| "label_tags_datadoghq_com_version" | ||
| ] | ||
| }, | ||
| } | ||
| ) |
There was a problem hiding this comment.
should we declare these as global variables and refactor them a bit? we're duplicating labels_to_get
There was a problem hiding this comment.
Great point, will refactor, thank you!
ahmed-mez
reviewed
Apr 6, 2020
| @@ -70,7 +70,7 @@ kube_deployment_created{deployment="tiller-deploy",namespace="kube-system"} 1.50 | |||
| # HELP kube_deployment_labels Kubernetes labels converted to Prometheus labels. | |||
| # TYPE kube_deployment_labels gauge | |||
| kube_deployment_labels{deployment="failingtest",label_app="failingtest",namespace="default"} 1 | |||
| kube_deployment_labels{deployment="tiller-deploy",label_app="helm",label_name="tiller",namespace="kube-system"} 1 | |||
| kube_deployment_labels{deployment="tiller-deploy",label_tags_datadoghq_com_env="dev",label_tags_datadoghq_com_service="tiller",label_tags_datadoghq_com_version="xyz",label_app="helm",label_name="tiller",namespace="kube-system"} 1 | |||
There was a problem hiding this comment.
thanks for the tests, could you please cover all the targeted objects in this PR not only deployments and pods?
There was a problem hiding this comment.
Yes, will add those!
ofek
changed the title
ahmed-mez
previously approved these changes
Apr 7, 2020
Codecov Report
|
ahmed-mez
approved these changes
Apr 7, 2020
ofek
approved these changes
Apr 16, 2020
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.
What does this PR do?
join_standard_tagsenables label joins for standard tags captured from the following labels:tags.datadoghq.com/versiontags.datadoghq.com/envtags.datadoghq.com/serviceMetrics are being enriched for the following objects: Pod, Deployment, ReplicaSet, DaemonSet, StatefulSet, Job, CronJob.
Motivation
Unified tagging in KSM integration.
Additional Notes
Review checklist (to be filled by reviewers)
changelog/andintegration/labels attached