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

Merge pull request #657 from vmarmol/events

Browse Source 
Handle container names in resource path
This commit is contained in:
Rohit Jnagal 2015-04-20 13:30:04 -07:00
commit 99aa5c511b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/handler.go
View File

@ -241,10 +241,6 @@ func getEventRequest(r *http.Request) (*events.Request, bool, error) {
query.EndTime = newTime query.EndTime = newTime
} }
} }
if val, ok := urlMap["container_name"]; ok {
containerName := strings.Trim(val[0], " /")
query.ContainerName = "/" + containerName
}
return query, stream, nil return query, stream, nil
} }

8
api/versions.go
View File

@ -17,6 +17,7 @@ package api
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"path"
"strconv" "strconv"
"github.com/golang/glog" "github.com/golang/glog"
@ -261,17 +262,18 @@ func (self *version1_3) SupportedRequestTypes() []string {
func (self *version1_3) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error { func (self *version1_3) HandleRequest(requestType string, request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
switch requestType { switch requestType {
case eventsApi: case eventsApi:
return handleEventRequest(m, w, r) return handleEventRequest(request, m, w, r)
default: default:
return self.baseVersion.HandleRequest(requestType, request, m, w, r) return self.baseVersion.HandleRequest(requestType, request, m, w, r)
} }
} }
func handleEventRequest(m manager.Manager, w http.ResponseWriter, r *http.Request) error { func handleEventRequest(request []string, m manager.Manager, w http.ResponseWriter, r *http.Request) error {
query, stream, err := getEventRequest(r) query, stream, err := getEventRequest(r)
if err != nil { if err != nil {
return err return err
} }
query.ContainerName = path.Join("/", getContainerName(request))
glog.V(4).Infof("Api - Events(%v)", query) glog.V(4).Infof("Api - Events(%v)", query)
if !stream { if !stream {
pastEvents, err := m.GetPastEvents(query) pastEvents, err := m.GetPastEvents(query)
@ -388,7 +390,7 @@ func (self *version2_0) HandleRequest(requestType string, request []string, m ma
} }
return writeResult(fi, w) return writeResult(fi, w)
case eventsApi: case eventsApi:
return handleEventRequest(m, w, r) return handleEventRequest(request, m, w, r)
default: default:
return fmt.Errorf("unknown request type %q", requestType) return fmt.Errorf("unknown request type %q", requestType)
} }