Merge branch 'master' into f-ui/alloc-fs

Author: backspace

CHANGELOG.md

@@ -1,10 +1,11 @@
 ## 0.9.4 (Unreleased)
 
 IMPROVEMENTS:
- * core: removed deprecated upgrade path code pertaining to older versions of Nomad [[GH-5894](https://github.com/hashicorp/nomad/issues/5894)]
- * api: use region from job hcl when not provided as query parameter in job registration and plan endpoints [[GH-5664](https://github.com/hashicorp/nomad/pull/5664)]
- * api: infer content type of file in alloc filesystem stat endpoint [[GH-5907](https://github.com/hashicorp/nomad/issues/5907)]
- * metrics: add namespace label as appropriate to metrics [[GH-5847](https://github.com/hashicorp/nomad/issues/5847)]
+ * core: Removed deprecated upgrade path code pertaining to older versions of Nomad [[GH-5894](https://github.com/hashicorp/nomad/issues/5894)]
+ * api: Used region from job hcl when not provided as query parameter in job registration and plan endpoints [[GH-5664](https://github.com/hashicorp/nomad/pull/5664)]
+ * api: Inferred content type of file in alloc filesystem stat endpoint [[GH-5907](https://github.com/hashicorp/nomad/issues/5907)]
+ * driver/docker: Added logging defaults to use json-file log driver with log rotation [[GH-5846](https://github.com/hashicorp/nomad/pull/5846)]
+ * metrics: Added namespace label as appropriate to metrics [[GH-5847](https://github.com/hashicorp/nomad/issues/5847)]
  * ui: Moved client status, draining, and eligibility fields into single state column [[GH-5789](https://github.com/hashicorp/nomad/pull/5789)]
 
 BUG FIXES:

client/structs/structs.go

@@ -41,7 +41,7 @@ type AllocFileInfo struct {
 	Size        int64
 	FileMode    string
 	ModTime     time.Time
-	ContentType string `json:"contenttype,omitempty"`
+	ContentType string `json:",omitempty"`
 }
 
 // FsListRequest is used to list an allocation's directory.

drivers/docker/driver.go

@@ -740,6 +740,15 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
 		Config: driverConfig.Logging.Config,
 	}
 
+	if hostConfig.LogConfig.Type == "" && hostConfig.LogConfig.Config == nil {
+		logger.Trace("no docker log driver provided, defaulting to json-file")
+		hostConfig.LogConfig.Type = "json-file"
+		hostConfig.LogConfig.Config = map[string]string{
+			"max-file": "2",
+			"max-size": "2m",
+		}
+	}
+
 	logger.Debug("configured resources", "memory", hostConfig.Memory,
 		"cpu_shares", hostConfig.CPUShares, "cpu_quota", hostConfig.CPUQuota,
 		"cpu_period", hostConfig.CPUPeriod)

drivers/docker/driver_test.go

@@ -1014,25 +1014,55 @@ func TestDockerDriver_CreateContainerConfig_Logging(t *testing.T) {
 	cases := []struct {
 		name           string
 		loggingConfig  DockerLogging
-		expectedDriver string
+		expectedConfig DockerLogging
 	}{
 		{
 			"simple type",
 			DockerLogging{Type: "fluentd"},
-			"fluentd",
+			DockerLogging{
+				Type:   "fluentd",
+				Config: map[string]string{},
+			},
 		},
 		{
 			"simple driver",
 			DockerLogging{Driver: "fluentd"},
-			"fluentd",
+			DockerLogging{
+				Type:   "fluentd",
+				Config: map[string]string{},
+			},
 		},
 		{
 			"type takes precedence",
 			DockerLogging{
 				Type:   "json-file",
 				Driver: "fluentd",
 			},
-			"json-file",
+			DockerLogging{
+				Type:   "json-file",
+				Config: map[string]string{},
+			},
+		},
+		{
+			"user config takes precedence, even if no type provided",
+			DockerLogging{
+				Type:   "",
+				Config: map[string]string{"max-file": "3", "max-size": "10m"},
+			},
+			DockerLogging{
+				Type:   "",
+				Config: map[string]string{"max-file": "3", "max-size": "10m"},
+			},
+		},
+		{
+			"defaults to json-file w/ log rotation",
+			DockerLogging{
+				Type: "",
+			},
+			DockerLogging{
+				Type:   "json-file",
+				Config: map[string]string{"max-file": "2", "max-size": "2m"},
+			},
 		},
 	}
 
@@ -1049,7 +1079,9 @@ func TestDockerDriver_CreateContainerConfig_Logging(t *testing.T) {
 			cc, err := driver.createContainerConfig(task, cfg, "org/repo:0.1")
 			require.NoError(t, err)
 
-			require.Equal(t, c.expectedDriver, cc.HostConfig.LogConfig.Type)
+			require.Equal(t, c.expectedConfig.Type, cc.HostConfig.LogConfig.Type)
+			require.Equal(t, c.expectedConfig.Config["max-file"], cc.HostConfig.LogConfig.Config["max-file"])
+			require.Equal(t, c.expectedConfig.Config["max-size"], cc.HostConfig.LogConfig.Config["max-size"])
 		})
 	}
 }

website/source/docs/drivers/docker.html.md

@@ -166,8 +166,8 @@ The `docker` driver supports the following configuration in the job spec.  Only
     }
     ```
 
-* `logging` - (Optional) A key-value map of Docker logging options. The default
-  value is `syslog`.
+* `logging` - (Optional) A key-value map of Docker logging options. 
+    Defaults to `json-file` with log rotation (`max-file=2` and `max-size=2m`).
 
     ```hcl
     config {