Commit Graph

195 Commits

Author SHA1 Message Date
Shimin Guo
1a867bdadd expose RSS 2016-01-15 08:45:51 -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
Piotr Szczesniak
9e739ec757 Added possibility to not ignore NumStats field in ContainerInfoRequest 2015-12-08 21:29:56 +01:00
Lei Xue
e36fc90b3f comment fix for function ContainerInfoRequest 2015-12-03 07:44:49 +08:00
Jimmi Dyson
82810f13cd Remove unused code (via deadcode linter) 2015-11-27 21:48:33 +00:00
Vish Kannan
64702e7202 Merge pull request #902 from jimmidyson/git-version
Expose git revision as well as version in version info, add Makefile
2015-10-08 11:42:12 -07:00
mqliang
1678418ef4 Fix typo in comment
Fix typo in comment
2015-10-06 18:37:59 +08:00
Tomas Kral
bd61caf0c3 add failcnt 2015-10-02 14:24:22 +02:00
Jimmi Dyson
cf43fd2556 Expose git revision as well as version in version info, add Makefile 2015-10-02 10:26:33 +01:00
Florian Koch
e4262b91b1 move TCP and TCP6 stats to NetworkStats 2015-09-25 09:04:53 +02:00
Florian Koch
dd041457b5 some fixes 2015-09-24 15:44:42 +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
Victor Marmol
78419de3ea Merge pull request #839 from rjnagal/docker
Add units and data type to spec for custom metrics.
2015-07-30 10:21:51 +02:00
Rohit Jnagal
dd0d0dd3b1 Add units and data type to spec for custom metrics.
Renamed units to data_type in collector config.
Use units for actual display units eg MB/s, "number of connections".
2015-07-30 06:11:17 +00: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
0a84ac1cda Fix incorrect use of metadata library, correct typo 2015-07-06 13:13:10 -07:00
AnanyaKumar
ee16d6e7da Victor code review 2015-06-30 15:48:56 -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
f5004aa553 Merge pull request #699 from vmarmol/collector
Add basic metric structures
2015-05-11 22:20:30 -07:00
Rohit Jnagal
5e10989a78 Add an api to support ps/top. 2015-05-12 00:06:47 +00:00
Rohit Jnagal
e43ada2e00 Add 'bytes available' to fs info.
The current capacity and usage numbers are insufficient to figure out
actual bytes available for a non-root user for the fs. Available is the
value used by df and the one we need to track to detect low diskspace
condition.
2015-05-11 19:27:40 +00:00
Victor Marmol
1e55ccf30d Add structures for simple metrics. 2015-05-11 12:26:51 -07:00
Rohit Jnagal
3b13df3c6c Remove spec info from container creation event data. 2015-05-05 22:14:15 +00:00
Victor Marmol
1e09f9012d Adding container labels 2015-04-30 23:09:03 -07:00
Victor Marmol
aa6e9a3d5b Use strings for EventType enum 2015-04-20 09:16:00 -07:00
Victor Marmol
fd1ff04f7f Split OOM event into OOM and OOM Kill.
This will allow to watch and differentiate that the OOM victim may not
equal the OOM'd container.
2015-04-15 13:30:08 -07:00
Victor Marmol
a21bf2555e Make EventData a concrete type.
Having this as an interface was giving us a lot of problems with
unmarshaling. Made into a union of concrete types.
2015-04-09 15:21:24 -07:00
Victor Marmol
4cb69036f8 Move Event to info since it is a public API object. 2015-04-01 09:17:43 -07:00
Victor Marmol
814c65059a Document and specify defaults for ContainerRequestInfo. 2015-03-25 13:15:10 -07:00
Federico Simoncelli
9d41787b62 machine: collect node boot id if available
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-03-23 10:45:03 -04: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
Vish Kannan
588b1498ac Merge pull request #587 from rjnagal/docker
Add alias and namespace information to /spec endpoint
2015-03-13 14:22:56 -07:00