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.

Sign up for GitHub

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

Jump to bottom

pack: output: added documentation for epoch_ms timestamp #715

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

pack: output: added documentation for epoch_ms timestamp #715

wants to merge 2 commits into from

Conversation

marcosdiez
Copy link
Contributor

@marcosdiez marcosdiez commented Feb 17, 2022 •
edited
Loading

Documentation for fluent/fluent-bit#4131

Contains also changes from #708

@marcosdiez marcosdiez mentioned this pull request Feb 17, 2022
Closed
3 tasks
@PettitWesley
Copy link
Contributor

@marcosdiez You need to rebase though we also won't merge docs until the change is released so by then you may need to rebase again...

@marcosdiez
Copy link
Contributor Author

Done!

@lecaros
Copy link
Contributor

lecaros commented Mar 9, 2022

hi @marcosdiez, thanks for your contribution.
Please resolve the conflict so we can merge it.

@lecaros lecaros added conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes labels Mar 9, 2022
@marcosdiez
Copy link
Contributor Author

@lecaros conflicts solved!

@lecaros
Copy link
Contributor

lecaros commented Mar 10, 2022

Hi @marcosdiez it seems we have new conflicts. Please take a look.

@marcosdiez
Copy link
Contributor Author

Hi @lecaros
I merged and it's all good now. That being said, fluent/fluent-bit#4131 has not yet been merged (although I think it should). Please merge them together.

@lecaros lecaros added waiting-on-code-merge and removed waiting-for-user Waiting for user/contributors feedback or requested changes conflict Waiting on conflict to be resolved by contributor labels Mar 10, 2022
@lecaros lecaros added the conflict Waiting on conflict to be resolved by contributor label Aug 19, 2022
@lecaros
Copy link
Contributor

lecaros commented Feb 22, 2024

Hi @marcosdiez I see that the related PR was closed. However, there are some others mentioned there. Can you please confirm if this PR is still relevant?

@lecaros lecaros added the waiting-for-user Waiting for user/contributors feedback or requested changes label Feb 22, 2024
@marcosdiez
Copy link
Contributor Author

@lecaros yes, this is relevant.

As one can see, https://github.com/fluent/fluent-bit/blob/master/src/flb_pack.c#L871 epoch_ms is in the code but not documented, which unfortunately makes it a secret.

I would merge it sooner than later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PettitWesley PettitWesley PettitWesley approved these changes

Assignees
No one assigned
Labels
conflict Waiting on conflict to be resolved by contributor waiting-for-user Waiting for user/contributors feedback or requested changes waiting-on-code-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marcosdiez @PettitWesley @lecaros