diff --git a/README.adoc b/README.adoc index 933158203..380e6a997 100644 --- a/README.adoc +++ b/README.adoc @@ -28,7 +28,7 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon). === Basic Compile and Test To build the source you will need to install -http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK {jdkversion}. +https://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK {jdkversion}. Spring Cloud uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the @@ -55,7 +55,7 @@ credentials and you already have those. If you need mongo, rabbit or redis, see the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for instructions. For example consider using the "fig.yml" with -http://www.fig.sh/[Fig] to run them in Docker containers. +https://www.fig.sh/[Fig] to run them in Docker containers. === Documentation @@ -94,7 +94,7 @@ added after the original pull request but before a merge. the ``Importing into eclipse'' instructions below you should get project specific formatting automatically. You can also import formatter settings using the `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ, you can - use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] + use the https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -110,13 +110,13 @@ added after the original pull request but before a merge. === Working with the code If you don't have an IDE preference we would recommend that you use -http://www.springsource.com/developer/sts[Spring Tools Suite] or -http://eclipse.org[Eclipse] when working with the code. We use the -http://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools +https://www.springsource.com/developer/sts[Spring Tools Suite] or +https://eclipse.org[Eclipse] when working with the code. We use the +https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools should also work without issue. ==== Importing into eclipse with m2eclipse -We recommend the http://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with +We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". @@ -135,7 +135,7 @@ from the `file` menu. ==== Adding Project Lombok Agent Spring Cloud uses [Project -Lombok](http://projectlombok.org/features/index.html) to generate +Lombok](https://projectlombok.org/features/index.html) to generate getters and setters etc. Compiling from the command line this shouldn't cause any problems, but in an IDE you need to add an agent to the JVM. Full instructions can be found in the Lombok website. The @@ -179,7 +179,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -192,6 +192,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). \ No newline at end of file diff --git a/asciidoctor.css b/asciidoctor.css index 06d52e688..58c68541c 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -1,4 +1,4 @@ -/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */ +/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ /* Remove the comments around the @import statement below when using this as a custom stylesheet */ /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/ article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block} diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 1d4178609..515285e16 100644 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -1,7 +1,7 @@ :github-tag: 1.0.x :github-repo: spring-cloud/spring-cloud-netflix -:github-raw: http://raw.github.com/{github-repo}/{github-tag} -:github-code: http://github.com/{github-repo}/tree/{github-tag} +:github-raw: https://raw.github.com/{github-repo}/{github-tag} +:github-code: https://github.com/{github-repo}/tree/{github-tag} :nofooter: = Spring Cloud Netflix @@ -364,7 +364,7 @@ IP Address rather than its hostname. == Circuit Breaker: Hystrix Clients -Netflix has created a library called https://github.com/Netflix/Hystrix[Hystrix] that implements the http://martinfowler.com/bliki/CircuitBreaker.html[circuit breaker pattern]. In a microservice architecture it is common to have multiple layers of service calls. +Netflix has created a library called https://github.com/Netflix/Hystrix[Hystrix] that implements the https://martinfowler.com/bliki/CircuitBreaker.html[circuit breaker pattern]. In a microservice architecture it is common to have multiple layers of service calls. .Microservice Graph image::HystrixGraph.png[] @@ -478,7 +478,7 @@ To run the Hystrix Dashboard annotate your Spring Boot main class with `@EnableH Looking at an individual instances Hystrix data is not very useful in terms of the overall health of the system. https://github.com/Netflix/Turbine[Turbine] is an application that aggregates all of the relevant `/hystrix.stream` endpoints into a combined `/turbine.stream` for use in the Hystrix Dashboard. Individual instances are located via Eureka. Running Turbine is as simple as annotating your main class with the `@EnableTurbine` annotation (e.g. using spring-cloud-starter-turbine to set up the classpath). All of the documented configuration properties from https://github.com/Netflix/Turbine/wiki/Configuration-(1.x)[the Turbine 1 wiki] apply. The only difference is that the `turbine.instanceUrlSuffix` does not need the port prepended as this is handled automatically unless `turbine.instanceInsertPort=false`. -The configuration key `turbine.appConfig` is a list of eureka serviceIds that turbine will use to lookup instances. The turbine stream is then used in the Hystrix dashboard using a url that looks like: `http://my.turbine.sever:8080/turbine.stream?cluster=` (the cluster parameter can be omitted if the name is "default"). The `cluster` parameter must match an entry in `turbine.aggregator.clusterConfig`. Values returned from eureka are uppercase, thus we expect this example to work if there is an app registered with Eureka called "customers": +The configuration key `turbine.appConfig` is a list of eureka serviceIds that turbine will use to lookup instances. The turbine stream is then used in the Hystrix dashboard using a url that looks like: `https://my.turbine.sever:8080/turbine.stream?cluster=` (the cluster parameter can be omitted if the name is "default"). The `cluster` parameter must match an entry in `turbine.aggregator.clusterConfig`. Values returned from eureka are uppercase, thus we expect this example to work if there is an app registered with Eureka called "customers": ---- turbine: @@ -728,7 +728,7 @@ in your external configuration (see == External Configuration: Archaius -https://github.com/Netflix/archaius[Archaius] is the Netflix client side configuration library. It is the library used by all of the Netflix OSS components for configuration. Archaius is an extension of the http://commons.apache.org/proper/commons-configuration[Apache Commons Configuration] project. It allows updates to configuration by either polling a source for changes or for a source to push changes to the client. Archaius uses DynamicProperty classes as handles to properties. +https://github.com/Netflix/archaius[Archaius] is the Netflix client side configuration library. It is the library used by all of the Netflix OSS components for configuration. Archaius is an extension of the https://commons.apache.org/proper/commons-configuration[Apache Commons Configuration] project. It allows updates to configuration by either polling a source for changes or for a source to push changes to the client. Archaius uses DynamicProperty classes as handles to properties. .Archaius Example [source,java] @@ -750,7 +750,7 @@ Archaius has its own set of configuration files and loading priorities. Spring Routing in an integral part of a microservice architecture. For example, `/` may be mapped to your web application, `/api/users` is mapped to the user service and `/api/shop` is mapped to the shop service. https://github.com/Netflix/zuul[Zuul] is a JVM based router and server side load balancer by Netflix. -http://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27[Netflix uses Zuul] for the following: +https://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27[Netflix uses Zuul] for the following: * Authentication * Insights @@ -843,7 +843,7 @@ The location of the backend can be specified as either a "serviceId" routes: users: path: /myusers/** - url: http://example.com/users_service + url: https://example.com/users_service ---- These simple url-routes doesn't get executed as HystrixCommand nor can you loadbalance multiple url with Ribbon. @@ -1048,7 +1048,7 @@ and the Sidecar is on port 5678, then it can be accessed at http://localhost:5678/configserver Non-jvm app can take advantage of the Config Server's ability to return YAML -documents. For example, a call to http://sidecar.local.spring.io:5678/configserver/default-master.yml +documents. For example, a call to https://sidecar.local.spring.io:5678/configserver/default-master.yml might result in a YAML document like the following [source,yaml] diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index 84952f686..6b8300fcb 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java @@ -58,14 +58,14 @@ public class EurekaClientConfigBeanTests { @Test public void serviceUrl() { EnvironmentTestUtils.addEnvironment(this.context, - "eureka.client.serviceUrl.defaultZone:http://example.com"); + "eureka.client.serviceUrl.defaultZone:https://example.com"); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); - assertEquals("{defaultZone=http://example.com}", + assertEquals("{defaultZone=https://example.com}", this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()); - assertEquals("[http://example.com]", + assertEquals("[https://example.com]", this.context.getBean(EurekaClientConfigBean.class) .getEurekaServerServiceUrls("defaultZone").toString()); } @@ -76,14 +76,14 @@ public class EurekaClientConfigBeanTests { this.context.getEnvironment().getPropertySources().addFirst(source); source.addPropertySource(new MapPropertySource("config", Collections . singletonMap("eureka.client.serviceUrl.defaultZone", - "http://example.com"))); + "https://example.com"))); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); - assertEquals("{defaultZone=http://example.com}", + assertEquals("{defaultZone=https://example.com}", this.context.getBean(EurekaClientConfigBean.class).getServiceUrl() .toString()); - assertEquals("[http://example.com]", + assertEquals("[https://example.com]", this.context.getBean(EurekaClientConfigBean.class) .getEurekaServerServiceUrls("defaultZone").toString()); } @@ -91,11 +91,11 @@ public class EurekaClientConfigBeanTests { @Test public void serviceUrlWithDefault() { EnvironmentTestUtils.addEnvironment(this.context, - "eureka.client.serviceUrl.defaultZone:http://example.com"); + "eureka.client.serviceUrl.defaultZone:https://example.com"); this.context.register(PropertyPlaceholderAutoConfiguration.class, TestConfiguration.class); this.context.refresh(); - assertEquals("[http://example.com]", + assertEquals("[https://example.com]", this.context.getBean(EurekaClientConfigBean.class) .getEurekaServerServiceUrls("defaultZone").toString()); } diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientTests.java index f357eb7c4..0917bf8f5 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientTests.java @@ -81,7 +81,7 @@ public class FeignRibbonClientTests { Request request = new RequestTemplate().method("GET").append("http://foo/") .request(); this.client.execute(request, new Options()); - RequestMatcher matcher = new RequestMatcher("http://foo.com:8000/"); + RequestMatcher matcher = new RequestMatcher("https://foo.com:8000/"); verify(this.delegate).execute(argThat(matcher), any(Options.class)); } diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignClientValidationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignClientValidationTests.java index 0ef130ce3..49dc9d516 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignClientValidationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/valid/FeignClientValidationTests.java @@ -45,7 +45,7 @@ public class FeignClientValidationTests { @EnableFeignClients protected static class GoodUrlConfiguration { - @FeignClient(url="http://example.com") + @FeignClient(url="https://example.com") interface Client { @RequestMapping(method = RequestMethod.GET, value = "/") @Deprecated diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRouteLocatorTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRouteLocatorTests.java index df8908a92..4dcd830c7 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRouteLocatorTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/ProxyRouteLocatorTests.java @@ -298,7 +298,7 @@ public class ProxyRouteLocatorTests { @Test public void testIgnoredRouteIncludedIfConfiguredAndNotDiscovered() { this.properties.getRoutes() - .put("foo", new ZuulRoute("/foo/**", "http://foo.com")); + .put("foo", new ZuulRoute("/foo/**", "http://www.foo.com/")); ProxyRouteLocator routeLocator = new ProxyRouteLocator("/", this.discovery, this.properties); this.properties.setIgnoredServices(Collections.singletonList("*")); @@ -322,7 +322,7 @@ public class ProxyRouteLocatorTests { @Test public void testAutoRoutesCanBeOverridden() { - ZuulRoute route = new ZuulRoute("/" + MYSERVICE + "/**", "http://example.com/" + ZuulRoute route = new ZuulRoute("/" + MYSERVICE + "/**", "https://example.com/" + MYSERVICE); this.properties.getRoutes().put(MYSERVICE, route); ProxyRouteLocator routeLocator = new ProxyRouteLocator("/", this.discovery, @@ -332,7 +332,7 @@ public class ProxyRouteLocatorTests { Map routesMap = routeLocator.getRoutes(); assertNotNull("routesMap was null", routesMap); assertFalse("routesMap was empty", routesMap.isEmpty()); - assertMapping(routesMap, "http://example.com/" + MYSERVICE, MYSERVICE); + assertMapping(routesMap, "https://example.com/" + MYSERVICE, MYSERVICE); } protected void assertMapping(Map routesMap, String serviceId) { diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/global.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/global.css index 46898b113..1a72e3adf 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/global.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/global.css @@ -14,7 +14,7 @@ img { #header { - background: #FFFFFF url(http://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 0%; + background: #FFFFFF url(https://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 0%; height: 65px; margin-bottom: 5px; } @@ -65,7 +65,7 @@ img { } #header { - background: #FFFFFF url(http://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 50%; + background: #FFFFFF url(https://raw.github.com/wiki/Netflix/Hystrix/images/hystrix-logo-tagline-tiny.png) no-repeat scroll 99% 50%; height: 65px; } } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css index 052ee4882..ca5653416 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/1236_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 1.125em; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css index 0ef2432c8..c694dc27d 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/720_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 0.875em; padding: 0; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css index 83a597887..0496041f7 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/986_grid.css @@ -1,7 +1,7 @@ /* SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 100%; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt index 15cfc8c35..772768319 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/README.txt @@ -1 +1 @@ -http://simplegrid.info/ \ No newline at end of file +https://simplegrid.info/ \ No newline at end of file diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css index 13cb4b2dc..1254f636d 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/css/simplegrid/percentage_grid.css @@ -1,9 +1,9 @@ /* Extension of SimpleGrid by benjchristensen to allow percentage based sizing on very large displays * * SimpleGrid - a fork of CSSGrid by Crowd Favorite (https://github.com/crowdfavorite/css-grid) - * http://simplegrid.info - * by Conor Muirhead (http://conor.cc) of Early LLC (http://earlymade.com) - * License: http://creativecommons.org/licenses/MIT/ */ + * https://simplegrid.info + * by Conor Muirhead (http://conor.cc) of Early LLC (https://earlymade.com) + * License: https://creativecommons.org/licenses/MIT/ */ /* Containers */ body { font-size: 1.125em; } diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js index 40d62eb53..733bbec36 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/jquery.tinysort.min.js @@ -3,10 +3,10 @@ * * Version: 1.0.5 * -* Copyright (c) 2008-2011 Ron Valstar http://www.sjeiti.com/ +* Copyright (c) 2008-2011 Ron Valstar http://ronvalstar.nl/ * * Dual licensed under the MIT and GPL licenses: -* http://www.opensource.org/licenses/mit-license.php -* http://www.gnu.org/licenses/gpl.html +* https://www.opensource.org/licenses/mit-license.php +* https://www.gnu.org/licenses/gpl.html */ (function(b){b.tinysort={id:"TinySort",version:"1.0.5",copyright:"Copyright (c) 2008-2011 Ron Valstar",uri:"http://tinysort.sjeiti.com/",defaults:{order:"asc",attr:"",place:"start",returns:false,useVal:false}};b.fn.extend({tinysort:function(h,j){if(h&&typeof(h)!="string"){j=h;h=null}var e=b.extend({},b.tinysort.defaults,j);var p={};this.each(function(t){var v=(!h||h=="")?b(this):b(this).find(h);var u=e.order=="rand"?""+Math.random():(e.attr==""?(e.useVal?v.val():v.text()):v.attr(e.attr));var s=b(this).parent();if(!p[s]){p[s]={s:[],n:[]}}if(v.length>0){p[s].s.push({s:u,e:b(this),n:t})}else{p[s].n.push({e:b(this),n:t})}});for(var g in p){var d=p[g];d.s.sort(function k(t,s){var i=t.s.toLowerCase?t.s.toLowerCase():t.s;var u=s.s.toLowerCase?s.s.toLowerCase():s.s;if(c(t.s)&&c(s.s)){i=parseFloat(t.s);u=parseFloat(s.s)}return(e.order=="asc"?1:-1)*(iu?1:0))})}var m=[];for(var g in p){var d=p[g];var n=[];var f=b(this).length;switch(e.place){case"first":b.each(d.s,function(s,t){f=Math.min(f,t.n)});break;case"org":b.each(d.s,function(s,t){n.push(t.n)});break;case"end":f=d.n.length;break;default:f=0}var q=[0,0];for(var l=0;l=f&&l0?d[1]:false}function a(e,f){var d=false;b.each(e,function(h,g){if(!d){d=g==f}});return d}b.fn.TinySort=b.fn.Tinysort=b.fn.tsort=b.fn.tinysort})(jQuery); \ No newline at end of file diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js index d7098f784..251b3681b 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/js/tmpl.js @@ -1,7 +1,7 @@ //Simple JavaScript Templating -//John Resig - http://ejohn.org/ - MIT Licensed -// http://ejohn.org/blog/javascript-micro-templating/ +//John Resig - https://johnresig.com/ - MIT Licensed +// https://johnresig.com/blog/javascript-micro-templating/ (function(window, undefined) { var cache = {}; diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl index 6108cc807..13a42b284 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl @@ -1,5 +1,5 @@ <#import "/spring.ftl" as spring /> - + @@ -36,13 +36,13 @@

Hystrix Dashboard

- +

- Cluster via Turbine (default cluster): http://turbine-hostname:port/turbine.stream + Cluster via Turbine (default cluster): https://turbine-hostname:port/turbine.stream
- Cluster via Turbine (custom cluster): http://turbine-hostname:port/turbine.stream?cluster=[clusterName] + Cluster via Turbine (custom cluster): https://turbine-hostname:port/turbine.stream?cluster=[clusterName]
- Single Hystrix App: http://hystrix-app:port/hystrix.stream + Single Hystrix App: https://hystrix-app:port/hystrix.stream

Delay: ms      diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl index c54f6dc48..cfe4010fd 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl @@ -182,7 +182,7 @@ }); //Read a page's GET URL variables and return them as an associative array. - // from: http://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html + // from: https://jquery-howto.blogspot.com/2009/09/get-url-parameters-values-with-jquery.html function getUrlVars() { var vars = [], hash;