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

add log-opts in global settings, witht tags #10204

Closed
badsmoke opened this issue May 4, 2021 · 1 comment · Fixed by #10583
Closed

add log-opts in global settings, witht tags #10204

badsmoke opened this issue May 4, 2021 · 1 comment · Fixed by #10583
Assignees
@rhatdan
Labels
kind/feature Categorizes issue or PR as related to a new feature. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Comments

@badsmoke
Copy link

badsmoke commented May 4, 2021

Is this a BUG REPORT or FEATURE REQUEST? (leave only one on its own line)

/kind feature

Description

hello we would like to switch to podman, with the added docker-compose compatibility everything is already almost perfect. Unfortunately the possibility to set global "log-opts" is still missing, especially the possibility to add "tags".

We use a promtail which looks at the log files and sends them to loki, only with the tag option a simple differentiation of the containers is guaranteed.

example our current /etc/docker/daemon.json

{
    "log-opts": {
          "max-file": "2",
          "max-size": "1g",
          "tag":"{{.Name}}|{{.ID}}"
      }
}

is there perhaps this possibility now and I have overlooked it?
@openshift-ci-robot openshift-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label May 4, 2021
@github-actions
Copy link

github-actions bot commented Jun 4, 2021

A friendly reminder that this issue had no activity for 30 days.

rhatdan added a commit to rhatdan/common that referenced this issue Jun 7, 2021
@rhatdan
Add default for log-tag
2abcb31 
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan mentioned this issue Jun 7, 2021
Merged
@rhatdan rhatdan mentioned this issue Jun 7, 2021
Merged
@rhatdan rhatdan self-assigned this Jun 7, 2021
rhatdan added a commit to rhatdan/common that referenced this issue Jun 9, 2021
@rhatdan
Add default for log-tag
b74335f 
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/common that referenced this issue Jun 9, 2021
@rhatdan
Add default for log-tag
ce0f069 
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/common that referenced this issue Jun 9, 2021
@rhatdan
Add default for log-tag
2ca5af7 
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/common that referenced this issue Jun 9, 2021
@rhatdan
Add default for log-tag
507aa2a 
Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan added a commit to rhatdan/podman that referenced this issue Jun 23, 2021
@rhatdan
Support log_tag defaults from containers.conf
f2dff41 
Fixes: containers#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
trusch pushed a commit to trusch/common that referenced this issue Jun 30, 2021
@vrothberg @trusch
add shelldriver secret driver.
f8396f0 
libmage: Exists: catch corrupted images

While various execution paths in libimage already handle corrupted
images, `(*Runtime).Exists()` did not and would list an image to exist
in the storage even if it is corrupted.

Some corruptions can only be detected when accessing the individual
data.  A reliable way of accessing such data is to inspect an image.
Hence, an image will only be listed to exist if a) it has been found
and b) can be inspected.  If the inspection fails, the image will be
reported to not exists but without an error.  That allows for users
of libimage to properly recover and repull.

Further, add a new unit tests that forces a data corruption and
gradually recovers from it.

Podman will now behave as follows:
```
$ ./bin/podman run -d --rm nginx ls
ERRO[0000] Image nginx exists in local storage but may be corrupted: layer not known
ERRO[0000] Looking up nginx in local storage: layer not known
Resolved "nginx" as an alias (/home/vrothberg/.cache/containers/short-name-aliases.conf)
Trying to pull docker.io/library/nginx:latest...
Getting image source signatures
Copying blob 596b1d696923 skipped: already exists
Copying blob 30afc0b18f67 skipped: already exists
Copying blob febe5bd23e98 skipped: already exists
Copying blob 69692152171a skipped: already exists
Copying blob 8283eee92e2f skipped: already exists
Copying blob 351ad75a6cfa done
Copying config d1a364dc54 done
Writing manifest to image destination
Storing signatures
56b65883c3c32b67277bcc173bd9f26c27cbbdbc6d3aacf6c552be796eb7a337
```

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

Add default for log-tag

Needed for containers/podman#10204

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

build(deps): bump github.com/containers/storage from 1.32.1 to 1.32.2

Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.32.1 to 1.32.2.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](containers/storage@v1.32.1...v1.32.2)

---
updated-dependencies:
- dependency-name: github.com/containers/storage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

fix autodiscovery of the secret passdriver.

add 'secret' section to the containers.conf struct.

libimage: fix Exists

Commit 964b002 introduced a regression to Exists() which would
return an error if the image does not exist.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

Sort containers.conf and containers.conf.5.md

Remove cgroup_check which is no longer needed.

Fixes: containers#372

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Add support for config drop in directories

Fixes: containers#368

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Fix spacing on name value pairs to be consistent

Replaces:  containers#556

Signed-off-by: unknowndev233@github unknowndevQwQ@protonmail.com
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

seccomp: allow timer_settime64

allow time64 variant of timer_settime which was missed in 4e31f66

Signed-off-by: Jan Palus <jpalus@fastmail.com>

seccomp: add support for defaultErrnoRet

Add support to specify the default errno return value.

The OCI runtime specs already have support for it, and both crun (>=
0.19) and runc (>= 1.0-rc95) have support for it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: switch default to ENOSYS

add the currently blocked syscalls to a deny-list and switch the
default to ENOSYS.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

build(deps): bump github.com/containers/image/v5 from 5.12.0 to 5.13.0

Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.12.0 to 5.13.0.
- [Release notes](https://github.com/containers/image/releases)
- [Commits](containers/image@v5.12.0...v5.13.0)

---
updated-dependencies:
- dependency-name: github.com/containers/image/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Strip extra trailing newlines in templates

When wrapping table format in range, string extra new lines from table
ends.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1855983

Signed-off-by: Jhon Honce <jhonce@redhat.com>

Use SetCredentials and add verbose to loginopts

Signed-off-by: flouthoc <flouthoc.git@gmail.com>

Bump to v0.40.0

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Move to v0.40.1-dev

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Set BigFilesTemporaryDir to GetEnv(TMPDIR) if set or /var/tmp

Currently if the caller does not specify the BigFilesTemporaryDir,
Podman and Buildah users expect this to default TMPDIR environment
variable or /var/tmp if not set.

Moving to libimage caused a regression in this functionality.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

build(deps): bump github.com/containers/image/v5 from 5.13.0 to 5.13.1

Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/containers/image/releases)
- [Commits](containers/image@v5.13.0...v5.13.1)

---
updated-dependencies:
- dependency-name: github.com/containers/image/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

libimage: force remove: only untag on multi tag image

When removing an image by name, do not remove the image and all its
tags, even if force is set.  Instead, just untag the specified name.

Note: adjust the load test to preserve the order in the untagged field.

Also vendor in the latest HEAD in containers/image to fix a bug revealed
in Podman CI.

Context: containers/podman/issues/10685
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

libimage: lookup images by custom platform

Allow for looking up images via customizable arch, os and variant.
This prevents `podman run --arch=xxx` from redundantly pulling down the
image if needed.

Context: containers/podman/issues/10648
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

seccomp: allow clone3

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: let io_uring_* fail with ENOSYS

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: allow pkey_*

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: allow rseq

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: let membarrier fail with ENOSYS

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

seccomp: always allow get_mempolicy, set_mempolicy, mbind

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Vendor in containers/image v5.13.2

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Vendor in containers/image v5.13.2

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Bump to v0.40.1

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Move to v0.40.2-dev

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

feat: add external secret driver.

use /bin/sh instead of /bin/bash

fix test by removing accidentially added driver setup.

rename externaldriver to shelldriver

Signed-off-by: Tino Rusch <tino.rusch@gmail.com>

remove commented test setup

Signed-off-by: Tino Rusch <tino.rusch@gmail.com>
@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 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@rhatdan rhatdan

Labels
kind/feature Categorizes issue or PR as related to a new feature. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Support log_tag defaults from containers.conf rhatdan/podman
3 participants
@rhatdan @badsmoke @openshift-ci-robot