summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-11 16:34:03 -0400
committerGitHub <noreply@github.com>2020-03-11 16:34:03 -0400
commit78e090092b38ab52993a3eec6d9bab0eabeaa1fc (patch)
treece444a2007a9edb00fcb3e8dabc5bfcc1650a10a /pkg/api
parent9cfcf5692bfb2d6236dff3291e794496f28353a1 (diff)
parent216a6091d0541285ba2607dbd8aa8c216e27323f (diff)
downloadpodman-78e090092b38ab52993a3eec6d9bab0eabeaa1fc.tar.gz
podman-78e090092b38ab52993a3eec6d9bab0eabeaa1fc.tar.bz2
podman-78e090092b38ab52993a3eec6d9bab0eabeaa1fc.zip
Merge pull request #5458 from baude/apiv2eventslibpod
[CI:DOCS]Add libpod event endpoint
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/server/register_events.go31
1 files changed, 29 insertions, 2 deletions
diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go
index 96ba4596e..b0f403709 100644
--- a/pkg/api/server/register_events.go
+++ b/pkg/api/server/register_events.go
@@ -11,8 +11,8 @@ func (s *APIServer) registerEventsHandlers(r *mux.Router) error {
// swagger:operation GET /events system getEvents
// ---
// tags:
- // - system
- // summary: Returns events filtered on query parameters
+ // - system (compat)
+ // summary: Get events
// description: Returns events filtered on query parameters
// produces:
// - application/json
@@ -37,5 +37,32 @@ func (s *APIServer) registerEventsHandlers(r *mux.Router) error {
r.Handle(VersionedPath("/events"), s.APIHandler(compat.GetEvents)).Methods(http.MethodGet)
// Added non version path to URI to support docker non versioned paths
r.Handle("/events", s.APIHandler(compat.GetEvents)).Methods(http.MethodGet)
+ // swagger:operation GET /libpod/events system libpodGetEvents
+ // ---
+ // tags:
+ // - system
+ // summary: Get events
+ // description: Returns events filtered on query parameters
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: since
+ // type: string
+ // in: query
+ // description: start streaming events from this time
+ // - name: until
+ // type: string
+ // in: query
+ // description: stop streaming events later than this
+ // - name: filters
+ // type: string
+ // in: query
+ // description: JSON encoded map[string][]string of constraints
+ // responses:
+ // 200:
+ // description: returns a string of json data describing an event
+ // 500:
+ // "$ref": "#/responses/InternalError"
+ r.Handle(VersionedPath("/events"), s.APIHandler(compat.GetEvents)).Methods(http.MethodGet)
return nil
}