Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
ed73f661
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ed73f661
编写于
11月 09, 2015
作者:
M
Maximilian Michels
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-2730] remove Apache License incompatible chart library
上级
3ade4c79
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
879 addition
and
1632 deletion
+879
-1632
flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
...shboard/app/partials/taskmanager/taskmanager.metrics.jade
+0
-23
flink-runtime-web/web-dashboard/app/scripts/index.coffee
flink-runtime-web/web-dashboard/app/scripts/index.coffee
+3
-84
flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.dir.coffee
...rd/app/scripts/modules/taskmanager/taskmanager.dir.coffee
+0
-93
flink-runtime-web/web-dashboard/bower.json
flink-runtime-web/web-dashboard/bower.json
+1
-2
flink-runtime-web/web-dashboard/web/js/index.js
flink-runtime-web/web-dashboard/web/js/index.js
+2
-179
flink-runtime-web/web-dashboard/web/js/vendor.js
flink-runtime-web/web-dashboard/web/js/vendor.js
+872
-1232
flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
...shboard/web/partials/taskmanager/taskmanager.metrics.html
+1
-19
未找到文件。
flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
浏览文件 @
ed73f661
...
...
@@ -15,29 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
table.table(ng-if="metrics.id")
thead
tr
th CPU Usage
th Memory - Used
tbody
tr
td
livechart(data="metrics" key="cpuLoad")
td
livechart(data="metrics" key="used")
.row.text-center
span.label.legend-box#total-mem
|
| Total Memory
span.label.legend-box#heap-mem
|
| Heap Memory
span.label.legend-box#non-heap-mem
|
| Non-heap Memory
table.table.table-properties(ng-if="metrics.id")
thead
...
...
flink-runtime-web/web-dashboard/app/scripts/index.coffee
浏览文件 @
ed73f661
...
...
@@ -44,86 +44,6 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
JobsService
.
listJobs
()
,
flinkConfig
[
"refresh-interval"
]
Highcharts
.
setOptions
({
global
:
{
useUTC
:
false
}
})
#
# Grid-light theme for Highcharts JS
# @author Torstein Honsi
#
# Taken from https://github.com/highslide-software/highcharts.com
#
Highcharts
.
createElement
(
'link'
,
{
href
:
'//fonts.googleapis.com/css?family=Dosis:400,600'
,
rel
:
'stylesheet'
,
type
:
'text/css'
},
null
,
document
.
getElementsByTagName
(
'head'
)[
0
]);
Highcharts
.
theme
=
{
colors
:
[
"#7cb5ec"
,
"#f7a35c"
,
"#90ee7e"
,
"#7798BF"
,
"#aaeeee"
,
"#ff0066"
,
"#eeaaee"
,
"#55BF3B"
,
"#DF5353"
,
"#7798BF"
,
"#aaeeee"
],
chart
:
{
backgroundColor
:
null
,
style
:
{
fontFamily
:
"Dosis, sans-serif"
}
},
title
:
{
style
:
{
fontSize
:
'16px'
,
fontWeight
:
'bold'
,
textTransform
:
'uppercase'
}
},
tooltip
:
{
borderWidth
:
0
,
backgroundColor
:
'rgba(219,219,216,0.8)'
,
shadow
:
false
},
legend
:
{
itemStyle
:
{
fontWeight
:
'bold'
,
fontSize
:
'13px'
}
},
xAxis
:
{
gridLineWidth
:
1
,
labels
:
{
style
:
{
fontSize
:
'12px'
}
}
},
yAxis
:
{
minorTickInterval
:
'auto'
,
title
:
{
style
:
{
textTransform
:
'uppercase'
}
},
labels
:
{
style
:
{
fontSize
:
'12px'
}
}
},
plotOptions
:
{
candlestick
:
{
lineColor
:
'#404048'
}
},
background2
:
'#F0F0EA'
};
Highcharts
.
setOptions
(
Highcharts
.
theme
);
# --------------------------------------
...
...
@@ -146,7 +66,7 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
main
:
templateUrl
:
"partials/jobs/running-jobs.html"
controller
:
'RunningJobsController'
.
state
"completed-jobs"
,
url
:
"/completed-jobs"
views
:
...
...
@@ -175,14 +95,14 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
views
:
'node-details'
:
templateUrl
:
"partials/jobs/job.plan.node-list.overview.html"
controller
:
'JobPlanOverviewController'
controller
:
'JobPlanOverviewController'
.
state
"single-job.plan.accumulators"
,
url
:
"/accumulators"
views
:
'node-details'
:
templateUrl
:
"partials/jobs/job.plan.node-list.accumulators.html"
controller
:
'JobPlanAccumulatorsController'
controller
:
'JobPlanAccumulatorsController'
.
state
"single-job.timeline"
,
url
:
"/timeline"
...
...
@@ -265,4 +185,3 @@ angular.module('flinkApp', ['ui.router', 'angularMoment'])
controller
:
'JobManagerLogsController'
$urlRouterProvider
.
otherwise
"/overview"
flink-runtime-web/web-dashboard/app/scripts/modules/taskmanager/taskmanager.dir.coffee
已删除
100644 → 0
浏览文件 @
3ade4c79
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
angular
.
module
(
'flinkApp'
)
.
directive
'livechart'
,
()
->
{
link
:
(
scope
,
element
,
attrs
)
->
getChartType
=
()
->
if
attrs
.
key
==
"cpuLoad"
"spline"
else
"area"
getYAxisTitle
=
()
->
if
attrs
.
key
==
"cpuLoad"
"CPU Usage(%)"
else
"Memory(MB)"
getKey1
=
()
->
"memory.total."
+
attrs
.
key
getKey2
=
()
->
"memory.heap."
+
attrs
.
key
getKey3
=
()
->
"memory.non-heap."
+
attrs
.
key
getKey4
=
()
->
"cpuLoad"
getChartOptions
=
()
->
{
title
:
{
text
:
' '
},
chart
:
{
type
:
getChartType
(),
zoomType
:
'x'
},
xAxis
:
{
type
:
'datetime'
},
yAxis
:
{
title
:
{
text
:
getYAxisTitle
()
}
min
:
0
if
attrs
.
key
==
"cpuLoad"
,
max
:
100
if
attrs
.
key
==
"cpuLoad"
},
series
:
[
{
name
:
"Memory: Total"
,
id
:
getKey1
(),
data
:
[],
color
:
"#7cb5ec"
},
{
name
:
"Memory: Heap"
,
id
:
getKey2
(),
data
:
[],
color
:
"#434348"
},
{
name
:
"Memory: Non-Heap"
,
id
:
getKey3
(),
data
:
[],
color
:
"#90ed7d"
},
{
name
:
"CPU Usage"
,
id
:
getKey4
(),
data
:
[],
color
:
"#f7a35c"
,
showInLegend
:
false
}
],
legend
:
{
enabled
:
false
},
tooltip
:
{
shared
:
true
},
exporting
:
{
enabled
:
false
},
credits
:
{
enabled
:
false
}
}
if
!
element
.
highcharts
()
?
element
.
highcharts
(
getChartOptions
())
scope
.
$watch
(
attrs
.
data
,
(
value
)
->
updateCharts
(
value
)
)
updateCharts
=
(
value
)
->
do
(
value
)
->
heartbeat
=
value
.
timeSinceLastHeartbeat
chart
=
element
.
highcharts
()
if
attrs
.
key
==
"cpuLoad"
chart
.
get
(
getKey4
()).
addPoint
([
heartbeat
,
+
((
value
.
metrics
.
gauges
[
getKey4
()].
value
*
100
).
toFixed
(
2
))
],
true
,
false
)
else
divider
=
1048576
chart
.
get
(
getKey1
()).
addPoint
([
heartbeat
,
+
((
value
.
metrics
.
gauges
[
getKey1
()].
value
/
divider
).
toFixed
(
2
))
],
true
,
false
)
chart
.
get
(
getKey2
()).
addPoint
([
heartbeat
,
+
((
value
.
metrics
.
gauges
[
getKey2
()].
value
/
divider
).
toFixed
(
2
))
],
true
,
false
)
chart
.
get
(
getKey3
()).
addPoint
([
heartbeat
,
+
((
value
.
metrics
.
gauges
[
getKey3
()].
value
/
divider
).
toFixed
(
2
))
],
true
,
false
)
}
flink-runtime-web/web-dashboard/bower.json
浏览文件 @
ed73f661
...
...
@@ -23,8 +23,7 @@
"dagre-d3"
:
"~0.4.10"
,
"font-awesome"
:
"~4.3.0"
,
"moment-duration-format"
:
"~1.3.0"
,
"qtip2"
:
"~2.2.1"
,
"highcharts-release"
:
"~4.1.8"
"qtip2"
:
"~2.2.1"
},
"overrides"
:
{
"dagre-d3"
:
{
...
...
flink-runtime-web/web-dashboard/web/js/index.js
浏览文件 @
ed73f661
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
flink-runtime-web/web-dashboard/web/js/vendor.js
浏览文件 @
ed73f661
此差异已折叠。
点击以展开。
flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
浏览文件 @
ed73f661
...
...
@@ -16,26 +16,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<table
ng-if=
"metrics.id"
class=
"table"
>
<thead>
<tr>
<th>
CPU Usage
</th>
<th>
Memory - Used
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<livechart
data=
"metrics"
key=
"cpuLoad"
></livechart>
</td>
<td>
<livechart
data=
"metrics"
key=
"used"
></livechart>
<div
class=
"row text-center"
><span
id=
"total-mem"
class=
"label legend-box"
>
</span>
Total Memory
<span
id=
"heap-mem"
class=
"label legend-box"
>
</span>
Heap Memory
<span
id=
"non-heap-mem"
class=
"label legend-box"
>
</span>
Non-heap Memory
</div>
</td>
</tr>
</tbody>
</table>
<table
ng-if=
"metrics.id"
class=
"table table-properties"
>
<thead>
<tr>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录