prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #99 from vmarmol/raw

Browse Source 
Enable the simple raw driver.
This commit is contained in:
Victor Marmol 2014-07-22 08:50:01 -07:00
commit 2c12f76e4a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cadvisor.go
View File

@ -22,7 +22,7 @@ import (
"github.com/google/cadvisor/api" "github.com/google/cadvisor/api"
"github.com/google/cadvisor/container/docker" "github.com/google/cadvisor/container/docker"
"github.com/google/cadvisor/container/lmctfy" "github.com/google/cadvisor/container/raw"
"github.com/google/cadvisor/info" "github.com/google/cadvisor/info"
"github.com/google/cadvisor/manager" "github.com/google/cadvisor/manager"
"github.com/google/cadvisor/pages" "github.com/google/cadvisor/pages"
@ -51,13 +51,11 @@ func main() {
log.Printf("Docker registration failed: %v.", err) log.Printf("Docker registration failed: %v.", err)
} }
// Register lmctfy. // Register the raw driver.
if err := lmctfy.Register(); err != nil { if err := raw.Register(); err != nil {
log.Fatalf("lmctfy registration failed: %v.", err) log.Fatalf("raw registration failed: %v.", err)
} }
// TODO(vmarmol): Have a no-op or "raw" factory.
// Handler for static content. // Handler for static content.
http.HandleFunc(static.StaticResource, func(w http.ResponseWriter, r *http.Request) { http.HandleFunc(static.StaticResource, func(w http.ResponseWriter, r *http.Request) {
err := static.HandleRequest(w, r.URL) err := static.HandleRequest(w, r.URL)

2
container/docker/factory.go
View File

@ -61,7 +61,7 @@ func (self *dockerFactory) CanHandle(name string) bool {
if self.useSystemd { if self.useSystemd {
return strings.HasPrefix(name, "/docker-") return strings.HasPrefix(name, "/docker-")
} }
return name == "/docker" || strings.HasPrefix(name, "/docker/") return strings.HasPrefix(name, "/docker/")
} }
func parseDockerVersion(full_version_string string) ([]int, error) { func parseDockerVersion(full_version_string string) ([]int, error) {