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

fix: promtail parser for azureeventhubs message without time field #14218

Merged

Conversation

andriikushch
Copy link
Contributor

@andriikushch andriikushch commented Sep 23, 2024

What this PR does / why we need it:

The promtail parser for azureeventhubs ignores records that doesn't contain the time field.

  • This change accepts such records if they contain the timeStamp field instead.
  • For the parsed time, the location is set to the UTC

Which issue(s) this PR fixes:
Fixes:

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@andriikushch andriikushch marked this pull request as ready for review September 23, 2024 12:42
@andriikushch andriikushch requested a review from a team as a code owner September 23, 2024 12:42
CHANGELOG.md Outdated Show resolved Hide resolved
@Kapsztajn
Copy link

Can this pull request be merged? @andriikushch

Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

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

Looks good, would you be open to my one suggestion regarding getTime()?

clients/pkg/promtail/targets/azureeventhubs/parser.go Outdated Show resolved Hide resolved
@andriikushch andriikushch force-pushed the andrii/fix-event-hub-log-message-parsing-without-time-field branch 2 times, most recently from b3d3043 to 72fb3a5 Compare October 29, 2024 08:40
@andriikushch
Copy link
Contributor Author

Looks good, would you be open to my one suggestion regarding getTime()?

@trevorwhitney, I have merged the suggestion 👍 and added the test. Could you please take a look once again at the latest changes and I think we can merge it then 😃

@andriikushch andriikushch force-pushed the andrii/fix-event-hub-log-message-parsing-without-time-field branch from d678abc to 1c8ca38 Compare October 29, 2024 08:53
@trevorwhitney trevorwhitney merged commit 2e62abb into main Oct 29, 2024
60 checks passed
@trevorwhitney trevorwhitney deleted the andrii/fix-event-hub-log-message-parsing-without-time-field branch October 29, 2024 17:13
@andriikushch
Copy link
Contributor Author

Can this pull request be merged? @andriikushch

Hi, @Kapsztajn 👋 It is merged now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants