diff --git a/website/source/docs/commands/alloc-status.html.md.erb b/website/source/docs/commands/alloc-status.html.md.erb index b0dcc2ad1..318c51202 100644 --- a/website/source/docs/commands/alloc-status.html.md.erb +++ b/website/source/docs/commands/alloc-status.html.md.erb @@ -26,21 +26,22 @@ allocations and information will be displayed. ## General Options <%= general_options_usage %> -# + ## Status Options * `-short`: Display short output. Shows only the most recent task event. +* `-verbose`: Show full information. ## Examples Short status of an alloc: ``` -$ nomad alloc-status --short a7365fe4-8b9f-4284-612d-a101fb41e773 -ID = a7365fe4-8b9f-4284-612d-a101fb41e773 -EvalID = 44c2d9ed-6377-ca3d-14a8-b2e6327230ce +$ nomad alloc-status --short a7365fe4 +ID = a7365fe4 +EvalID = 44c2d9ed Name = example.cache[0] -NodeID = e55859b1-4330-f00b-da49-8a292432ead3 +NodeID = e55859b1 JobID = example ClientStatus = running NodesEvaluated = 1 @@ -57,18 +58,18 @@ redis running Started 02:29:40 11/17/15 web running Started 02:30:41 11/17/15 ==> Status -Allocation "a7365fe4-8b9f-4284-612d-a101fb41e773" status "running" (0/1 nodes filtered) - * Score "e55859b1-4330-f00b-da49-8a292432ead3.binpack" = 10.334026 +Allocation "a7365fe4" status "running" (0/1 nodes filtered) + * Score "e55859b1.binpack" = 10.334026 ``` Full status of an alloc, which shows one of the tasks dying and then being restarted: ``` -$ nomad alloc-status a7365fe4-8b9f-4284-612d-a101fb41e773 -ID = a7365fe4-8b9f-4284-612d-a101fb41e773 -EvalID = 44c2d9ed-6377-ca3d-14a8-b2e6327230ce +$ nomad alloc-status a7365fe4 +ID = a7365fe4 +EvalID = 44c2d9ed Name = example.cache[0] -NodeID = e55859b1-4330-f00b-da49-8a292432ead3 +NodeID = e55859b1 JobID = example ClientStatus = running NodesEvaluated = 1 @@ -90,7 +91,7 @@ Time Type Description 02:29:40 11/17/15 Started ==> Status -Allocation "a7365fe4-8b9f-4284-612d-a101fb41e773" status "running" (0/1 nodes filtered) - * Score "e55859b1-4330-f00b-da49-8a292432ead3.binpack" = 10.334026 +Allocation "a7365fe4" status "running" (0/1 nodes filtered) + * Score "e55859b1.binpack" = 10.334026 ``` diff --git a/website/source/docs/commands/eval-monitor.html.md.erb b/website/source/docs/commands/eval-monitor.html.md.erb index 0159debe8..bf7360cea 100644 --- a/website/source/docs/commands/eval-monitor.html.md.erb +++ b/website/source/docs/commands/eval-monitor.html.md.erb @@ -39,14 +39,18 @@ indicated by exit code 1. <%= general_options_usage %> +## Status Options + +* `-verbose`: Show full information. + ## Examples Monitor an existing evaluation ``` -$ nomad eval-monitor 8262bc83-3be0-2894-237c-c06ab5e14785 -==> Monitoring evaluation "8262bc83-3be0-2894-237c-c06ab5e14785" - Allocation "bd6bd0de-1c97-1e6c-ab8b-106618a0393c" created: node "6f299da5-8e4e-0e48-93f4-f544f4b948a8", group "group1" +$ nomad eval-monitor 8262bc83 +==> Monitoring evaluation "8262bc83" + Allocation "bd6bd0de" created: node "6f299da5", group "group1" Evaluation status changed: "pending" -> "complete" -==> Evaluation "8262bc83-3be0-2894-237c-c06ab5e14785" finished with status "complete" +==> Evaluation "8262bc83" finished with status "complete" ``` diff --git a/website/source/docs/commands/node-status.html.md.erb b/website/source/docs/commands/node-status.html.md.erb index 066f99ab1..a8a8e9967 100644 --- a/website/source/docs/commands/node-status.html.md.erb +++ b/website/source/docs/commands/node-status.html.md.erb @@ -34,6 +34,7 @@ Otherwise, a list of matching nodes and information will be displayed. * `-short`: Display short output. Used only when querying a single node. Drops verbose information about node allocations. +* `-verbose`: Show full information. ## Examples @@ -41,16 +42,16 @@ List view: ``` $ nomad node-status -ID DC Name Drain Status -a72dfba2-c01f-49de-5ac6-e3391de2c50c dc1 node1 false ready -1f3f03ea-a420-b64b-c73b-51290ed7f481 dc1 node2 false ready +ID DC Name Drain Status +a72dfba2 dc1 node1 false ready +1f3f03ea dc1 node2 false ready ``` Single-node view in short mode: ``` -$ nomad node-status -short 1f3f03ea-a420-b64b-c73b-51290ed7f481 -ID = 1f3f03ea-a420-b64b-c73b-51290ed7f481 +$ nomad node-status -short 1f3f03ea +ID = 1f3f03ea Name = node2 Class = Datacenter = dc1 @@ -61,8 +62,8 @@ Status = ready Full output for a single node: ``` -$ nomad node-status 1f3f03ea-a420-b64b-c73b-51290ed7f481 -ID = 1f3f03ea-a420-b64b-c73b-51290ed7f481 +$ nomad node-status 1f3f03ea +ID = 1f3f03ea Name = node2 Class = Datacenter = dc1 @@ -70,6 +71,6 @@ Drain = false Status = ready ### Allocations -ID EvalID JobID TaskGroup DesiredStatus ClientStatus -678c51dc-6c55-0ac8-d92d-675a1e8ea6b0 193229c4-aa02-bbe6-f996-fd7d6974a309 job8 grp8 failed failed +ID EvalID JobID TaskGroup DesiredStatus ClientStatus +678c51dc 193229c4 job8 grp8 failed failed ``` diff --git a/website/source/docs/commands/run.html.md.erb b/website/source/docs/commands/run.html.md.erb index e5118e662..f89eedc72 100644 --- a/website/source/docs/commands/run.html.md.erb +++ b/website/source/docs/commands/run.html.md.erb @@ -42,24 +42,28 @@ client connection issues or internal errors, are indicated by exit code 1. will be output, which can be used to call the monitor later using the [eval-monitor](/docs/commands/eval-monitor.html) command. +## Status Options + +* `-verbose`: Show full information. + ## Examples Schedule the job contained in the file `job1.nomad`, monitoring placement: ``` $ nomad run job1.nomad -==> Monitoring evaluation "52dee78a-a1f0-95c9-81a5-95b4cbe7f6f8" - Allocation "5e0b39f0-5e69-6fec-d17b-4b8b7d922cc8" created: node "3e84d3d2-8500-42a3-9d1b-7ad88913352b", group "group1" - Allocation "5e0b39f0-5e69-6fec-d17b-4b8b7d922cc8" status changed: "pending" -> "running" +==> Monitoring evaluation "52dee78a" + Allocation "5e0b39f0" created: node "3e84d3d2", group "group1" + Allocation "5e0b39f0" status changed: "pending" -> "running" Evaluation status changed: "pending" -> "complete" -==> Evaluation "52dee78a-a1f0-95c9-81a5-95b4cbe7f6f8" finished with status "complete" +==> Evaluation "52dee78a" finished with status "complete" ``` Schedule the job contained in `job1.nomad` and return immediately: ``` $ nomad run -detach job1.nomad -4947e728-fb4e-90c6-895a-42479940e0bc +4947e728 ``` Schedule a job which cannot get placement. This results in a scheduling failure @@ -67,10 +71,10 @@ and the specifics of the placement are printed: ``` $ nomad run failing.nomad -==> Monitoring evaluation "0d7447d9-43fd-4994-6812-500c93c08fce" +==> Monitoring evaluation "0d7447d9" Scheduling error for group "group1" (failed to find a node for placement) - Allocation "a739288e-547a-cd26-1355-e92ca10f165c" status "failed" (1/1 nodes filtered) + Allocation "a739288e" status "failed" (1/1 nodes filtered) * Constraint "$attr.kernel.name = linux" filtered 1 nodes Evaluation status changed: "pending" -> "complete" -==> Evaluation "0d7447d9-43fd-4994-6812-500c93c08fce" finished with status "complete" +==> Evaluation "0d7447d9" finished with status "complete" ``` diff --git a/website/source/docs/commands/status.html.md.erb b/website/source/docs/commands/status.html.md.erb index e1b10f8f5..e580d3e1b 100644 --- a/website/source/docs/commands/status.html.md.erb +++ b/website/source/docs/commands/status.html.md.erb @@ -32,6 +32,7 @@ the most useful status fields for each. * `-short`: Display short output. Used only when a single node is being queried. Drops verbose node allocation data from the output. +* `-verbose`: Show full information. ## Examples @@ -70,10 +71,10 @@ Datacenters = dc1,dc2,dc3 Status = pending ### Evaluations -ID Priority Type TriggeredBy NodeID Status -193229c4-aa02-bbe6-f996-fd7d6974a309 3 service job-register node2 complete +ID Priority Type TriggeredBy NodeID Status +193229c4 3 service job-register node2 complete ### Allocations -ID EvalID NodeID TaskGroup DesiredStatus ClientStatus -678c51dc-6c55-0ac8-d92d-675a1e8ea6b0 193229c4-aa02-bbe6-f996-fd7d6974a309 node2 grp8 failed failed +ID EvalID NodeID TaskGroup DesiredStatus ClientStatus +678c51dc 193229c4 node2 grp8 failed failed ``` diff --git a/website/source/docs/commands/stop.html.md.erb b/website/source/docs/commands/stop.html.md.erb index 08fcec3ee..dd56683b8 100644 --- a/website/source/docs/commands/stop.html.md.erb +++ b/website/source/docs/commands/stop.html.md.erb @@ -37,20 +37,24 @@ reached a terminal state. It is safe to exit the monitor early using ctrl+c. will be output, which can be used to call the monitor later using the [eval-monitor](/docs/commands/eval-monitor.html) command. +## Status Options + +* `-verbose`: Show full information. + ## Examples Stop the job with ID "job1": ``` $ nomad stop job1 -==> Monitoring evaluation "43bfe672-e9a2-1cb8-457a-4c2dca5ce1c7" +==> Monitoring evaluation "43bfe672" Evaluation status changed: "pending" -> "complete" -==> Evaluation "43bfe672-e9a2-1cb8-457a-4c2dca5ce1c7" finished with status "complete" +==> Evaluation "43bfe672" finished with status "complete" ``` Stop the job with ID "job1" and return immediately: ``` $ nomad stop -detach job1 -507d26cb-1d67-672c-da9d-f6053837bb70 +507d26cb ```