Commit Graph

333 Commits

Author SHA1 Message Date
Michael Crosby efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
2016-09-16 10:22:09 -07:00
Denis Gladkikh 4907cc7793 Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-09-12 09:00:16 -07:00
Brian Goff 5ada5f129f Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
2016-09-12 09:05:49 -04:00
Harald Albers d5a79579d3 Add completion for `docker events -f event=health_status`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-06 13:46:21 -07:00
Harald Albers be455538aa Add bash completion for `service {create,update} --group-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-04 05:52:50 -07:00
Harald Albers 7f9096adb7 Remove bash completion for `docker volume create --name`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-31 09:50:11 +02:00
Alexander Morozov 78771b6225 Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
2016-08-25 09:12:31 -07:00
Yong Tang 7fd2c80962 Update zsh and bash completion scripts.
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-18 18:41:15 -07:00
timfeirg 37466cc8c8 expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
2016-08-18 11:25:27 +08:00
Denis Gladkikh 603fd08315 Splunk Logging Driver: formats and verifyconnection
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where

`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message

`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-08-16 21:45:16 -07:00
Michael Crosby 0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332
Add --no-trunc to service/node/stack ps output
2016-08-16 09:25:45 -07:00
Josh Horwitz 204c4d39d3 Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-08-16 10:19:11 -04:00
Harald Albers 5d43a78763 Add bash completion for `docker {network,volume} ls --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn 0309eeb5dd Merge pull request #25745 from albers/completion-volume-ls-filter-label
Add bash completion for `docker volume ls --filter label`
2016-08-16 13:27:14 +02:00
Harald Albers 41511f8911 Add bash completion for `docker volume ls --filter label`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 09:10:46 +02:00
Akihiro Suda dc38c9a047 add `--format` flag to `docker info`
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-08-16 04:03:52 +00:00
Lei Jitang b72a41b32e Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
2016-08-06 10:47:18 +08:00
Vincent Demeester 54e2cbc11e Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
2016-08-05 19:59:32 +02:00
Brian Goff e9bfb9b4cb Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
2016-08-05 13:50:26 -04:00
Harald Albers fa1b82e5eb Fix bash completion for `docker swarm join --advertise-addr`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 19:14:13 +02:00
Harald Albers 07f6655286 Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:56:17 +02:00
Harald Albers b63a7692d6 Add `self` to bash completion of `docker node inspect`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:06:25 +02:00
Harald Albers 197f23da49 Fix bash completion for `docker service {create,update} {-e,--env}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 17:41:40 +02:00
Harald Albers 46d3464362 Add bash completion for `docker node rm --force`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-03 11:08:28 +02:00
Stephen J Day 0aa4e1e689
cli: `docker service|node|stack ps` instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-27 11:06:42 -07:00
Sebastiaan van Stijn 00295c4bb3 Merge pull request #25060 from albers/completion-swarm-inspect
Remove bash completion for `docker swarm inspect`
2016-07-26 13:56:11 +02:00
Harald Albers 34d9a82409 Remove bash completion for `docker swarm inspect`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:51:27 -07:00
Harald Albers 13c138ec2a bash completion for container labels to `service {create,update}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:45:57 -07:00
Aaron Lehmann 57ae29aa74 Add failure action for rolling updates
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-25 08:51:19 -07:00
Aaron Lehmann a0ccd0d42f Split advertised address from listen address
There are currently problems with "swarm init" and "swarm join" when an
explicit --listen-addr flag is not provided. swarmkit defaults to
finding the IP address associated with the default route, and in cloud
setups this is often the wrong choice.

Introduce a notion of "advertised address", with the client flag
--advertise-addr, and the daemon flag --swarm-default-advertise-addr to
provide a default. The default listening address is now 0.0.0.0, but a
valid advertised address must be detected or specified.

If no explicit advertised address is specified, error out if there is
more than one usable candidate IP address on the system. This requires a
user to explicitly choose instead of letting swarmkit make the wrong
choice. For the purposes of this autodetection, we ignore certain
interfaces that are unlikely to be relevant (currently docker*).

The user is also required to choose a listen address on swarm init if
they specify an explicit advertise address that is a hostname or an IP
address that's not local to the system. This is a requirement for
overlay networking.

Also support specifying interface names to --listen-addr,
--advertise-addr, and the daemon flag --swarm-default-advertise-addr.
This will fail if the interface has multiple IP addresses (unless it has
a single IPv4 address and a single IPv6 address - then we resolve the
tie in favor of IPv4).

This change also exposes the node's externally-reachable address in
docker info, as requested by #24017.

Make corresponding API and CLI docs changes.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:23:07 -07:00
Tibor Vass 771cf83807 Merge pull request #24934 from albers/completion-swarm-join-token
bash completion for `docker swarm join-token`
2016-07-22 11:24:25 -07:00
Vincent Demeester 97039324c0 Merge pull request #24885 from vdemeester/24875-registrauth-with
Rename `--registry-auth` to `--with-registry-auth`
2016-07-22 19:05:49 +02:00
Harald Albers 42b4d6ebe4 bash completion for `docker swarm join-token`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-22 17:39:55 +02:00
Sebastiaan van Stijn c4ab20c5f8
remove "secrets" from completion scripts
Swarm join has been changed in f5e1f6f688,
removing various options and the "node accept" command.

This removes the removed options from the completion
scripts.

NOTE: a new command ("docker swarm join-token") was
also added, but is not part of this commit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-22 14:26:21 +02:00
Vincent Demeester 8426f72107
Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Harald Albers 6c98d5bfac Add manual support for macvlan networks to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 13:13:14 -07:00
Harald Albers 492fdf1f57 Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 12:35:04 -07:00
Sebastiaan van Stijn be2e2fca08 Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
2016-07-19 15:22:29 +02:00
Harald Albers 823e161de7 bash completion for `docker service {create,update} --log-{driver,opt}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:20:40 +02:00
Harald Albers bc6e3c0b5e bash completion for `docker node update --label-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:09:28 +02:00
Sebastiaan van Stijn 7925de9098 Merge pull request #24598 from albers/completion-daemon--oom-score-adjust
bash completion for `docker daemon --oom-score-adjust`
2016-07-13 23:34:54 +02:00
Harald Albers e1e310ea1f bash completion for `docker daemon --oom-score-adjust`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 12:31:55 -07:00
Sebastiaan van Stijn 7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie 58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Vincent Demeester e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Harald Albers c4846f6972 Change bash completion for `docker run --net*` to `--network*`
Ref: https://github.com/docker/docker/pull/23324

Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 12:42:33 +02:00
Antonio Murdaca ae1a809c39 Merge pull request #24581 from albers/completion-service--endpoint-mode
Update bash completion for `docker service {create,update} {--mode,--…
2016-07-13 09:52:52 +00:00
Harald Albers a394490d38 Update bash completion for `docker service {create,update} {--mode,--endpoint-mode}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:37:31 +02:00
Harald Albers a44e71c427 bash completion for `docker service {create,update} --registry-auth`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:20:02 +02:00
Brian Goff 2664f37452 Merge pull request #24119 from albers/completion-swarm-mode
Fix & improve bash completion for swarm mode commands
2016-07-08 15:34:51 -04:00