SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
689 Commits 21 Branches 0 Tags
2.1.x
Commit Graph

190 Commits

Author SHA1 Message Date
Tim Ysewyn
9ec99fedca Merge branch '2.0.x' 2019-07-23 21:31:20 +02:00
Tim Ysewyn
8d74a85e79 Extracted heartbeat and catalog watch auto-configuration. (#574) 
* Extracted heartbeat and catalog watch auto-configuration.
Needed in order to have those beans running in the correct application context when SC Config discovery is enabled.

* Moved heartbeat config to support package
 2019-07-23 21:10:18 +02:00
Spring Operator
2c92c64db8 URL Cleanup (#523) 
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 115 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
 2019-03-26 16:18:16 -04:00
Spring Operator
ef3f7b2eda URL Cleanup (#519) 
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 97 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
 2019-03-26 16:17:13 -04:00
Niko
bd621e987f Fix deregister services critical not working when using TTL (#500) 
* Service health check ttl with critical timeout 

fixes gh-490
 2019-03-04 10:41:35 -05:00
Ryan Baxter
5159eec232 Fixing checkstyle issues 2019-02-21 15:31:30 -05:00
Ryan Baxter
ccfbddd790 Merge remote-tracking branch 'origin/2.0.x' 2019-02-21 15:10:09 -05:00
Olga Maciaszek-Sharma
ed2ae397aa Make spring.cloud.discovery.enabled=false behave the same as spring.cloud.consul.discovery.enabled=false (#496) 2019-02-21 15:07:59 -05:00
Spencer Gibb
1b84852c50 Changes test service name 2019-02-07 15:39:03 -05:00
Marcin Grzejszczak
999fb6c9e8 Added checkstyle rules 2019-02-07 15:03:44 +01:00
Alexey Savchuk
ddd9961120 Adds anagement registration customizer (#479) 
Management registration customizer

fixes gh-478
 2019-02-06 15:36:00 -05:00
Alexey Savchuk
a706683bd3 Service check TTL (#471) 
Closes gh-470
 2019-02-06 15:32:13 -05:00
Spencer Gibb
50849a9053 Removes duplicate @ConditionalOnMissingBean 2019-01-31 23:36:07 -05:00
Zoran Regvart
9f7a8f95a4 Add @ConditionalOnMissingBean (#467) 
In Apache Camel we had some tests fail when upgrading to Spring Boot 2.1
we narrowed it down to missing `@ConditionalOnMissingBean`. I guess the
processing order for auto-configurations changed between Spring Boot 2.0
and 2.1 and this issue surfaced.

The tests that failed are here:

https://github.com/apache/camel/tree/master/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul
 2019-01-31 12:41:06 -05:00
Spencer Gibb
64a9fbb4eb Merge branch '2.0.x' 2018-12-14 15:27:00 -05:00
Spencer Gibb
365a1540c7 Moves handling of WebServerInitializedEvent to outside class. 
This lets the ConsulAutoServiceRegistration.start() method be
called externally to spring-retry aop is utilized and retry functions
again.

fixes gh-419
 2018-12-14 15:18:12 -05:00
Lomesh Patel
1aa7b20648 Apply customized instanceId and serviceName to management service (#451) 
- If instanceId and/or serviceName is customized, they're also applied
to the management service registration
- Updated documentation to provide information about management service

Fixes gh-443
 2018-12-13 13:38:26 -05:00
Spojowa
3ab7de8acd Add acl token to getCatalogServices call. Fixes gh-440 (#445) 2018-12-13 11:45:57 -05:00
Spencer Gibb
f8d205a60f Disables jmx for test 2018-12-11 13:33:17 -05:00
Spencer Gibb
af03a6b0f7 Removes consulDiscoveryProperties from config client bootstrap. 
The need to set a property to disable registration is no longer needed
since auto registration is separate and not imported in bootstrap.

fixes gh-465
 2018-12-11 12:37:52 -05:00
Tim Ysewyn
0e5456aab7 Added the instance id to the DefaultServiceInstance (#456) 2018-12-06 21:28:28 +01:00
Spencer Gibb
0256f9bd89 Merge branch '2.0.x' 2018-11-19 14:04:47 -05:00
Spencer Gibb
0937968605 Propagates metadata thru load balancer client. 
fixes gh-424
 2018-11-19 14:04:29 -05:00
Spencer Gibb
d3617405fc removes unused import 2018-11-19 12:28:43 -05:00
Spencer Gibb
5c937a1015 Merge branch '2.0.x' 2018-11-19 12:28:26 -05:00
Spencer Gibb
e15835727d Makes management tags mutable. 
fixes gh-415
 2018-11-19 12:26:49 -05:00
Spencer Gibb
bcd90718af removes deprecated method 2018-09-17 16:41:27 -04:00
Spencer Gibb
a55111ee2a polish spaces to tabs 2018-09-17 16:23:21 -04:00
Spencer Gibb
50c9a65e89 removes deprecated method 2018-09-17 16:23:06 -04:00
Spencer Gibb
00da0423dd polish toString to use ToStringCreator 2018-09-17 16:22:52 -04:00
Lomesh Patel
3a9d423bbc Added Header support for Service Checks 
- Upgraded com.ecwid.consul:consul-api to 1.4.1, which adds
support for Headers in NewService model
- Added new property healthCheckHeaders in ConsulDiscoveryProperties
- Updated docs with instructions on how to set headers

Fixes gh-391
 2018-09-17 16:18:13 -04:00
Spencer Gibb
c3561543c3 Removes deprecated constructor and polish 2018-09-10 13:46:02 -04:00
Olga Maciaszek-Sharma
ad8938d491 Gh 304 add discovery clients order support (#446) 
NOTE: This can only be merged after https://github.com/spring-cloud/spring-cloud-commons/pull/412 is has been merged.
 2018-09-10 13:42:59 -04:00
Spencer Gibb
8150eb0597 Changes to compile with boot 2.1.0 2018-08-03 15:20:34 -04:00
Spencer Gibb
78a4e05281 Removes lombok 2018-06-05 14:55:58 -04:00
Spencer Gibb
8d55728418 Moves ConsulCatalogWatch to TaskScheduler rather than @Scheduled 
fixes gh-146
 2018-06-05 14:43:37 -04:00
Spencer Gibb
0e03c2613a Removes lombok from config, adds logging to ConfigWatch 2018-06-05 13:24:39 -04:00
Glen Lockhart
e1f96389ec #319 Update so that ServiceInstance will return a https URI where app… (#409) 2018-04-10 13:28:27 -04:00
Spencer Gibb
96b0bef765 Merge branch '1.3.x' 2018-03-22 14:57:03 -04:00
a3aanwisse
2d784ef775 When deregistering from Consul use the aclToken. (#401) 
Fixes #326
 2018-02-28 16:15:55 -05:00
Spencer Gibb
3eab3d9869 Move property to canonical format. 2018-02-12 20:29:20 -05:00
Spencer Gibb
b8b8c8fbcf Merge branch '1.3.x' 2018-02-06 15:53:34 -05:00
Spencer Gibb
24fa15bb7b polish 2018-02-06 15:45:10 -05:00
Dmitry Zhikharev
5336fc3fa7 Add option to disable management registration (#323) 2018-02-06 15:23:49 -05:00
Spencer Gibb
1f93385ffa Fix tests 2018-01-17 16:28:57 -05:00
Spencer Gibb
efdaf19ac7 remove lombok 2018-01-17 16:28:57 -05:00
Spencer Gibb
44e8048c8f Make LifecycleRegistrationResolver public 2018-01-08 13:46:39 -05:00
Tim Ysewyn
5d7331a648 Updated default health check path to reflect Spring Boot 2.0 changes (#378) 2017-12-11 16:34:44 -07:00
Spencer Gibb
103004ec17 Merge branch 'master' into 2.0.x 2017-11-21 18:50:41 -05:00
Spencer Gibb
b888515d4e Make LocalResolver public. 
fixes gh-371
 2017-11-21 16:23:04 -05:00