From 2a54e5d16eab48d97698cf254fc29ec7b6ce467b Mon Sep 17 00:00:00 2001
From: Allen Sun <shlallen1990@gmail.com>
Date: Sat, 23 Sep 2017 12:08:38 +0800
Subject: [PATCH] add node/service/secret/config specific event filter

Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: 4611ecd3cdc9b2738f58a136b79f752add223f3f
Component: engine
---
 components/engine/api/swagger.yaml            | 8 ++++++--
 components/engine/daemon/events/filter.go     | 4 ++++
 components/engine/docs/api/version-history.md | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml
index 275c2e9cec..afec91e72a 100644
--- a/components/engine/api/swagger.yaml
+++ b/components/engine/api/swagger.yaml
@@ -6941,16 +6941,20 @@ paths:
           description: |
             A JSON encoded value of filters (a `map[string][]string`) to process on the event list. Available filters:
 
+            - `config=<string>` config name or ID
             - `container=<string>` container name or ID
             - `daemon=<string>` daemon name or ID
             - `event=<string>` event type
             - `image=<string>` image name or ID
             - `label=<string>` image or container label
             - `network=<string>` network name or ID
+            - `node=<string>` node ID
             - `plugin`=<string> plugin name or ID
             - `scope`＝<string> local or swarm
-            - `type=<string>` object to filter by, one of `container`, `image`, `volume`, `network`, `daemon`, `plugin`, `node`, `service` or `secret`
-            - `volume=<string>` volume name or ID
+            - `secret=<string>` secret name or ID
+            - `service=<string>` service name or ID
+            - `type=<string>` object to filter by, one of `container`, `image`, `volume`, `network`, `daemon`, `plugin`, `node`, `service`, `secret` or `config`
+            - `volume=<string>` volume name
           type: "string"
       tags: ["System"]
   /system/df:
diff --git a/components/engine/daemon/events/filter.go b/components/engine/daemon/events/filter.go
index 645f1ca917..5a3163deda 100644
--- a/components/engine/daemon/events/filter.go
+++ b/components/engine/daemon/events/filter.go
@@ -27,6 +27,10 @@ func (ef *Filter) Include(ev events.Message) bool {
 		ef.matchVolume(ev) &&
 		ef.matchNetwork(ev) &&
 		ef.matchImage(ev) &&
+		ef.matchNode(ev) &&
+		ef.matchService(ev) &&
+		ef.matchSecret(ev) &&
+		ef.matchConfig(ev) &&
 		ef.matchLabels(ev.Actor.Attributes)
 }
 
diff --git a/components/engine/docs/api/version-history.md b/components/engine/docs/api/version-history.md
index 1144e95447..a8507ce465 100644
--- a/components/engine/docs/api/version-history.md
+++ b/components/engine/docs/api/version-history.md
@@ -18,7 +18,8 @@ keywords: "API, Docker, rcli, REST, documentation"
 
 [Docker Engine API v1.33](https://docs.docker.com/engine/api/v1.33/) documentation
 
-
+* `GET /events` now supports filtering 4 more kinds of events: `config`, `node`,
+`secret` and `service`. 
 
 ## v1.32 API changes