prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
700 Commits 1 Branch 39 Tags 50 MiB
90e407d234
Commit Graph

700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Marmol
181e12dda2 Refactoring and fixes of /docker API endpoint. 
This canges the output of the Docker endpoint to be a map so that it is
more consistent from single to multiple returns. It also refactors
internally how we handle both types of requests.

Without this PR the /docker API endpoint is broken completely so this
change in format has no effect anyways.

These changes are tested by the upcoming integration tests.
 2014-11-19 03:36:18 -08:00
Rohit Jnagal
22c54d7f22 Merge pull request #315 from vishh/fix_influx 
Release 0.6.1 to patch influxdb driver issue.
 2014-11-18 16:25:06 -08:00
Vishnu Kannan
da5b235dd7 Release 0.6.1 to patch influxdb driver issue. 2014-11-19 00:17:17 +00:00
Vish Kannan
ec5a39d30d Merge pull request #314 from vishh/fix_influx 
Fix issue in influxdb driver
 2014-11-18 11:24:27 -08:00
Vishnu Kannan
0e13061cfa Fix issue in influxdb driver that prevented container name and hostname from being populated. 2014-11-18 19:13:54 +00:00
Victor Marmol
1e98602907 Merge pull request #310 from vmarmol/release 
cAdvisor 0.6.0
 2014-11-17 11:24:47 -08:00
Rohit Jnagal
761b98421c Merge pull request #312 from vmarmol/unique 
Do not duplicate Docker container output.
 2014-11-17 11:12:44 -08:00
Victor Marmol
f61d2379ee cAdvisor 0.6.0 2014-11-17 11:08:38 -08:00
Victor Marmol
742bb8c724 Do not duplicate Docker container output. 
Since Docker containers are known by more than one name we were
returning them once for every name they're known by. This change makes
the returned containers unique.
 2014-11-17 10:40:28 -08:00
Victor Marmol
c7886629f8 Merge pull request #311 from vmarmol/fix 
Fix Docker ALL reference
 2014-11-17 10:28:28 -08:00
Victor Marmol
ac0b27a4b8 Fix Docker ALL reference 2014-11-17 10:07:40 -08:00
Victor Marmol
a1e72b2017 Merge pull request #308 from mindscratch/embed-external-js-css 
Embed bootstrap, jquery and other external dependencies
 2014-11-14 13:31:45 -08:00
Craig Wickesser
89b039ae9e Include version numbers in resource URLs. 2014-11-14 16:15:36 -05:00
Craig Wickesser
7f718a30d7 fixed formatting 2014-11-13 20:16:12 -05:00
Craig Wickesser
b4e1dbb4f9 Embed bootstrap, jquery and other external dependencies to allow cAdvisor to function without a connection to the Internet per issue #304. 2014-11-13 18:09:29 -05:00
Rohit Jnagal
a4e25f056b Merge pull request #307 from vmarmol/root 
Add "Docker containers are here" link to the main page.
 2014-11-13 11:23:27 -08:00
Victor Marmol
e7b5a587c6 Add 'Docker containers are here' link to the main page 2014-11-13 11:09:54 -08:00
Vish Kannan
cefdb9c817 Merge pull request #297 from vmarmol/namespaces 
Introducing Namespaces: Simplify how the Docker containers are handled.
 2014-11-13 09:50:25 -08:00
Victor Marmol
2dac0d5c58 Merge pull request #300 from rancherio/configure-ip 
Make the listen IP address configurable
 2014-11-13 08:20:05 -08:00
Victor Marmol
f97e57df88 Simplify how the Docker containers are handled. 
This is done by introducting the concept of "namespaces" of container
names. The aliases of a container are under this namespace. Namespace
names are of the form:

//<namespace>/<alias>

This allows us to (within cAdvisor) query all docker containers as
//docker regardless of whether this is a systemd or a non-systemd system.

This does break our ability to handle Docker aliases with the /container
endpoint. I think this is acceptable as our support there was not
consistent between system types.
 2014-11-12 18:01:47 -08:00
Darren Shepherd
bed887ffb6 Make the listen IP address configurable 2014-11-12 16:47:45 -07:00
Victor Marmol
fbafdbb860 Merge pull request #299 from rancherio/send-500-error 
When an unknown error occurs set the HTTP status code to 500
 2014-11-12 11:20:08 -08:00
Vish Kannan
4910466050 Merge pull request #296 from vmarmol/docker 
Add /docker/ UI endpoint.
 2014-11-12 09:48:52 -08:00
Vish Kannan
2020019e33 Merge pull request #231 from vmarmol/circular-buffer 
Add a StatsBuffer circular buffer for ContainerStats.
 2014-11-10 09:52:55 -08:00
Darren Shepherd
bce92c2a0b When an unknown error occurs set the HTTP status code to 500 2014-11-08 14:56:28 -07:00
Vish Kannan
d072778d01 Merge pull request #298 from vmarmol/readme 
Reorganizing cAdvisor docs and moving many of them to their own pages.
 2014-11-07 16:36:13 -08:00
Victor Marmol
1118597ade Reorganizing cAdvisor docs and moving many of them to their own pages. 2014-11-07 16:34:45 -08:00
Victor Marmol
023520da9b Add a StatsBuffer circular buffer for ContainerStats. 2014-11-07 15:21:40 -08:00
Victor Marmol
6e89bdef9f Add /docker/ UI endpoint. 
Fixes #294
 2014-11-07 08:53:52 -08:00
Vish Kannan
c356d3b7c1 Merge pull request #295 from vmarmol/readme 
Add more detailed build docs.
 2014-11-06 15:44:47 -08:00
Victor Marmol
45be8162c7 Add more detailed build docs. 2014-11-06 15:37:26 -08:00
Vish Kannan
26921c3643 Merge pull request #277 from vmarmol/flat 
Flatten ContainerStats struct
 2014-11-05 11:26:10 -08:00
Victor Marmol
b6d719ac0c Merge pull request #292 from vmarmol/readme 
Add more detailed running instructions.
 2014-11-03 17:43:23 -08:00
Victor Marmol
c53641c29f Add more detailed running instructions. 
Fixes #290
 2014-11-03 17:23:14 -08:00
Rohit Jnagal
84da7270da Merge pull request #289 from vmarmol/docker 
Fix logic for deciding if Docker container was not found.
 2014-10-29 13:41:45 -07:00
Victor Marmol
cb80366c6d Fix logic for deciding if Docker container was not found. 
This is currently broken for all searches of Docker containers.
 2014-10-29 13:32:14 -07:00
Rohit Jnagal
67e3a367b6 Merge pull request #288 from vmarmol/limits 
Only overwrite the Name and Parent in the libcontainer Cgroup.
 2014-10-29 11:58:43 -07:00
Victor Marmol
e695c3820e Only overwrite the Name and Parent in the libcontainer Cgroup. 
Fixes #287
 2014-10-29 11:41:23 -07:00
Rohit Jnagal
02aaf8276e Merge pull request #285 from vmarmol/master 
Update libcontainer for new net stats patch that uses less CPU.
 2014-10-29 10:17:00 -07:00
Victor Marmol
5cdc6c3304 Update libcontainer for new net stats patch that uses less CPU. 2014-10-28 10:58:54 -07:00
Vish Kannan
812e1f4944 Merge pull request #284 from vmarmol/release 
cAdvisor version 0.5.0
 2014-10-28 09:21:07 -08:00
Victor Marmol
8c4f650e62 cAdvisor version 0.5.0 2014-10-28 10:19:41 -07:00
Vish Kannan
a0c97f660a Merge pull request #282 from vmarmol/content-type 
Output correct content-type with API responses.
 2014-10-28 09:30:16 -07:00
Victor Marmol
edb452603c Merge pull request #283 from ashahab-altiscale/more-blkio-stats 
Additional blkio stats
 2014-10-28 09:24:18 -07:00
Victor Marmol
3a6faf5653 Merge pull request #279 from ashahab-altiscale/additional-disk-stats 
Added /proc/diskstats
 2014-10-28 08:58:22 -07:00
Victor Marmol
9961e0f4d6 Output correct content-type with API responses. 
Fixes #281
 2014-10-27 08:33:22 -07:00
Abin Shahab
e6406ef6d0 Additional blkio stats 
This adds blkio.io_wait_time, blkio.io_service_time, blkio.io_merged, and blkio.time to the api
 2014-10-21 22:41:33 +00:00
Rohit Jnagal
b1796da270 Merge pull request #278 from vmarmol/docker-api 
Add API version v1.2 with /docker endpoint.
 2014-10-21 09:58:32 -07:00
Victor Marmol
559eb716c7 Add v1.2 documentation to the README. 2014-10-21 08:30:28 -07:00
Victor Marmol
bc3b01665f Merge pull request #274 from ashahab-altiscale/raw-disk-space 
Mounted partitions space usage metrics per container
 2014-10-21 08:27:13 -07:00