updated cadvisor deps
This commit is contained in:
10
vendor/github.com/google/cadvisor/container/docker/factory.go
generated
vendored
10
vendor/github.com/google/cadvisor/container/docker/factory.go
generated
vendored
@@ -57,6 +57,12 @@ var (
|
||||
dockerRootDirFlag = flag.String("docker_root", "/var/lib/docker", "DEPRECATED: docker root is read from docker info (this is a fallback, default: /var/lib/docker)")
|
||||
|
||||
dockerRootDirOnce sync.Once
|
||||
|
||||
// flag that controls globally disabling thin_ls pending future enhancements.
|
||||
// in production, it has been found that thin_ls makes excessive use of iops.
|
||||
// in an iops restricted environment, usage of thin_ls must be controlled via blkio.
|
||||
// pending that enhancement, disable its usage.
|
||||
disableThinLs = true
|
||||
)
|
||||
|
||||
func RootDir() string {
|
||||
@@ -189,6 +195,10 @@ func startThinPoolWatcher(dockerInfo *dockertypes.Info) (*devicemapper.ThinPoolW
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if disableThinLs {
|
||||
return nil, fmt.Errorf("usage of thin_ls is disabled to preserve iops")
|
||||
}
|
||||
|
||||
dockerThinPoolName, err := dockerutil.DockerThinPoolName(*dockerInfo)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
8
vendor/github.com/google/cadvisor/container/docker/handler.go
generated
vendored
8
vendor/github.com/google/cadvisor/container/docker/handler.go
generated
vendored
@@ -252,9 +252,11 @@ func newDockerContainerHandler(
|
||||
// split env vars to get metadata map.
|
||||
for _, exposedEnv := range metadataEnvs {
|
||||
for _, envVar := range ctnr.Config.Env {
|
||||
splits := strings.SplitN(envVar, "=", 2)
|
||||
if splits[0] == exposedEnv {
|
||||
handler.envs[strings.ToLower(exposedEnv)] = splits[1]
|
||||
if envVar != "" {
|
||||
splits := strings.SplitN(envVar, "=", 2)
|
||||
if len(splits) == 2 && splits[0] == exposedEnv {
|
||||
handler.envs[strings.ToLower(exposedEnv)] = splits[1]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user