Commit Graph

694 Commits

Author SHA1 Message Date
Andy Wilkinson
f73d86e700 Upgrade to Elasticsearch 1.5.2
Closes gh-3194
2015-06-10 14:26:09 +01:00
Stephane Nicoll
be26cba01e Merge branch '1.2.x' 2015-06-08 15:43:48 +02:00
Stephane Nicoll
5a57913732 Tune spring-boot-actuator logging config
Closes gh-3060
2015-06-08 15:43:30 +02:00
Phillip Webb
7609c43685 Switch Javadoc <code>...</code> to {@code ...}
Update Javadoc to use the {@code ...} syntax when possible.
2015-06-05 10:10:34 -07:00
Phillip Webb
6230d905c6 Polish 2015-06-05 09:32:07 -07:00
Stephane Nicoll
9b5e5f7bf8 Fix Javadoc 2015-06-05 17:22:17 +02:00
Eddú Meléndez
baca62a6c0 Fix typos 2015-06-05 16:59:51 +02:00
Dave Syer
cc169c5009 Change the way the AggregateMetricReader works to make it easier
for users to get started. It also makes it more flexible if different
aggregation keys are needed depending on the environment. The most
important new feature is the
spring.metrics.export.redis.aggregateKeyPattern configuration, which
fits the *.redis.key and prefix defaults. The aggregate reader uses
a prefix based on the key by default, with a naming convention that
the key starts with "keys.".
2015-06-05 11:54:06 +01:00
Phillip Webb
683c19ee8b Polish 2015-06-04 12:21:35 -07:00
Stephane Nicoll
f6115a0713 polish
Closes gh-3110
2015-06-04 14:49:49 +02:00
izeye
5096a5d242 Remove duplicate in MetricExportProperties
Closes gh-3109
2015-06-04 14:36:42 +02:00
Dave Syer
6c653038f6 Remove getDefault() from MetricExportProperties
Fixes gh-3112
2015-06-04 12:39:54 +01:00
Dave Syer
c108b1483a Restore and deprecate DropwizardMetricWriter
Fixes gh-3113
2015-06-04 12:36:31 +01:00
Phillip Webb
31d6a0f17a Polish updated metrics code 2015-06-04 00:56:00 -07:00
Phillip Webb
d2f11c465e Polish cache code 2015-06-04 00:55:38 -07:00
Phillip Webb
412b7b9e50 Polish 2015-06-04 00:55:30 -07:00
Spring Buildmaster
5d81c87b43 Next Development Version 2015-06-04 00:49:11 -07:00
Phillip Webb
4a097f8550 Merge branch '1.2.x' 2015-06-02 14:32:56 -07:00
Phillip Webb
df0ba5c03a Guard against metric failures in MetricsFilter
Update MetricsFilter so that failures to record metrics are logged and
ignored.

Fixes gh-2777
2015-06-02 14:30:59 -07:00
Phillip Webb
49c4710f63 Merge branch '1.2.x' 2015-06-02 12:32:46 -07:00
Phillip Webb
1d5a62b3df Show endpoint.isEnabled in /configprops
Update `ConfigurationPropertiesReportEndpoint` so that properties that
are set with a Boolean class but read with a boolean primitive still
appear in the report. The allows the Endpoint.isEnabled() property to
be displayed.

Fixes gh-2929
2015-06-02 12:01:47 -07:00
Phillip Webb
aaa2ff54dd Extract @ConditionalOnEnabledEndpoint
Extract @ConditionalOnEnabledEndpoint to a top level class.

See gh-2798
2015-06-02 11:17:23 -07:00
Phillip Webb
968b68c322 Polish 2015-06-02 11:17:16 -07:00
Stephane Nicoll
18d7634947 Add basic cache metrics support for Infinispan
Closes gh-3066
2015-06-01 17:41:59 +02:00
Stephane Nicoll
28d2955d03 Fix Hazelcast cache statistics condition
Make sure the Hazelcast statistics support is not triggered if the Spring
support is not present. The Hazelcast dependency alone may be used with
JCache and this should not trigger the support of the native Hazelcast
metrics infra.

See gh-2633
2015-06-01 15:08:59 +02:00
Dave Syer
33f06e1cb0 Ensure redis export properties are actually set using a @Value()
Previously the @Value annotation was not on a top level @Bean field
(it was nested inside). Manually constructing the bean in a separate
configuration class seems like the best way to get it to actually bind
at runtime.
2015-06-01 11:31:41 +01:00
Dave Syer
8a83bd12bd Refactor annotations for metric export
Users can add @ExportMetric[Reader,Writer] to readers and writers that
they want to participate in the default exporter. There is also still an
@ActuatorMetricWriter that is used for the legacy (non-Java8) Gauge and
CounterServices.
2015-05-31 12:51:07 +01:00
Dave Syer
80ff92919c Add redis properties as convenience in spring.metrics.export
The redis export and aggregate use case is a lot nicer with this
shared data between the two component types.

Also made MetricExportProperties itself a Trigger (so the default
delay etc. can be configured via spring.metrics.export.*).
2015-05-31 12:18:43 +01:00
Dave Syer
a49901f0dc Tweak conditions on metric export to make it easier to override 2015-05-29 14:25:12 +01:00
izeye
8f0fd21f11 Fix redudant assertion in test
Closes gh-3064
2015-05-29 09:51:44 +02:00
izeye
88612393f3 Fix allowCredentials property handling
Closes gh-3059
2015-05-28 15:44:49 +02:00
Andreas Ahlenstorf
9805643e41 Fix spring-security versions
Closes gh-3050
2015-05-27 16:57:56 +02:00
Stephane Nicoll
a6f671be3e Add excludeName to EnableAutoConfiguration
Allow user to exclude an auto-configuration class by specifying the fully
qualified name instead of the class reference.

Closes gh-2660
2015-05-27 14:24:47 +02:00
Stephane Nicoll
fc61f2e837 Improve documentation for JMX related keys
Closes gh-2747
2015-05-27 11:36:34 +02:00
Stephane Nicoll
ab55331863 Improve configuration keys documentation 2015-05-26 17:26:01 +02:00
Dave Syer
5468949a55 Update to latest 1.3 code 2015-05-26 06:34:43 +01:00
Andy Wilkinson
3eb5c348fb Align test with Spring MVC's internals once again
The internals have been updated so that the field that was originally
used, interceptors, can be used again.

This reverts commit 2a1bca6806.
2015-05-20 10:49:16 +01:00
Andy Wilkinson
2a1bca6806 Update field that’s checked reflectively to match Spring MVC’s internals 2015-05-19 16:41:24 +01:00
Andy Wilkinson
129c24926e Fix metrics speed tests on Windows
Write to NUL on Windows and /dev/null on other platforms. Increase the
default number of iterations to avoid problems with the reduced timing
precision on Windows.

Closes gh-2976
2015-05-19 09:13:27 +01:00
Andy Wilkinson
a0c0822293 Use array of correct size when turning List<MetricReader> into an array 2015-05-18 19:16:50 +01:00
Andy Wilkinson
54b0613179 Gracefully handle null readers in MetricExportAutoConfiguration 2015-05-18 16:29:55 +01:00
Dave Syer
20cea2aefc Remove duplicate declaration of s-i-core 2015-05-18 16:01:47 +01:00
Dave Syer
a065b80e57 Add MetricsEndpointMetricReader for exporting all metrics
User can add a bean of type MetricsEndpointMetricReader to opt in
to exporting all metrics via the MetricsEndpoint (instead of via
MetricReaders). There are disadvantages (like no accurate timestamps)
so it's best to leave it as an opt in.

Also improved tests for metric auto configuration a bit.
2015-05-18 15:01:53 +01:00
Dave Syer
5ceb35473d Allow multiple readers/writers to be @ActuatorMetric*
In principle you might have multiple "system" repositories, all
of which you want to go to public metrics or not be metrics exporters.
This change adds a new annotation and renames the old one, so that
reades and writers can be distinguished, and also changes the
autowiring of them to accept multiple values.

Also adds automatic public metrics for Spring Integration.
2015-05-18 15:01:53 +01:00
Stephane Nicoll
80ecb8220d Add explicit dependency to CacheAutoConfiguration
Make sure that the cache statistics auto-configuration is evaluated after
the cache auto-configuration itself.

See gh-2633
2015-05-15 16:57:45 +02:00
Stephane Nicoll
d63d2dded8 polish
Improve documentation of cors settings.

See gh-2936
2015-05-15 08:45:15 +02:00
Andy Wilkinson
b45a2bcfc0 Update javadoc following removal of deprecated APIs
See gh-2697
2015-05-14 19:43:57 +01:00
Andy Wilkinson
e3a53cb087 Remove classes and methods deprecated since 1.2 and earlier
Closes gh-2697
2015-05-14 19:00:12 +01:00
Andy Wilkinson
84d3a34c49 Add CORS support to the actuator’s endpoints
This commit adds CORS support to the Actuator’s MVC endpoints. CORS
support is disabled by default and is only enabled once the
endpoints.cors.allowed-origins property has been set.

The new properties to control the endpoints’ CORS configuration are:

endpoints.cors.allow-credentials
endpoints.cors.allowed-origins
endpoints.cors.allowed-methods
endpoints.cors.allowed-headers
endpoints.cors.exposed-headers

The changes to enable Jolokia-specific CORS support (57a51ed) have been
reverted as part of this commit. This provides a consistent approach
to CORS configuration across all endpoints, rather than Jolokia using
its own configuration.

See gh-1987
Closes gh-2936
2015-05-14 11:39:53 +01:00
Dave Syer
64af3272a1 Extract metric export into a separate autoconfig class
This avoids a potential problems with ordering between Dropwizard and
normal repository configuration. A Dropwizard sample has been added to
verify the behaviour.
2015-05-13 13:56:03 +01:00