prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,680 Commits 1 Branch 39 Tags 50 MiB
31dcb5f3b7
Commit Graph

66 Commits

Author SHA1 Message Date
Jimmi Dyson
31dcb5f3b7 Remove systemd docker container name check 2016-02-06 20:38:32 +00:00
Vishnu kannan
dabec0a6b2 Fix fs stats handling for non-aufs storage drivers. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-05 16:32:07 -08:00
Vishnu kannan
3f75344053 Fallback to flag defined value for storage dir in case docker info 
doesn't provide the storage dir.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-03 18:00:59 -08:00
Vishnu kannan
59c03672d0 Handle fs metrics for docker version >= 1.10.0 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-02 10:20:20 -08:00
Vishnu kannan
5ab2f45fc6 Use storage dir from docker info for filesystem usage tracking. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-01 18:20:00 -08:00
Vish Kannan
01434a1c54 Merge pull request #1020 from miguel250/zfs-support 
Add support ZFS filesystem
 2016-01-13 11:52:37 -08:00
Daniel Dao
e5b6bfa94f add whitelisted env as container metadata 
This add Envs to container spec as a metadata source. When using prometheus
exposition format, they will be merged into the list of metrics' labels.

Also changed the cli flag to docker_env_metadata_whitelist, and add refenrences
of whitelist envs to API

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
 2016-01-13 11:22:13 +00:00
Florian Pfitzer
009761cb53 Export image name and env variables as prometheus labels 2016-01-05 10:49:20 +00:00
Miguel Perez
e0fef76668 Add support ZFS filesystem 
- fix container usage stat not loading on first load
 2015-12-15 15:41:19 -05:00
Vishnu Kannan
cf0adcc817 Add support for Overlayfs. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2015-12-02 15:43:34 -08:00
Lei Xue
dbbe38dfed re-order the import package 2015-11-30 16:43:22 +08:00
Jimmi Dyson
82810f13cd Remove unused code (via deadcode linter) 2015-11-27 21:48:33 +00:00
Jimmi Dyson
f9eb56e800 Merge pull request #966 from afein/godep_update_runc 
[Godeps] changed docker/libcontainer dependency to runc/libcontainer
 2015-11-26 15:19:28 +00:00
Jimmi Dyson
d1fce20304 Regexp tidy up 2015-11-26 09:14:26 +00:00
Alex Mavrogiannis
4533dd7d18 changed libcontainer dependency to runc 2015-11-21 14:04:01 -08:00
Vishnu kannan
401cbbc48f Add a --nosystemd flag to avoid assuming systemd to be the cgroups 
owner for docker containers.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2015-11-16 10:37:54 -08:00
Jimmi Dyson
b8b6e1bac1 Support devicemapper storage for docker images dir 
Fixes #920
 2015-10-21 09:56:33 +01:00
Jimmi Dyson
357e6a0f23 Reuse cached docker client 
Fixes #925
 2015-10-20 20:15:54 +01:00
Bas van der Lei
f8eb8cc982 validate name with isContainerName func 2015-10-02 13:49:27 +02:00
Bas van der Lei
9931854585 remove dead code 2015-10-02 13:42:40 +02:00
Bas van der Lei
13674cf06c optimize dockerCgroupRegexp 2015-09-27 00:20:52 +02:00
Bas van der Lei
7788c8bd27 Ignore systemd 'containers' in the docker driver 2015-09-23 23:55:35 +02:00
Jimmi Dyson
7e10398a50 Use proc fs to get network stats. 
Reasons discussed in
https://github.com/google/cadvisor/issues/822#issuecomment-135811901 &
following.
 2015-08-29 00:20:07 +01:00
Victor Marmol
53bcd977b5 Detect systemd with cgroup hierarchy. 
The previous approach was brittle from within a container and was inconsistend.

Fixes #666
 2015-06-02 13:11:46 -07:00
Victor Marmol
0525d40a4a Add DebugInfo() API and put the information on /validate 2015-05-21 14:46:35 -07:00
Rohit Jnagal
d0424eca0f Add --docker_only flag to enable tracking for only docker containers and root. 
This reduces unnecessary load on the system and also cleans up the UI clutter.
Currently defaulted to false.
 2015-04-30 23:34:44 +00:00
Victor Marmol
64c0d3d8c3 Migrating cAdvisor to new libcontainer. 
Backwards compatability is maintained with older versions of
libcontainer.
 2015-04-10 14:51:29 -07:00
Clayton Coleman
9ce178f707 Lazily init DBus only when it is needed 
OpenShift has some cAdvisor packages in its import chain. The init() here
invokes Dbus start even when cAdvisor is not actively running or being
used (in our packages).  This change makes the systemd check and dbus
initialization and connection lazy, occuring only the first time someone
invokes UseSystemd().
 2015-03-19 16:35:48 -04:00
Rohit Jnagal
a0a419614f Add /storage endpoint to 2.0 API. 
/storage returns {device, mountpoint, capacity, usage} for all filesystems.
In addition, it also detect and applies label for each filesystem - currently two - "root", "docker-images".

/storage/<label> returns info about the filesystem with specific label. eg. /storage/root returns info for root filesystem.
 2015-03-11 01:49:58 +00:00
Rohit Jnagal
872546ba3a Bulk move current info api to info/v1. Making room for info/v2. 2015-03-04 00:47:28 +00:00
Victor Marmol
131a0c21ea Detect Docker containers by asking the Docker. 
No longer do deduction from the cgroup path (only to get the Docker
container ID).

Fixes #450.
 2015-02-06 09:15:59 -08:00
Rohit Jnagal
ed155019ac Verify and fix error message nit :) 2015-01-14 01:15:13 +00:00
Rohit Jnagal
8eec529106 Merge pull request #358 from vmarmol/update-libcontainer 
Update libcontainer dependency
 2014-12-15 17:01:44 -08:00
Victor Marmol
91c974e913 Generate CgroupPaths when not available. 
This happens always for non-Docker containers and sometimes with older Docker
containers.
 2014-12-15 16:57:30 -08:00
Victor Marmol
084e809507 Merge pull request #356 from rjnagal/rename 
Add systemd information to validate output.
 2014-12-16 07:35:30 +08:00
Rohit Jnagal
4ec9894ea2 Add systemd information to validate output. 2014-12-15 23:26:30 +00:00
Victor Marmol
0123fe1d07 Merge pull request #355 from rjnagal/syst 
Fix Docker handler for machines that use systemd just as a naming service
 2014-12-16 07:07:42 +08:00
Rohit Jnagal
f585e4bc5e Fix Docker handler for machines that use systemd just as a naming service without controlling cgroups. 2014-12-15 22:58:44 +00:00
Rohit Jnagal
1953bd0e94 Bump minimum docker supported version to 1.0. 2014-12-15 16:57:22 +00:00
Victor Marmol
cb0387b41e Try to detect systemd by checking for its named cgroup hierarchy. 
Fixes #342
 2014-12-11 17:30:33 -08:00
Victor Marmol
0e603d2709 Let the raw driver handle the /docker container. 
This will give us stats on this container and since the /docker UI
endpoint, it no longer serves the purpose it once did.
 2014-11-20 06:44:35 +08:00
Victor Marmol
f97e57df88 Simplify how the Docker containers are handled. 
This is done by introducting the concept of "namespaces" of container
names. The aliases of a container are under this namespace. Namespace
names are of the form:

//<namespace>/<alias>

This allows us to (within cAdvisor) query all docker containers as
//docker regardless of whether this is a systemd or a non-systemd system.

This does break our ability to handle Docker aliases with the /container
endpoint. I think this is acceptable as our support there was not
consistent between system types.
 2014-11-12 18:01:47 -08:00
Victor Marmol
6e89bdef9f Add /docker/ UI endpoint. 
Fixes #294
 2014-11-07 08:53:52 -08:00
Victor Marmol
8aa05b0c39 Add API version v1.2 with /docker endpoint. 
The /docker endpoint lists all Docker containers under one unified
namespace.
 2014-10-20 22:24:01 -07:00
Vishnu Kannan
0699e7029d Avoid storage usagge calculations when aufs driver is not being used. 2014-10-07 11:48:10 +00:00
Vish Kannan
1ed9d122c1 Merge pull request #220 from vmarmol/coreos 
Fix name resolution in Systemd systems
 2014-09-29 11:28:23 -07:00
Satnam Singh
7ddc75c41b Squashed commit of the following: 
commit 6bf9fe89f6
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:23:16 2014 -0700

    Change error to warning during handling check.

commit c580907183
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:21:41 2014 -0700

    Decapatalise fmt.Errorf error messages.

commit 3ecc5745d6
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:19:15 2014 -0700

    Fix misunderstanding about when CanHandle fails.

commit adce0c5433
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:13:32 2014 -0700

    Change the interface of CanHandle to return error information.
 2014-09-26 18:06:58 -07:00
Victor Marmol
ebf231e4df Fix name resolution in Systemd systems 2014-09-23 20:01:35 -07:00
Victor Marmol
f9c45094ab Only register the Docker driver in systems using libcontainer. 2014-09-05 13:37:18 -07:00
Victor Marmol
b75dea4021 Adding --docekr_root to customize where Docker stores state. 
Fixes #199
 2014-08-29 14:54:40 -07:00