From 65e034d90b758248598facb7a2f46b51d95faa78 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 16:11:26 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/README.html | 3 +++ reference/html/index.html | 19 ++++++++++++++++++- reference/html/sagan-index.html | 3 +++ reference/html/spring-cloud-consul.html | 19 ++++++++++++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/reference/html/README.html b/reference/html/README.html index 8ab9e586..80cc3404 100644 --- a/reference/html/README.html +++ b/reference/html/README.html @@ -186,6 +186,9 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon), Circuit Brea

  • supports Ribbon and Zuul

    • +
  • +

    supports Spring Cloud LoadBalancer

    +
    • diff --git a/reference/html/index.html b/reference/html/index.html index 5cbd7dc2..9488bc96 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -446,7 +446,7 @@ spring.cloud.consul.discovery.management-tags

    Looking up services

    -

    Using Ribbon

    +

    Using Load-balancer

    Spring Cloud has support for Feign (a REST client builder) and also Spring RestTemplate for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize Ribbon for client-side load balancing.

    @@ -481,6 +481,23 @@ public String getFirstProduct() { you use property spring.cloud.consul.discovery.datacenters.STORES=dc-west where STORES is the service name/id and dc-west is the datacenter where the STORES service lives.

    +
    + + + + + +
    + + +Spring Cloud now also offers support for +Spring Cloud LoadBalancer. +
    +
    +
    +

    As Spring Cloud Ribbon is now under maintenance, we suggest you set spring.cloud.loadbalancer.ribbon.enabled +to false, so that BlockingLoadBalancerClient is used instead of RibbonLoadBalancerClient.

    +

    Using the DiscoveryClient

    diff --git a/reference/html/sagan-index.html b/reference/html/sagan-index.html index 7ce9e102..4cb07812 100644 --- a/reference/html/sagan-index.html +++ b/reference/html/sagan-index.html @@ -123,6 +123,9 @@ $(addBlockSwitches);

    Supports Ribbon, the client side load-balancer via Spring Cloud Netflix

  • +

    Supports Spring Cloud LoadBalancer - a client side load-balancer provided by the Spring Cloud project

    +
    • +

  • Supports Zuul, a dynamic router and filter via Spring Cloud Netflix

  • diff --git a/reference/html/spring-cloud-consul.html b/reference/html/spring-cloud-consul.html index 5cbd7dc2..9488bc96 100644 --- a/reference/html/spring-cloud-consul.html +++ b/reference/html/spring-cloud-consul.html @@ -446,7 +446,7 @@ spring.cloud.consul.discovery.management-tags

    Looking up services

    -

    Using Ribbon

    +

    Using Load-balancer

    Spring Cloud has support for Feign (a REST client builder) and also Spring RestTemplate for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize Ribbon for client-side load balancing.

    @@ -481,6 +481,23 @@ public String getFirstProduct() { you use property spring.cloud.consul.discovery.datacenters.STORES=dc-west where STORES is the service name/id and dc-west is the datacenter where the STORES service lives.

    +
    + + + + + +
    + + +Spring Cloud now also offers support for +Spring Cloud LoadBalancer. +
    +
    +
    +

    As Spring Cloud Ribbon is now under maintenance, we suggest you set spring.cloud.loadbalancer.ribbon.enabled +to false, so that BlockingLoadBalancerClient is used instead of RibbonLoadBalancerClient.

    +

    Using the DiscoveryClient