From 3666c1188417bba79cc192710b0c6874432aa994 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 9 Apr 2020 20:23:23 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/index.html | 58 ++++++++++++++++++++++++- reference/html/spring-cloud-consul.html | 58 ++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 2 deletions(-) diff --git a/reference/html/index.html b/reference/html/index.html index 0123ba81..81606e5f 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -127,7 +127,12 @@ $(globalSwitch);
  • 3.3. HTTP Health Check @@ -424,6 +429,57 @@ spring.cloud.consul.discovery.management-tags

    The above configuration will result in a map with foo→bar and baz→baz.

    +
    +
    Generated Metadata
    +
    +

    The Consul Auto Registration will generate a few entries automatically.

    +
    + + ++++ + + + + + + + + + + + + + + + + + + + + +
    Table 1. Auto Generated Metadata
    KeyValue

    'group'

    Property spring.cloud.consul.discovery.instance-group. This values is only generated if instance-group is not empty.'

    'secure'

    True if property spring.cloud.consul.discovery.scheme equals 'https', otherwise false.

    Property spring.cloud.consul.discovery.default-zone-metadata-name, defaults to 'zone'

    Property spring.cloud.consul.discovery.instance-zone. This values is only generated if instance-zone is not empty.'

    +
    +
    +
    Official Consul Metadata
    +
    +

    Consul added official support for a meta field that is a Map<String, String>. Spring Cloud Consul has added spring.cloud.consul.discovery.metadata and spring.cloud.consul.discovery.management-metadata properties to support it.

    +
    +
    + + + + + +
    + + +By default, the ServiceInstance.getMetadata() method from Spring Cloud Commons will continue to populated by parsing the spring.cloud.consul.discovery.tags property for backwards compatibility. To change this behaviour set spring.cloud.consul.discovery.tags-as-metadata=false and the metadata will be populated from spring.cloud.consul.discovery.metadata. In a future version, parsing the tags property will be removed. +
    +
    +

    3.3.2. Making the Consul Instance ID Unique

    diff --git a/reference/html/spring-cloud-consul.html b/reference/html/spring-cloud-consul.html index 0123ba81..81606e5f 100644 --- a/reference/html/spring-cloud-consul.html +++ b/reference/html/spring-cloud-consul.html @@ -127,7 +127,12 @@ $(globalSwitch);
  • 3.3. HTTP Health Check @@ -424,6 +429,57 @@ spring.cloud.consul.discovery.management-tags

    The above configuration will result in a map with foo→bar and baz→baz.

    +
    +
    Generated Metadata
    +
    +

    The Consul Auto Registration will generate a few entries automatically.

    +
    + + ++++ + + + + + + + + + + + + + + + + + + + + +
    Table 1. Auto Generated Metadata
    KeyValue

    'group'

    Property spring.cloud.consul.discovery.instance-group. This values is only generated if instance-group is not empty.'

    'secure'

    True if property spring.cloud.consul.discovery.scheme equals 'https', otherwise false.

    Property spring.cloud.consul.discovery.default-zone-metadata-name, defaults to 'zone'

    Property spring.cloud.consul.discovery.instance-zone. This values is only generated if instance-zone is not empty.'

    +
    +
    +
    Official Consul Metadata
    +
    +

    Consul added official support for a meta field that is a Map<String, String>. Spring Cloud Consul has added spring.cloud.consul.discovery.metadata and spring.cloud.consul.discovery.management-metadata properties to support it.

    +
    +
    + + + + + +
    + + +By default, the ServiceInstance.getMetadata() method from Spring Cloud Commons will continue to populated by parsing the spring.cloud.consul.discovery.tags property for backwards compatibility. To change this behaviour set spring.cloud.consul.discovery.tags-as-metadata=false and the metadata will be populated from spring.cloud.consul.discovery.metadata. In a future version, parsing the tags property will be removed. +
    +
    +

    3.3.2. Making the Consul Instance ID Unique