Commit Graph

1499 Commits

Author SHA1 Message Date
Bas van der Lei
f8eb8cc982 validate name with isContainerName func 2015-10-02 13:49:27 +02:00
Bas van der Lei
9931854585 remove dead code 2015-10-02 13:42:40 +02:00
Jimmi Dyson
5d72e5ce74 Merge pull request #891 from f0/master
add tcp/tcp6 statistics
2015-10-02 10:53:04 +01:00
Jimmi Dyson
cf43fd2556 Expose git revision as well as version in version info, add Makefile 2015-10-02 10:26:33 +01:00
Jimmi Dyson
fba0608527 Merge pull request #887 from Snorch/fix-for-custom-cgroup-mounting
Make getCgroupPath work in case of named or multi- hierarchies
2015-09-30 17:31:32 +01:00
Jimmi Dyson
4cb5a7eab6 Merge pull request #895 from jimmidyson/docker-subdir
Fix docker containers relative links
2015-09-30 17:31:01 +01:00
Bas van der Lei
13674cf06c optimize dockerCgroupRegexp 2015-09-27 00:20:52 +02:00
Jimmi Dyson
7072911994 Fix docker containers relative links 2015-09-26 20:19:45 +01:00
Florian Koch
e4262b91b1 move TCP and TCP6 stats to NetworkStats 2015-09-25 09:04:53 +02:00
Florian Koch
dd041457b5 some fixes 2015-09-24 15:44:42 +02:00
Florian Koch
c331982f21 add tcp/tcp6 statistics 2015-09-24 15:44:42 +02:00
Bas van der Lei
7788c8bd27 Ignore systemd 'containers' in the docker driver 2015-09-23 23:55:35 +02:00
Vish Kannan
259ce65055 Merge pull request #893 from rjnagal/release
Make release 0.18.0
2015-09-23 14:52:01 -07:00
Rohit Jnagal
1f910b1ad5 Make release 0.18.0
Didn't notice that we already had a tag for 0.17.0 from last week.
Let's skip that and move to 0.18.
2015-09-23 20:08:28 +00:00
Rohit Jnagal
e675b00a40 Merge pull request #892 from rjnagal/release
New version 0.17.0
2015-09-23 13:05:49 -07:00
Rohit Jnagal
9e667bc6dc New version 0.17.0 2015-09-23 18:21:19 +00:00
Pavel Tikhomirov
4cbd91c761 Make getCgroupPath work in case of named or multi- hierarchies
In case we have devices hierarchies mounted in named cgroup
or together with other hierarchy regexp parse will fail.
So after "devices" and before ":" can be name of cgroup or
other hierarchies names.

E.g.:
1) remount cgroups:
umount /sys/fs/cgroup/devices
mkdir /sys/fs/cgroup/named_cgroup
mount -n -t cgroup -o devices,name=named_cgroup cgroup
/sys/fs/cgroup/named_cgroup

2) add some task to nested device cgroup and check ps output
mkdir /sys/fs/cgroup/named_cgroup/test.slice
sleep 1000 &
[1] 22734
echo 22734 > /sys/fs/cgroup/named_cgroup/test.slice/tasks
ps -ao pid,cgroup | grep 22734
22734
14:devices,name=named_cgroup:/test.slice,1:name=systemd:/user.slice/user-1000.slice/session-1.scope

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
2015-09-18 17:55:23 +03:00
Vish Kannan
9feca2c039 Merge pull request #882 from lborguetti/master
Add flag -k to journalctl show only kernel messages
2015-09-17 12:36:32 -07:00
Vish Kannan
a059975c63 Merge pull request #876 from basvdlei/relative-links
use relative links on docker pages
2015-09-17 12:34:06 -07:00
Vish Kannan
769738ba88 Merge pull request #884 from hacpai/fixbug-issue-881
Fix problem about ElasticSearch container
2015-09-17 10:52:56 -07:00
hacpai
1fc01caa65 Fix issue #881 2015-09-18 00:05:48 +08:00
Vish Kannan
7327cfe267 Merge pull request #885 from rjnagal/docker
Initial skeleton for application metrics docs.
2015-09-15 11:49:53 -07:00
Shahid
65019576b3 Merge pull request #1 from linux-on-ibm-z/SystemZ-Changes
System z changes
2015-09-15 17:30:46 +05:30
Rohit Jnagal
b24efc0af3 Initial skeleton for application metrics docs.
Not linked off from the main page yet. Needs few more tweaks, links, and
sample images.
2015-09-14 18:30:17 +00:00
Luciano Antonio Borguetti Faustino
e0c994c4c5 Add flag -k to journalctl show only kernel messages 2015-09-10 23:53:34 -03:00
Rohit Jnagal
5aa8b0fc86 Merge pull request #880 from jimmidyson/prom-machine-spec
Add machine memory & cpu cores to prometheus metrics
2015-09-10 09:55:14 -07:00
Jimmi Dyson
760a25b94f Add machine memory & cpu cores to prometheus metrics 2015-09-10 11:59:16 +01:00
Rohit Jnagal
b22a085257 Merge pull request #877 from jimmidyson/prom-container-spec
Prometheus metrics improvements
2015-09-09 09:30:32 -07:00
Jimmi Dyson
b8fc8cd2ae Add container specs & cadvisor version info to prometheus metrics 2015-09-09 14:28:54 +01:00
Rohit Jnagal
4914057418 Merge pull request #875 from hacpai/feature-support-elastic
🍺 Add support for elasticsearch storage driver
2015-09-08 09:50:27 -07:00
Bas van der Lei
a103cee81a use relative links on docker pages 2015-09-08 15:05:58 +02:00
hacpai
3386114814 🍺 Add support for elasticsearch storage driver 2015-09-08 14:01:35 +08:00
Shahid
bfa8c9378c Update sysfs.go 2015-09-02 13:07:40 +05:30
Shahid
0dce153b6e Update machine.go 2015-09-02 13:00:36 +05:30
Vish Kannan
cefada41b8 Merge pull request #872 from jimmidyson/prom-multiple-interfaces
Expose all interfaces in Prometheus metrics.
2015-09-01 11:05:49 -07:00
Vish Kannan
499737d7ad Merge pull request #870 from jimmidyson/net-stats-from-proc
Use proc fs to get network stats.
2015-08-31 14:00:29 -07:00
Jimmi Dyson
80648f783e Expose all interfaces in Prometheus metrics.
Fixes #871
2015-08-29 21:19:56 +01:00
Jimmi Dyson
7e10398a50 Use proc fs to get network stats.
Reasons discussed in
https://github.com/google/cadvisor/issues/822#issuecomment-135811901 &
following.
2015-08-29 00:20:07 +01:00
Rohit Jnagal
4445152678 Merge pull request #869 from jimmidyson/prom-image-label
Add image name to container spec & prometheus metrics
2015-08-28 09:08:07 -07:00
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