Skip to content

Revert "[logs] Inherit source/service name in some cases (#7310)"#7345

Merged
prognant merged 1 commit intomasterfrom
prognant/revert-7310
Feb 4, 2021
Merged

Revert "[logs] Inherit source/service name in some cases (#7310)"#7345
prognant merged 1 commit intomasterfrom
prognant/revert-7310

Conversation

@prognant
Copy link
Copy Markdown
Contributor

@prognant prognant commented Feb 3, 2021

What does this PR do?

This reverts commit 8e56591.

#7310 introduced a change that is not consistent with the nominal integration config behaviour as they are supposed to be independent from each others.
Source/service may be manually set per log integration config if required Also a service may be set at pod level (using the label tags.datadoghq.com/service),

Motivation

Consistency across config.

Additional Notes

N/A

Describe your test plan

See #7176.

Using this logs config annotation:

[{"type":"file","path":"/tmp/share/test.log"},{"source":"my_source", "service":"my_service"}]

Should :

  • Trigger container tailing with my_source/my_service as service/source in the log explorer
  • Trigger file tailing for /tmp/share/test.log with no service/source set

@prognant prognant requested review from a team as code owners February 3, 2021 15:32
@prognant prognant added this to the 7.27.0 milestone Feb 3, 2021
@prognant prognant added changelog/no-changelog No changelog entry needed [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead.. labels Feb 3, 2021
Copy link
Copy Markdown
Member

@olivielpeau olivielpeau left a comment

Choose a reason for hiding this comment

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

Thanks! For future reference, more details on the rationale in this comment: #7310 (comment)

@prognant prognant modified the milestones: 7.27.0, 7.26.0 Feb 4, 2021
@prognant prognant merged commit 3ad0dc8 into master Feb 4, 2021
@prognant prognant deleted the prognant/revert-7310 branch February 4, 2021 09:33
sergei-deliveroo pushed a commit to deliveroo/datadog-agent that referenced this pull request Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog No changelog entry needed [deprecated] team/agent-core Deprecated. Use metrics-logs / shared-components labels instead..

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants