Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
a2270dc2
Commit
a2270dc2
authored
Jul 27, 2015
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Hystrix 1.4.13
Also brings in patches to the hystrix dashboard. fixes gh-465
parent
e5e677c0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
6 deletions
+5
-6
pom.xml
pom.xml
+1
-1
hystrixCommand.css
...atic/hystrix/components/hystrixCommand/hystrixCommand.css
+1
-1
hystrixCommand.js
...tatic/hystrix/components/hystrixCommand/hystrixCommand.js
+0
-0
hystrixCircuitContainer.html
...nts/hystrixCommand/templates/hystrixCircuitContainer.html
+1
-1
hystrixThreadPoolContainer.html
...strixThreadPool/templates/hystrixThreadPoolContainer.html
+1
-1
monitor.ftl
...ashboard/src/main/resources/templates/hystrix/monitor.ftl
+1
-2
No files found.
pom.xml
View file @
a2270dc2
...
...
@@ -27,7 +27,7 @@
<archaius.version>
0.6.5
</archaius.version>
<eureka.version>
1.1.147
</eureka.version>
<feign.version>
8.6.0
</feign.version>
<hystrix.version>
1.4.1
0
</hystrix.version>
<hystrix.version>
1.4.1
3
</hystrix.version>
<ribbon.version>
2.0.0
</ribbon.version>
<zuul.version>
1.0.28
</zuul.version>
<rxjava.version>
1.0.11
</rxjava.version>
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.css
View file @
a2270dc2
...
...
@@ -110,7 +110,7 @@
.dependencies
div
.monitor
{
width
:
245px
;
/* we want a fixed width instead of percentage as I want the boxes to be a set size and then fill in as many as can fit in each row ... this allows 3 columns on an iPad */
height
:
15
0
px
;
height
:
15
5
px
;
}
.dependencies
.success
{
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.js
View file @
a2270dc2
This diff is collapsed.
Click to expand it.
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/templates/hystrixCircuitContainer.html
View file @
a2270dc2
...
...
@@ -9,7 +9,7 @@
%>
<div
id=
"chart_CIRCUIT_<%= name %>"
class=
"chart"
style=
"position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"
></div>
<div
style=
"position:absolute;top:0
x
;width:100%;height:15px;opacity:0.8; background:white;"
>
<div
style=
"position:absolute;top:0;width:100%;height:15px;opacity:0.8; background:white;"
>
<
%
if
(
includeDetailIcon
)
{
%
>
<p
class=
"name"
<%=
toolTip
%
>
style="padding-right:16px">
<
%=
displayName
%
>
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixThreadPool/templates/hystrixThreadPoolContainer.html
View file @
a2270dc2
...
...
@@ -10,7 +10,7 @@
%>
<div
id=
"chart_THREAD_POOL_<%= name %>"
class=
"chart"
style=
"position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"
></div>
<div
style=
"position:absolute;top:0
x
;width:100%;height:15px;opacity:0.8; background:white;"
><p
class=
"name"
<%=
toolTip
%
>
>
<
%=
displayName
%
></p></div>
<div
style=
"position:absolute;top:0;width:100%;height:15px;opacity:0.8; background:white;"
><p
class=
"name"
<%=
toolTip
%
>
>
<
%=
displayName
%
></p></div>
<div
style=
"position:absolute;top:15px;; opacity:0.8; background:white; width:100%; height:95%;"
>
<div
class=
"monitor_data"
></div>
</div>
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl
View file @
a2270dc2
...
...
@@ -61,8 +61,7 @@
<div
id=
"dependencies"
class=
"row dependencies"
><span
class=
"loading"
>
Loading ...
</span></div>
<div
class=
"spacer"
></div>
<div
class=
"spacer"
></div>
<div
class=
"row"
>
<div
class=
"menubar"
>
<div
class=
"title"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment