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
Victor Marmol
563ead3cce
Use mux to register HTTP handlers.
...
This will allow us to register handlers on the non-default HTTP handler.
2015-03-10 15:37:16 -07:00
Vish Kannan
62a1788621
Merge pull request #570 from vmarmol/less-log
...
Don't fail requests if System UUID is not available.
2015-03-10 09:45:40 -07:00
Victor Marmol
4d9cdc0426
Merge pull request #569 from kateknister/apiBranch
...
Added streaming to api
2015-03-09 18:29:31 -07:00
Victor Marmol
853f2d9bad
Don't fail requests if System UUID is not available.
...
We won't have access to it if we're not running as root.
2015-03-09 18:22:08 -07:00
Katie Knister
3a133c2be7
Added streaming to api
2015-03-09 17:54:28 -07:00
Rohit Jnagal
24ab222ae0
Merge pull request #567 from vmarmol/less-log
...
Lowering log level for frequent events.
2015-03-09 14:59:45 -07:00
Victor Marmol
54bc33dd2c
Lowering log level for frequent events.
...
Lowering all frequent normal logs to v=3. Kubelet runs by default on
debug of v=2 and we don't want to log these events in that case.
2015-03-09 14:53:53 -07:00
Victor Marmol
b5e2f3788e
Merge pull request #565 from rjnagal/rename
...
Update documentation on running integration tests.
2015-03-05 14:51:41 -08:00
Rohit Jnagal
7af93e643c
Update documentation on running integration tests.
2015-03-05 22:44:54 +00:00
Rohit Jnagal
0e8af3b671
Merge pull request #563 from vmarmol/kube
...
Adding Equal() for ContainerInfoReq
2015-03-05 12:51:51 -08:00
Victor Marmol
f0521ffd29
Adding Equal() for ContainerInfoReq
2015-03-05 10:43:23 -08:00
Victor Marmol
d94f9363b0
Merge pull request #561 from rjnagal/rename
...
Make machine-id sources flag a comma-separated list.
2015-03-05 10:40:41 -08:00
Rohit Jnagal
6dcae1221f
Make machine-id sources flag a comma-separated list.
...
Use "/etc/machine-id,/var/lib/dbus/machine-id" as default.
2015-03-05 16:52:24 +00:00
Victor Marmol
d3754abee1
Merge pull request #559 from rjnagal/version
...
Move derived stats to v2. Add v2 container spec.
2015-03-04 10:53:01 -08:00
Rohit Jnagal
d3db8503f4
Move derived stats to v2. Add v2 container spec.
2015-03-04 18:27:57 +00:00
Victor Marmol
7839dd8eef
Merge pull request #560 from simon3z/master
...
Add system uuid and machine id information
2015-03-04 09:42:41 -08:00
Victor Marmol
7b3fdb8fc4
Merge pull request #539 from kateknister/apiBranch
...
Added container event monitoring
2015-03-04 08:29:03 -08:00
Katie Knister
6ffb8454b0
Added container event monitoring
2015-03-03 18:14:36 -08:00
Victor Marmol
98d368e7ac
Merge pull request #558 from rjnagal/version
...
Bulk move current info api to info/v1. Making room for info/v2.
2015-03-03 17:00:38 -08: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
Rohit Jnagal
e2e54565fe
Merge pull request #557 from vmarmol/kube
...
Add ManagerMock.
2015-03-03 13:24:14 -08:00
Victor Marmol
c1959cebee
Add ManagerMock.
2015-03-03 11:28:33 -08:00
Victor Marmol
bd06eda9c2
Merge pull request #556 from vmarmol/kube
...
Updating Docker dependency to match Kubernetes'
2015-03-03 09:29:49 -08:00
Victor Marmol
000a1be281
Changes to use new version of Docker packages.
2015-03-03 08:56:04 -08:00
Victor Marmol
b5769d50a8
Updating github.com/docker/docker/... godeps.
2015-03-03 08:56:04 -08:00
Victor Marmol
5e6c11abd9
Merge pull request #549 from kateknister/master
...
Revised oomparser to not use all the cpu
2015-03-03 08:25:48 -08:00
Rohit Jnagal
60b223596c
Merge pull request #555 from vmarmol/docs
...
Register container handler factories in manager.New().
2015-03-02 18:51:41 -08:00
Victor Marmol
7e7c433307
Register container handler factories in manager.New().
...
This lets us simplify the startup of the manager.
2015-03-02 17:31:20 -08:00
Katie Knister
412f27798e
Revised oomparser to not use all the cpu
2015-03-02 14:22:53 -08:00
Rohit Jnagal
63a6b91554
Merge pull request #553 from vmarmol/docs
...
Add instructions for running the integration tests.
2015-03-02 11:17:43 -08:00
Victor Marmol
c1f572f13f
Add instructions for running the integration tests.
2015-03-02 11:11:39 -08:00
Victor Marmol
14d142b14c
Merge pull request #552 from rjnagal/summary
...
Report status of hierarchical memory accounting in validate output.
2015-03-02 08:22:27 -08:00
Rohit Jnagal
ae48c70aff
Report status of hierarchical memory accounting in validate output.
...
We still report 'Supported and Recommended' even if hierarchical accounting is disabled.
Most current distros don't enable it by default.
2015-03-02 06:48:01 +00:00
Federico Simoncelli
02a3e46996
Add system uuid and machine id information
...
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-03-01 15:06:19 -05:00