prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,054 Commits 1 Branch 39 Tags 50 MiB
9ce178f707
Commit Graph

1054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
19c6e473b2 Merge pull request #602 from vmarmol/master 
Revert back to progrium/busybox.
 2015-03-19 09:09:17 -07:00
Victor Marmol
ebbaf9b46c Revert back to progrium/busybox. 
Alpine doesn't have glibc which we build with.
 2015-03-19 08:49:50 -07:00
Victor Marmol
a973ddb3b8 Merge pull request #599 from rjnagal/version 
Add recursive and type options (raw/docker) to spec and summary endpoints.
 2015-03-18 16:46:15 -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
d8b9a50994 Merge pull request #598 from vmarmol/master 
Switch to gliderlabs/alpine Docker image.
 2015-03-16 18:01:07 -07:00
Victor Marmol
e69432f5db Switch to gliderlabs/alpine Docker image. 
Fixes #597.
 2015-03-16 17:29:45 -07:00
Victor Marmol
219906ca98 Merge pull request #594 from google/rjnagal-docs 
Update web.md
 2015-03-15 18:41:59 -07:00
Rohit Jnagal
1e80db6fb2 Merge pull request #593 from vmarmol/master 
Return unique containers in Subcontainers().
 2015-03-15 18:35:43 -07:00
Rohit Jnagal
e83f7f3802 Update web.md 
Closes #591
 2015-03-15 18:34:09 -07:00
Victor Marmol
67f6ee48f9 Return unique containers in Subcontainers(). 
Before this we'd return an instance for each alias we'd saved.

Fixes #592.
 2015-03-15 09:58:04 -07:00
Rohit Jnagal
8e787e010b Merge pull request #590 from juliusv/prometheus-docs 
Add Prometheus documentation.
 2015-03-14 21:31:20 -07:00
Julius Volz
6419153c0b Add Prometheus documentation. 2015-03-15 03:01:44 +01:00
Victor Marmol
e80e345cc1 Merge pull request #588 from rjnagal/version 
Add /machine endpoint for 2.0
 2015-03-13 16:28:30 -07: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
Victor Marmol
b4f6712f6e Merge pull request #589 from rjnagal/docker 
Add recursive option for /stats endpoint.
 2015-03-13 16:13:27 -07:00
Rohit Jnagal
1b3de3a16e Add recursive option for /stats endpoint. 2015-03-13 23:08:15 +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
Rohit Jnagal
53d25cc90e Add alias and namespace information to /spec endpoint 2015-03-13 21:13:23 +00:00
Victor Marmol
7d27bf2f6f Merge pull request #586 from rjnagal/docker 
Add handling of docker container to 2.0 stats API.
 2015-03-13 12:03:50 -07:00
Rohit Jnagal
7a6f5ddaaf Add handling of docker container to 2.0 stats API. 
Next: Apply similar handling to spec and summary endpoints.
 2015-03-13 18:57:08 +00:00
Victor Marmol
6226889f55 Merge pull request #585 from juliusv/cleanup-metrics 
Clean up code around Prometheus metrics, more DRY.
 2015-03-13 09:11:45 -07:00
Julius Volz
fa17966229 Clean up code around Prometheus metrics, more DRY. 
With this change, all definitions and functionality for a given metric
are in a single place only instead of being distributed all over the
file. This makes it easier to inspect the code for correctness and
adding/changing metrics.
 2015-03-13 17:00:07 +01:00
Victor Marmol
b28b26ca30 Merge pull request #584 from juliusv/prometheus-tests 
Add Prometheus tests and fix metric type bug.
 2015-03-13 08:43:21 -07:00
Julius Volz
bac3a5d839 Add Prometheus tests and fix metric type bug. 2015-03-13 01:25:20 +01:00
Victor Marmol
e78e515723 Merge pull request #583 from rjnagal/docker 
Fix broken links in api doc.
 2015-03-12 15:14:15 -07:00
Rohit Jnagal
14d56d3eda Fix broken links in api doc. 2015-03-12 22:11:06 +00:00
Victor Marmol
05b16c6063 Merge pull request #578 from rjnagal/docker 
WIP: Add stats API for 2.0.
 2015-03-12 15:08:16 -07:00
Rohit Jnagal
405e9d5eb2 Merge pull request #582 from vmarmol/fix 
Don't fail fetching machine information when not available
 2015-03-12 15:07:07 -07:00
Victor Marmol
aa8697140d Don't fail fetching machine information when not available 2015-03-12 14:48:12 -07: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
Victor Marmol
cf9c76c06c Merge pull request #581 from juliusv/fix-metrics 
Fix Prometheus metrics and typo in container info stats
 2015-03-12 14:16:27 -07:00
Julius Volz
661b174c1d Fix Uinterruptible -> Uinterruptible typo. 2015-03-12 22:09:49 +01:00
Julius Volz
4f01599386 Fix Prometheus metrics and docstrings. 2015-03-12 22:09:45 +01:00
Victor Marmol
4da12aa637 Merge pull request #580 from mikael84/patch-1 
Update containers_html.go
 2015-03-12 08:41:22 -07:00
Mikael Kjaer
d85b6e24d8 Update containers_html.go 
Changed logo to a link to the front page
 2015-03-12 14:18:33 +04:00
Rohit Jnagal
e685067a04 Merge pull request #579 from vmarmol/master 
Start() exits gracefully when there are no factories.
 2015-03-11 23:24:16 -07:00
Victor Marmol
ffdb6f5c7d Start() exits gracefully when there are no factories. 
This allows us to handle the case where there are no factories as
happens when testing in a non-container environment. We will still serve
the machine information that is available.
 2015-03-11 21:22:16 -07:00
Victor Marmol
f3de810a09 Merge pull request #545 from discordianfish/export-prometheus 
Provide cadvisor stats as prometheus metrics
 2015-03-11 13:36:35 -07:00
Johannes 'fish' Ziemke
60a107371b Add prometheus client lib dependencies 2015-03-11 20:51:11 +01:00
Johannes 'fish' Ziemke
822d60ba8a Provide cadvisor stats as prometheus metrics 2015-03-11 20:51:06 +01:00
Victor Marmol
5eeb6fdd40 Merge pull request #574 from kateknister/master 
Fixed some bugs in oomparser streaming
 2015-03-11 09:14:07 -07:00
Victor Marmol
8ae06b5c3d Merge pull request #573 from rjnagal/docker 
Add /storage endpoint to 2.0 API.
 2015-03-10 21:48:51 -07: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
4e2479bcab Merge pull request #575 from vmarmol/register 
Refactor and centralize HTTP registration.
 2015-03-10 18:19:41 -07:00
Katie Knister
78f3029943 Fixed some bugs in oomparser streaming 2015-03-10 18:18:54 -07:00
Victor Marmol
d357c34f22 Refactor and centralize HTTP registration. 2015-03-10 18:00:10 -07:00
Victor Marmol
770eae1875 Merge pull request #572 from vmarmol/no-cgroup 
Don't fail if the raw cgroup factory fails to register.
 2015-03-10 15:53:12 -07:00
Victor Marmol
963d9816a3 Merge pull request #571 from vmarmol/mux 
Use mux to register HTTP handlers.
 2015-03-10 15:53:08 -07:00
Victor Marmol
c593620f47 Don't fail if the raw cgroup factory fails to register. 
This will allow us to degrade gracefully in the environments where no
cgroups exist, but we'd still like cAdvisor to be running.
 2015-03-10 15:41:15 -07:00