Commit Graph

386 Commits

Author SHA1 Message Date
Valentyn Boginskey
b09b68c4a9 Fix cache reporting with cgroup hierarchy 2018-07-28 07:20:42 -04:00
David Ashpole
c225d06adf don't emit prometheus metrics that are ignored 2018-07-09 13:17:49 -07:00
Sashank Appireddy
ed0e3f0f43 Add mesos containerizer support
This commit includes support for collecting container stats
launched by mesos containerizer.
2018-06-28 22:07:55 +00:00
David Ashpole
b1535b8a39
Merge pull request #1926 from andyxning/add_docker-only_whitelist
add docker_only_prefix_whitelist
2018-06-21 11:27:17 -07:00
Antonio Murdaca
42eeba5783
container: fix concurrent map acccess
GetSpec() can be called concurrently in
manager/container.go.updateSpec()
results into a concurrent map access on the labels map because we're
directly updating the map inside GetSpec(). The labels map from the
container handler is not a copy of the map itself, just a reference,
that's why we're getting the concurrent map access.
Fix this by moving the label update with restartcount to the handler's
initialization method which is not called concurrently.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-06-13 19:06:47 +02:00
David Ashpole
8335af9d6b Revert "Switch from Inotify to Fsnotify"
This reverts commit c1a6d6090b.
2018-06-11 10:50:23 -07:00
Andy Xie
ed6521013f add raw container cgroup path prefix whitelist 2018-04-16 12:05:51 +08:00
David Ashpole
c1a6d6090b Switch from Inotify to Fsnotify 2018-04-09 11:09:40 -07:00
David Ashpole
4edfcdda8e
Merge pull request #1919 from Random-Liu/fix-containerd-wait
Fix containerd connection wait.
2018-03-29 17:55:09 -07:00
David Ashpole
31c5df3bd9
Merge pull request #1918 from Random-Liu/update-containerd
Update containerd to v1.0.2.
2018-03-29 17:44:24 -07:00
Lantao Liu
021065e3b9 Fix containerd connection wait.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 00:35:20 +00:00
Lantao Liu
cdb1f2ac71 Update containerd to v1.0.2.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-29 23:50:34 +00:00
nielsole
08f0c2397c Adding /proc/<pid>/schedstat (#1872)
Add /proc/<pid>/schedstat metrics for scheduler metrics
2018-03-08 09:27:06 -08:00
Lantao Liu
d5ee05fc25 Use backoff to tolerant race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-23 22:04:35 +00:00
David Ashpole
e1d602d7af create libcontainer handler for common code 2018-02-21 08:53:42 -08:00
David Ashpole
c094ef0d2a
Merge pull request #1859 from andyxning/reduce_labels_for_container_info
reduce labels for container info
2018-02-21 08:33:17 -08:00
Bryan Boreham
ec6da3acae Prometheus metrics: optionally export total CPU instead of per-CPU
Per-CPU stats are more expensive to transport and store, and that
level of detail is not required in many cases.

We export overall total cpu in the same metric as per-cpu, so that
dashboards which previously summed over cpu will work identically.
2018-02-20 13:58:44 +00:00
David Ashpole
6116f26530
Merge pull request #1882 from dashpole/overlay_upper
monitor only the upper directory for overlay
2018-02-08 11:18:43 -08:00
Yanqiang Miao
1dd9469469 All handlers of containerd containers share a single client instance
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-02-08 12:21:51 +08:00
James Ravn
e660d8b8b7 Retry docker status on startup
For https://github.com/google/cadvisor/issues/1866.
2018-02-06 10:31:11 +00:00
David Ashpole
812cc819ac monitor only the upper directory for overlay 2018-02-05 15:49:27 -08:00
Andy Xie
1ccbe6fdd0 reduce labels for container info 2018-01-12 00:14:01 +08:00
David Ashpole
9ffa37396f
Merge pull request #1806 from sentinelt/master
fix #1607; use container creation time provided by Docker handler
2017-12-20 11:25:35 -08:00
James Ravn
57e17d8be2 Add timeouts for docker queries
As these can otherwise block indefinitely due to docker issues.

This is to fix https://github.com/kubernetes/kubernetes/issues/53207,
where kubelet relies on cadvisor for gathering docker information as
part of its periodic node status update.
2017-12-05 13:50:48 +00:00
Tim Allclair
5b435b4b70
Clean up cAdvisor logging 2017-11-27 19:48:05 -08:00
David Ashpole
6988e70a3d Revert "fix #1708; move from inotify to fsnotify"
This reverts commit e6b6a1ac57.
2017-11-17 10:28:28 -08:00
Sławek Piotrowski
2648be083a fix #1607; use container creation time provided by Docker handler 2017-11-16 00:41:10 +01:00
David Ashpole
4466b4d9a0
Merge pull request #1795 from abhi/containerd
Containerd cadvisor integration
2017-11-15 10:24:53 -08:00
abhi
6ad15431f4 Integrating containerd to cadvisor
This commit includes changes to integrate containerd
runtime to cadvisor to collect container stats

Signed-off-by: abhi <abhi@docker.com>

Test cases and minor changes

This commit include test cases and minor fixes
for the same

Signed-off-by: abhi <abhi@docker.com>
2017-11-14 17:37:36 -08:00
Derek Carr
49e0496c8f
Merge pull request #1773 from runcom/crio-socket-edit
container: crio: change crio socket
2017-11-14 11:18:15 -05:00
Euan Kemp
1ecd24ea8d libcontainer: Use first cgroup subsystem found (#1792)
libcontainer: Use first cgroup subsystem found
2017-11-06 15:33:59 -08:00
Rohit Agarwal
4a35130019 Collect container-level GPU metrics using NVML.
When cAdvisor starts up, it would read the `vendor` files in
`/sys/bus/pci/devices/*` to see if any NVIDIA devices (vendor ID: 0x10de) are
attached to the node. If no NVIDIA devices are found, this code path would
become dormant for the rest of cAdvisor lifetime. If NVIDIA devices are found,
we would start a goroutine that would check for the presence of NVML by trying
to dynamically load it at regular intervals. We need to do this regular
checking instead of doing it just once because it may happen that cAdvisor is
started before the NVIDIA drivers and NVML are installed.  Once the NVML
dynamic loading succeeds, we would use NVML’s query methods to find out how
many devices exist on the node and create a map from their minor numbers to
their handles and cache that map. The goroutine would exit at this point.

If we detected the presence of NVML in the previous step, whenever a new
container is detected by cAdvisor, cAdvisor would read the `devices.list` file
from the container's devices cgroup. The `devices.list` file lists the
major:minor number of all the devices that the container is allowed to access.
If we find any device with major number 195 (which is the major number assigned
to NVIDIA devices), we would cache the list of corresponding minor numbers for
that container.

During every housekeeping operation, in addition to collecting all the existing
metrics, we will use the cached NVIDIA device minor numbers and the map from
minor numbers to device handles to get metrics for GPU devices attached to the
container.
2017-11-06 11:54:59 -08:00
David Ashpole
6d3841c68a
Merge pull request #1784 from majst01/misspelled-errors
Fix wrong error checking in fsHandler.go
2017-10-30 10:02:08 -07:00
Seth Jennings
cc77f13a2b fix long du message 2017-10-30 10:00:47 -05:00
Stefan Majer
d5e2ffbef7 Fix wrong error checking in fsHandler.go 2017-10-30 07:44:57 +01:00
Antonio Murdaca
088aaf1a32
CRI-O: fix handling of overlay2 storage
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-10-21 12:05:40 +02:00
Euan Kemp
587691c7f3 libcontainer: ignore nil cpustats
Cadvisor can inotify watch for new cgroups. This leads to it racing
fairly tightly with cgroup creation... So tightly, that sometimes
cpustats are nil.

The runc library code we call
(https://github.com/opencontainers/runc/blob/v1.0.0-rc4/libcontainer/cgroups/fs/apply_raw.go#L179-L182)
doesn't actaully consider this an error, so we have to handle that
scenario ourselves.

This fixes https://github.com/google/cadvisor/issues/1765
2017-10-20 13:08:23 -07:00
Antonio Murdaca
54b661236d
container: crio: change crio socket
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-10-19 00:17:18 +02:00
David Ashpole
b7959da460 monitor diff directory for overlay2 2017-10-11 14:13:42 -07:00
Derek Carr
9ea61176bf Expose memory.max_usage_in_bytes in container stats 2017-10-10 17:31:31 -04:00
Seth Jennings
fd9c6d2fde adaptive longOp for du operation 2017-10-05 09:22:54 -05:00
David Ashpole
888a529088 fix #1743; move off of docker/engine-api 2017-09-28 11:05:13 -07:00
David Ashpole
e6b6a1ac57 fix #1708; move from inotify to fsnotify 2017-09-28 10:57:49 -07:00
Antonio Murdaca
4b002b3bd3
*: add CRI-O handler
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-09-05 17:01:58 +02:00
Euan Kemp
d2e11efba2 libcontainer: use real number of CPUs for usage
As of the 4.7 kernel, the cpustats field returned from libcontainer
contains values for every possible cpu (including nonexistent ones).
The extra values are all 0s.

If we assume that hotplug events won't happen, we can get a more
accurage cpu count by using runtime.NumCPU and then ignoring any values
beyond that.
2017-08-30 14:26:26 -07:00
Karl
5a033c064e Add runtime options for TLS support 2017-08-24 15:14:33 +02:00
Derek Carr
6fa48d9048 Expose total_rss when hierarchy is enabled 2017-08-23 14:56:59 -04:00
Derek Carr
d493f11f0b Reduce log spam when unable to get network stats 2017-08-18 16:11:03 -04:00
Andrew Pilloud
9e40f1c837 Fix race in ignoring non-existent files 2017-06-08 11:16:31 -07:00
David Ashpole
96b603e20a Merge branch 'master' into overlay2 2017-05-31 14:05:54 -07:00