From 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a Mon Sep 17 00:00:00 2001 From: Nishant Totla Date: Sun, 24 Jan 2016 13:30:21 -0800 Subject: [PATCH] Adding SystemStatus field for /info endpoint Signed-off-by: Nishant Totla --- api/client/info.go | 5 +++++ docs/reference/api/docker_remote_api.md | 2 ++ docs/reference/api/docker_remote_api_v1.22.md | 1 + docs/reference/api/docker_remote_api_v1.23.md | 1 + 4 files changed, 9 insertions(+) diff --git a/api/client/info.go b/api/client/info.go index 42f06826e3..3cb7f23153 100644 --- a/api/client/info.go +++ b/api/client/info.go @@ -42,6 +42,11 @@ func (cli *DockerCli) CmdInfo(args ...string) error { } } + if info.SystemStatus != nil { + for _, pair := range info.SystemStatus { + fmt.Fprintf(cli.out, "%s: %s\n", pair[0], pair[1]) + } + } ioutils.FprintfIfNotEmpty(cli.out, "Execution Driver: %s\n", info.ExecutionDriver) ioutils.FprintfIfNotEmpty(cli.out, "Logging Driver: %s\n", info.LoggingDriver) diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 7f428658bc..6b43a859c9 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -128,6 +128,8 @@ This section lists each version from latest to oldest. Each listing includes a * `GET /networks/{network-id}` Now returns IPAM config options for custom IPAM plugins if any are available. * `GET /networks/` now returns subnets info for user-defined networks. +* `GET /info` can now return a `SystemStatus` field useful for returning additional information about applications + that are built on top of engine. ### v1.21 API changes diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index d523b95449..4fd8792fd7 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -2102,6 +2102,7 @@ Display system-wide information "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], + "SystemStatus": [["State", "Healthy"]], "Plugins": { "Volume": [ "local" diff --git a/docs/reference/api/docker_remote_api_v1.23.md b/docs/reference/api/docker_remote_api_v1.23.md index 50053a068a..0b9118273f 100644 --- a/docs/reference/api/docker_remote_api_v1.23.md +++ b/docs/reference/api/docker_remote_api_v1.23.md @@ -2102,6 +2102,7 @@ Display system-wide information "DockerRootDir": "/var/lib/docker", "Driver": "btrfs", "DriverStatus": [[""]], + "SystemStatus": [["State", "Healthy"]], "Plugins": { "Volume": [ "local"