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

Merge pull request #683 from rjnagal/validate

Browse Source 
Remove spec info from container creation event data.
This commit is contained in:
Victor Marmol 2015-05-05 15:50:10 -07:00
commit 833a60014e
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
info/v1/container.go
View File

@ -508,19 +508,10 @@ const (
// Extra information about an event. Only one type will be set. // Extra information about an event. Only one type will be set.
type EventData struct { type EventData struct {
// Information about a container creation event.
Created *CreatedEventData `json:"created,omitempty"`
// Information about an OOM kill event. // Information about an OOM kill event.
OomKill *OomKillEventData `json:"oom,omitempty"` OomKill *OomKillEventData `json:"oom,omitempty"`
} }
// Information related to a container creation event.
type CreatedEventData struct {
// Spec of the container at creation.
Spec ContainerSpec `json:"spec"`
}
// Information related to an OOM kill instance // Information related to an OOM kill instance
type OomKillEventData struct { type OomKillEventData struct {
// process id of the killed process // process id of the killed process

5
manager/manager.go
View File

@ -707,11 +707,6 @@ func (m *manager) createContainer(containerName string) error {
ContainerName: contRef.Name, ContainerName: contRef.Name,
Timestamp: contSpec.CreationTime, Timestamp: contSpec.CreationTime,
EventType: info.EventContainerCreation, EventType: info.EventContainerCreation,
EventData: info.EventData{
Created: &info.CreatedEventData{
Spec: contSpec,
},
},
} }
err = m.eventHandler.AddEvent(newEvent) err = m.eventHandler.AddEvent(newEvent)
if err != nil { if err != nil {