Stephane Nicoll
e4876eb666
Merge branch '1.5.x'
2017-01-15 09:46:07 +01:00
Stephane Nicoll
f21c767356
Polish contribution
...
Closes gh-7914
2017-01-15 09:45:32 +01:00
Kazuki Shimizu
a6756c9ed3
Allow lowercase logger level on MVC endpoint
...
See gh-7914
2017-01-15 09:42:40 +01:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
Andy Wilkinson
78a06c3278
Merge branch '1.5.x'
2017-01-10 17:05:09 -05:00
Phillip Webb
9159c87bf9
Polish
2017-01-10 09:51:11 -05:00
Stephane Nicoll
a2d55428ef
Merge branch '1.5.x'
2017-01-08 09:20:28 +01:00
Stephane Nicoll
fefc66625f
Merge branch '1.4.x' into 1.5.x
2017-01-08 09:20:00 +01:00
Eddú Meléndez
f896ff9a10
Fix incomplete assertions
...
Closes gh-7907
2017-01-08 09:12:54 +01:00
Phillip Webb
c35454e5f4
Merge branch '1.5.x'
2017-01-05 23:40:58 -08:00
Madhura Bhave
4ea47220e9
Match nested paths for insensitive actuators
...
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.
Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.
Fixes gh-7868
Closes gh-7881
2017-01-05 18:45:30 -08:00
Phillip Webb
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
0cc313f224
Polish
2017-01-05 11:30:33 -08:00
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
Stephane Nicoll
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
Phillip Webb
24f5125a8b
Merge branch '1.5.x'
2017-01-03 19:01:17 -08:00
Madhura Bhave
530c3cd3be
Simplify HealthMvcEndpoint security
...
Expose full health details if management security is disabled or
management role is present.
Fixes gh-7604
Closes gh-7852
2017-01-03 19:00:14 -08:00
Phillip Webb
2fe4d60b47
Add `management.cloudfoundry.*` meta-data
...
Update configuration meta-data and appendix to include
`management.cloudfoundry.*` meta-data.
See gh-7108
2017-01-03 17:24:58 -08:00
Phillip Webb
b1cb8bb3d9
Merge branch '1.5.x'
2017-01-03 15:14:41 -08:00
Phillip Webb
8ccd4db513
Merge branch '1.4.x' into 1.5.x
2017-01-03 15:14:14 -08:00
Phillip Webb
732011987d
Fix ManagementContextConfiguration @Order support
...
Update `ManagementContextConfigurationsImportSelector` to instantiate
classes so that order annotations are respected.
Fixes gh-7814
2017-01-03 15:12:35 -08:00
Phillip Webb
b4b8370632
Fix AuditEventsJmxEndpoint bean name
...
See gh-6579
2017-01-03 14:43:24 -08:00
Phillip Webb
8a9a61b64f
Prevent duplicate JmxEndpoint MBean registration
...
Update JmxEndpoint support so that the `@ManagedResource` annotation
is no longer required. This prevents both `EndpointMBeanExporter` and
the regular `AnnotationMBeanExporter` from both registering the bean.
Fixes gh-7813
See gh-6579
2017-01-03 14:43:24 -08:00
Phillip Webb
4026fa563f
Merge branch '1.5.x'
2017-01-02 19:54:26 -08:00
Phillip Webb
51762642b2
Polish audit event endpoint support
...
Closes gh-6579
2017-01-02 19:43:26 -08:00
Phillip Webb
5b40eb48e0
Improve MBean without backing Endpoint support
...
Improve support for MBeans without a backing endpoint by introducing
a `JmxEndpoint` interface. The `JmxEndpoint` is intentionally
similar in design to the `MvcEndpoint` from the `mvc` package and
allows for completely custom JMX beans that are not backed by any
real actuator `Endpoint`.
The `AuditEventsMBean` has been refactored to use the new interface and
has been renamed to `AuditEventsJmxEndpoint`.
See gh-6579
2017-01-02 19:43:14 -08:00
Vedran Pavic
2f1e4f0c02
Add MVC and JMX endpoints to retrieve audit events
...
Add MVC and JMX specific endpoints that allow audit events to be
retrieved.
See gh-6579
2017-01-02 19:20:35 -08:00
Vedran Pavic
a6d18f714f
Add JMX without backing `Endpoint` support
...
Decompose `EndpointMBean` to improve support for JMX endpoints without
a backing `Endpoint`.
See gh-6579
2017-01-02 19:19:04 -08:00
Phillip Webb
e1eb48e8b4
Fix warnings
2016-12-30 17:26:25 -08:00
Phillip Webb
6496ea78d4
Merge branch '1.5.x'
2016-12-30 14:07:15 -08:00
Phillip Webb
a167db7b37
Allow OPTIONS requests in interceptors
...
Update `MvcEndpointSecurityInterceptor` and
`CloudFoundrySecurityInterceptor` to allow OPTIONS requests to be
processed.
Fixes gh-7720
2016-12-30 14:05:29 -08:00
Phillip Webb
53f1df86a2
Merge branch '1.5.x'
2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f
Update copyright year for changed files
2016-12-30 11:53:51 -08:00
Phillip Webb
38271b7397
Merge branch '1.5.x'
2016-12-28 15:41:17 -08:00
Phillip Webb
367963f29f
Polish
2016-12-28 15:41:00 -08:00
Phillip Webb
519f9c6c54
Merge branch '1.5.x'
2016-12-28 15:35:32 -08:00
Phillip Webb
8b69856fc9
Polish
2016-12-28 15:23:26 -08:00
Stephane Nicoll
ee9d86cb1c
Merge branch '1.5.x'
2016-12-28 18:25:21 +01:00
Stephane Nicoll
8b7055719f
Move InMemoryMultiMetricRepository to a separate class
...
This commit moves the `MultiMetricRepository` implementation from
`InMemoryMetricRepository` to `InMemoryMultiMetricRepository`. Both
implementations can share the same underlying store (and are for backward
compatible reasons).
The side effect is that `reset` now works as expected for a group.
Closes gh-7687
2016-12-28 18:16:10 +01:00
Phillip Webb
49fa702708
Merge branch '1.5.x'
2016-12-27 15:06:22 -08:00
Phillip Webb
3af5ae2a26
Polish `ObjectProvider` names
...
Consistently use the simple name for ObjectProvider parameter and
field names. For example:
`ObjectProvider<Something> something`
rather than
`ObjectProvider<Something> somethingProvider`
2016-12-27 15:04:06 -08:00
Phillip Webb
e0541d0f74
Polish
2016-12-27 14:48:44 -08:00
Stephane Nicoll
740813a1e8
Merge branch '1.5.x'
2016-12-27 11:42:03 +01:00
Stephane Nicoll
0d4ef3dbdb
Fix formatting
2016-12-27 11:41:53 +01:00
Stephane Nicoll
fb70097c4f
Merge branch '1.5.x'
2016-12-27 10:12:03 +01:00