From 0b108c0a83636ef30b5faf827c4cbadd0d53a5bc Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Sat, 21 Feb 2015 10:13:05 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 spring-cloud.html | 67 ++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/spring-cloud.html b/spring-cloud.html
index 305e482..8ad8da6 100644
--- a/spring-cloud.html
+++ b/spring-cloud.html
@@ -473,7 +473,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_prefer_ip_address">Prefer IP Address</a></li>
 </ul>
 </li>
-<li><a href="#_circuit_breaker_hystrix_clients">Circuit Breaker: Hystrix Clients</a></li>
+<li><a href="#_circuit_breaker_hystrix_clients">Circuit Breaker: Hystrix Clients</a>
+<ul class="sectlevel2">
+<li><a href="#_hystrix_metrics_stream">Hystrix Metrics Stream</a></li>
+</ul>
+</li>
 <li><a href="#_circuit_breaker_hystrix_dashboard">Circuit Breaker: Hystrix Dashboard</a>
 <ul class="sectlevel2">
 <li><a href="#_turbine">Turbine</a></li>
@@ -656,7 +660,8 @@ map, even if the origin of the values (reflected in the
 "propertySources" of the "standard" form) has multiple sources.</p>
 </div>
 <div class="paragraph">
-<p>Spring Cloud Config Server also supports multiple git repositories:</p>
+<p>Spring Cloud Config Server pulls configuration for remote clients
+from a git repository (which must be provided):</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -665,22 +670,9 @@ map, even if the origin of the values (reflected in the
     config:
 	  server:
 	    git:
-	      uri: https://github.com/spring-cloud-samples/config-repo
-	      repos:
-	        - patterns: *pattern
-	          uri: https://github.com/pattern1/config-repo
-	        - patterns: pattern*,*pattern1*
-	          uri: https://github.com/pattern2/config-repo
-	        - patterns: local*
-	          uri: file:/home/configsvc/config-repo</pre>
+	      uri: https://github.com/spring-cloud-samples/config-repo</pre>
 </div>
 </div>
-<div class="paragraph">
-<p>In the above example, if {application} does not match to any of the patterns
-under "spring.cloud.config.server.git.repos", it will use the default uri
-defined under "spring.cloud.config.server.git.uri".  Acceptable pattern
-format is "<strong>xxx", "xxx</strong>", or "<strong>xxx</strong>".</p>
-</div>
 <div class="sect2">
 <h3 id="_client_side_usage">Client Side Usage</h3>
 <div class="paragraph">
@@ -892,24 +884,25 @@ working copy as a cache.</p>
 HTTP resource to a git label (commit id, branch name or tag).</p>
 </div>
 <div class="paragraph">
-<p>Spring Cloud Config Server also supports multiple git repositories:</p>
+<p>Spring Cloud Config Server supports a single or multiple git
+repositories:</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre>spring:
   cloud:
     config:
-	  server:
-	    git:
-	      uri: https://github.com/spring-cloud-samples/config-repo
-	      repos:
-	        simple: https://github.com/pattern1/config-repo
+    server:
+      git:
+        uri: https://github.com/spring-cloud-samples/config-repo
+        repos:
+          simple: https://github.com/pattern1/config-repo
             special:
               pattern: pattern*,*pattern1*
-	          uri: https://github.com/pattern2/config-repo
-	        local:
+            uri: https://github.com/pattern2/config-repo
+          local:
               pattern: local*
-	          uri: file:/home/configsvc/config-repo</pre>
+            uri: file:/home/configsvc/config-repo</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -930,9 +923,9 @@ e.g.</p>
 <pre>spring:
   cloud:
     config:
-	  server:
-	    git:
-	      uri: https://github.com/spring-cloud-samples/config-repo
+    server:
+      git:
+        uri: https://github.com/spring-cloud-samples/config-repo
           username: trolley
           password: strongpassword</pre>
 </div>
@@ -2172,6 +2165,20 @@ for details on the properties available.</p>
 }</code></pre>
 </div>
 </div>
+<div class="sect2">
+<h3 id="_hystrix_metrics_stream">Hystrix Metrics Stream</h3>
+<div class="paragraph">
+<p>To enable the Hystrix metrics stream include a dependency on <code>spring-boot-starter-actuator</code>.  This will expose the <code>/hystrix.stream</code> as a management endpoint.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-xml" data-lang="xml">    &lt;dependency&gt;
+        &lt;groupId&gt;org.springframework.boot&lt;/groupId&gt;
+        &lt;artifactId&gt;spring-boot-starter-actuator&lt;/artifactId&gt;
+    &lt;/dependency&gt;</code></pre>
+</div>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -2222,7 +2229,7 @@ for details on the properties available.</p>
 <div class="sect2">
 <h3 id="_turbine_amqp">Turbine AMQP</h3>
 <div class="paragraph">
-<p>In some environments (e.g. in a PaaS setting), the classic Turbine model of pulling metrics from all the distributed Hystrix commands doesn&#8217;t work. In that case you might want to have your Hystrix commands push metrics to Turbine, and Spring Cloud enables that with AMQP messaging. All you need to do on the client is add a dependency to <code>spring-cloud-netflix-hystrix-amqp</code> and make sure there is a Rabbit brooker available (see Spring Boot documentation for details on how to configure the client credentials, but it should work out of the box for a local broker or in Cloud Foundry).</p>
+<p>In some environments (e.g. in a PaaS setting), the classic Turbine model of pulling metrics from all the distributed Hystrix commands doesn&#8217;t work. In that case you might want to have your Hystrix commands push metrics to Turbine, and Spring Cloud enables that with AMQP messaging. All you need to do on the client is add a dependency to <code>spring-cloud-netflix-hystrix-amqp</code> and make sure there is a Rabbit broker available (see Spring Boot documentation for details on how to configure the client credentials, but it should work out of the box for a local broker or in Cloud Foundry).</p>
 </div>
 <div class="paragraph">
 <p>On the server side Just create a Spring Boot application and annotate it with <code>@EnableTurbineAmqp</code> and by default it will come up on port 8989 (point your Hystrix dashboard to that port, any path). You can customize the port using either <code>server.port</code> or <code>turbine.amqp.port</code>. If you have <code>spring-boot-starter-web</code> and <code>spring-boot-starter-actuator</code> on the classpath as well, then you can open up the Actuator endpoints on a separate port (with Tomcat by default) by providing a <code>management.port</code> which is different.</p>
@@ -3373,7 +3380,7 @@ ProxyAuthenticationProperties</a> for full details.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-17 05:28:18 UTC
+Last updated 2015-02-21 10:12:17 UTC
 </div>
 </div>
 </body>