Commit Graph

32 Commits

Author SHA1 Message Date
Vishnu kannan
6dfdd8eca1 1. Update filesystem stats APIs.
2. Add BaseUsage to containers which includes only the rootfs usage, if available.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-01-15 15:39:17 -08:00
Vish Kannan
b47498c16e Merge pull request #1045 from timstclair/v2-info-simple
Add V2 ContainerInfo API
2016-01-13 12:04:26 -08:00
Tim St. Clair
e011781a88 Add V2 ContainerInfo API
- Add V2 ContainerInfo struct
- Move v1/v2 conversion functions to a reusable package
- Add V2 ContainerInfo accessor method to Manager
2016-01-13 11:58:09 -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 Koch
e4262b91b1 move TCP and TCP6 stats to NetworkStats 2015-09-25 09:04:53 +02:00
Florian Koch
c331982f21 add tcp/tcp6 statistics 2015-09-24 15:44:42 +02:00
Jimmi Dyson
ff0796712b Add image name to container spec & prometheus metrics
Fixes #848
2015-08-28 12:38:16 +01:00
Daniel Martí
208baa507f Add instantaneous cpu metrics to v2 2015-08-27 16:47:11 -07:00
anushree-n
04a78502ca Modify generic collector 2015-08-12 17:56:01 -07:00
Rohit Jnagal
ef41402a39 Merge pull request #838 from rjnagal/docker
Add custom metrics to spec.
2015-07-27 16:37:32 -07:00
Rohit Jnagal
c0b3f779f5 Add custom metrics to spec.
Remove spec-related fields from stat.
We can simplify the stats a bit further by handling Int and Float better.
But this was big enough change already.
Verified v1 and v2 spec/stats/appmetrics APIs.
2015-07-25 20:17:54 +00:00
Daniel Martí
752228ef62 Add 50th and 95th percentiles 2015-07-21 17:50:37 -07:00
anushree-n
b197771668 API changes for custom metrics 2015-07-20 11:29:43 -07:00
anushree-n
4f83aae835 Include custom metrics in ContainerStats structure 2015-07-13 21:15:40 -07:00
Ananya Kumar
1abd853d6b Create package cloudinfo 2015-06-19 02:35:08 -04:00
Victor Marmol
b923eff11c Expose multiple network interfaces in API.
Part of #686
2015-06-07 17:01:53 -07:00
Rohit Jnagal
e21cab8d43 Add filesystem, diskio, and network to spec. 2015-05-28 18:25:14 +00:00
Rohit Jnagal
d8fb3c802f Add cgroup info and links to the process list on root page. 2015-05-20 03:19:56 +00:00
Rohit Jnagal
1ca29f8f20 Improve process table output.
Use pretty prints, but maintain sorting capabilities.
2015-05-19 16:33:56 +00:00
Victor Marmol
45a0cc2dc7 Merge pull request #710 from rjnagal/summary
Add memory-percent to ps output.
2015-05-12 15:51:31 -07:00
Rohit Jnagal
3bcae7f430 Add memory-percent to ps output. 2015-05-12 22:44:48 +00:00
Rohit Jnagal
828da56a01 Add 'Available' to storage API. 2015-05-12 06:56:45 +00:00
Victor Marmol
d61a381e84 Merge pull request #707 from rjnagal/docker
Add an api to support ps/top.
2015-05-11 23:01:24 -07:00
Rohit Jnagal
5e10989a78 Add an api to support ps/top. 2015-05-12 00:06:47 +00:00
Victor Marmol
1e55ccf30d Add structures for simple metrics. 2015-05-11 12:26:51 -07:00
Victor Marmol
1e09f9012d Adding container labels 2015-04-30 23:09:03 -07:00
Rohit Jnagal
6db3717426 Add recursive and type options (raw/docker) to spec and summary endpoints.
spec, stats, and summary now all support the same options (except count,
which is only parsed for stats).
2015-03-18 18:44:59 +00:00
Rohit Jnagal
9df3ea740e Add /machine endpoint for 2.0
Only difference from v1 /machine is that both h/w and s/w state is included.
2015-03-13 23:26:10 +00:00
Rohit Jnagal
53d25cc90e Add alias and namespace information to /spec endpoint 2015-03-13 21:13:23 +00:00
Rohit Jnagal
2e2a31bea2 WIP: Add stats API for 2.0.
First cut on 2.0 stats API. Main change in returned stats is that presence checks (eg. HasCPU) are embedded in each stat.
Added support to handle querying container with name.

Current syntax:
/stats?name=/&count=1,
/stats?name=docker/928c058ce260ac2a55972b18cb991fa0475fbbb7bc15bd295e62b76964d05fe6 [default count: 64]

Other handlers to include: dockerid, dockeralias. We can make subcontainers inclusion as an option too.
2015-03-12 21:42:40 +00: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
d3db8503f4 Move derived stats to v2. Add v2 container spec. 2015-03-04 18:27:57 +00:00