Add the support for redis in cAdvisor's storage by superzhaoyy · Pull Request #693 · google/cadvisor

superzhaoyy · 2015-05-07T05:27:49Z

provide redis driver for cAdvisor's storage，we can push the data from cAdvisor to redis.

googlebot · 2015-05-07T05:27:50Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please let us know the company's name.

cadvisorJenkinsBot · 2015-05-07T05:29:01Z

Can one of the admins verify this patch?

superzhaoyy · 2015-05-07T05:42:21Z

I signed it!

googlebot · 2015-05-07T05:42:22Z

CLAs look good, thanks!

rjnagal · 2015-05-07T05:48:08Z

Hostname() won't return what you expect if cAdvisor is running inside a container. You probably want to accept an IP or hostname as a flag.

vmarmol · 2015-05-07T15:19:50Z

ok to test

vmarmol · 2015-05-07T15:19:59Z

this looks great @superzhaoyy, thanks for the PR!

vmarmol · 2015-05-07T15:20:25Z

Looks like we'll need to add the redis godep btw.

superzhaoyy · 2015-05-08T09:46:11Z

hi @vmarmol why I can't add the redis godep on Godeps?
when I run [ go get github.com/garyburd/redigo/redis] [ godep save ] ,I haven't changed anything in Godeps/Godeps.json and Godeps/_workspace

when I run [ go get github.com/garyburd/redigo/redis] [ godep save ]
result is ：
godep: github.com/docker/docker/pkg/symlink: revision is af9dac9627e7b04a803df152cc24f0db073ea17a, want 8e107a93210c54f22ec1354d969c771b1abfbe058e107a93210c54f22ec1354d969c771b1abfbe05

vmarmol · 2015-05-08T15:17:53Z

Usually what works for me is this (from cAdvisor root):

$ godep restore
$ go get -u github.com/garyburd/redigo/redis
$ godep save ./...

Does that return any problems?

superzhaoyy · 2015-05-12T02:39:48Z

thanks@vmarmol
As you said, I successfully added redis in Godeps.

rjnagal · 2015-05-12T05:01:14Z

Can you run with go1.4 or just change the version back in this file manually?

rjnagal · 2015-05-12T05:04:40Z

Looks great, just minor nits.

Can you also squash your commits. Thanks @superzhaoyy !

Cmeger

superzhaoyy · 2015-05-12T07:35:58Z

hi@rjnagal
I have modified some mistakes that you had pointed out，but how can i squash my commits
thank you.

This gives us a bit over one event per second for one day. Assuming 250 bytes per event, the max memory usage is ~24MiB per event type.

This will allow us to register and run custom collectors for each container.

This will allow cAdvisor to be reverse proxied. Fixes #513 Fixes #566 Fixes #596 Fixes #667

Fixes #668

Added missing docker page handling.

Fixes #379

The current logic assumes that entries are added to the store in monotonically increasing order for time. This is not true when we add creation events for existing containers.

Containers with subcontainers always report creation time to be same as the time of creation of the latest subcontainer. Still not an ideal solution, but accurate for most practical purposes.

Everything other than cache information is available through /proc/cpuinfo.

1) cgroups were getting mounted at /cgroup: not /cgroup 2) incorrect flag was used: provided but not defined: --privilege See 'docker run --help'.

Add the support of redis in cadvisor's storage Add redis for cadvisor's storage Add the support for redis in the cAdvisor's storage Update storagedriver.go

superzhaoyy · 2015-05-13T02:09:07Z

hi @vmarmol
oh ,it's sad .I add more commits because i make mistakes by using git .
This article http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
says "A word of caution: Only do this on commits that haven’t been pushed an external repository"
but I have pushed commits to remote master, so can't I make my commits into less commits ?
can i give up this PR, then I give another PR ?

vmarmol · 2015-05-13T06:44:04Z

That works too :)

It looks like you got a rebase slightly incorrect. Git is a bit of a pain to get used to for stuff like this...

superzhaoyy · 2015-05-13T06:53:35Z

@vmarmol
yes.it is sad .I am not able to skillfully use Git. I have to delete my repository,i refork google/cadvisor.
can i give up this PR, then I give another PR ?
Thank you for your patience to answer.
👍

vmarmol · 2015-05-13T07:02:02Z

Yes you certainly can close this PR and make a new one. You shouldn't need to delete your repository, just make a new branch:

Assuming that origin is the upstream fork in GitHub.

# Grab the latest code
$ git fetch origin master

# Make a new branch based on the current code
$ git branch new-branch origin/master

# Switch to that branch
$ git checkout new-branch

superzhaoyy · 2015-05-13T07:17:18Z

thanks@vmarmol
I have make a new PR. Please close this PR.
It's nice talking with you.

superzhaoyy added 3 commits May 7, 2015 11:41

add redis

e904784

add redis in storage

8207747

Add the support for redis

84b709c

catrixs mentioned this pull request May 7, 2015

Feature Request: Support ELK #634

Closed

rjnagal reviewed May 7, 2015
View reviewed changes

superzhaoyy added 3 commits May 8, 2015 05:56

Add the support of redis

12ba92e

Add the support of redis for cAdvisor's storage

4ef3f5f

Merge branch 'master' of https://github.com/google/cadvisor

ea6c850

Add redis for cAdvisor's storage

be796a3

superzhaoyy added 3 commits May 11, 2015 22:53

Add the support of redis in cadvisor's storage

e9b075b

Add redis for cadvisor's storage

cd551f8

Update storagedriver.go

ef2aed0

rjnagal reviewed May 12, 2015
View reviewed changes

superzhaoyy added 2 commits May 12, 2015 03:05

Add the support for redis in the cAdvisor's storage

8a8a873

Merge branch 'master' of https://github.com/superzhaoyy/cadvi

0ec8523

Cmeger

vmarmol and others added 24 commits May 12, 2015 21:48

Limit events to 100,000 of each type.

127d6ab

This gives us a bit over one event per second for one day. Assuming 250 bytes per event, the max memory usage is ~24MiB per event type.

Add events StoragePolicy.

bafc521

Add flags to customize the events StoragePolicy.

74d1780

cAdvisor 0.13.0

b320085

Update inotify dependency.

b61884a

Publish creation event for pre-existing containers on start-up.

980a69b

Add generic collector runtimes

1fd461b

Run custom collectors in container housekeeping.

02452aa

This will allow us to register and run custom collectors for each container.

Make all links relative.

c13d0a8

This will allow cAdvisor to be reverse proxied. Fixes #513 Fixes #566 Fixes #596 Fixes #667

Update libcontainer godep

25f7646

Fixes #668

Update gocapability

7f54c2b

Remove spec info from container creation event data.

b7042bd

Add 'all_events' option to the api to report all event types.

e52ab5a

Revert "Make all links relative."

1cb63a1

Make all link relative - part 2.

f6dc304

Added missing docker page handling.

Lower logging level of some common logs.

b97a4dc

Replace gcutil with gcloud usage

18f51ef

Document that cAdvisor needs --privilege in RHEL/CentOS

db19729

Fixes #379

Fix handling of time ranges in timed store.

b9361fc

The current logic assumes that entries are added to the store in monotonically increasing order for time. This is not true when we add creation events for existing containers.

Improve approximation of container creation time.

36c10d3

Containers with subcontainers always report creation time to be same as the time of creation of the latest subcontainer. Still not an ideal solution, but accurate for most practical purposes.

Return partial topology information if cache info is not available.

02d6bdb

Everything other than cache information is available through /proc/cpuinfo.

update documentation for CentOS 7

396abc4

1) cgroups were getting mounted at /cgroup: not /cgroup 2) incorrect flag was used: provided but not defined: --privilege See 'docker run --help'.

Add redis for cAdvisor's storage

a79e67e

Add the support of redis in cadvisor's storage Add redis for cadvisor's storage Add the support for redis in the cAdvisor's storage Update storagedriver.go

Merge branch 'master' of https://github.com/superzhaoyy/cadvisor

5225a0d

vmarmol closed this May 13, 2015

Conversation

superzhaoyy commented May 7, 2015

Uh oh!

googlebot commented May 7, 2015

Uh oh!

cadvisorJenkinsBot commented May 7, 2015

Uh oh!

superzhaoyy commented May 7, 2015

Uh oh!

googlebot commented May 7, 2015

Uh oh!

rjnagal May 7, 2015

Choose a reason for hiding this comment

Uh oh!

vmarmol commented May 7, 2015

Uh oh!

vmarmol commented May 7, 2015

Uh oh!

vmarmol commented May 7, 2015

Uh oh!

superzhaoyy commented May 8, 2015

Uh oh!

vmarmol commented May 8, 2015

Uh oh!

superzhaoyy commented May 12, 2015

Uh oh!

rjnagal May 12, 2015

Choose a reason for hiding this comment

Uh oh!

rjnagal commented May 12, 2015

Uh oh!

superzhaoyy commented May 12, 2015

Uh oh!

superzhaoyy commented May 13, 2015

Uh oh!

vmarmol commented May 13, 2015

Uh oh!

superzhaoyy commented May 13, 2015

Uh oh!

vmarmol commented May 13, 2015

Uh oh!

superzhaoyy commented May 13, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants