From de5bb1c1b9d65b07fcc69e9e49c4d8b93abd1a13 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 15 Nov 2016 11:43:09 +0000 Subject: [PATCH] Fixes and improvements to diagnostics - We now only have nslookup not dig. - Use curl not wget. - add /proc/cpuinfo Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/capture.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/alpine/packages/diagnostics/capture.go b/alpine/packages/diagnostics/capture.go index 3d4e4c26d..28ef73ac1 100644 --- a/alpine/packages/diagnostics/capture.go +++ b/alpine/packages/diagnostics/capture.go @@ -47,12 +47,13 @@ var ( {"/bin/cat", []string{"/etc/network/interfaces"}, defaultCommandTimeout}, {"/bin/cat", []string{"/etc/resolv.conf"}, defaultCommandTimeout}, {"/bin/cat", []string{"/etc/sysctl.conf"}, defaultCommandTimeout}, - {"/usr/bin/dig", []string{"docker.com"}, defaultCommandTimeout}, - {"/usr/bin/dig", []string{"@8.8.8.8", "docker.com"}, defaultCommandTimeout}, - {"/usr/bin/wget", []string{"-O", "-", "http://www.docker.com/"}, defaultCommandTimeout}, - {"/usr/bin/wget", []string{"-O", "-", "http://104.239.220.248/"}, defaultCommandTimeout}, // a www.docker.com address - {"/usr/bin/wget", []string{"-O", "-", "http://216.58.213.68/"}, defaultCommandTimeout}, // a www.google.com address - {"/usr/bin/wget", []string{"-O", "-", "http://91.198.174.192/"}, defaultCommandTimeout}, // a www.wikipedia.com address + {"/bin/cat", []string{"/proc/cpuinfo"}, defaultCommandTimeout}, + {"/usr/bin/nslookup", []string{"docker.com"}, defaultCommandTimeout}, + {"/usr/bin/nslookup", []string{"docker.com", "8.8.8.8"}, defaultCommandTimeout}, + {"/usr/bin/curl", []string{"http://www.docker.com/"}, defaultCommandTimeout}, + {"/usr/bin/curl", []string{"http://104.239.220.248/"}, defaultCommandTimeout}, // a www.docker.com address + {"/usr/bin/curl", []string{"http://216.58.213.68/"}, defaultCommandTimeout}, // a www.google.com address + {"/usr/bin/curl", []string{"http://91.198.174.192/"}, defaultCommandTimeout}, // a www.wikipedia.com address } localCmdCaptures = []CommandCapturer{ {"/usr/bin/tail", []string{"-100", "/var/log/proxy-vsockd.log"}, defaultCommandTimeout},