Commit Graph

19 Commits

Author SHA1 Message Date
Micah Hausler
a9bb292b52 Add inodes to /metrics endpoint 2016-08-27 18:39:53 -04:00
Florian Koch
3ce98a46c4 add cgropu swap usage and export as prometheus metric 2016-08-09 07:33:37 +02:00
Tobias Schmidt
1653733ea7 Expose cpu cgroup CFS prometheus metrics
If CPU quota is configured (cpu.cfs_quota != -1) the CFS will provide
stats about elapsed periods and throtting in cpu.stats. This change
makes these information available as container_cpu_cfs_* metrics.
2016-08-06 18:08:26 -04:00
Jimmi Dyson
f1d8b2da70
Prefix Docker labels & env vars in Prometheus metrics to prevent conflicts 2016-08-01 21:33:31 +01:00
Alexander Staubo
f8f474e791 This fixes a bug where any errors encountered during Prometheus metric
collection would stay counted in the gauge "container_scrape_errors",
making that particular metric useless. Instead, it must be reset on
every scrape.
2016-07-21 20:04:21 -04:00
Florian Koch
669bc4abfa add cgroup quota and period support / add missing tests 2016-02-02 20:33:11 +01:00
Shimin Guo
d656ffb0db Add unit tests. 2016-01-15 08:53:30 -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
Daniel Dao
544b852a3b satitize label name before setting them as prometheus label
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-05 10:49:20 +00:00
Daniel Dao
9131bcb315 fix prometheus regex matching
the previous regex wasnt able to match anything. This regex should hopefully do
better.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-05 10:49:20 +00:00
Florian Pfitzer
009761cb53 Export image name and env variables as prometheus labels 2016-01-05 10:49:20 +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
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
Jimmi Dyson
760a25b94f Add machine memory & cpu cores to prometheus metrics 2015-09-10 11:59:16 +01:00
Jimmi Dyson
b8fc8cd2ae Add container specs & cadvisor version info to prometheus metrics 2015-09-09 14:28:54 +01:00
Jimmi Dyson
80648f783e Expose all interfaces in Prometheus metrics.
Fixes #871
2015-08-29 21:19:56 +01:00
Jimmi Dyson
ff0796712b Add image name to container spec & prometheus metrics
Fixes #848
2015-08-28 12:38:16 +01:00
Julius Volz
bac3a5d839 Add Prometheus tests and fix metric type bug. 2015-03-13 01:25:20 +01:00