Merge pull request #3110 from izeye/patch-15

* patch-15:
  polish
  Document `spring.metrics.export.*` properties

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java

@@ -35,6 +35,9 @@ import org.springframework.util.StringUtils;
 @ConfigurationProperties("spring.metrics.export")
 public class MetricExportProperties extends TriggerProperties {
 
+	/**
+	 * Specific trigger properties per MetricWriter bean name.
+	 */
 	private Map<String, SpecificTriggerProperties> triggers
 			= new LinkedHashMap<String, SpecificTriggerProperties>();
 

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -229,7 +229,7 @@ content into your application; rather pick only the properties that you need.
     spring.mustache.check-template-location=true
     spring.mustache.content-type=UTF-8
     spring.mustache.enabled=true # enable MVC view resolution
-    spring.mustache.prefix
+    spring.mustache.prefix=
     spring.mustache.suffix=.html
     spring.mustache.view-names= # whitelist of view names that can be resolved
 
@@ -652,6 +652,16 @@ content into your application; rather pick only the properties that you need.
 	shell.auth.simple.user.name=
 	shell.auth.simple.user.password=
 	shell.auth.spring.roles=
+	
+	# METRICS EXPORT ({sc-spring-boot-actuator}/metrics/export/MetricExportProperties.{sc-ext}[MetricExportProperties])
+	spring.metrics.export.enabled=true # flag to disable all metric exports (assuming any MetricWriters are available)
+	spring.metrics.export.delay-millis=5000 # delay in milliseconds between export ticks
+	spring.metrics.export.send-latest=true # flag to switch off any available optimizations based on not exporting unchanged metric values
+	spring.metrics.export.includes= # list of patterns for metric names to include
+	spring.metrics.export.excludes= # list of patterns for metric names to exclude. Applied after the includes
+	spring.metrics.export.redis.prefix=spring.metrics # prefix for redis repository if active
+	spring.metrics.export.redis.key=keys.spring.metrics # key for redis repository export (if active)
+	spring.metrics.export.triggers.*= # specific trigger properties per MetricWriter bean name
 
 	# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
 	spring.sendgrid.username= # SendGrid account username