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

1410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jimmi Dyson
ff0796712b Add image name to container spec & prometheus metrics 
Fixes #848
 2015-08-28 12:38:16 +01:00
Rohit Jnagal
7c0403d6ed Merge pull request #861 from mvdan/cpu-inst 
Add instantaneous cpu metrics
 2015-08-27 16:56:34 -07:00
Daniel Martí
208baa507f Add instantaneous cpu metrics to v2 2015-08-27 16:47:11 -07:00
Vish Kannan
abd5386c7c Merge pull request #867 from mvdan/recursive-go-build 
Add empty healthz test_utils to fix go build ./...
 2015-08-26 15:32:48 -07:00
Daniel Martí
58cd3ddf0c Add empty healthz test_utils to fix go build ./... 
Without any .go file that doesn't end in _test, it fails:

no buildable Go source files in [...]/integration/tests/healthz

An empty source file works around this.
 2015-08-26 12:15:55 -07:00
Vish Kannan
f99e491a98 Merge pull request #865 from jimmidyson/network-stats-by-ns 
Get network stats by switching network namespace on newer Docker versions.
 2015-08-25 15:34:02 -07:00
Jimmi Dyson
d5fa97c998 Get network stats by switching network namespace on newer Docker 
versions.

Fixes #822
 2015-08-25 23:27:01 +01:00
Victor Marmol
27fb6d593c Merge pull request #864 from rjnagal/docker 
Fix network info for docker containers running with --net=host.
 2015-08-24 08:31:57 -07:00
Rohit Jnagal
7a2f508b50 Fix network info for docker containers running with --net=host. 
Docker still reports a loop device for these. Need to check for
more than one device to mark network as available.
 2015-08-24 02:58:03 +00:00
Rohit Jnagal
39290eeb49 Merge pull request #860 from pwittrock/no_cache_versioninfo 
Always to a live lookup of version info instead of caching.
 2015-08-21 09:11:06 -07:00
Phillip Wittrock
b7bbefd9b1 Always to a live lookup of version info instead of caching. 2015-08-20 16:48:45 -07:00
Vish Kannan
5d30b67a30 Merge pull request #859 from mikedanese/go1.5 
use vanity domain for gcloud-golang
 2015-08-19 16:35:27 -07:00
Mike Danese
f50b3b11a0 add go1.5 target to travis build 2015-08-19 16:19:30 -07:00
Mike Danese
38ab53a8ff use gcloud-golang vanity domain 2015-08-19 16:15:01 -07:00
Mike Danese
e4fa9ea7ed update godeps 2015-08-19 16:15:01 -07:00
Victor Marmol
c6826504a5 Merge pull request #857 from Miciah/Warning-to-Warningf 
glog.Warning -> glog.Warningf
 2015-08-19 12:57:50 -07:00
Miciah Masters
003125975c glog.Warning -> glog.Warningf 
Fix two places where glog.Warning is used with a formatted string.
 2015-08-19 15:47:36 -04:00
Victor Marmol
f6d53e4e52 Merge pull request #844 from jhjeong-kr/master 
issue: high cpu usage
 2015-08-17 17:51:49 -07:00
Jin-Hwan Jeong
9bb7a0278d this patch fixes "high cpu consumption without sleeping in housekeeping()" problem if system time has changed 
Signed-off-by: Jin-Hwan Jeong <jhjeong.kr@gmail.com>
 2015-08-18 09:03:12 +09:00
Victor Marmol
9db0c2e26f Merge pull request #856 from rjnagal/docker 
Ignore NaN values in collection.
 2015-08-17 16:58:38 -07:00
Rohit Jnagal
374e36d38e Ignore NaN values in collection. 
We'll re-enable it when we have a better way in UI to handle these.
 2015-08-17 23:24:19 +00:00
Rohit Jnagal
ac85d8f8f6 Merge pull request #854 from anushree-n/promUI 
UI changes
 2015-08-14 23:41:53 -07:00
anushree-n
74767b8600 UI changes 2015-08-14 17:57:24 -07:00
Rohit Jnagal
9d94806f1b Merge pull request #853 from anushree-n/prometheus 
Add Prometheus Collector
 2015-08-14 11:21:46 -07:00
anushree-n
4c67b21c1d Add Prometheus Collector 2015-08-14 10:59:37 -07:00
Rohit Jnagal
e68e5052df Merge pull request #850 from jimonreal/stdout-storage 
Stdout storage
 2015-08-14 10:28:40 -07:00
Jose I. Monreal Bailey
3f54f77f9e Removing constant typed string. Handle fmt.Println error 2015-08-14 14:19:23 -03:00
Jose I. Monreal Bailey
6573abf96d Fixing assignment of containerName and adding space between external imports and golibs 2015-08-14 12:12:44 -03:00
Rohit Jnagal
2a022a4a74 Merge pull request #852 from anushree-n/genericCollector 
Modify generic collector
 2015-08-12 22:00:38 -07:00
anushree-n
04a78502ca Modify generic collector 2015-08-12 17:56:01 -07:00
Jose I. Monreal Bailey
96a7710a45 Adding new storage driver stdout 2015-08-11 15:39:23 -03:00
Victor Marmol
2a7218e03b Merge pull request #846 from rjnagal/docker 
Fix cgroup name parsing logic in ps output for centos6.
 2015-08-07 21:53:39 -07:00
Rohit Jnagal
15664a6a0c Fix cgroup name parsing logic in ps output for centos6. 
Centos 6 uses a different ps lib resulting in different output.
 2015-08-08 02:23:58 +00:00
Rohit Jnagal
b0684c2457 Merge pull request #840 from anushree-n/fix 
Change X and Y axes labels in custom metrics
 2015-07-31 21:56:22 -07:00
anushree-n
d1649b17d7 Change X and Y axes labels in custom metrics 2015-07-31 18:10:15 -07:00
Rohit Jnagal
0bed2bdd7f Merge pull request #829 from anushree-n/ui 
UI changes to display custom metrics
 2015-07-31 15:55:09 -07:00
anushree-n
44886a0c90 UI changes for custom metrics 2015-07-31 15:47:26 -07:00
Victor Marmol
78419de3ea Merge pull request #839 from rjnagal/docker 
Add units and data type to spec for custom metrics.
 2015-07-30 10:21:51 +02:00
Rohit Jnagal
dd0d0dd3b1 Add units and data type to spec for custom metrics. 
Renamed units to data_type in collector config.
Use units for actual display units eg MB/s, "number of connections".
 2015-07-30 06:11:17 +00:00
Rohit Jnagal
843fc130ae Merge pull request #798 from jmaitrehenry/master 
Update statsd storage - issue #724
 2015-07-28 11:58:22 -07:00
Julien Maitrehenry
1e35331848 Update statsd storage - cpu, memory and network done 
Add Fs stats to statsd

Update import for pointing to official repository

Update statsd storage for respecting fmt coding style

Create a separate client file

Fix gofmt
 2015-07-28 14:55:15 -04:00
Rohit Jnagal
ef41402a39 Merge pull request #838 from rjnagal/docker 
Add custom metrics to spec.
 2015-07-27 16:37:32 -07:00
Rohit Jnagal
c0b3f779f5 Add custom metrics to spec. 
Remove spec-related fields from stat.
We can simplify the stats a bit further by handling Int and Float better.
But this was big enough change already.
Verified v1 and v2 spec/stats/appmetrics APIs.
 2015-07-25 20:17:54 +00:00
Victor Marmol
b581ee2e67 Merge pull request #835 from rjnagal/docker 
Fix converion of rss and vsz in ps output.
 2015-07-24 10:12:25 -07:00
Rohit Jnagal
a5e65b38c6 Fix converion of rss and vsz in ps output. 2015-07-24 15:35:58 +00:00
Victor Marmol
ca7fd6d40a Merge pull request #831 from rjnagal/docker 
Two small fixes to custom metric collection.
 2015-07-22 21:34:23 -07:00
Rohit Jnagal
3f8e065947 Two small fixes to custom metric collection. 
- a typo in minPollingFrequency multiplies it with time.Second twice.
- Updating custom metrics is unnecessarily called for all containers.
 2015-07-23 01:56:07 +00:00
Victor Marmol
17c45c6ec3 Merge pull request #827 from rjnagal/docker 
Add logic to read custom metric config files from container root.
 2015-07-22 13:39:17 -07:00
Rohit Jnagal
a123fd72d8 Add logic to read custom metric config files from container root. 
Docker does not provide the rootfs path through docker inspect or statefile
and the path is dependent on the storage driver being used.

Instead of enumerating the storage drivers, we pick a pid from the container
and get the config from /proc/pid/root. Although a bit expensive, this method
works for non-docker containers too.
 2015-07-22 15:45:07 +00:00
Victor Marmol
3f2643897d Merge pull request #828 from vegasbrianc/patch-1 
Update prometheus.md
 2015-07-22 08:34:24 -07:00