Merge pull request #650 from vmarmol/events

Add oom_kill_events parameter to API
google · Apr 15, 2015 · 6c284ef · 6c284ef
2 parents 0971262 + a45d396
commit 6c284ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/api/handler.go b/api/handler.go
@@ -205,6 +205,12 @@ func getEventRequest(r *http.Request) (*events.Request, bool, error) {
 			query.EventType[info.EventOom] = newBool
 		}
 	}
+	if val, ok := urlMap["oom_kill_events"]; ok {
+		newBool, err := strconv.ParseBool(val[0])
+		if err == nil {
+			query.EventType[info.EventOomKill] = newBool
+		}
+	}
 	if val, ok := urlMap["creation_events"]; ok {
 		newBool, err := strconv.ParseBool(val[0])
 		if err == nil {

diff --git a/docs/api.md b/docs/api.md
@@ -30,6 +30,7 @@ The endpoint accepts a certain number of query parameters:
 | `subcontainers`   | Whether to also return events for all subcontainers                            | false             |
 | `max_events`      | The max number of events to return (for stream=false)                          | 10                |
 | `oom_events`      | Whether to include OOM events                                                  | false             |
+| `oom_kill_events` | Whether to include OOM kill events                                             | false             |
 | `creation_events` | Whether to include container creation events                                   | false             |
 | `deletion_events` | Whether to include container deletion events                                   | false             |