Set Docker custom metric label for cAdvisor if custom metric volume i…

…s mounted
kubernetes · Feb 5, 2016 · bf0c881 · bf0c881 · k8s-teamcity-mesosphere · Feb 5, 2016
1 parent ce6fd46
commit bf0c881
Show file tree

Hide file tree

Showing 13 changed files with 986 additions and 818 deletions.
diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go
@@ -77,6 +77,7 @@ func NewKubeletServer() *KubeletServer {
 			DockerExecHandlerName:       "native",
 			EventBurst:                  10,
 			EventRecordQPS:              5.0,
+			EnableCustomMetrics:         false,
 			EnableDebuggingHandlers:     true,
 			EnableServer:                true,
 			FileCheckFrequency:          unversioned.Duration{20 * time.Second},
@@ -214,4 +215,5 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&s.ExperimentalFlannelOverlay, "experimental-flannel-overlay", s.ExperimentalFlannelOverlay, "Experimental support for starting the kubelet with the default overlay network (flannel). Assumes flanneld is already running in client mode. [default=false]")
 	fs.DurationVar(&s.OutOfDiskTransitionFrequency.Duration, "outofdisk-transition-frequency", s.OutOfDiskTransitionFrequency.Duration, "Duration for which the kubelet has to wait before transitioning out of out-of-disk node condition status. Default: 5m0s")
 	fs.StringVar(&s.NodeIP, "node-ip", s.NodeIP, "IP address of the node. If set, kubelet will use this IP address for the node")
+	fs.BoolVar(&s.EnableCustomMetrics, "enable-custom-metrics", s.EnableCustomMetrics, "Support for gathering custom metrics.")
 }
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -193,6 +193,7 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) {
 		DockerClient:              dockertools.ConnectToDockerOrDie(s.DockerEndpoint),
 		DockerDaemonContainer:     s.DockerDaemonContainer,
 		DockerExecHandler:         dockerExecHandler,
+		EnableCustomMetrics:       s.EnableCustomMetrics,
 		EnableDebuggingHandlers:   s.EnableDebuggingHandlers,
 		EnableServer:              s.EnableServer,
 		EventBurst:                s.EventBurst,
@@ -491,6 +492,7 @@ func SimpleKubelet(client *clientset.Clientset,
 		DockerClient:              dockerClient,
 		DockerDaemonContainer:     "/docker-daemon",
 		DockerExecHandler:         &dockertools.NativeExecHandler{},
+		EnableCustomMetrics:       false,
 		EnableDebuggingHandlers:   true,
 		EnableServer:              true,
 		FileCheckFrequency:        fileCheckFrequency,
@@ -665,6 +667,7 @@ type KubeletConfig struct {
 	DockerClient                   dockertools.DockerInterface
 	DockerDaemonContainer          string
 	DockerExecHandler              dockertools.ExecHandler
+	EnableCustomMetrics            bool
 	EnableDebuggingHandlers        bool
 	EnableServer                   bool
 	EventClient                    *clientset.Clientset
@@ -811,6 +814,7 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
 		kc.ExperimentalFlannelOverlay,
 		kc.NodeIP,
 		kc.Reservation,
+		kc.EnableCustomMetrics,
 	)
 
 	if err != nil {

diff --git a/docs/admin/kubelet.md b/docs/admin/kubelet.md
@@ -82,6 +82,7 @@ kubelet
       --cpu-cfs-quota[=true]: Enable CPU CFS quota enforcement for containers that specify CPU limits
       --docker-endpoint="": If non-empty, use this for the docker endpoint to communicate with
       --docker-exec-handler="native": Handler to use when executing a command in a container. Valid values are 'native' and 'nsenter'. Defaults to 'native'.
+      --enable-custom-metrics[=false]: Support for gathering custom metrics.
       --enable-debugging-handlers[=true]: Enables server endpoints for log collection and local running of containers and commands
       --enable-server[=true]: Enable the Kubelet's server
       --event-burst=10: Maximum size of a bursty event records, temporarily allows event records to burst to this number, while still not exceeding event-qps. Only used if --event-qps > 0
@@ -146,7 +147,7 @@ kubelet
       --volume-plugin-dir="/usr/libexec/kubernetes/kubelet-plugins/volume/exec/": <Warning: Alpha feature> The full path of the directory in which to search for additional third party volume plugins
 ```
 
-###### Auto generated by spf13/cobra on 29-Jan-2016
+###### Auto generated by spf13/cobra on 3-Feb-2016
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt
@@ -84,6 +84,7 @@ dry-run
 duration-sec
 e2e-output-dir
 e2e-verify-service-account
+enable-custom-metrics
 enable-debugging-handlers
 enable-hostpath-provisioner
 enable-server