Commit Graph

1077 Commits

Author SHA1 Message Date
Rohit Jnagal
d1f21bb2fd Merge pull request #600 from kateknister/apiBranch
adding systemd oomparser functionality
2015-03-25 23:06:00 -07:00
Victor Marmol
fae2234846 Merge pull request #576 from kateknister/master
Provides a way to remove unused channels from an eventHandler's watchers list
2015-03-25 17:29:01 -07:00
Katie Knister
3c7e67991d Created a way to remove unused channels from an eventHandler's watchers list 2015-03-25 16:36:48 -07:00
Rohit Jnagal
fd9f7e0e82 Merge pull request #615 from vmarmol/default
Return all stats by default.
2015-03-25 13:33:24 -07:00
Victor Marmol
bacf817e6a If start and end specified, ignore maxResults. 2015-03-25 13:18:54 -07:00
Victor Marmol
814c65059a Document and specify defaults for ContainerRequestInfo. 2015-03-25 13:15:10 -07:00
Victor Marmol
bfaf70b255 Merge pull request #614 from rjnagal/master
Fix table length for bigquery storage.
2015-03-24 18:04:16 -07:00
Katie Knister
21e96ed61c adding systemd oomparser functionality 2015-03-24 12:33:57 -07:00
Rohit Jnagal
a37b596a45 Fix table length for bigquery storage. 2015-03-24 18:18:42 +00:00
Rohit Jnagal
cf13f4d5ee Merge pull request #610 from kargakis/goauth2-replacement
goauth2 replacement
2015-03-24 11:16:14 -07:00
kargakis
3ccd56d848 Use new oauth2 package
Fixes #608
2015-03-24 10:54:38 +01:00
kargakis
ee9dd8abdb Replace deprecated oauth2 package 2015-03-24 10:42:05 +01:00
Victor Marmol
8ec4990bc6 Merge pull request #613 from rjnagal/version
Remove field descriptions from Machine doc.
2015-03-23 12:52:59 -07:00
Rohit Jnagal
c34d80fdca Remove field descriptions from Machine doc. 2015-03-23 18:23:10 +00:00
Victor Marmol
e68a8c511e Merge pull request #611 from rjnagal/version
Add documentation for 2.0 API.
2015-03-23 11:12:04 -07:00
Rohit Jnagal
9a79c8a0fb Add documentation for 2.0 API. 2015-03-23 18:06:03 +00:00
Victor Marmol
1acf796852 Merge pull request #538 from DreadPirateShawn/patch-1
Fixed minor typo in runtime_options.md
2015-03-23 10:54:42 -07:00
Victor Marmol
41a0c30fbf Merge pull request #609 from simon3z/boot-id
machine: collect node boot id if available
2015-03-23 08:19:13 -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
Vish Kannan
3390499a8c Merge pull request #604 from smarterclayton/slightly_decrease_log_on_startup
Reduce the level for a few common log messages
2015-03-19 21:03:18 -07:00
Clayton Coleman
3e7c1b3613 Reduce the level for a few common log messages
Following the Kubernetes convention of V(2) is normal verbosity (log
each request to a webserver).
2015-03-19 23:55:36 -04:00
Vish Kannan
fb9b778b9f Merge pull request #603 from smarterclayton/lazily_init_systemd
Lazily init DBus only when it is needed
2015-03-19 15:16:24 -07:00
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