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

Fill cluster name property for traces #754

Merged
merged 1 commit into from
Jul 6, 2020
Merged

Fill cluster name property for traces #754

merged 1 commit into from
Jul 6, 2020

Conversation

pmm-sumo
Copy link
Contributor

@pmm-sumo pmm-sumo commented Jun 30, 2020

Description

cluster property was not filled for traces previously. This fixes it, using the new tracing taxonomy (so it goes to k8s.cluster.name)

Testing performed
  • ci/build.sh
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

@pmm-sumo pmm-sumo requested a review from perk-sumo June 30, 2020 14:02
Copy link
Contributor

@perk-sumo perk-sumo left a comment

Choose a reason for hiding this comment

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

LGTM

{{- $yamlFile | replace "processors.source.collector.replace" $_collector | replace "exporters.zipkin.url_replace" $endpoint | replace "processors.source.name.replace" $sourceName | replace "processors.source.category.replace" $sourceCategory | replace "processors.source.category_prefix.replace" $sourceCategoryPrefix | replace "processors.source.category_replace_dash.replace" $sourceCategoryReplaceDash | replace "processors.source.exclude_namespace_regex.replace" $excludeNamespaceRegex | replace "processors.source.exclude_pod_regex.replace" $excludePodRegex | replace "processors.source.exclude_container_regex.replace" $excludeContainerRegex | replace "processors.source.exclude_host_regex.replace" $excludeHostRegex | replace "processors.resource.cluster.replace" $clusterName | nindent 2 }}
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: split it on several lines to make reviews easier in the future

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sumo-drosiek totally agree, tried to split into several lines but must have been doing it wrong and the chart never rendered; do you know the right way to do it?

Copy link
Contributor

Choose a reason for hiding this comment

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

I believe something like that:

{{- $yamlFile = replace "processors.source.collector.replace" $_collector $yamlFIle }}

@perk-sumo perk-sumo added this to the v1.1 milestone Jul 6, 2020
@perk-sumo perk-sumo merged commit fcc0821 into master Jul 6, 2020
@perk-sumo perk-sumo deleted the ot-cluster branch July 6, 2020 11:47
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.

5 participants