|
 |
ce8dbd |
From 5f67a7f6cd532a4dea57a0c8ece51f1734ed8cbe Mon Sep 17 00:00:00 2001
|
|
|
ce8dbd |
From: Takayoshi Kimura <takayoshi@gmail.com>
|
|
|
ce8dbd |
Date: Mon, 22 May 2017 10:45:13 +0900
|
|
|
ce8dbd |
Subject: [PATCH] [docker] Enable log timestamp in docker logs
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Enable docker logs -t option to make container troubleshooting
|
|
|
ce8dbd |
easier. Container logs sometimes have different TZ timestapms
|
|
|
ce8dbd |
without TZ info or no timestamps at all.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Fixes: #1013
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Signed-off-by: Takayoshi Kimura <tkimura@redhat.com>
|
|
|
ce8dbd |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
ce8dbd |
---
|
|
|
ce8dbd |
sos/plugins/docker.py | 2 +-
|
|
|
ce8dbd |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ce8dbd |
|
|
|
ce8dbd |
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
|
|
|
ce8dbd |
index 4f6c98828..50fdc9c28 100644
|
|
|
ce8dbd |
--- a/sos/plugins/docker.py
|
|
|
ce8dbd |
+++ b/sos/plugins/docker.py
|
|
|
ce8dbd |
@@ -99,7 +99,7 @@ def setup(self):
|
|
|
ce8dbd |
if self.get_option('logs'):
|
|
|
ce8dbd |
for container in insp:
|
|
|
ce8dbd |
self.add_cmd_output(
|
|
|
ce8dbd |
- "{0} logs {1}".format(
|
|
|
ce8dbd |
+ "{0} logs -t {1}".format(
|
|
|
ce8dbd |
self.docker_cmd,
|
|
|
ce8dbd |
container
|
|
|
ce8dbd |
)
|
|
|
ce8dbd |
|
|
|
ce8dbd |
From 9fc6eb234682ce695c2b1b1608f755928d441585 Mon Sep 17 00:00:00 2001
|
|
|
ce8dbd |
From: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ce8dbd |
Date: Wed, 6 Sep 2017 14:44:20 -0400
|
|
|
ce8dbd |
Subject: [PATCH] [docker] Collect new registry config location
|
|
|
ce8dbd |
|
|
|
ce8dbd |
For the Red Hat release of docker, registries are now configured in
|
|
|
ce8dbd |
/etc/containers/registries.conf instead of /etc/sysconfig/docker.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
This patch adds collection of /etc/containers to collect registry
|
|
|
ce8dbd |
configuration files. /etc/sysconfig/docker can still be used for daemon
|
|
|
ce8dbd |
configuration, so that is still collected.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Resolves: #1096
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ce8dbd |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
ce8dbd |
---
|
|
|
ce8dbd |
sos/plugins/docker.py | 3 ++-
|
|
|
ce8dbd |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
ce8dbd |
|
|
|
ce8dbd |
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
|
|
|
ce8dbd |
index 50fdc9c28..80b6af30a 100644
|
|
|
ce8dbd |
--- a/sos/plugins/docker.py
|
|
|
ce8dbd |
+++ b/sos/plugins/docker.py
|
|
|
ce8dbd |
@@ -114,7 +114,8 @@ def setup(self):
|
|
|
ce8dbd |
super(RedHatDocker, self).setup()
|
|
|
ce8dbd |
|
|
|
ce8dbd |
self.add_copy_spec([
|
|
|
ce8dbd |
- "/etc/udev/rules.d/80-docker.rules"
|
|
|
ce8dbd |
+ "/etc/udev/rules.d/80-docker.rules",
|
|
|
ce8dbd |
+ "/etc/containers/"
|
|
|
ce8dbd |
])
|
|
|
ce8dbd |
|
|
|
ce8dbd |
|
|
|
ce8dbd |
From 15d7237527fe26da95070b48e7aafd0597dc245f Mon Sep 17 00:00:00 2001
|
|
|
ce8dbd |
From: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ce8dbd |
Date: Fri, 15 Dec 2017 12:11:57 -0500
|
|
|
ce8dbd |
Subject: [PATCH] [docker] Collect daemon.json for all OSes
|
|
|
ce8dbd |
|
|
|
ce8dbd |
The Red Hat packaging of docker now also supports using
|
|
|
ce8dbd |
/etc/docker/daemon.json for configuring docker.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
This moves collect of daemon.json from being Ubuntu-only to being for
|
|
|
ce8dbd |
any OS installation.
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Resolves: #1168
|
|
|
ce8dbd |
|
|
|
ce8dbd |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ce8dbd |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
ce8dbd |
---
|
|
|
ce8dbd |
sos/plugins/docker.py | 2 +-
|
|
|
ce8dbd |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ce8dbd |
|
|
|
ce8dbd |
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
|
|
|
ce8dbd |
index 80b6af30a..f372845c3 100644
|
|
|
ce8dbd |
--- a/sos/plugins/docker.py
|
|
|
ce8dbd |
+++ b/sos/plugins/docker.py
|
|
|
ce8dbd |
@@ -36,6 +36,7 @@ class Docker(Plugin):
|
|
|
ce8dbd |
|
|
|
ce8dbd |
def setup(self):
|
|
|
ce8dbd |
self.add_copy_spec([
|
|
|
ce8dbd |
+ "/etc/docker/daemon.json",
|
|
|
ce8dbd |
"/var/lib/docker/repositories-*"
|
|
|
ce8dbd |
])
|
|
|
ce8dbd |
|
|
|
ce8dbd |
@@ -127,7 +128,6 @@ def setup(self):
|
|
|
ce8dbd |
super(UbuntuDocker, self).setup()
|
|
|
ce8dbd |
self.add_copy_spec([
|
|
|
ce8dbd |
"/etc/default/docker",
|
|
|
ce8dbd |
- "/etc/docker/daemon.json",
|
|
|
ce8dbd |
"/var/run/docker/libcontainerd/containerd/events.log"
|
|
|
ce8dbd |
])
|
|
|
ce8dbd |
|