Cherry-pick #15935 to 7.6: [Elastic Log Driver] Fix file check bug, deal with logging

x-pack/dockerlogbeat/config.json

@@ -10,6 +10,14 @@
       "socket": "beatSocket.sock"
     },
     "env":[
+      {
+        "description": "debug level",
+        "name": "LOG_DRIVER_LEVEL",
+        "value": "info",
+        "Settable": [
+          "value"
+        ]
+      },
       {
         "description": "libbeat env hack",
         "name": "BEAT_STRICT_PERMS",

x-pack/dockerlogbeat/handlers.go

@@ -39,7 +39,7 @@ func startLoggingHandler(pm *pipelinemanager.PipelineManager) func(w http.Respon
 		}
 
 		pm.Logger.Debugf("Homepath: %v\n", filepath.Dir(os.Args[0]))
-		pm.Logger.Debugf("Got start request object from container %#v\n", startReq.Info.ContainerName)
+		pm.Logger.Infof("Got start request object from container %#v\n", startReq.Info.ContainerName)
 		pm.Logger.Debugf("Got a container with the following labels: %#v\n", startReq.Info.ContainerLabels)
 		pm.Logger.Debugf("Got a container with the following log opts: %#v\n", startReq.Info.Config)
 
@@ -64,13 +64,13 @@ func stopLoggingHandler(pm *pipelinemanager.PipelineManager) func(w http.Respons
 			http.Error(w, errors.Wrap(err, "error decoding json request").Error(), http.StatusBadRequest)
 			return
 		}
-		pm.Logger.Infof(" Got stop request object %#v\n", stopReq)
+		pm.Logger.Infof("Got stop request object %#v\n", stopReq)
 		// Run the stop async, since nothing 'depends' on it,
 		// and we can break people's docker automation if this times out.
 		go func() {
 			err = pm.CloseClientWithFile(stopReq.File)
 			if err != nil {
-				pm.Logger.Infof(" Got stop request error %#v\n", err)
+				pm.Logger.Errorf(" Got stop request error %#v\n", err)
 			}
 		}()
 

x-pack/dockerlogbeat/magefile.go

@@ -109,15 +109,15 @@ func createContainer(ctx context.Context, cli *client.Client) error {
 	}
 	//build, wait for output
 	buildResp, err := cli.ImageBuild(ctx, buildContext, buildOpts)
+	if err != nil {
+		return errors.Wrap(err, "error building final container image")
+	}
 	defer buildResp.Body.Close()
-	buf, errBufRead := ioutil.ReadAll(buildResp.Body)
+	// This blocks until the build operation completes
+	_, errBufRead := ioutil.ReadAll(buildResp.Body)
 	if errBufRead != nil {
 		return errors.Wrap(err, "error reading from docker output")
 	}
-	if err != nil {
-		fmt.Printf("Docker response: \n %s\n", string(buf))
-		return errors.Wrap(err, "error building final container image")
-	}
 
 	// move back to the x-pack dir
 	err = os.Chdir(dockerLogBeatDir)

x-pack/dockerlogbeat/main.go

@@ -26,8 +26,12 @@ import (
 
 // genNewMonitoringConfig is a hacked-in function to enable a debug stderr logger
 func genNewMonitoringConfig() (*common.Config, error) {
+	lvl, isSet := os.LookupEnv("LOG_DRIVER_LEVEL")
+	if !isSet {
+		lvl = "info"
+	}
 	cfgObject := make(map[string]string)
-	cfgObject["level"] = "debug"
+	cfgObject["level"] = lvl
 	cfgObject["to_stderr"] = "true"
 
 	cfg, err := common.NewConfigFrom(cfgObject)

x-pack/dockerlogbeat/pipelinemanager/libbeattools.go

@@ -245,21 +245,21 @@ func loadMeta(metaPath string) (uuid.UUID, error) {
 func openRegular(filename string) (*os.File, error) {
 	f, err := os.Open(filename)
 	if err != nil {
-		return f, errors.Wrapf(err, "error opening file %s", filename)
+		return f, err
 	}
 
 	info, err := f.Stat()
 	if err != nil {
 		f.Close()
-		return nil, errors.Wrapf(err, "error statting %s", filename)
+		return nil, err
 	}
 
 	if !info.Mode().IsRegular() {
 		f.Close()
 		if info.IsDir() {
-			return nil, fmt.Errorf("%s is a directory", filename)
+			return nil, err
 		}
-		return nil, fmt.Errorf("%s is not a regular file", filename)
+		return nil, err
 	}
 
 	return f, nil

x-pack/dockerlogbeat/pipelinemanager/pipelineManager.go

@@ -43,8 +43,7 @@ type PipelineManager struct {
 // NewPipelineManager creates a new Pipeline map
 func NewPipelineManager(logCfg *common.Config) *PipelineManager {
 	return &PipelineManager{
-		Logger: logp.NewLogger("PipelineManager"),
-		//mu:        new(sync.Mutex),
+		Logger:    logp.NewLogger("PipelineManager"),
 		pipelines: make(map[string]*Pipeline),
 		clients:   make(map[string]*ClientLogger),
 	}