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

oci conmon: tell conmon to log container name #6291

Merged

Conversation

haircommander
Copy link
Collaborator

specifying -n=ctr-name tells conmon to log CONTAINER_NAME=name if the log driver is journald

add this, and a test!

also, refactor the args slice creation to not append() unnecessarily.

technically, this needs containers/conmon#154, though the test is skipped anyway

Signed-off-by: Peter Hunt [email protected]

specifying `-n=ctr-name` tells conmon to log CONTAINER_NAME=name if the log driver is journald

add this, and a test!

also, refactor the args slice creation to not append() unnecessarily.

Signed-off-by: Peter Hunt <[email protected]>
@@ -173,6 +173,24 @@ var _ = Describe("Podman logs", func() {
Expect(string(out)).To(ContainSubstring("alpine"))
})

It("podman journald logs for container name", func() {
Skip("need to verify images have correct packages for journald")
Copy link
Member

Choose a reason for hiding this comment

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

You test is always skipped?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

all of the logs tests are always skipped

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

they're actually skipped in two different spots 😄

@rhatdan
Copy link
Member

rhatdan commented May 20, 2020

LGTM
other then the issue with skipping the test.

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM (other than Dan's comment)

@haircommander
Copy link
Collaborator Author

all logs tests are skipped here
all journald tests are skipped here

I have a feeling fully enabling the test will be a bit more challenging than dropping these. do you two want me to address those here @rhatdan @vrothberg ?

@vrothberg
Copy link
Member

all logs tests are skipped here

Only for remote though.

I have a feeling fully enabling the test will be a bit more challenging than dropping these. do you two want me to address those here @rhatdan @vrothberg ?

If you have some cycles for that, it would be great. Adding disabled tests is not ideal.

@haircommander
Copy link
Collaborator Author

I have about enough cycles to attempt to enable them, but I can't promise carrying through fixing the tests if they fail from v2/not having journalctl on the images

@haircommander
Copy link
Collaborator Author

(also without containers/conmon#154 the test will fail)

@haircommander haircommander force-pushed the journald-container-name branch from 1d03585 to d2d338b Compare May 20, 2020 15:11
@haircommander
Copy link
Collaborator Author

update: ci images do not have journald. I would like to enable the tests as a follow up

@rhatdan
Copy link
Member

rhatdan commented May 20, 2020

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2020
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2020
@openshift-merge-robot openshift-merge-robot merged commit b5a1342 into containers:master May 20, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants