pack: output: added documentation for epoch_ms timestamp #715
Conversation
|
@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
force-pushed
the
epoch-millis
branch
from
8e959ac to
beee0fd
Compare
|
Done! |
|
hi @marcosdiez, thanks for your contribution. |
lecaros
added
conflict
marcosdiez
force-pushed
the
epoch-millis
branch
from
beee0fd to
9c4fe6f
Compare
|
@lecaros conflicts solved! |
|
Hi @marcosdiez it seems we have new conflicts. Please take a look. |
…n athena Signed-off-by: Marcos Diez <marcos@unitron.com.br>
Signed-off-by: Marcos Diez <marcos@unitron.com.br>
marcosdiez
force-pushed
the
epoch-millis
branch
from
9c4fe6f to
5719b11
Compare
|
Hi @lecaros |
lecaros
added
waiting-on-code-merge
and removed
waiting-for-user
|
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
added
the
waiting-for-user
|
@lecaros yes, this is relevant. As one can see, https://github.com/fluent/fluent-bit/blob/master/src/flb_pack.c#L871 I would merge it sooner than later. |
|
The code PR has been merged here: fluent/fluent-bit#6114 |
|
@marcosdiez can you resolve the conflicts here so I can merge these updates? |
Signed-off-by: Lynette Miles <6818907+esmerel@users.noreply.github.com>
|
The conflicts were mostly due to stylistic updates. I added the change to the table, and then fixed the conflicts so this can keep moving. |
|
@esmerel it's still failing CI |
|
The vale failure is due to the same issues other PRs are having. Not sure why markdownlint is grumpy, I'll look. |
Signed-off-by: Lynette Miles <6818907+esmerel@users.noreply.github.com>
hah, found it and fixed. |
|
@marcosdiez merging this docs PR as the original code PR fluent/fluent-bit#4131 was closed in favor of the final merged code PR fluent/fluent-bit#6114. Thanks for the patience here. |
eschabell
removed
waiting-for-user
* pack: output: added java_sql_timestamp, a format string used by amazon athena Signed-off-by: Marcos Diez <marcos@unitron.com.br> * pack: output: added docs for java_sql_timestamp and epoch_ms Signed-off-by: Marcos Diez <marcos@unitron.com.br> * Update pipeline/outputs/standard-output.md Signed-off-by: Lynette Miles <6818907+esmerel@users.noreply.github.com> --------- Signed-off-by: Marcos Diez <marcos@unitron.com.br> Signed-off-by: Lynette Miles <6818907+esmerel@users.noreply.github.com> Co-authored-by: Lynette Miles <6818907+esmerel@users.noreply.github.com> Signed-off-by: Tom <yao.lin@siemens.com>
6 participants
Documentation for fluent/fluent-bit#4131
Contains also changes from #708