Commit Graph

79 Commits

Author SHA1 Message Date
Spencer Gibb
d04df564f0 Try and fix old static wonkiness in test. 2016-08-29 12:47:35 -06:00
Spencer Gibb
5f192dd6ce Fix NPE when instance has no status page url.
fixes gh-1285
2016-08-29 12:29:57 -06:00
Daniel Lavoie
6f32aa95a7 Migrate tests to Spring Boot Test 1.4
Fixes gh-1205
2016-07-22 00:54:48 +02:00
Spencer Gibb
83cdf647c9 Angel eureka clients can use brixton eureka servers.
Updates so CloudJacksonJson extension is properly recognized by Eureka
Server as LegacyJacksonJson.

see gh-978
fixes gh-1111
2016-06-17 16:53:44 -06:00
Spencer Gibb
2ff2ce4de4 Only prepend hostname if it has text 2016-05-23 12:17:06 -06:00
Dave Syer
a0c1b4c05d Align instanceId calculation with the one done on the client
The Angel client has an idiosyncratic way of calculating an instance
id, and the Brixton client aligned with that already, but the
Brixton server did not. This change should make Brixton Eureka
Servers work with Angel clients.

See gh-978
2016-05-18 17:32:26 +02:00
Matt Reynolds
5c2937b05c filter basic auth credentials from Eureka replica data for display
so they don't appear on the dashboard

Fixes gh-974
2016-04-26 09:05:52 +01:00
Dave Syer
8b306df132 Use @PropertySource instead of @Bean for http encoder properties
Protects us against changes in Spring Boot 1.4 where the naming
convention changes.
2016-04-20 14:34:44 +01:00
Spencer Gibb
1c4db22c28 Angel metadata.instanceId works with Brixton
Fixes gh-642
2016-04-01 13:02:43 -06:00
Dave Syer
1a96e594f0 Do not override register() method in instance registry
The super class deals with syncing to peers, so we need that
call. It still delegates to the other register method and seems
to work just fine without the override.

Fixes gh-838
2016-02-23 09:49:16 +00:00
Dave Syer
32b3ca4159 Set registration retries to non-zero by default if peered 2016-02-23 09:49:16 +00:00
Dave Syer
7bdab0f23b Relay eureka.environment to Archaius if it is set
Apparently we already support eureka.datacenter as an alias for
archaius.deployment.datacenter and it looks like when that code
was written we intended to support eureka.environment in a similar way.
But it was never finished off, so this change adds the necessary one
line of code.

Fixes gh-791
2016-01-26 14:05:54 +00:00
Dave Syer
b46dab3099 Put @Bean EurekaServerConfig in nested class to avoid cycle
A new integration test ill be added in spring-cloud-samples/tests.

Fixes gh-759
2016-01-18 17:35:17 +00:00
alexVengrovsk
8957a40328 Update InstanceRegistry.java 2015-11-30 16:23:24 +02:00
Spencer Gibb
d23a57d13b Don't extend EurekaBootStrap.
EurekaBootStrap implements ServletContextListener which causes problems because of early instantiation.

fixes gh-664
2015-11-23 16:32:31 -07:00
Spencer Gibb
4721bee8f2 allow EurekaServerConfig to be overridden.
fixes gh-657
2015-11-20 10:48:51 -07:00
Spencer Gibb
415cd1d83c Remove unneeded hardcoded initializers. 2015-11-19 08:33:39 -07:00
Spencer Gibb
1e716ff2c2 Upgrade eureka to v1.3.4
fixes gh-589
2015-11-10 12:25:05 -07:00
Spencer Gibb
7eb5855815 fix resource filtering so it works with boot 1.3.x
get's eureka branding back.

fixes gh-627
2015-11-04 16:39:04 -07:00
Spencer Gibb
fa75ddf452 polish 2015-10-14 11:33:57 -06:00
alexVengrovsk
914fee9ae4 Add isDebugEnabled() check
It is good thing to make this checks because of expensive concatenation of String objects (debug messages).
2015-10-13 10:43:43 -06:00
Spencer Gibb
7fcc559edb Remove blitz4j
fixes gh-527
2015-10-12 12:08:34 -06:00
Spencer Gibb
f878cfcf67 Polish 2015-10-12 11:25:27 -06:00
Spencer Gibb
7cf0fa4824 add support for HasFeatures 2015-09-25 16:08:37 -06:00
Andrei Sfat
60b437e2c5 Update eureka admin page
When click one of the up and running instances this should open the actual instance in separate tab
2015-09-25 15:42:18 +03:00
Jon Schneider
8f9acab3bd Update Eureka to 1.2.5-rc.1
Remove Servo from EurekaHealthIndicator.
Remove custom DataCenterInfo.
EurekaInstanceConfig.SID is now used as eureka id.
EurekaInstanceConfigBean.getSID falls back to metadataMap.instanceId for
backwards compatibility.
2015-09-24 15:34:17 -06:00
Dave Syer
ded968ad58 Ensure changes to eureka metadata are relected on refresh
And also when using eureka-first for discovering config server.
The EurekaClient is very rigid and initializes itself, registering
with the remote service on instantiation. Hance it needs to be
in @RefreshScope for it to be properly refreshable. Doing that
leads to a sequence of other changes (e.g. to account for the
fact that there is no @RefreshScope in bootstrap context).

Fixes gh-551
2015-09-24 13:37:17 +01:00
Spencer Gibb
4037f4ca80 Add initialization of JsonXStream back.
fixes gh-535
2015-09-10 12:59:24 -06:00
Spencer Gibb
62129c72c2 fix condition for selfPreservationMode 2015-08-25 16:32:02 -06:00
Gunnar Hillert
b1dffe00e7 Replace XD logo with a Eureka logo
* Fixes gh-310
2015-08-24 14:41:32 -04:00
Spencer Gibb
246830c9d3 Upgrade to Eureka 1.2.0
Implements forwarding of eureka CacheRefreshedEvent as HeartbeatEvent,
rather thank serialization hack.  Uses new Eureka DI functionality
(mostly there, some issues). Updates EurekaJacksonCodec to be
"DataCenterAware". Reference EurekaClient interface rather than
DiscoveryClient class.

fixes gh-349
2015-08-05 13:37:36 -06:00
Dave Syer
91d288d781 Update to Spring Boot 1.3, stage I (make it compile) 2015-07-03 09:54:16 +01:00
Dave Syer
a903b5d58c Fix guava imports 2015-06-24 17:31:06 +01:00
Bertrand Renuart
58284a4508 Change Jersey init to avoid classpath scanning issues
Scan classpath for Jersey resources with Spring and initialize the
Jersey filter with a jaxrs Application instead. (Fixes gh-399,
fixes gh-400)
2015-06-23 13:00:38 +01:00
Spencer Gibb
aa002b56c4 fixed canceled leases template var referencec
fixes gh-375
2015-06-05 09:00:54 -06:00
Dave Syer
069afb2a73 Use logback by default in Eureka server
Now that blitz4j 1.36.0 is out, with a bit of hackery we can prevent
it from barfing on startup. Seems worth it (and certainly makes
it easier to embed Eureka server).

Fixes gh-3
2015-02-05 12:01:12 +01:00
Dave Syer
4f39b64f26 Make test Eureka run on port 8761 2015-02-03 10:38:39 +01:00
Dave Syer
63e6c813a3 Remove guava usages (fixes gh-154) 2015-01-30 14:10:38 +00:00
Dave Syer
b5bd371d8c Be defiensive about errors getting remote status 2015-01-27 07:29:27 +00:00
Spencer Gibb
a0b73fe7c7 migrate from slf4j to commons logging
fixes gh-147
2015-01-15 14:31:20 -07:00
Spencer Gibb
e7331098fa change protected and package scope fields to private
fixes gh-149
2015-01-15 12:02:19 -07:00
Phillip Webb
3ea0f8d283 Polish 2015-01-14 14:49:23 -08:00
Phillip Webb
9d823513c3 Add copyright headers 2015-01-14 13:24:18 -08:00
Phillip Webb
6a7676a93f Apply eclipse formatting and cleanup 2015-01-14 13:10:41 -08:00
Dave Syer
a5d2d2abe5 Add configuration properties for Eureka dashboard
Not used by the app itself, but will show up in metadata reports
and in tooling, so useful for documentation purposes.

See gh-125
2015-01-03 16:30:38 +00:00
Dave Syer
e6c7422c00 Use <@spring.url/> for all relative paths in FTL
Fixes gh-125
2015-01-02 16:06:48 +00:00
Julien Roy
11201762a7 Eureka dashboard controller path mapping can be configured or disabled 2015-01-02 15:49:37 +00:00
Dave Syer
34785b6bdd Make actuator dependency optional in netflix-core
Fixes gh-117
2014-12-26 14:03:12 +00:00
Dave Syer
4a77b86d08 Minify Javascript so it isn't needed in jars at runtime 2014-12-26 09:39:22 +00:00
Spencer Gibb
4d9281c2af reset zuul routes when eureka sends catalog delta.
fixes gh-76
2014-12-15 16:23:28 -07:00