containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logDriver to podman info 

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-09-08 17:41:57 -04:00
parent 26c8549ae3
commit 2f967b81cb
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
4 changed files with 107 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
docs/source/markdown/podman-info.1.md
View File

@ -31,23 +31,18 @@ Run podman info with plain text response:
$ podman info $ podman info
host: host:
arch: amd64 arch: amd64
buildahVersion: 1.19.0-dev buildahVersion: 1.22.3
cgroupControllers: cgroupControllers: []
- cpuset
- cpu
- io
- memory
- pids
cgroupManager: systemd cgroupManager: systemd
cgroupVersion: v2 cgroupVersion: v2
conmon: conmon:
package: conmon-2.0.22-2.fc33.x86_64 package: conmon-2.0.29-2.fc34.x86_64
path: /usr/bin/conmon path: /usr/bin/conmon
version: 'conmon version 2.0.22, commit: 1be6c73605006a85f7ed60b7f76a51e28eb67e01' version: 'conmon version 2.0.29, commit: '
cpus: 8 cpus: 8
distribution: distribution:
distribution: fedora distribution: fedora
version: "33" version: "34"
eventLogger: journald eventLogger: journald
hostname: localhost.localdomain hostname: localhost.localdomain
idMappings: idMappings:
@ -65,108 +60,112 @@ host:
- container_id: 1 - container_id: 1
host_id: 100000 host_id: 100000
size: 65536 size: 65536
kernel: 5.9.11-200.fc33.x86_64 kernel: 5.13.13-200.fc34.x86_64
linkmode: dynamic linkmode: dynamic
memFree: 837505024 logDriver: journald
memTotal: 16416481280 memFree: 1351262208
memTotal: 16401895424
ociRuntime: ociRuntime:
name: crun name: crun
package: crun-0.16-1.fc33.x86_64 package: crun-1.0-1.fc34.x86_64
path: /usr/bin/crun path: /usr/bin/crun
version: |- version: |-
crun version 0.16 crun version 1.0
commit: eb0145e5ad4d8207e84a327248af76663d4e50dd commit: 139dc6971e2f1d931af520188763e984d6cdfbf8
spec: 1.0.0 spec: 1.0.0
+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +YAJL +SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +CRIU +YAJL
os: linux os: linux
remoteSocket: remoteSocket:
exists: true
path: /run/user/3267/podman/podman.sock path: /run/user/3267/podman/podman.sock
security: security:
apparmorEnabled: false apparmorEnabled: false
capabilities: CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FOWNER,CAP_FSETID,CAP_KILL,CAP_NET_BIND_SERVICE,CAP_SETFCAP,CAP_SETGID,CAP_SETPCAP,CAP_SETUID,CAP_SYS_CHROOT capabilities: CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FOWNER,CAP_FSETID,CAP_KILL,CAP_NET_BIND_SERVICE,CAP_SETFCAP,CAP_SETGID,CAP_SETPCAP,CAP_SETUID,CAP_SYS_CHROOT
rootless: true rootless: true
seccompEnabled: true seccompEnabled: true
seccompProfilePath: /usr/share/containers/seccomp.json
selinuxEnabled: true selinuxEnabled: true
serviceIsRemote: false
slirp4netns: slirp4netns:
executable: /bin/slirp4netns executable: /bin/slirp4netns
package: slirp4netns-1.1.4-4.dev.giteecccdb.fc33.x86_64 package: slirp4netns-1.1.12-2.fc34.x86_64
version: |- version: |-
slirp4netns version 1.1.4+dev slirp4netns version 1.1.12
commit: eecccdb96f587b11d7764556ffacfeaffe4b6e11 commit: 7a104a101aa3278a2152351a082a6df71f57c9a3
libslirp: 4.3.1 libslirp: 4.4.0
SLIRP_CONFIG_VERSION_MAX: 3 SLIRP_CONFIG_VERSION_MAX: 3
libseccomp: 2.5.0 libseccomp: 2.5.0
swapFree: 6509203456 swapFree: 16818888704
swapTotal: 12591292416 swapTotal: 16886259712
uptime: 264h 14m 32.73s (Approximately 11.00 days) uptime: 33h 57m 32.85s (Approximately 1.38 days)
plugins:
log:
- k8s-file
- none
- journald
network:
- bridge
- macvlan
volume:
- local
registries: registries:
localhost:5000:
Blocked: false
Insecure: true
Location: localhost:5000
MirrorByDigestOnly: false
Mirrors: null
Prefix: localhost:5000
search: search:
- registry.fedoraproject.org - registry.fedoraproject.org
- registry.access.redhat.com - registry.access.redhat.com
- registry.centos.org
- docker.io - docker.io
store: store:
configFile: /home/dwalsh/.config/containers/storage.conf configFile: /home/dwalsh/.config/containers/storage.conf
containerStore: containerStore:
number: 3 number: 2
paused: 0 paused: 0
running: 0 running: 1
stopped: 3 stopped: 1
graphDriverName: overlay graphDriverName: overlay
graphOptions: graphOptions: {}
overlay.mount_program:
Executable: /home/dwalsh/bin/fuse-overlayfs
Package: Unknown
Version: |-
fusermount3 version: 3.9.3
fuse-overlayfs: version 0.7.2
FUSE library version 3.9.3
using FUSE kernel interface version 7.31
graphRoot: /home/dwalsh/.local/share/containers/storage graphRoot: /home/dwalsh/.local/share/containers/storage
graphStatus: graphStatus:
Backing Filesystem: extfs Backing Filesystem: extfs
Native Overlay Diff: "false" Native Overlay Diff: "true"
Supports d_type: "true" Supports d_type: "true"
Using metacopy: "false" Using metacopy: "false"
imageStore: imageStore:
number: 77 number: 37
runRoot: /run/user/3267/containers runRoot: /run/user/3267/containers
volumePath: /home/dwalsh/.local/share/containers/storage/volumes volumePath: /home/dwalsh/.local/share/containers/storage/volumes
version: version:
APIVersion: 3.0.0 APIVersion: 3.3.1
Built: 1608562922 Built: 1631137208
BuiltTime: Mon Dec 21 10:02:02 2020 BuiltTime: Wed Sep 8 17:40:08 2021
GitCommit: d6925182cdaf94225908a386d02eae8fd3e01123-dirty GitCommit: ab272d1e9bf4daac224fb230e0c9b5c56c4cab4d-dirty
GoVersion: go1.15.5 GoVersion: go1.16.6
OsArch: linux/amd64 OsArch: linux/amd64
Version: 3.0.0-dev Version: 3.3.1
``` ```
Run podman info with JSON formatted response: Run podman info with JSON formatted response:
``` ```
$ ./bin/podman info --format json
{ {
"host": { "host": {
"arch": "amd64", "arch": "amd64",
"buildahVersion": "1.19.0-dev", "buildahVersion": "1.22.3",
"cgroupManager": "systemd", "cgroupManager": "systemd",
"cgroupVersion": "v2", "cgroupVersion": "v2",
"cgroupControllers": [ "cgroupControllers": [],
"cpuset",
"cpu",
"io",
"memory",
"pids"
],
"conmon": { "conmon": {
"package": "conmon-2.0.22-2.fc33.x86_64", "package": "conmon-2.0.29-2.fc34.x86_64",
"path": "/usr/bin/conmon", "path": "/usr/bin/conmon",
"version": "conmon version 2.0.22, commit: 1be6c73605006a85f7ed60b7f76a51e28eb67e01" "version": "conmon version 2.0.29, commit: "
}, },
"cpus": 8, "cpus": 8,
"distribution": { "distribution": {
"distribution": "fedora", "distribution": "fedora",
"version": "33" "version": "34"
}, },
"eventLogger": "journald", "eventLogger": "journald",
"hostname": "localhost.localdomain", "hostname": "localhost.localdomain",
@ -196,81 +195,99 @@ Run podman info with JSON formatted response:
} }
] ]
}, },
"kernel": "5.9.11-200.fc33.x86_64", "kernel": "5.13.13-200.fc34.x86_64",
"memFree": 894574592, "logDriver": "journald",
"memTotal": 16416481280, "memFree": 1274040320,
"memTotal": 16401895424,
"ociRuntime": { "ociRuntime": {
"name": "crun", "name": "crun",
"package": "crun-0.16-1.fc33.x86_64", "package": "crun-1.0-1.fc34.x86_64",
"path": "/usr/bin/crun", "path": "/usr/bin/crun",
"version": "crun version 0.16\ncommit: eb0145e5ad4d8207e84a327248af76663d4e50dd\nspec: 1.0.0\n+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +YAJL" "version": "crun version 1.0\ncommit: 139dc6971e2f1d931af520188763e984d6cdfbf8\nspec: 1.0.0\n+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +CRIU +YAJL"
}, },
"os": "linux", "os": "linux",
"remoteSocket": { "remoteSocket": {
"path": "/run/user/3267/podman/podman.sock", "path": "/run/user/3267/podman/podman.sock"
"exists": true
}, },
"serviceIsRemote": false,
"security": { "security": {
"apparmorEnabled": false, "apparmorEnabled": false,
"capabilities": "CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FOWNER,CAP_FSETID,CAP_KILL,CAP_NET_BIND_SERVICE,CAP_SETFCAP,CAP_SETGID,CAP_SETPCAP,CAP_SETUID,CAP_SYS_CHROOT", "capabilities": "CAP_CHOWN,CAP_DAC_OVERRIDE,CAP_FOWNER,CAP_FSETID,CAP_KILL,CAP_NET_BIND_SERVICE,CAP_SETFCAP,CAP_SETGID,CAP_SETPCAP,CAP_SETUID,CAP_SYS_CHROOT",
"rootless": true, "rootless": true,
"seccompEnabled": true, "seccompEnabled": true,
"seccompProfilePath": "/usr/share/containers/seccomp.json",
"selinuxEnabled": true "selinuxEnabled": true
}, },
"slirp4netns": { "slirp4netns": {
"executable": "/bin/slirp4netns", "executable": "/bin/slirp4netns",
"package": "slirp4netns-1.1.4-4.dev.giteecccdb.fc33.x86_64", "package": "slirp4netns-1.1.12-2.fc34.x86_64",
"version": "slirp4netns version 1.1.4+dev\ncommit: eecccdb96f587b11d7764556ffacfeaffe4b6e11\nlibslirp: 4.3.1\nSLIRP_CONFIG_VERSION_MAX: 3\nlibseccomp: 2.5.0" "version": "slirp4netns version 1.1.12\ncommit: 7a104a101aa3278a2152351a082a6df71f57c9a3\nlibslirp: 4.4.0\nSLIRP_CONFIG_VERSION_MAX: 3\nlibseccomp: 2.5.0"
}, },
"swapFree": 6509203456, "swapFree": 16818888704,
"swapTotal": 12591292416, "swapTotal": 16886259712,
"uptime": "264h 13m 12.39s (Approximately 11.00 days)", "uptime": "33h 59m 25.69s (Approximately 1.38 days)",
"linkmode": "dynamic" "linkmode": "dynamic"
}, },
"store": { "store": {
"configFile": "/home/dwalsh/.config/containers/storage.conf", "configFile": "/home/dwalsh/.config/containers/storage.conf",
"containerStore": { "containerStore": {
"number": 3, "number": 2,
"paused": 0, "paused": 0,
"running": 0, "running": 1,
"stopped": 3 "stopped": 1
}, },
"graphDriverName": "overlay", "graphDriverName": "overlay",
"graphOptions": { "graphOptions": {
"overlay.mount_program": {
"Executable": "/home/dwalsh/bin/fuse-overlayfs",
"Package": "Unknown",
"Version": "fusermount3 version: 3.9.3\nfuse-overlayfs: version 0.7.2\nFUSE library version 3.9.3\nusing FUSE kernel interface version 7.31"
}
}, },
"graphRoot": "/home/dwalsh/.local/share/containers/storage", "graphRoot": "/home/dwalsh/.local/share/containers/storage",
"graphStatus": { "graphStatus": {
"Backing Filesystem": "extfs", "Backing Filesystem": "extfs",
"Native Overlay Diff": "false", "Native Overlay Diff": "true",
"Supports d_type": "true", "Supports d_type": "true",
"Using metacopy": "false" "Using metacopy": "false"
}, },
"imageStore": { "imageStore": {
"number": 77 "number": 37
}, },
"runRoot": "/run/user/3267/containers", "runRoot": "/run/user/3267/containers",
"volumePath": "/home/dwalsh/.local/share/containers/storage/volumes" "volumePath": "/home/dwalsh/.local/share/containers/storage/volumes"
}, },
"registries": { "registries": {
"localhost:5000": {
"Prefix": "localhost:5000",
"Location": "localhost:5000",
"Insecure": true,
"Mirrors": null,
"Blocked": false,
"MirrorByDigestOnly": false
},
"search": [ "search": [
"registry.fedoraproject.org", "registry.fedoraproject.org",
"registry.access.redhat.com", "registry.access.redhat.com",
"registry.centos.org",
"docker.io" "docker.io"
] ]
}, },
"plugins": {
"volume": [
"local"
],
"network": [
"bridge",
"macvlan"
],
"log": [
"k8s-file",
"none",
"journald"
]
},
"version": { "version": {
"APIVersion": "3.0.0", "APIVersion": "3.3.1",
"Version": "3.0.0-dev", "Version": "3.3.1",
"GoVersion": "go1.15.5", "GoVersion": "go1.16.6",
"GitCommit": "d6925182cdaf94225908a386d02eae8fd3e01123-dirty", "GitCommit": "",
"BuiltTime": "Mon Dec 21 10:02:02 2020", "BuiltTime": "Mon Aug 30 16:46:36 2021",
"Built": 1608562922, "Built": 1630356396,
"OsArch": "linux/amd64" "OsArch": "linux/amd64"
} }
} }

1
libpod/define/info.go
View File

@ -36,6 +36,7 @@ type HostInfo struct {
Hostname string `json:"hostname"` Hostname string `json:"hostname"`
IDMappings IDMappings `json:"idMappings,omitempty"` IDMappings IDMappings `json:"idMappings,omitempty"`
Kernel string `json:"kernel"` Kernel string `json:"kernel"`
LogDriver string `json:"logDriver"`
MemFree int64 `json:"memFree"` MemFree int64 `json:"memFree"`
MemTotal int64 `json:"memTotal"` MemTotal int64 `json:"memTotal"`
OCIRuntime *OCIRuntimeInfo `json:"ociRuntime"` OCIRuntime *OCIRuntimeInfo `json:"ociRuntime"`

1
libpod/info.go
View File

@ -126,6 +126,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
Linkmode: linkmode.Linkmode(), Linkmode: linkmode.Linkmode(),
CPUs: runtime.NumCPU(), CPUs: runtime.NumCPU(),
Distribution: hostDistributionInfo, Distribution: hostDistributionInfo,
LogDriver: r.config.Containers.LogDriver,
EventLogger: r.eventer.String(), EventLogger: r.eventer.String(),
Hostname: host, Hostname: host,
IDMappings: define.IDMappings{}, IDMappings: define.IDMappings{},

1
test/system/005-info.bats
View File

@ -9,6 +9,7 @@ load helpers
buildahVersion: *[0-9.]\\\+ buildahVersion: *[0-9.]\\\+
conmon:\\\s\\\+package: conmon:\\\s\\\+package:
distribution: distribution:
logDriver:
ociRuntime:\\\s\\\+name: ociRuntime:\\\s\\\+name:
os: os:
rootless: rootless: