Kubernetes Submit Queue c326cb1d94 Merge pull request #49079 from smarterclayton/restore_metrics ...

Automatic merge from submit-queue

Restore cAdvisor prometheus metrics to the main port

But under a new path - `/metrics/cadvisor`. This ensures a secure port still exists for metrics while getting the benefit of separating out container metrics from the kubelet's metrics as recommended in the linked issue.

Fixes #48483

```release-note-action-required
Restored cAdvisor prometheus metrics to the main port -- a regression that existed in v1.7.0-v1.7.2
cAdvisor metrics can now be scraped from `/metrics/cadvisor` on the kubelet ports.
Note that you have to update your scraping jobs to get kubelet-only metrics from `/metrics` and `container_*` metrics from `/metrics/cadvisor`
```

2017-07-19 05:16:56 -07:00

..

apis

Run hack/update-generated-runtime.sh

2017-07-17 09:49:43 +08:00

cadvisor

add InstanceID to fake cadvisor (used in Kubemark)

2017-07-18 12:10:54 +02:00

certificate

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

client

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

cm

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

config

Shared Informer Run blocks until all goroutines finish

2017-07-18 14:05:08 +10:00

configmap

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

container

Merge pull request #49116 from sttts/sttts-authorative-api-v1-ref

2017-07-19 03:21:25 -07:00

custommetrics

run hack/update-all

2017-06-22 11:31:03 -07:00

dockershim

Fix compilation failure in dockershim for windows

2017-07-14 18:15:26 -07:00

envvars

run hack/update-all

2017-06-22 11:31:03 -07:00

events

cleanup the conversion of ObjectReference

2017-07-18 12:47:03 +08:00

eviction

run hack/update-all

2017-06-22 11:31:03 -07:00

gpu

Merge pull request #48203 from cmluciano/cml/addgpuowners

2017-07-13 18:51:04 -07:00

images

cleanup the conversion of ObjectReference

2017-07-18 12:47:03 +08:00

kuberuntime

Move pkg/api/v1/ref -> client-go/tools/reference

2017-07-18 22:45:43 +02:00

leaky

Enable auto-generating sources rules

2017-01-05 14:14:13 -08:00

lifecycle

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

metrics

Unregister some metrics

2017-05-17 18:31:56 +08:00

network

deepcopy: add interface deepcopy funcs

2017-07-18 09:28:47 +02:00

pleg

Merge pull request #45496 from andyxning/fix_pleg_relist_time

2017-05-21 04:17:14 -07:00

pod

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

preemption

fix-review

2017-07-05 15:40:51 +08:00

prober

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

qos

run hack/update-all

2017-06-22 11:31:03 -07:00

remote

Update CRI references

2017-06-09 10:16:40 +08:00

rkt

Merge pull request #48308 from yguo0905/docker-api

2017-07-14 15:30:59 -07:00

rktshim

Update CRI references

2017-06-09 10:16:40 +08:00

secret

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

server

Restore cAdvisor prometheus metrics to the main port

2017-07-18 08:58:14 -04:00

status

Migrate api.Scheme to scheme.Scheme

2017-07-17 15:05:38 -07:00

sysctl

run hack/update-all

2017-06-22 11:31:03 -07:00

types

Improved code coverage for pkg/kubelet/types/pod_update

2017-07-12 16:21:42 +08:00

util

kubelet should resume csr bootstrap

2017-06-22 23:45:15 +02:00

volumemanager

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

active_deadline_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

active_deadline.go

run hack/update-all

2017-06-22 11:31:03 -07:00

BUILD

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

disk_manager_test.go

…

disk_manager.go

…

doc.go

…

kubelet_cadvisor_test.go

Kubelet:

2017-06-27 18:45:02 -07:00

kubelet_cadvisor.go

Restore cAdvisor prometheus metrics to the main port

2017-07-18 08:58:14 -04:00

kubelet_getters_test.go

Use the assert/require package in kubelet unit tests

2017-03-16 10:21:44 -07:00

kubelet_getters.go

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

kubelet_network_test.go

kubelet: remove unused bandwidth shaping teardown code

2017-06-30 11:51:22 -05:00

kubelet_network.go

kubelet: remove NET_PLUGIN_CAPABILITY_SHAPING

2017-06-30 11:51:22 -05:00

kubelet_node_status_test.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

kubelet_node_status.go

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

kubelet_pods_test.go

Manual changes.

2017-07-17 15:05:37 -07:00

kubelet_pods_windows_test.go

run root-rewrite-v1-..., compile

2017-06-22 10:25:57 -07:00

kubelet_pods.go

Refactor: pkg/util into sub-pkgs

2017-07-18 14:34:08 +08:00

kubelet_resources_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

kubelet_resources.go

Migrate api.Scheme to scheme.Scheme

2017-07-17 15:05:38 -07:00

kubelet_test.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

kubelet_volumes_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

kubelet_volumes.go

run hack/update-all

2017-06-22 11:31:03 -07:00

kubelet.go

Shared Informer Run blocks until all goroutines finish

2017-07-18 14:05:08 +10:00

networks_test.go

Bump kubelet/networks test coverage

2017-05-17 11:20:06 +02:00

networks.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

oom_watcher_test.go

run root-rewrite-import-client-go-api-types

2017-06-22 11:30:59 -07:00

oom_watcher.go

run hack/update-all

2017-06-22 11:31:03 -07:00

OWNERS

Name change: s/timstclair/tallclair/

2017-07-10 14:05:46 -07:00

pod_container_deletor_test.go

…

pod_container_deletor.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

pod_workers_test.go

run hack/update-all

2017-06-22 11:31:03 -07:00

pod_workers.go

run hack/update-all

2017-06-22 11:31:03 -07:00

reason_cache_test.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

reason_cache.go

start the apimachinery repo

2017-01-11 09:09:48 -05:00

runonce_test.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00

runonce.go

run root-rewrite-v1-..., compile

2017-06-22 10:25:57 -07:00

runtime.go

Check the health of PLEG when updating the node status

2017-01-10 16:34:00 -08:00

util.go

Fix comments and typo in the error message.

2017-07-14 19:17:12 +02:00

volume_host.go

Scripted migration from clientset_generated to client-go.

2017-07-17 15:05:37 -07:00