You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/12/12 20:22:35 UTC
flink git commit: [FLINK-3023][web-dashboard] Display version and
commit information on Overview Page.
Repository: flink
Updated Branches:
refs/heads/master 6bd5714d2 -> 0f98a8ed5
[FLINK-3023][web-dashboard] Display version and commit information on Overview Page.
This closes #1422
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0f98a8ed
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0f98a8ed
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0f98a8ed
Branch: refs/heads/master
Commit: 0f98a8ed53a7462aebfbffeb16bd37b7b14849a3
Parents: 6bd5714
Author: Sachin Goel <sa...@gmail.com>
Authored: Sat Nov 28 14:56:16 2015 +0530
Committer: Robert Metzger <rm...@apache.org>
Committed: Sat Dec 12 20:22:03 2015 +0100
----------------------------------------------------------------------
.../webmonitor/handlers/ClusterOverviewHandler.java | 10 +++++++++-
.../web-dashboard/app/partials/overview.jade | 6 ++++++
.../web-dashboard/web/partials/overview.html | 2 ++
.../apache/flink/runtime/util/EnvironmentInformation.java | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0f98a8ed/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
index 9fcf144..a1f6a76 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ClusterOverviewHandler.java
@@ -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();
http://git-wip-us.apache.org/repos/asf/flink/blob/0f98a8ed/flink-runtime-web/web-dashboard/app/partials/overview.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/overview.jade b/flink-runtime-web/web-dashboard/app/partials/overview.jade
index dbaf1a7..eeb3be9 100644
--- a/flink-runtime-web/web-dashboard/app/partials/overview.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/overview.jade
@@ -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
http://git-wip-us.apache.org/repos/asf/flink/blob/0f98a8ed/flink-runtime-web/web-dashboard/web/partials/overview.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/overview.html b/flink-runtime-web/web-dashboard/web/partials/overview.html
index 24e8f93..05022ef 100644
--- a/flink-runtime-web/web-dashboard/web/partials/overview.html
+++ b/flink-runtime-web/web-dashboard/web/partials/overview.html
@@ -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">
http://git-wip-us.apache.org/repos/asf/flink/blob/0f98a8ed/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
index 687f1a5..4d742f1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
@@ -39,7 +39,7 @@ public class EnvironmentInformation {
private static final Logger LOG = LoggerFactory.getLogger(EnvironmentInformation.class);
- private static final String UNKNOWN = "<unknown>";
+ public static final String UNKNOWN = "<unknown>";
/**
* Returns the version of the code as String. If version == null, then the JobManager does not run from a