diff --git a/api/jobs_test.go b/api/jobs_test.go index de4ae634d..da7bfc99b 100644 --- a/api/jobs_test.go +++ b/api/jobs_test.go @@ -258,7 +258,7 @@ func TestJobs_Canonicalize(t *testing.T) { }, Services: []*Service{ { - Name: "global-redis-check", + Name: "redis-cache", Tags: []string{"global", "cache"}, PortLabel: "db", Checks: []ServiceCheck{ @@ -368,7 +368,7 @@ func TestJobs_Canonicalize(t *testing.T) { }, Services: []*Service{ { - Name: "global-redis-check", + Name: "redis-cache", Tags: []string{"global", "cache"}, PortLabel: "db", AddressMode: "auto", diff --git a/command/init.go b/command/init.go index f9953cde7..519ea8dff 100644 --- a/command/init.go +++ b/command/init.go @@ -310,7 +310,7 @@ job "example" { # https://www.nomadproject.io/docs/job-specification/service.html # service { - name = "global-redis-check" + name = "redis-cache" tags = ["global", "cache"] port = "db" check { diff --git a/ui/mirage/factories/job-version.js b/ui/mirage/factories/job-version.js index a91b8abd7..0665bd8dc 100644 --- a/ui/mirage/factories/job-version.js +++ b/ui/mirage/factories/job-version.js @@ -160,8 +160,8 @@ function generateDiff(version) { { Annotations: null, Name: 'Name', - New: 'global-redis-check', - Old: 'global-redis-check', + New: 'redis-cache', + Old: 'redis-cache', Type: 'None', }, { diff --git a/website/source/api/allocations.html.md b/website/source/api/allocations.html.md index 6655d52e0..61c9f471e 100644 --- a/website/source/api/allocations.html.md +++ b/website/source/api/allocations.html.md @@ -224,7 +224,7 @@ $ curl \ "Env": null, "Services": [ { - "Name": "global-redis-check", + "Name": "redis-cache", "PortLabel": "db", "Tags": [ "global", diff --git a/website/source/api/jobs.html.md b/website/source/api/jobs.html.md index a923939cf..2cef512d7 100644 --- a/website/source/api/jobs.html.md +++ b/website/source/api/jobs.html.md @@ -141,7 +141,7 @@ The table below shows this endpoint's support for }, "Services": [{ "Id": "", - "Name": "global-redis-check", + "Name": "redis-cache", "Tags": [ "global", "cache" @@ -519,7 +519,7 @@ $ curl \ "Env": null, "Services": [ { - "Name": "global-redis-check", + "Name": "redis-cache", "PortLabel": "db", "Tags": [ "global", diff --git a/website/source/api/json-jobs.html.md b/website/source/api/json-jobs.html.md index 95fd024b6..f966013f0 100644 --- a/website/source/api/json-jobs.html.md +++ b/website/source/api/json-jobs.html.md @@ -45,7 +45,7 @@ Below is the JSON representation of the job outputted by `$ nomad init`: }, "Services": [{ "Id": "", - "Name": "global-redis-check", + "Name": "redis-cache", "Tags": [ "global", "cache" diff --git a/website/source/api/nodes.html.md b/website/source/api/nodes.html.md index 68d982e2f..d5ddb1410 100644 --- a/website/source/api/nodes.html.md +++ b/website/source/api/nodes.html.md @@ -251,7 +251,7 @@ $ curl \ "Env": null, "Services": [ { - "Name": "global-redis-check", + "Name": "redis-cache", "PortLabel": "db", "AddressMode": "auto", "Tags": [ diff --git a/website/source/docs/job-specification/service.html.md b/website/source/docs/job-specification/service.html.md index 578f0c1ed..54f429075 100644 --- a/website/source/docs/job-specification/service.html.md +++ b/website/source/docs/job-specification/service.html.md @@ -74,12 +74,13 @@ does not automatically enable service discovery. define multiple checks for the service. At this time, Nomad supports the `script`1, `http` and `tcp` checks. -- `name` `(string: "--")` - Specifies the name of this - service. If not supplied, this will default to the name of the job, group, and - task concatenated together with a dash, like `"docs-example-server"`. Each - service must have a unique name within the cluster. Names must adhere to - [RFC-1123 §2.1](https://tools.ietf.org/html/rfc1123#section-2) and are limited - to alphanumeric and hyphen characters (i.e. `[a-z0-9\-]`), and be less than 64 +- `name` `(string: "--")` - Specifies the name this service + will be advertised as in Consul. If not supplied, this will default to the + name of the job, group, and task concatenated together with a dash, like + `"docs-example-server"`. Each service must have a unique name within the + cluster. Names must adhere to [RFC-1123 + §2.1](https://tools.ietf.org/html/rfc1123#section-2) and are limited to + alphanumeric and hyphen characters (i.e. `[a-z0-9\-]`), and be less than 64 characters in length. In addition to the standard [Nomad interpolation][interpolation], the