-
Notifications
You must be signed in to change notification settings - Fork 3k
Add libpod journald logging #2709
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
Add libpod journald logging #2709
Conversation
|
(ignore this for now folks, starting this by seeing if updating CRI-O breaks CI) |
|
☔ The latest upstream changes (presumably #2833) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@haircommander Needs rebase. |
|
@rhatdan needs much more than that :) thanks for the heads up |
9c43499 to
6499206
Compare
cac4e1b to
35a030d
Compare
|
Alrighty team, the last of the changes I wanted are in. The one thing that is missing is podman logs --follow, but given the sdjournal package API, it'll be kind of annoying to translate that for what we have, so I've opted to disable it and document doing so. The one thing I'd like to wait for is bumping conmon version to 0.2.0 and make sure it's documented users should have that version to ensure they can actually use this feature. In the meantime, PTAL |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, mheon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
☔ The latest upstream changes (presumably #3190) made this pull request unmergeable. Please resolve the merge conflicts. |
Signed-off-by: Peter Hunt <[email protected]>
Signed-off-by: Peter Hunt <[email protected]>
Signed-off-by: Peter Hunt <[email protected]>
Add a journald reader that translates the journald entry to a k8s-file formatted line, to be added as a log line Note: --follow with journald hasn't been implemented. It's going to be a larger undertaking that can wait. Signed-off-by: Peter Hunt <[email protected]>
Signed-off-by: Peter Hunt <[email protected]>
Signed-off-by: Peter Hunt <[email protected]>
|
last remaining issue: containers/conmon#34 |
| @@ -367,8 +367,6 @@ func (r *OCIRuntime) execContainer(c *Container, cmd, capAdd, env []string, tty | |||
| args := []string{} | |||
|
|
|||
| // TODO - should we maintain separate logpaths for exec sessions? | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this comment still valid
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will no longer be once i finish conmon exec :)
|
LGTM |
|
@haircommander What do we think about |
|
I'm willing to let this into 1.4.0, as it's pretty self contained |
|
@mheon json-file is in my list of things to do--needs addition in conmon first and it isn't high on my priority list. in other words: it'll be an alias until I get to fixing it :) |
|
containers/conmon#37 here's a tracker--I can file an issue here if you'd like it |
|
Can we throw a not-implemented error instead? I'd prefer to not establish an alias now and break it later |
|
@mheon Actually, it's not an alias |
|
though, would you prefer if I moved the error higher up the stack? It'll be caught in conmon but may be better not to waste time pretending it'll work in podman |
|
Alright, LGTM then |
|
Eh, I think we're ok with asking Conmon nicely... no changes on our end when it is implemented |
Signed-off-by: Peter Hunt [email protected]