Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
0f98a8ed
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,发现更多精彩内容 >>
提交
0f98a8ed
编写于
11月 28, 2015
作者:
S
Sachin Goel
提交者:
Robert Metzger
12月 12, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-3023][web-dashboard] Display version and commit information on Overview Page.
This closes #1422
上级
6bd5714d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
2 deletion
+18
-2
flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
...k/runtime/webmonitor/handlers/ClusterOverviewHandler.java
+9
-1
flink-runtime-web/web-dashboard/app/partials/overview.jade
flink-runtime-web/web-dashboard/app/partials/overview.jade
+6
-0
flink-runtime-web/web-dashboard/web/partials/overview.html
flink-runtime-web/web-dashboard/web/partials/overview.html
+2
-0
flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
...org/apache/flink/runtime/util/EnvironmentInformation.java
+1
-1
未找到文件。
flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
浏览文件 @
0f98a8ed
...
...
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import
org.apache.flink.runtime.instance.ActorGateway
;
import
org.apache.flink.runtime.messages.webmonitor.RequestStatusOverview
;
import
org.apache.flink.runtime.messages.webmonitor.StatusOverview
;
import
org.apache.flink.runtime.util.EnvironmentInformation
;
import
scala.concurrent.Await
;
import
scala.concurrent.Future
;
import
scala.concurrent.duration.FiniteDuration
;
...
...
@@ -38,7 +39,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
public
class
ClusterOverviewHandler
implements
RequestHandler
,
RequestHandler
.
JsonResponse
{
private
final
FiniteDuration
timeout
;
private
static
final
String
version
=
EnvironmentInformation
.
getVersion
();
private
static
final
String
commitID
=
EnvironmentInformation
.
getRevisionInformation
().
commitId
;
public
ClusterOverviewHandler
(
FiniteDuration
timeout
)
{
this
.
timeout
=
checkNotNull
(
timeout
);
...
...
@@ -63,6 +67,10 @@ public class ClusterOverviewHandler implements RequestHandler, RequestHandler.Js
gen
.
writeNumberField
(
"jobs-finished"
,
overview
.
getNumJobsFinished
());
gen
.
writeNumberField
(
"jobs-cancelled"
,
overview
.
getNumJobsCancelled
());
gen
.
writeNumberField
(
"jobs-failed"
,
overview
.
getNumJobsFailed
());
gen
.
writeStringField
(
"flink-version"
,
version
);
if
(!
commitID
.
equals
(
EnvironmentInformation
.
UNKNOWN
))
{
gen
.
writeStringField
(
"flink-commit"
,
commitID
);
}
gen
.
writeEndObject
();
gen
.
close
();
...
...
flink-runtime-web/web-dashboard/app/partials/overview.jade
浏览文件 @
0f98a8ed
...
...
@@ -22,6 +22,12 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main
.navbar-title
| Overview
.navbar-info.last.first
| Version: {{overview['flink-version']}}
.navbar-info.last.first(ng-if="overview['flink-commit']")
| Commit: {{overview['flink-commit']}}
#content-inner
.row
.col-md-6
...
...
flink-runtime-web/web-dashboard/web/partials/overview.html
浏览文件 @
0f98a8ed
...
...
@@ -20,6 +20,8 @@ limitations under the License.
<nav
class=
"navbar navbar-default navbar-fixed-top navbar-main"
>
<div
id=
"fold-button"
ng-click=
"showSidebar()"
class=
"btn btn-default navbar-btn pull-left"
><i
class=
"fa fa-navicon"
></i></div>
<div
class=
"navbar-title"
>
Overview
</div>
<div
class=
"navbar-info last first"
>
Version: {{overview['flink-version']}}
</div>
<div
ng-if=
"overview['flink-commit']"
class=
"navbar-info last first"
>
Commit: {{overview['flink-commit']}}
</div>
</nav>
<div
id=
"content-inner"
>
<div
class=
"row"
>
...
...
flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
浏览文件 @
0f98a8ed
...
...
@@ -39,7 +39,7 @@ public class EnvironmentInformation {
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
EnvironmentInformation
.
class
);
p
rivate
static
final
String
UNKNOWN
=
"<unknown>"
;
p
ublic
static
final
String
UNKNOWN
=
"<unknown>"
;
/**
* Returns the version of the code as String. If version == null, then the JobManager does not run from a
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录