From e5b31bb0e9bc386c0b03c610ef988e243d5f2a8f Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Mon, 20 Mar 2017 18:41:26 +0100
Subject: [PATCH 1/4] [refactor] Move netty setup into separate class

---
 .../runtime/webmonitor/WebRuntimeMonitor.java |  93 +----------
 .../utils/WebFrontendBootstrap.java           | 146 ++++++++++++++++++
 2 files changed, 152 insertions(+), 87 deletions(-)
 create mode 100644 flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java

diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
index d88fdcf218fba..39bca71004662 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
@@ -20,18 +20,7 @@
 
 import akka.actor.ActorSystem;
 
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.codec.http.HttpServerCodec;
-import io.netty.handler.codec.http.router.Handler;
 import io.netty.handler.codec.http.router.Router;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.handler.stream.ChunkedWriteHandler;
 
 import org.apache.flink.api.common.time.Time;
 import org.apache.flink.configuration.ConfigConstants;
@@ -84,6 +73,7 @@
 import org.apache.flink.runtime.webmonitor.metrics.JobVertexMetricsHandler;
 import org.apache.flink.runtime.webmonitor.metrics.MetricFetcher;
 import org.apache.flink.runtime.webmonitor.metrics.TaskManagerMetricsHandler;
+import org.apache.flink.runtime.webmonitor.utils.WebFrontendBootstrap;
 import org.apache.flink.util.FileUtils;
 
 import org.slf4j.Logger;
@@ -95,10 +85,8 @@
 import scala.concurrent.duration.FiniteDuration;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
 import java.io.File;
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
@@ -137,13 +125,10 @@ public class WebRuntimeMonitor implements WebMonitor {
 
 	private final SSLContext serverSSLContext;
 
-	private final ServerBootstrap bootstrap;
-
 	private final Promise<String> jobManagerAddressPromise = new scala.concurrent.impl.Promise.DefaultPromise<>();
 
 	private final FiniteDuration timeout;
-
-	private Channel serverChannel;
+	private final WebFrontendBootstrap netty;
 
 	private final File webRootDir;
 
@@ -380,52 +365,7 @@ public void run() {
 			LOG.warn("Error while adding shutdown hook", t);
 		}
 
-		final Configuration sslConfig = config;
-		ChannelInitializer<SocketChannel> initializer = new ChannelInitializer<SocketChannel>() {
-
-			@Override
-			protected void initChannel(SocketChannel ch) {
-				Handler handler = new Handler(router);
-
-				// SSL should be the first handler in the pipeline
-				if (serverSSLContext != null) {
-					SSLEngine sslEngine = serverSSLContext.createSSLEngine();
-					SSLUtils.setSSLVerAndCipherSuites(sslEngine, sslConfig);
-					sslEngine.setUseClientMode(false);
-					ch.pipeline().addLast("ssl", new SslHandler(sslEngine));
-				}
-
-				ch.pipeline()
-						.addLast(new HttpServerCodec())
-						.addLast(new ChunkedWriteHandler())
-						.addLast(new HttpRequestHandler(uploadDir))
-						.addLast(handler.name(), handler)
-						.addLast(new PipelineErrorHandler(LOG));
-			}
-		};
-
-		NioEventLoopGroup bossGroup   = new NioEventLoopGroup(1);
-		NioEventLoopGroup workerGroup = new NioEventLoopGroup();
-
-		this.bootstrap = new ServerBootstrap();
-		this.bootstrap
-				.group(bossGroup, workerGroup)
-				.channel(NioServerSocketChannel.class)
-				.childHandler(initializer);
-
-		ChannelFuture ch;
-		if (configuredAddress == null) {
-			ch = this.bootstrap.bind(configuredPort);
-		} else {
-			ch = this.bootstrap.bind(configuredAddress, configuredPort);
-		}
-		this.serverChannel = ch.sync().channel();
-
-		InetSocketAddress bindAddress = (InetSocketAddress) serverChannel.localAddress();
-		String address = bindAddress.getAddress().getHostAddress();
-		int port = bindAddress.getPort();
-
-		LOG.info("Web frontend listening at " + address + ':' + port);
+		this.netty = new WebFrontendBootstrap(router, LOG, uploadDir, serverSSLContext, configuredAddress, configuredPort, config);
 	}
 
 	/**
@@ -482,7 +422,7 @@ public void start(String jobManagerAkkaUrl) throws Exception {
 			// this here repeatedly, because cache clean up only happens on
 			// interactions with the cache. We need it to make sure that we
 			// don't leak memory after completed jobs or long ago accessed stats.
-			bootstrap.childGroup().scheduleWithFixedDelay(new Runnable() {
+			netty.getBootstrap().childGroup().scheduleWithFixedDelay(new Runnable() {
 				@Override
 				public void run() {
 					try {
@@ -500,18 +440,7 @@ public void stop() throws Exception {
 		synchronized (startupShutdownLock) {
 			leaderRetrievalService.stop();
 
-			if (this.serverChannel != null) {
-				this.serverChannel.close().awaitUninterruptibly();
-				this.serverChannel = null;
-			}
-			if (bootstrap != null) {
-				if (bootstrap.group() != null) {
-					bootstrap.group().shutdownGracefully();
-				}
-				if (bootstrap.childGroup() != null) {
-					bootstrap.childGroup().shutdownGracefully();
-				}
-			}
+			netty.shutdown();
 
 			stackTraceSamples.shutDown();
 
@@ -525,17 +454,7 @@ public void stop() throws Exception {
 
 	@Override
 	public int getServerPort() {
-		Channel server = this.serverChannel;
-		if (server != null) {
-			try {
-				return ((InetSocketAddress) server.localAddress()).getPort();
-			}
-			catch (Exception e) {
-				LOG.error("Cannot access local server port", e);
-			}
-		}
-
-		return -1;
+		return netty.getServerPort();
 	}
 
 	private void cleanup() {
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
new file mode 100644
index 0000000000000..19ec08ad316cf
--- /dev/null
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.utils;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.router.Handler;
+import io.netty.handler.codec.http.router.Router;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.stream.ChunkedWriteHandler;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.runtime.net.SSLUtils;
+import org.apache.flink.runtime.webmonitor.HttpRequestHandler;
+import org.apache.flink.runtime.webmonitor.PipelineErrorHandler;
+import org.apache.flink.util.Preconditions;
+import org.slf4j.Logger;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import java.io.File;
+import java.net.InetSocketAddress;
+
+/**
+ * This classes encapsulates the boot-strapping of netty for the web-frontend.
+ */
+public class WebFrontendBootstrap {
+	private final Router router;
+	private final Logger log;
+	private final File uploadDir;
+	private final SSLContext serverSSLContext;
+	private final ServerBootstrap bootstrap;
+	private final Channel serverChannel;
+
+	public WebFrontendBootstrap(
+			Router router,
+			Logger log,
+			File directory,
+			SSLContext sslContext,
+			String configuredAddress,
+			int configuredPort,
+			final Configuration config) throws InterruptedException {
+		this.router = Preconditions.checkNotNull(router);
+		this.log = Preconditions.checkNotNull(log);
+		this.uploadDir = Preconditions.checkNotNull(directory);
+		this.serverSSLContext = sslContext;
+
+		ChannelInitializer<SocketChannel> initializer = new ChannelInitializer<SocketChannel>() {
+
+			@Override
+			protected void initChannel(SocketChannel ch) {
+				Handler handler = new Handler(WebFrontendBootstrap.this.router);
+
+				// SSL should be the first handler in the pipeline
+				if (serverSSLContext != null) {
+					SSLEngine sslEngine = serverSSLContext.createSSLEngine();
+					SSLUtils.setSSLVerAndCipherSuites(sslEngine, config);
+					sslEngine.setUseClientMode(false);
+					ch.pipeline().addLast("ssl", new SslHandler(sslEngine));
+				}
+
+				ch.pipeline()
+					.addLast(new HttpServerCodec())
+					.addLast(new ChunkedWriteHandler())
+					.addLast(new HttpRequestHandler(uploadDir))
+					.addLast(handler.name(), handler)
+					.addLast(new PipelineErrorHandler(WebFrontendBootstrap.this.log));
+			}
+		};
+
+		NioEventLoopGroup bossGroup   = new NioEventLoopGroup(1);
+		NioEventLoopGroup workerGroup = new NioEventLoopGroup();
+
+		this.bootstrap = new ServerBootstrap();
+		this.bootstrap
+			.group(bossGroup, workerGroup)
+			.channel(NioServerSocketChannel.class)
+			.childHandler(initializer);
+
+		ChannelFuture ch;
+		if (configuredAddress == null) {
+			ch = this.bootstrap.bind(configuredPort);
+		} else {
+			ch = this.bootstrap.bind(configuredAddress, configuredPort);
+		}
+		this.serverChannel = ch.sync().channel();
+
+		InetSocketAddress bindAddress = (InetSocketAddress) serverChannel.localAddress();
+		String address = bindAddress.getAddress().getHostAddress();
+		int port = bindAddress.getPort();
+
+		this.log.info("Web frontend listening at {}" + ':' + "{}", address, port);
+	}
+
+	public ServerBootstrap getBootstrap() {
+		return bootstrap;
+	}
+	
+	public int getServerPort() {
+		Channel server = this.serverChannel;
+		if (server != null) {
+			try {
+				return ((InetSocketAddress) server.localAddress()).getPort();
+			}
+			catch (Exception e) {
+				log.error("Cannot access local server port", e);
+			}
+		}
+
+		return -1;
+	}
+	
+	public void shutdown() {
+		if (this.serverChannel != null) {
+			this.serverChannel.close().awaitUninterruptibly();
+		}
+		if (bootstrap != null) {
+			if (bootstrap.group() != null) {
+				bootstrap.group().shutdownGracefully();
+			}
+			if (bootstrap.childGroup() != null) {
+				bootstrap.childGroup().shutdownGracefully();
+			}
+		}
+	}
+}

From 130078bf3f158196866aa96c0e0e4323497251b6 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Mon, 20 Mar 2017 18:41:54 +0100
Subject: [PATCH 2/4] [FLINK-1579] Implement History Server

---
 docs/monitoring/back_pressure.md              |   2 +-
 docs/monitoring/checkpoint_monitoring.md      |   2 +-
 docs/monitoring/debugging_classloading.md     |   2 +-
 docs/monitoring/debugging_event_time.md       |   2 +-
 docs/monitoring/historyserver.md              |  98 ++++++
 docs/monitoring/large_state_tuning.md         |   2 +-
 docs/setup/config.md                          |  17 +
 .../configuration/HistoryServerOptions.java   |  82 +++++
 .../src/main/flink-bin/bin/flink-daemon.sh    |   6 +-
 .../src/main/flink-bin/bin/historyserver.sh   |  34 ++
 flink-dist/src/main/resources/flink-conf.yaml |  21 ++
 .../runtime/webmonitor/WebRuntimeMonitor.java |   6 +-
 .../files/StaticFileServerHandler.java        |  12 +-
 .../webmonitor/history/HistoryServer.java     | 298 ++++++++++++++++++
 .../history/HistoryServerArchiveFetcher.java  | 252 +++++++++++++++
 .../HistoryServerStaticFileServerHandler.java | 249 +++++++++++++++
 .../webmonitor/WebMonitorUtilsTest.java       |  36 +++
 .../history/FsJobArchivistTest.java           |  84 +++++
 ...toryServerStaticFileServerHandlerTest.java |  77 +++++
 .../webmonitor/history/HistoryServerTest.java | 122 +++++++
 .../web-dashboard/app/index_hs.jade           |  60 ++++
 .../web-dashboard/app/scripts/index_hs.coffee | 208 ++++++++++++
 flink-runtime-web/web-dashboard/gulpfile.js   |  29 +-
 .../flink/runtime/history/FsJobArchivist.java | 121 +++++++
 .../runtime/jobmanager/JobManagerOptions.java |   7 +
 .../runtime/webmonitor/WebMonitorUtils.java   |  48 +++
 .../webmonitor/history/ArchivedJson.java      |  16 +
 .../flink/runtime/jobmanager/JobManager.scala |  29 +-
 .../runtime/jobmanager/MemoryArchivist.scala  |  37 ++-
 .../minicluster/LocalFlinkMiniCluster.scala   |  14 +-
 .../jobmanager/JobManagerHARecoveryTest.java  |   3 +-
 .../webmonitor/history/ArchivedJsonTest.java  |  37 +++
 .../testingUtils/TestingMemoryArchivist.scala |   4 +-
 33 files changed, 1986 insertions(+), 31 deletions(-)
 create mode 100644 docs/monitoring/historyserver.md
 create mode 100644 flink-core/src/main/java/org/apache/flink/configuration/HistoryServerOptions.java
 create mode 100644 flink-dist/src/main/flink-bin/bin/historyserver.sh
 create mode 100644 flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
 create mode 100644 flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcher.java
 create mode 100644 flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
 create mode 100644 flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebMonitorUtilsTest.java
 create mode 100644 flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/FsJobArchivistTest.java
 create mode 100644 flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandlerTest.java
 create mode 100644 flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
 create mode 100644 flink-runtime-web/web-dashboard/app/index_hs.jade
 create mode 100644 flink-runtime-web/web-dashboard/app/scripts/index_hs.coffee
 create mode 100644 flink-runtime/src/main/java/org/apache/flink/runtime/history/FsJobArchivist.java
 create mode 100644 flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/history/ArchivedJsonTest.java

diff --git a/docs/monitoring/back_pressure.md b/docs/monitoring/back_pressure.md
index 4a4bd22265a99..f047066831c97 100644
--- a/docs/monitoring/back_pressure.md
+++ b/docs/monitoring/back_pressure.md
@@ -1,7 +1,7 @@
 ---
 title: "Monitoring Back Pressure"
 nav-parent_id: monitoring
-nav-pos: 4
+nav-pos: 5
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/monitoring/checkpoint_monitoring.md b/docs/monitoring/checkpoint_monitoring.md
index 5a4dba73312b8..7cf06d118f9b3 100644
--- a/docs/monitoring/checkpoint_monitoring.md
+++ b/docs/monitoring/checkpoint_monitoring.md
@@ -1,7 +1,7 @@
 ---
 title: "Monitoring Checkpointing"
 nav-parent_id: monitoring
-nav-pos: 3
+nav-pos: 4
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/monitoring/debugging_classloading.md b/docs/monitoring/debugging_classloading.md
index 85ee9bb93d6cd..8c91e0f91b13d 100644
--- a/docs/monitoring/debugging_classloading.md
+++ b/docs/monitoring/debugging_classloading.md
@@ -1,7 +1,7 @@
 ---
 title: "Debugging Classloading"
 nav-parent_id: monitoring
-nav-pos: 13
+nav-pos: 14
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/monitoring/debugging_event_time.md b/docs/monitoring/debugging_event_time.md
index eaf0d5c342819..edc7dd0fcb4d1 100644
--- a/docs/monitoring/debugging_event_time.md
+++ b/docs/monitoring/debugging_event_time.md
@@ -1,7 +1,7 @@
 ---
 title: "Debugging Windows & Event Time"
 nav-parent_id: monitoring
-nav-pos: 12
+nav-pos: 13
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/monitoring/historyserver.md b/docs/monitoring/historyserver.md
new file mode 100644
index 0000000000000..fd957f282db48
--- /dev/null
+++ b/docs/monitoring/historyserver.md
@@ -0,0 +1,98 @@
+---
+title: "History Server"
+nav-parent_id: monitoring
+nav-pos: 3
+---
+<!--
+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.
+-->
+
+Flink has a history server that can be used to query the statistics of completed jobs after the corresponding Flink cluster has been shut down.
+
+Furthermore, it exposes a REST API that accepts HTTP requests and responds with JSON data.
+
+* This will be replaced by the TOC
+{:toc}
+
+## Overview
+
+The HistoryServer allows you to query the status and statistics of completed jobs that have been archived by a JobManager.
+
+You start and stop the HistoryServer via its corresponding startup script:
+
+```sh
+# Start or stop the HistoryServer
+bin/historyserver.sh (start|stop)
+```
+
+By default, this server binds to `localhost` and listens at port `8082`.
+
+Currently, you can only run it as a standalone process.
+
+## Configuration
+
+The configuration keys `jobmanager.archive.fs.dir` and `historyserver.archive.fs.refresh-interval` need to be adjusted for archiving and displaying archived jobs.
+
+**JobManager**
+
+The archiving of completed jobs happens on the JobManager, which uploads the archived job information to a file system directory. You can configure the directory to archive completed jobs in `flink-conf.yaml` by setting a directory via `jobmanager.archive.fs.dir`.
+
+```sh
+# Directory to upload completed job information
+jobmanager.archive.fs.dir: hdfs:///completed-jobs
+```
+
+**HistoryServer**
+
+The HistoryServer can be configured to monitor a comma-separated list of directories in via `historyserver.archive.fs.dir`. The configured directories are regularly polled for new archives; the polling interval can be configured via `historyserver.archive.fs.refresh-interval`.
+
+```sh
+# Monitor the following directories for completed jobs
+historyserver.archive.fs.dir: hdfs:///completed-jobs
+
+# Refresh every 10 seconds
+historyserver.archive.fs.refresh-interval: 10000
+```
+
+The contained archives are downloaded and cached in the local filesystem. The local directory for this is configured via `historyserver.web.tmpdir`.
+
+Check out the configuration page for a [complete list of configuration options]({{ site.baseurl }}/setup/config.html#history-server).
+
+## Available Requests
+
+Below is a list of available requests, with a sample JSON response. All requests are of the sample form `http://hostname:8082/jobs`, below we list only the *path* part of the URLs.
+
+Values in angle brackets are variables, for example `http://hostname:port/jobs/<jobid>/exceptions` will have to requested for example as `http://hostname:port/jobs/7684be6004e4e955c2a558a9bc463f65/exceptions`.
+
+  - `/config`
+  - `/jobs`
+  - `/joboverview`
+  - `/jobs/<jobid>`
+  - `/jobs/<jobid>/vertices`
+  - `/jobs/<jobid>/config`
+  - `/jobs/<jobid>/exceptions`
+  - `/jobs/<jobid>/accumulators`
+  - `/jobs/<jobid>/vertices/<vertexid>`
+  - `/jobs/<jobid>/vertices/<vertexid>/subtasktimes`
+  - `/jobs/<jobid>/vertices/<vertexid>/taskmanagers`
+  - `/jobs/<jobid>/vertices/<vertexid>/accumulators`
+  - `/jobs/<jobid>/vertices/<vertexid>/subtasks/accumulators`
+  - `/jobs/<jobid>/vertices/<vertexid>/subtasks/<subtasknum>`
+  - `/jobs/<jobid>/vertices/<vertexid>/subtasks/<subtasknum>/attempts/<attempt>`
+  - `/jobs/<jobid>/vertices/<vertexid>/subtasks/<subtasknum>/attempts/<attempt>/accumulators`
+  - `/jobs/<jobid>/plan`
diff --git a/docs/monitoring/large_state_tuning.md b/docs/monitoring/large_state_tuning.md
index 78a5cb4814776..a5201063313c6 100644
--- a/docs/monitoring/large_state_tuning.md
+++ b/docs/monitoring/large_state_tuning.md
@@ -1,7 +1,7 @@
 ---
 title: "Debugging and Tuning Checkpoints and Large State"
 nav-parent_id: monitoring
-nav-pos: 11
+nav-pos: 12
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
diff --git a/docs/setup/config.md b/docs/setup/config.md
index d9d5f15670829..6a5c1ff350579 100644
--- a/docs/setup/config.md
+++ b/docs/setup/config.md
@@ -582,6 +582,23 @@ Previously this key was named `recovery.mode` and the default value was `standal
 
 - `metrics.latency.history-size`: (Default: 128) Defines the number of measured latencies to maintain at each operator
 
+### History Server
+
+You have to configure `jobmanager.archive.fs.dir` in order to archive terminated jobs and add it to the list of monitored directories via `historyserver.archive.fs.dir` if you want to display them via the HistoryServer's web frontend.
+
+- `jobmanager.archive.fs.dir`: Directory to upload information about terminated jobs to. You have to add this directory to the list of monitored directories of the history server via `historyserver.archive.fs.dir`.
+
+- `historyserver.archive.fs.dir`: Comma separated list of directories to fetch archived jobs from. The history server will monitor these directories for archived jobs. You can configure the JobManager to archive jobs to a directory via `jobmanager.archive.fs.dir`.
+
+- `historyserver.archive.fs.refresh-interval`: Interval in milliseconds for refreshing the archived job directories (DEFAULT: `10000`).
+
+- `historyserver.web.tmpdir`: This configuration parameter allows defining the Flink web directory to be used by the history server web interface. The web interface will copy its static files into the directory (DEFAULT: local system temporary directory).
+
+- `historyserver.web.address`: Address of the HistoryServer's web interface (DEFAULT: `anyLocalAddress()`).
+
+- `historyserver.web.port`: Port of the HistoryServers's web interface (DEFAULT: `8082`).
+
+- `historyserver.web.ssl.enabled`: Enable HTTPs access to the HistoryServer web frontend. This is applicable only when the global SSL flag security.ssl.enabled is set to true (DEFAULT: `false`).
 
 ## Background
 
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/HistoryServerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/HistoryServerOptions.java
new file mode 100644
index 0000000000000..ebe4f2b7b5806
--- /dev/null
+++ b/flink-core/src/main/java/org/apache/flink/configuration/HistoryServerOptions.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.flink.configuration;
+
+import org.apache.flink.annotation.PublicEvolving;
+
+import static org.apache.flink.configuration.ConfigOptions.key;
+
+/**
+ * The set of configuration options relating to the HistoryServer.
+ */
+@PublicEvolving
+public class HistoryServerOptions {
+
+	/**
+	 * The interval at which the HistoryServer polls {@link HistoryServerOptions#HISTORY_SERVER_ARCHIVE_DIRS} for new archives.
+	 */
+	public static final ConfigOption<Long> HISTORY_SERVER_ARCHIVE_REFRESH_INTERVAL =
+		key("historyserver.archive.fs.refresh-interval")
+			.defaultValue(10000L);
+
+	/**
+	 * Comma-separated list of directories which the HistoryServer polls for new archives.
+	 */
+	public static final ConfigOption<String> HISTORY_SERVER_ARCHIVE_DIRS =
+		key("historyserver.archive.fs.dir")
+			.noDefaultValue();
+
+	/**
+	 * The local directory used by the HistoryServer web-frontend.
+	 */
+	public static final ConfigOption<String> HISTORY_SERVER_WEB_DIR =
+		key("historyserver.web.tmpdir")
+			.noDefaultValue();
+
+	/**
+	 * The address under which the HistoryServer web-frontend is accessible.
+	 */
+	public static final ConfigOption<String> HISTORY_SERVER_WEB_ADDRESS =
+		key("historyserver.web.address")
+			.noDefaultValue();
+
+	/**
+	 * The port under which the HistoryServer web-frontend is accessible.
+	 */
+	public static final ConfigOption<Integer> HISTORY_SERVER_WEB_PORT =
+		key("historyserver.web.port")
+			.defaultValue(8082);
+
+	/**
+	 * The refresh interval for the HistoryServer web-frontend in milliseconds.
+	 */
+	public static final ConfigOption<Long> HISTORY_SERVER_WEB_REFRESH_INTERVAL =
+		key("historyserver.web.refresh-interval")
+			.defaultValue(10000L);
+
+	/**
+	 * Enables/Disables SSL support for the HistoryServer web-frontend. Only relevant if
+	 * {@link ConfigConstants#SECURITY_SSL_ENABLED} is enabled.
+	 */
+	public static final ConfigOption<Boolean> HISTORY_SERVER_WEB_SSL_ENABLED =
+		key("historyserver.web.ssl.enabled")
+			.defaultValue(false);
+
+	private HistoryServerOptions() {
+	}
+}
diff --git a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
index 2230e92608f45..b25358db73a57 100644
--- a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
+++ b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
@@ -18,7 +18,7 @@
 ################################################################################
 
 # Start/stop a Flink daemon.
-USAGE="Usage: flink-daemon.sh (start|stop|stop-all) (jobmanager|taskmanager|zookeeper) [args]"
+USAGE="Usage: flink-daemon.sh (start|stop|stop-all) (jobmanager|taskmanager|zookeeper|historyserver) [args]"
 
 STARTSTOP=$1
 DAEMON=$2
@@ -42,6 +42,10 @@ case $DAEMON in
         CLASS_TO_RUN=org.apache.flink.runtime.zookeeper.FlinkZooKeeperQuorumPeer
     ;;
 
+    (historyserver)
+        CLASS_TO_RUN=org.apache.flink.runtime.webmonitor.history.HistoryServer
+    ;;
+
     (*)
         echo "Unknown daemon '${DAEMON}'. $USAGE."
         exit 1
diff --git a/flink-dist/src/main/flink-bin/bin/historyserver.sh b/flink-dist/src/main/flink-bin/bin/historyserver.sh
new file mode 100644
index 0000000000000..adc966004cc35
--- /dev/null
+++ b/flink-dist/src/main/flink-bin/bin/historyserver.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+################################################################################
+#  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.
+################################################################################
+
+# Start/stop a Flink HistoryServer
+USAGE="Usage: historyserver.sh (start|stop)"
+
+STARTSTOP=$1
+
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/config.sh
+
+if [[ $STARTSTOP == "start" ]]; then
+	args=("--configDir" "${FLINK_CONF_DIR}")
+fi
+
+"${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP historyserver "${args[@]}"
diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml
index 72acbeb357ecb..446d99280ff46 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -81,6 +81,27 @@ jobmanager.web.port: 8081
 
 #jobmanager.web.submit.enable: false
 
+#==============================================================================
+# HistoryServer
+#==============================================================================
+
+# The HistoryServer is started and stopped via bin/historyserver.sh (start|stop)
+
+# Directory to upload completed jobs to. Add this directory to the list of
+# monitored directories of the HistoryServer as well (see below).
+#jobmanager.archive.fs.dir: hdfs:///completed-jobs/
+
+# The address under which the web-based HistoryServer listens.
+#historyserver.web.address: 0.0.0.0
+
+# The port under which the web-based HistoryServer listens.
+#historyserver.web.port: 8082
+
+# Comma separated list of directories to monitor for completed jobs.
+#historyserver.archive.fs.dir: hdfs:///completed-jobs/
+
+# Interval in milliseconds for refreshing the monitored directories.
+#historyserver.archive.fs.refresh-interval: 10000
 
 #==============================================================================
 # Streaming state checkpointing
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
index 39bca71004662..c1e6229d69ce3 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitor.java
@@ -121,8 +121,6 @@ public class WebRuntimeMonitor implements WebMonitor {
 	/** LeaderRetrievalListener which stores the currently leading JobManager and its archive */
 	private final JobManagerRetriever retriever;
 
-	private final Router router;
-
 	private final SSLContext serverSSLContext;
 
 	private final Promise<String> jobManagerAddressPromise = new scala.concurrent.impl.Promise.DefaultPromise<>();
@@ -243,7 +241,7 @@ public WebRuntimeMonitor(
 		RuntimeMonitorHandler triggerHandler = handler(cancelWithSavepoint.getTriggerHandler());
 		RuntimeMonitorHandler inProgressHandler = handler(cancelWithSavepoint.getInProgressHandler());
 
-		router = new Router();
+		Router router = new Router();
 		// config how to interact with this web server
 		GET(router, new DashboardConfigHandler(cfg.getRefreshInterval()));
 
@@ -381,7 +379,7 @@ public void run() {
 	 * 
 	 * @return array of all JsonArchivists relevant for the history server
 	 */
-	public static JsonArchivist[] getArchivers() {
+	public static JsonArchivist[] getJsonArchivists() {
 		JsonArchivist[] archivists = new JsonArchivist[]{
 			new CurrentJobsOverviewHandler.CurrentJobsOverviewJsonArchivist(),
 
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java
index 5a8c76f779689..b7874c904c5e1 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/files/StaticFileServerHandler.java
@@ -106,7 +106,7 @@ public class StaticFileServerHandler extends SimpleChannelInboundHandler<Routed>
 	private static final TimeZone GMT_TIMEZONE = TimeZone.getTimeZone("GMT");
 
 	/** Date format for HTTP */
-	private static final String HTTP_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
+	public static final String HTTP_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
 
 	/** Be default, we allow files to be cached for 5 minutes */
 	private static final int HTTP_CACHE_SECONDS = 300;
@@ -348,7 +348,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
 	 * @param ctx    The channel context to write the response to.
 	 * @param status The response status.
 	 */
-	private static void sendError(ChannelHandlerContext ctx, HttpResponseStatus status) {
+	public static void sendError(ChannelHandlerContext ctx, HttpResponseStatus status) {
 		FullHttpResponse response = new DefaultFullHttpResponse(
 				HTTP_1_1, status, Unpooled.copiedBuffer("Failure: " + status + "\r\n", CharsetUtil.UTF_8));
 		response.headers().set(CONTENT_TYPE, "text/plain; charset=UTF-8");
@@ -363,7 +363,7 @@ private static void sendError(ChannelHandlerContext ctx, HttpResponseStatus stat
 	 *
 	 * @param ctx The channel context to write the response to.
 	 */
-	private static void sendNotModified(ChannelHandlerContext ctx) {
+	public static void sendNotModified(ChannelHandlerContext ctx) {
 		FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, NOT_MODIFIED);
 		setDateHeader(response);
 
@@ -376,7 +376,7 @@ private static void sendNotModified(ChannelHandlerContext ctx) {
 	 *
 	 * @param response HTTP response
 	 */
-	private static void setDateHeader(FullHttpResponse response) {
+	public static void setDateHeader(FullHttpResponse response) {
 		SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
 		dateFormatter.setTimeZone(GMT_TIMEZONE);
 
@@ -390,7 +390,7 @@ private static void setDateHeader(FullHttpResponse response) {
 	 * @param response    The HTTP response object.
 	 * @param fileToCache File to extract the modification timestamp from.
 	 */
-	private static void setDateAndCacheHeaders(HttpResponse response, File fileToCache) {
+	public static void setDateAndCacheHeaders(HttpResponse response, File fileToCache) {
 		SimpleDateFormat dateFormatter = new SimpleDateFormat(HTTP_DATE_FORMAT, Locale.US);
 		dateFormatter.setTimeZone(GMT_TIMEZONE);
 
@@ -411,7 +411,7 @@ private static void setDateAndCacheHeaders(HttpResponse response, File fileToCac
 	 * @param response HTTP response
 	 * @param file     file to extract content type
 	 */
-	private static void setContentTypeHeader(HttpResponse response, File file) {
+	public static void setContentTypeHeader(HttpResponse response, File file) {
 		String mimeType = MimeTypes.getMimeTypeForFileName(file.getName());
 		String mimeFinal = mimeType != null ? mimeType : MimeTypes.getDefaultMimeType();
 		response.headers().set(CONTENT_TYPE, mimeFinal);
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
new file mode 100644
index 0000000000000..75c3e9bf38030
--- /dev/null
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServer.java
@@ -0,0 +1,298 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import io.netty.handler.codec.http.router.Router;
+import org.apache.flink.api.java.utils.ParameterTool;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.GlobalConfiguration;
+import org.apache.flink.configuration.HistoryServerOptions;
+import org.apache.flink.core.fs.FileSystem;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.history.FsJobArchivist;
+import org.apache.flink.runtime.net.SSLUtils;
+import org.apache.flink.runtime.security.SecurityUtils;
+import org.apache.flink.runtime.webmonitor.WebMonitorUtils;
+import org.apache.flink.runtime.webmonitor.handlers.DashboardConfigHandler;
+import org.apache.flink.runtime.webmonitor.utils.WebFrontendBootstrap;
+import org.apache.flink.util.FileUtils;
+import org.apache.flink.util.FlinkException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * The HistoryServer provides a WebInterface and REST API to retrieve information about finished jobs for which
+ * the JobManager may have already shut down.
+ * 
+ * The HistoryServer regularly checks a set of directories for job archives created by the {@link FsJobArchivist} and
+ * caches these in a local directory. See {@link HistoryServerArchiveFetcher}.
+ * 
+ * All configuration options are defined in{@link HistoryServerOptions}.
+ * 
+ * The WebInterface only displays the "Completed Jobs" page.
+ * 
+ * The REST API is limited to
+ * <ul>
+ *     <li>/config</li>
+ *     <li>/joboverview</li>
+ *     <li>/jobs/:jobid/*</li>
+ * </ul>
+ * and relies on static files that are served by the {@link HistoryServerStaticFileServerHandler}.
+ */
+public class HistoryServer {
+
+	private static final Logger LOG = LoggerFactory.getLogger(HistoryServer.class);
+
+	private final Configuration config;
+
+	private final String webAddress;
+	private final int webPort;
+	private final long webRefreshIntervalMillis;
+	private final File webDir;
+
+	private final HistoryServerArchiveFetcher archiveFetcher;
+
+	private final SSLContext serverSSLContext;
+	private WebFrontendBootstrap netty;
+
+	private final Object startupShutdownLock = new Object();
+	private final AtomicBoolean shutdownRequested = new AtomicBoolean(false);
+	private final Thread shutdownHook;
+
+	public static void main(String[] args) throws Exception {
+		ParameterTool pt = ParameterTool.fromArgs(args);
+		String configDir = pt.getRequired("configDir");
+
+		LOG.info("Loading configuration from {}", configDir);
+		final Configuration flinkConfig = GlobalConfiguration.loadConfiguration(configDir);
+
+		// run the history server
+		SecurityUtils.install(new SecurityUtils.SecurityConfiguration(flinkConfig));
+
+		try {
+			SecurityUtils.getInstalledContext().runSecured(new Callable<Integer>() {
+				@Override
+				public Integer call() throws Exception {
+					HistoryServer hs = new HistoryServer(flinkConfig);
+					hs.run();
+					return 0;
+				}
+			});
+			System.exit(0);
+		} catch (UndeclaredThrowableException ute) {
+			Throwable cause = ute. getUndeclaredThrowable();
+			LOG.error("Failed to run HistoryServer.", cause);
+			cause.printStackTrace();
+			System.exit(1);
+		} catch (Exception e) {
+			LOG.error("Failed to run HistoryServer.", e);
+			e.printStackTrace();
+			System.exit(1);
+		}
+	}
+
+	public HistoryServer(Configuration config) throws IOException, FlinkException {
+		this.config = config;
+		if (config.getBoolean(HistoryServerOptions.HISTORY_SERVER_WEB_SSL_ENABLED) && SSLUtils.getSSLEnabled(config)) {
+			LOG.info("Enabling SSL for the history server.");
+			try {
+				this.serverSSLContext = SSLUtils.createSSLServerContext(config);
+			} catch (Exception e) {
+				throw new IOException("Failed to initialize SSLContext for the history server.", e);
+			}
+		} else {
+			this.serverSSLContext = null;
+		}
+
+		webAddress = config.getString(HistoryServerOptions.HISTORY_SERVER_WEB_ADDRESS);
+		webPort = config.getInteger(HistoryServerOptions.HISTORY_SERVER_WEB_PORT);
+		webRefreshIntervalMillis = config.getLong(HistoryServerOptions.HISTORY_SERVER_WEB_REFRESH_INTERVAL);
+
+		String webDirectory = config.getString(HistoryServerOptions.HISTORY_SERVER_WEB_DIR);
+		if (webDirectory == null) {
+			webDirectory = System.getProperty("java.io.tmpdir") + "flink-web-history-" + UUID.randomUUID();
+		}
+		webDir = new File(webDirectory);
+
+		String refreshDirectories = config.getString(HistoryServerOptions.HISTORY_SERVER_ARCHIVE_DIRS);
+		if (refreshDirectories == null) {
+			throw new FlinkException(HistoryServerOptions.HISTORY_SERVER_ARCHIVE_DIRS + " was not configured.");
+		}
+		List<RefreshLocation> refreshDirs = new ArrayList<>();
+		for (String refreshDirectory : refreshDirectories.split(",")) {
+			try {
+				Path refreshPath = WebMonitorUtils.validateAndNormalizeUri(new Path(refreshDirectory).toUri());
+				FileSystem refreshFS = refreshPath.getFileSystem();
+				refreshDirs.add(new RefreshLocation(refreshPath, refreshFS));
+			} catch (Exception e) {
+				// there's most likely something wrong with the path itself, so we ignore it from here on
+				LOG.warn("Failed to create Path or FileSystem for directory {}.", refreshDirectory, e);
+			}
+		}
+
+		long refreshIntervalMillis = config.getLong(HistoryServerOptions.HISTORY_SERVER_ARCHIVE_REFRESH_INTERVAL);
+		archiveFetcher = new HistoryServerArchiveFetcher(refreshIntervalMillis, refreshDirs, webDir);
+
+		this.shutdownHook = new Thread() {
+			@Override
+			public void run() {
+				HistoryServer.this.stop();
+			}
+		};
+		// add shutdown hook for deleting the directories and remaining temp files on shutdown
+		try {
+			Runtime.getRuntime().addShutdownHook(shutdownHook);
+		} catch (IllegalStateException e) {
+			// race, JVM is in shutdown already, we can safely ignore this
+			LOG.debug("Unable to add shutdown hook, shutdown already in progress", e);
+		} catch (Throwable t) {
+			// these errors usually happen when the shutdown is already in progress
+			LOG.warn("Error while adding shutdown hook", t);
+		}
+	}
+
+	public void run() {
+		try {
+			start();
+			new CountDownLatch(1).await();
+		} catch (Exception e) {
+			LOG.error("Failure while running HistoryServer.", e);
+		} finally {
+			stop();
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// Life-cycle
+	// ------------------------------------------------------------------------
+
+	void start() throws IOException, InterruptedException {
+		synchronized (startupShutdownLock) {
+			LOG.info("Starting history server.");
+
+			Files.createDirectories(webDir.toPath());
+			LOG.info("Using directory {} as local cache.", webDir);
+
+			Router router = new Router();
+			router.GET("/:*", new HistoryServerStaticFileServerHandler(webDir));
+
+			if (!webDir.exists() && !webDir.mkdirs()) {
+				throw new IOException("Failed to create local directory " + webDir.getAbsoluteFile() + ".");
+			}
+
+			createDashboardConfigFile();
+
+			archiveFetcher.start();
+
+			netty = new WebFrontendBootstrap(router, LOG, webDir, serverSSLContext, webAddress, webPort, config);
+		}
+	}
+
+	void stop() {
+		if (shutdownRequested.compareAndSet(false, true)) {
+			synchronized (startupShutdownLock) {
+				LOG.info("Stopping history server.");
+
+				try {
+					netty.shutdown();
+				} catch (Throwable t) {
+					LOG.warn("Error while shutting down WebFrontendBootstrap.", t);
+				}
+
+				archiveFetcher.stop();
+
+				try {
+					LOG.info("Removing web dashboard root cache directory {}", webDir);
+					FileUtils.deleteDirectory(webDir);
+				} catch (Throwable t) {
+					LOG.warn("Error while deleting web root directory {}", webDir, t);
+				}
+
+				LOG.info("Stopped history server.");
+
+				// Remove shutdown hook to prevent resource leaks, unless this is invoked by the shutdown hook itself
+				if (shutdownHook != null && shutdownHook != Thread.currentThread()) {
+					try {
+						Runtime.getRuntime().removeShutdownHook(shutdownHook);
+					} catch (IllegalStateException ignored) {
+						// race, JVM is in shutdown already, we can safely ignore this
+					} catch (Throwable t) {
+						LOG.warn("Exception while unregistering HistoryServer cleanup shutdown hook.");
+					}
+				}
+			}
+		}
+	}
+
+	// ------------------------------------------------------------------------
+	// File generation
+	// ------------------------------------------------------------------------
+
+	static FileWriter createOrGetFile(File folder, String name) throws IOException {
+		File file = new File(folder, name + ".json");
+		if (!file.exists()) {
+			Files.createFile(file.toPath());
+		}
+		FileWriter fr = new FileWriter(file);
+		return fr;
+	}
+
+	private void createDashboardConfigFile() throws IOException {
+		try (FileWriter fw = createOrGetFile(webDir, "config")) {
+			fw.write(DashboardConfigHandler.createConfigJson(webRefreshIntervalMillis));
+			fw.flush();
+		} catch (IOException ioe) {
+			LOG.error("Failed to write config file.");
+			throw ioe;
+		}
+	}
+
+	/**
+	 * Container for the {@link Path} and {@link FileSystem} of a refresh directory.
+	 */
+	static class RefreshLocation {
+		private final Path path;
+		private final FileSystem fs;
+
+		private RefreshLocation(Path path, FileSystem fs) {
+			this.path = path;
+			this.fs = fs;
+		}
+
+		public Path getPath() {
+			return path;
+		}
+
+		public FileSystem getFs() {
+			return fs;
+		}
+	}
+}
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcher.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcher.java
new file mode 100644
index 0000000000000..f01731de89109
--- /dev/null
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerArchiveFetcher.java
@@ -0,0 +1,252 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.api.common.JobID;
+import org.apache.flink.configuration.HistoryServerOptions;
+import org.apache.flink.core.fs.FileStatus;
+import org.apache.flink.core.fs.FileSystem;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.history.FsJobArchivist;
+import org.apache.flink.runtime.util.ExecutorThreadFactory;
+import org.apache.flink.runtime.webmonitor.handlers.CurrentJobsOverviewHandler;
+import org.apache.flink.util.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TimerTask;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This class is used by the {@link HistoryServer} to fetch the job archives that are located at
+ * {@link HistoryServerOptions#HISTORY_SERVER_ARCHIVE_DIRS}. The directories are polled in regular intervals, defined
+ * by {@link HistoryServerOptions#HISTORY_SERVER_ARCHIVE_REFRESH_INTERVAL}.
+ * 
+ * The archives are downloaded and expanded into a file structure analog to the REST API defined in the WebRuntimeMonitor.
+ */
+public class HistoryServerArchiveFetcher {
+
+	private static final Logger LOG = LoggerFactory.getLogger(HistoryServerArchiveFetcher.class);
+
+	private static final JsonFactory jacksonFactory = new JsonFactory();
+	private static final ObjectMapper mapper = new ObjectMapper();
+
+	private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(
+		new ExecutorThreadFactory("Flink-HistoryServer-ArchiveFetcher"));
+	private final JobArchiveFetcherTask fetcherTask;
+	private final long refreshIntervalMillis;
+
+	HistoryServerArchiveFetcher(long refreshIntervalMillis, List<HistoryServer.RefreshLocation> refreshDirs, File webDir) {
+		this.refreshIntervalMillis = refreshIntervalMillis;
+		this.fetcherTask = new JobArchiveFetcherTask(refreshDirs, webDir);
+		if (LOG.isInfoEnabled()) {
+			for (HistoryServer.RefreshLocation refreshDir : refreshDirs) {
+				LOG.info("Monitoring directory {} for archived jobs.", refreshDir.getPath());
+			}
+		}
+	}
+
+	void start() {
+		executor.scheduleWithFixedDelay(fetcherTask, 0, refreshIntervalMillis, TimeUnit.MILLISECONDS);
+	}
+
+	void stop() {
+		executor.shutdown();
+
+		try {
+			if (!executor.awaitTermination(1, TimeUnit.SECONDS)) {
+				executor.shutdownNow();
+			}
+		} catch (InterruptedException ignored) {
+			executor.shutdownNow();
+		}
+	}
+
+	/**
+	 * {@link TimerTask} that polls the directories configured as {@link HistoryServerOptions#HISTORY_SERVER_ARCHIVE_DIRS} for
+	 * new job archives.
+	 */
+	static class JobArchiveFetcherTask extends TimerTask {
+
+		private final List<HistoryServer.RefreshLocation> refreshDirs;
+
+		/** Cache of all available jobs identified by their id. */
+		private final Set<String> cachedArchives;
+
+		private final File webDir;
+		private final File webJobDir;
+		private final File webOverviewDir;
+
+		private static final String JSON_FILE_ENDING = ".json";
+
+		JobArchiveFetcherTask(List<HistoryServer.RefreshLocation> refreshDirs, File webDir) {
+			this.refreshDirs = checkNotNull(refreshDirs);
+			this.cachedArchives = new HashSet<>();
+			this.webDir = checkNotNull(webDir);
+			this.webJobDir = new File(webDir, "jobs");
+			webJobDir.mkdir();
+			this.webOverviewDir = new File(webDir, "overviews");
+			webOverviewDir.mkdir();
+		}
+
+		@Override
+		public void run() {
+			try {
+				for (HistoryServer.RefreshLocation refreshLocation : refreshDirs) {
+					Path refreshDir = refreshLocation.getPath();
+					FileSystem refreshFS = refreshLocation.getFs();
+
+					// contents of /:refreshDir
+					FileStatus[] jobArchives;
+					try {
+						jobArchives = refreshFS.listStatus(refreshDir);
+					} catch (IOException e) {
+						LOG.error("Failed to access job archive location for path {}.", refreshDir, e);
+						continue;
+					}
+					if (jobArchives == null) {
+						continue;
+					}
+					boolean updateOverview = false;
+					for (FileStatus jobArchive : jobArchives) {
+						Path jobArchivePath = jobArchive.getPath();
+						String jobID = jobArchivePath.getName();
+						try {
+							JobID.fromHexString(jobID);
+						} catch (IllegalArgumentException iae) {
+							LOG.debug("Archive directory {} contained file with unexpected name {}. Ignoring file.",
+								refreshDir, jobID, iae);
+							continue;
+						}
+						if (cachedArchives.add(jobID)) {
+							try {
+								for (ArchivedJson archive : FsJobArchivist.getArchivedJsons(jobArchive.getPath())) {
+									String path = archive.getPath();
+									String json = archive.getJson();
+
+									File target;
+									if (path.equals("/joboverview")) {
+										target = new File(webOverviewDir, jobID + JSON_FILE_ENDING);
+									} else {
+										target = new File(webDir, path + JSON_FILE_ENDING);
+									}
+
+									java.nio.file.Path parent = target.getParentFile().toPath();
+
+									try {
+										Files.createDirectories(parent);
+									} catch (FileAlreadyExistsException ignored) {
+										// there may be left-over directories from the previous attempt
+									}
+
+									java.nio.file.Path targetPath = target.toPath();
+									
+									// We overwrite existing files since this may be another attempt at fetching this archive.
+									// Existing files may be incomplete/corrupt.
+									if (Files.exists(targetPath)) {
+										Files.delete(targetPath);
+									}
+
+									Files.createFile(target.toPath());
+									try (FileWriter fw = new FileWriter(target)) {
+										fw.write(json);
+										fw.flush();
+									}
+								}
+								updateOverview = true;
+							} catch (IOException e) {
+								LOG.error("Failure while fetching/processing job archive for job {}.", jobID, e);
+								// Make sure we attempt to fetch the archive again
+								cachedArchives.remove(jobID);
+								// Make sure we do not include this job in the overview
+								try {
+									Files.delete(new File(webOverviewDir, jobID + JSON_FILE_ENDING).toPath());
+								} catch (IOException ioe) {
+									LOG.debug("Could not delete file from overview directory.", ioe);
+								}
+
+								// Clean up job files we may have created
+								File jobDirectory = new File(webJobDir, jobID);
+								try {
+									FileUtils.deleteDirectory(jobDirectory);
+								} catch (IOException ioe) {
+									LOG.debug("Could not clean up job directory.", ioe);
+								}
+							}
+						}
+					}
+					if (updateOverview) {
+						updateJobOverview(webDir);
+					}
+				}
+			} catch (Exception e) {
+				LOG.error("Critical failure while fetching/processing job archives.", e);
+			}
+		}
+	}
+
+	/**
+	 * This method replicates the JSON response that would be given by the {@link CurrentJobsOverviewHandler} when
+	 * listing both running and finished jobs.
+	 *
+	 * Every job archive contains a joboverview.json file containing the same structure. Since jobs are archived on
+	 * their own however the list of finished jobs only contains a single job.
+	 *
+	 * For the display in the HistoryServer WebFrontend we have to combine these overviews.
+	 */
+	private static void updateJobOverview(File webDir) {
+		File webOverviewDir = new File(webDir, "overviews");
+		try (JsonGenerator gen = jacksonFactory.createGenerator(HistoryServer.createOrGetFile(webDir, "joboverview"))) {
+			gen.writeStartObject();
+			gen.writeArrayFieldStart("running");
+			gen.writeEndArray();
+			gen.writeArrayFieldStart("finished");
+
+			File[] overviews = new File(webOverviewDir.getPath()).listFiles();
+			if (overviews != null) {
+				for (File overview : overviews) {
+					JsonNode root = mapper.readTree(overview);
+					JsonNode finished = root.get("finished");
+					JsonNode job = finished.get(0);
+					mapper.writeTree(gen, job);
+				}
+			}
+
+			gen.writeEndArray();
+			gen.writeEndObject();
+		} catch (IOException ioe) {
+			LOG.error("Failed to update job overview.", ioe);
+		}
+	}
+}
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
new file mode 100644
index 0000000000000..77b69edc59619
--- /dev/null
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
@@ -0,0 +1,249 @@
+/*
+ * 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.
+ */
+
+package org.apache.flink.runtime.webmonitor.history;
+
+/*****************************************************************************
+ * This code is based on the "HttpStaticFileServerHandler" from the
+ * Netty project's HTTP server example.
+ *
+ * See http://netty.io and
+ * https://github.com/netty/netty/blob/4.0/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
+ *****************************************************************************/
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.DefaultFileRegion;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpChunkedInput;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http.router.Routed;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.stream.ChunkedFile;
+import org.apache.flink.runtime.webmonitor.files.StaticFileServerHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.IF_MODIFIED_SINCE;
+import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
+import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
+/**
+ * Simple file server handler used by the {@link HistoryServer} that serves requests to web frontend's static files,
+ * such as HTML, CSS, JS or JSON files.
+ *
+ * This code is based on the "HttpStaticFileServerHandler" from the Netty project's HTTP server
+ * example.
+ * 
+ * This class is a copy of the {@link StaticFileServerHandler}. The differences are that the request path is
+ * modified to end on ".json" if it does not have a filename extension; when "index.html" is requested we load
+ * "index_hs.html" instead to inject the modified HistoryServer WebInterface and that the caching of the "/joboverview"
+ * page is prevented.
+ */
+@ChannelHandler.Sharable
+public class HistoryServerStaticFileServerHandler extends SimpleChannelInboundHandler<Routed> {
+
+	/** Default logger, if none is specified */
+	private static final Logger LOG = LoggerFactory.getLogger(HistoryServerStaticFileServerHandler.class);
+
+	// ------------------------------------------------------------------------
+
+	/** The path in which the static documents are */
+	private final File rootPath;
+
+	public HistoryServerStaticFileServerHandler(File rootPath) throws IOException {
+		this.rootPath = checkNotNull(rootPath).getCanonicalFile();
+	}
+
+	// ------------------------------------------------------------------------
+	//  Responses to requests
+	// ------------------------------------------------------------------------
+
+	@Override
+	public void channelRead0(ChannelHandlerContext ctx, Routed routed) throws Exception {
+		String requestPath = routed.path();
+
+		respondWithFile(ctx, routed.request(), requestPath);
+	}
+
+	/**
+	 * Response when running with leading JobManager.
+	 */
+	private void respondWithFile(ChannelHandlerContext ctx, HttpRequest request, String requestPath)
+		throws IOException, ParseException {
+
+		// make sure we request the "index.html" in case there is a directory request
+		if (requestPath.endsWith("/")) {
+			requestPath = requestPath + "index.html";
+		}
+
+		if (!requestPath.contains(".")) { // we assume that the path ends in either .html or .js
+			requestPath = requestPath + ".json";
+		}
+
+		// convert to absolute path
+		final File file = new File(rootPath, requestPath);
+
+		if (!file.exists()) {
+			// file does not exist. Try to load it with the classloader
+			ClassLoader cl = HistoryServerStaticFileServerHandler.class.getClassLoader();
+
+			String pathToLoad = requestPath.replace("index.html", "index_hs.html");
+
+			try (InputStream resourceStream = cl.getResourceAsStream("web" + pathToLoad)) {
+				boolean success = false;
+				try {
+					if (resourceStream != null) {
+						URL root = cl.getResource("web");
+						URL requested = cl.getResource("web" + pathToLoad);
+
+						if (root != null && requested != null) {
+							URI rootURI = new URI(root.getPath()).normalize();
+							URI requestedURI = new URI(requested.getPath()).normalize();
+
+							// Check that we don't load anything from outside of the
+							// expected scope.
+							if (!rootURI.relativize(requestedURI).equals(requestedURI)) {
+								LOG.debug("Loading missing file from classloader: {}", pathToLoad);
+								// ensure that directory to file exists.
+								file.getParentFile().mkdirs();
+								Files.copy(resourceStream, file.toPath());
+
+								success = true;
+							}
+						}
+					}
+				} catch (Throwable t) {
+					LOG.error("error while responding", t);
+				} finally {
+					if (!success) {
+						LOG.debug("Unable to load requested file {} from classloader", pathToLoad);
+						StaticFileServerHandler.sendError(ctx, NOT_FOUND);
+						return;
+					}
+				}
+			}
+		}
+
+		if (!file.exists() || file.isHidden() || file.isDirectory() || !file.isFile()) {
+			StaticFileServerHandler.sendError(ctx, NOT_FOUND);
+			return;
+		}
+
+		if (!file.getCanonicalFile().toPath().startsWith(rootPath.toPath())) {
+			StaticFileServerHandler.sendError(ctx, NOT_FOUND);
+			return;
+		}
+
+		// cache validation
+		final String ifModifiedSince = request.headers().get(IF_MODIFIED_SINCE);
+		if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
+			SimpleDateFormat dateFormatter = new SimpleDateFormat(StaticFileServerHandler.HTTP_DATE_FORMAT, Locale.US);
+			Date ifModifiedSinceDate = dateFormatter.parse(ifModifiedSince);
+
+			// Only compare up to the second because the datetime format we send to the client
+			// does not have milliseconds
+			long ifModifiedSinceDateSeconds = ifModifiedSinceDate.getTime() / 1000;
+			long fileLastModifiedSeconds = file.lastModified() / 1000;
+			if (ifModifiedSinceDateSeconds == fileLastModifiedSeconds) {
+				if (LOG.isDebugEnabled()) {
+					LOG.debug("Responding 'NOT MODIFIED' for file '" + file.getAbsolutePath() + '\'');
+				}
+
+				StaticFileServerHandler.sendNotModified(ctx);
+				return;
+			}
+		}
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Responding with file '" + file.getAbsolutePath() + '\'');
+		}
+
+		// Don't need to close this manually. Netty's DefaultFileRegion will take care of it.
+		final RandomAccessFile raf;
+		try {
+			raf = new RandomAccessFile(file, "r");
+		} catch (FileNotFoundException e) {
+			StaticFileServerHandler.sendError(ctx, NOT_FOUND);
+			return;
+		}
+		long fileLength = raf.length();
+
+		HttpResponse response = new DefaultHttpResponse(HTTP_1_1, OK);
+		StaticFileServerHandler.setContentTypeHeader(response, file);
+
+		// the job overview should be updated as soon as possible
+		if (!requestPath.equals("/joboverview")) {
+			StaticFileServerHandler.setDateAndCacheHeaders(response, file);
+		}
+		if (HttpHeaders.isKeepAlive(request)) {
+			response.headers().set(CONNECTION, HttpHeaders.Values.KEEP_ALIVE);
+		}
+		HttpHeaders.setContentLength(response, fileLength);
+
+		// write the initial line and the header.
+		ctx.write(response);
+
+		// write the content.
+		ChannelFuture lastContentFuture;
+		if (ctx.pipeline().get(SslHandler.class) == null) {
+			ctx.write(new DefaultFileRegion(raf.getChannel(), 0, fileLength), ctx.newProgressivePromise());
+			lastContentFuture = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
+		} else {
+			lastContentFuture = ctx.writeAndFlush(new HttpChunkedInput(new ChunkedFile(raf, 0, fileLength, 8192)),
+				ctx.newProgressivePromise());
+			// HttpChunkedInput will write the end marker (LastHttpContent) for us.
+		}
+
+		// close the connection, if no keep-alive is needed
+		if (!HttpHeaders.isKeepAlive(request)) {
+			lastContentFuture.addListener(ChannelFutureListener.CLOSE);
+		}
+	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+		if (ctx.channel().isActive()) {
+			LOG.error("Caught exception", cause);
+			StaticFileServerHandler.sendError(ctx, INTERNAL_SERVER_ERROR);
+		}
+	}
+}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebMonitorUtilsTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebMonitorUtilsTest.java
new file mode 100644
index 0000000000000..1c51b43e9ba2c
--- /dev/null
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebMonitorUtilsTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor;
+
+import org.apache.flink.runtime.webmonitor.history.JsonArchivist;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class WebMonitorUtilsTest {
+
+	@Test
+	public void testGetArchivers() {
+		JsonArchivist[] direct = WebRuntimeMonitor.getJsonArchivists();
+		JsonArchivist[] reflected = WebMonitorUtils.getJsonArchivists();
+
+		Assert.assertEquals(direct.length, reflected.length);
+		for(int x = 0; x < direct.length; x++) {
+			Assert.assertSame(direct[x].getClass(), reflected[x].getClass());
+		}
+	}
+}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/FsJobArchivistTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/FsJobArchivistTest.java
new file mode 100644
index 0000000000000..f23c249ba1b8f
--- /dev/null
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/FsJobArchivistTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
+import org.apache.flink.runtime.history.FsJobArchivist;
+import org.apache.flink.runtime.webmonitor.WebRuntimeMonitor;
+import org.apache.flink.runtime.webmonitor.utils.ArchivedJobGenerationUtils;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+
+/**
+ * This test must reside in flink-runtime-web since the {@link FsJobArchivist} relies on
+ * {@link WebRuntimeMonitor#getJsonArchivists()}.
+ */
+public class FsJobArchivistTest {
+
+	@Rule
+	public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+	@Test
+	public void testArchiveJob() throws Exception {
+		Path tmpPath = new Path(tmpFolder.getRoot().getAbsolutePath());
+
+		AccessExecutionGraph graph = ArchivedJobGenerationUtils.getTestJob();
+
+		Collection<ArchivedJson> expected = new ArrayList<>();
+		for (JsonArchivist archivist : WebRuntimeMonitor.getJsonArchivists()) {
+			for (ArchivedJson archive : archivist.archiveJsonWithPath(graph)) {
+				expected.add(archive);
+			}
+		}
+
+		Path archivePath = FsJobArchivist.archiveJob(tmpPath, graph);
+		Collection<ArchivedJson> actual = FsJobArchivist.getArchivedJsons(archivePath);
+
+		Assert.assertEquals(expected.size(), actual.size());
+
+		Iterator<ArchivedJson> eI = expected.iterator();
+		Iterator<ArchivedJson> aI = actual.iterator();
+		
+		// several jsons contain a dynamic "now" field that depends on the time of creation, so we can't easily compare
+		// the json and only check the path
+		// /jobs/:jobid
+		// /jobs/:jobid/vertices
+		// /jobs/:jobid/vertices/:vertexid
+		// /jobs/:jobid/vertices/:vertexid/subtasktimes
+		// /jobs/:jobid/vertices/:vertexid/taskmanagers
+		Pattern jobDetailsPattern = Pattern.compile("/jobs/[a-fA-F0-9]{32}(/vertices(/[a-fA-F0-9]{32}(/(subtasktimes|taskmanagers))?)?)?");
+		while (eI.hasNext() && aI.hasNext()) {
+			// technically there isn't guarantee that the order is identical, but as it stands this is the case
+			ArchivedJson exp = eI.next();
+			ArchivedJson act = aI.next();
+			if (jobDetailsPattern.matcher(exp.getPath()).matches()) {
+				Assert.assertEquals(exp.getPath(), act.getPath());
+			} else {
+				Assert.assertEquals(exp, act);
+			}
+		}
+	}
+}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandlerTest.java
new file mode 100644
index 0000000000000..3eff02afa1df3
--- /dev/null
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandlerTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import io.netty.handler.codec.http.router.Router;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.runtime.webmonitor.utils.WebFrontendBootstrap;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class HistoryServerStaticFileServerHandlerTest {
+
+	@Rule
+	public TemporaryFolder tmp = new TemporaryFolder();
+
+	@Test
+	public void testRespondWithFile() throws Exception {
+		File webDir = tmp.newFolder("webDir");
+		Router router = new Router()
+			.GET("/:*", new HistoryServerStaticFileServerHandler(webDir));
+		WebFrontendBootstrap webUI = new WebFrontendBootstrap(
+			router,
+			LoggerFactory.getLogger(HistoryServerStaticFileServerHandlerTest.class),
+			tmp.newFolder("uploadDir"),
+			null,
+			"localhost",
+			8081,
+			new Configuration());
+		try {
+			// verify that 404 message is returned when requesting a non-existant file
+			String notFound404 = HistoryServerTest.getFromHTTP("http://localhost:8081/hello");
+			Assert.assertTrue(notFound404.contains("404 Not Found"));
+
+			// verify that a) a file can be loaded using the ClassLoader and b) that the HistoryServer
+			// index_hs.html is injected
+			String index = HistoryServerTest.getFromHTTP("http://localhost:8081/index.html");
+			Assert.assertTrue(index.contains("Completed Jobs"));
+
+			// verify that index.html is appended if the request path ends on '/'
+			String index2 = HistoryServerTest.getFromHTTP("http://localhost:8081/");
+			Assert.assertEquals(index, index2);
+
+			// verify that a 404 message is returned when requesting a directory
+			File dir = new File(webDir, "dir.json");
+			dir.mkdirs();
+			String dirNotFound404 = HistoryServerTest.getFromHTTP("http://localhost:8081/dir");
+			Assert.assertTrue(dirNotFound404.contains("404 Not Found"));
+
+			// verify that a 404 message is returned when requesting a file outside the webDir
+			tmp.newFile("secret");
+			String x = HistoryServerTest.getFromHTTP("http://localhost:8081/../secret");
+			Assert.assertTrue(x.contains("404 Not Found"));
+		} finally {
+			webUI.shutdown();
+		}
+	}
+}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
new file mode 100644
index 0000000000000..f54cb82655a26
--- /dev/null
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.HistoryServerOptions;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.akka.AkkaUtils;
+import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
+import org.apache.flink.runtime.jobmanager.JobManager;
+import org.apache.flink.runtime.jobmanager.JobManagerOptions;
+import org.apache.flink.runtime.jobmanager.MemoryArchivist;
+import org.apache.flink.runtime.messages.ArchiveMessages;
+import org.apache.flink.runtime.webmonitor.utils.ArchivedJobGenerationUtils;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import scala.Option;
+
+public class HistoryServerTest {
+
+	@Rule
+	public TemporaryFolder tmpDir = new TemporaryFolder();
+
+	@Test
+	public void testFullArchiveLifecycle() throws Exception {
+		ArchivedExecutionGraph graph = (ArchivedExecutionGraph) ArchivedJobGenerationUtils.getTestJob();
+
+		File jmDirectory = tmpDir.newFolder("jm");
+		File hsDirectory = tmpDir.newFolder("hs");
+		
+		Configuration config = new Configuration();
+		config.setString(JobManagerOptions.ARCHIVE_DIR, jmDirectory.toURI().toString());
+
+		config.setString(HistoryServerOptions.HISTORY_SERVER_ARCHIVE_DIRS, jmDirectory.toURI().toString());
+		config.setString(HistoryServerOptions.HISTORY_SERVER_WEB_DIR, hsDirectory.getAbsolutePath());
+
+		ActorSystem actorSystem = AkkaUtils.createLocalActorSystem(config);
+		Option<Path> archivePath = Option.apply(new Path(jmDirectory.toURI().toString()));
+
+		ActorRef memoryArchivist = actorSystem.actorOf(JobManager.getArchiveProps(MemoryArchivist.class, 1, archivePath));
+		memoryArchivist.tell(new ArchiveMessages.ArchiveExecutionGraph(graph.getJobID(), graph), null);
+
+		File archive = new File(jmDirectory, graph.getJobID().toString());
+		for (int x = 0; x < 10 && !archive.exists(); x++) {
+			Thread.sleep(50);
+		}
+		Assert.assertTrue(archive.exists());
+
+		HistoryServer hs = new HistoryServer(config);
+		try {
+			hs.start();
+			ObjectMapper mapper = new ObjectMapper();
+			JsonNode overview = null;
+			for (int x = 0; x < 20; x++) {
+				Thread.sleep(50);
+				String response = getFromHTTP("http://localhost:8082/joboverview");
+				if (response.contains("404 Not Found")) {
+					// file may not be written yet
+					continue;
+				} else {
+					try {
+						overview = mapper.readTree(response);
+						break;
+					} catch (IOException ignored) {
+						// while the file may exist the contents may not have been written yet
+						continue;
+					}
+				}
+			}
+			Assert.assertNotNull("/joboverview.json did not contain valid json", overview);
+			String jobID = overview.get("finished").get(0).get("jid").asText();
+			JsonNode jobDetails = mapper.readTree(getFromHTTP("http://localhost:8082/jobs/" + jobID));
+			Assert.assertNotNull(jobDetails.get("jid"));
+		} finally {
+			hs.stop();
+		}
+	}
+
+	public static String getFromHTTP(String url) throws Exception {
+		URL u = new URL(url);
+		HttpURLConnection connection = (HttpURLConnection) u.openConnection();
+		connection.setConnectTimeout(100000);
+		connection.connect();
+		InputStream is;
+		if (connection.getResponseCode() >= 400) {
+			// error!
+			is = connection.getErrorStream();
+		} else {
+			is = connection.getInputStream();
+		}
+
+		return IOUtils.toString(is, connection.getContentEncoding() != null ? connection.getContentEncoding() : "UTF-8");
+	}
+}
diff --git a/flink-runtime-web/web-dashboard/app/index_hs.jade b/flink-runtime-web/web-dashboard/app/index_hs.jade
new file mode 100644
index 0000000000000..9cf7411840c69
--- /dev/null
+++ b/flink-runtime-web/web-dashboard/app/index_hs.jade
@@ -0,0 +1,60 @@
+//
+  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.
+
+doctype html
+html(lang='en')
+  head
+    meta(charset='utf-8')
+    meta(http-equiv='X-UA-Compatible', content='IE=edge')
+    meta(name='viewport', content='width=device-width, initial-scale=1')
+
+    title Apache Flink History Server
+
+    link(rel="apple-touch-icon", sizes="180x180", href="images/apple-touch-icon.png")
+    link(rel="icon", type="image/png", href="images/favicon-32x32.png", sizes="32x32")
+    link(rel="icon", type="image/png", href="images/favicon-16x16.png", sizes="16x16")
+    link(rel="manifest", href="images/manifest.json")
+    link(rel="mask-icon", href="images/safari-pinned-tab.svg", color="#aa1919")
+    link(rel="shortcut icon", href="images/favicon.ico")
+    meta(name="msapplication-config", content="images/browserconfig.xml")
+    meta(name="theme-color", content="#ffffff")
+
+    link(rel='stylesheet', href='css/vendor.css', type='text/css')
+    link(rel='stylesheet', href='css/index.css', type='text/css')
+
+    script(src="js/vendor.js")
+    script(src="js/hs/index.js")
+
+  body(ng-app="flinkApp" ng-strict-di)
+    #sidebar(ng-class="{ 'sidebar-visible': sidebarVisible }")
+      nav.navbar.navbar-inverse.navbar-static-top
+        .navbar-header
+          a.navbar-brand(ui-sref="completed-jobs")
+            img.logo(alt="Apache Flink Dashboard" src="images/flink-logo.png")
+          a.navbar-brand.navbar-brand-text(ui-sref="completed-jobs")
+            | Apache Flink Dashboard
+
+      .navbar.navbar-sidebar
+        ul.nav
+          li
+            a(ui-sref="completed-jobs" ui-sref-active='active')
+              i.fa.fa-check-circle.fa-fw
+              | 
+              | Completed Jobs
+
+    #content(ng-class="{ 'sidebar-visible': sidebarVisible }")
+      #main(ui-view='main')
diff --git a/flink-runtime-web/web-dashboard/app/scripts/index_hs.coffee b/flink-runtime-web/web-dashboard/app/scripts/index_hs.coffee
new file mode 100644
index 0000000000000..55d6b0c8fbbbb
--- /dev/null
+++ b/flink-runtime-web/web-dashboard/app/scripts/index_hs.coffee
@@ -0,0 +1,208 @@
+#
+# 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', ['ui.router', 'angularMoment', 'dndLists'])
+
+# --------------------------------------
+
+.run ($rootScope) ->
+  $rootScope.sidebarVisible = false
+  $rootScope.showSidebar = ->
+    $rootScope.sidebarVisible = !$rootScope.sidebarVisible
+    $rootScope.sidebarClass = 'force-show'
+
+# --------------------------------------
+
+.value 'flinkConfig', {
+  jobServer: ''
+#  jobServer: 'http://localhost:8081/'
+  "refresh-interval": 10000
+}
+
+# --------------------------------------
+
+.value 'watermarksConfig', {
+  # A value of (Java) Long.MIN_VALUE indicates that there is no watermark
+  # available. This is parsed by Javascript as this number. We have it as
+  # a constant here to compare available watermarks against.
+  noWatermark: -9223372036854776000
+}
+
+# --------------------------------------
+
+.run (JobsService, MainService, flinkConfig, $interval) ->
+  MainService.loadConfig().then (config) ->
+    angular.extend flinkConfig, config
+
+    JobsService.listJobs()
+
+    $interval ->
+      JobsService.listJobs()
+    , flinkConfig["refresh-interval"]
+
+
+# --------------------------------------
+
+.config ($uiViewScrollProvider) ->
+  $uiViewScrollProvider.useAnchorScroll()
+
+# --------------------------------------
+
+.run ($rootScope, $state) ->
+  $rootScope.$on '$stateChangeStart', (event, toState, toParams, fromState) ->
+    if toState.redirectTo
+      event.preventDefault()
+      $state.go toState.redirectTo, toParams
+
+# --------------------------------------
+
+.config ($stateProvider, $urlRouterProvider) ->
+  $stateProvider.state "completed-jobs",
+    url: "/completed-jobs"
+    views:
+      main:
+        templateUrl: "partials/jobs/completed-jobs.html"
+        controller: 'CompletedJobsController'
+
+  .state "single-job",
+    url: "/jobs/{jobid}"
+    abstract: true
+    views:
+      main:
+        templateUrl: "partials/jobs/job.html"
+        controller: 'SingleJobController'
+
+  .state "single-job.plan",
+    url: ""
+    redirectTo: "single-job.plan.subtasks"
+    views:
+      details:
+        templateUrl: "partials/jobs/job.plan.html"
+        controller: 'JobPlanController'
+
+  .state "single-job.plan.subtasks",
+    url: ""
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.subtasks.html"
+        controller: 'JobPlanSubtasksController'
+
+  .state "single-job.plan.metrics",
+    url: "/metrics"
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.metrics.html"
+        controller: 'JobPlanMetricsController'
+
+  .state "single-job.plan.watermarks",
+    url: "/watermarks"
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.watermarks.html"
+
+  .state "single-job.plan.taskmanagers",
+    url: "/taskmanagers"
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.taskmanagers.html"
+        controller: 'JobPlanTaskManagersController'
+
+  .state "single-job.plan.accumulators",
+    url: "/accumulators"
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.accumulators.html"
+        controller: 'JobPlanAccumulatorsController'
+
+  .state "single-job.plan.checkpoints",
+      url: "/checkpoints"
+      redirectTo: "single-job.plan.checkpoints.overview"
+      views:
+        'node-details':
+          templateUrl: "partials/jobs/job.plan.node-list.checkpoints.html"
+          controller: 'JobPlanCheckpointsController'
+  
+    .state "single-job.plan.checkpoints.overview",
+      url: "/overview"
+      views:
+        'checkpoints-view':
+          templateUrl: "partials/jobs/job.plan.node.checkpoints.overview.html"
+          controller: 'JobPlanCheckpointsController'
+  
+    .state "single-job.plan.checkpoints.summary",
+      url: "/summary"
+      views:
+        'checkpoints-view':
+          templateUrl: "partials/jobs/job.plan.node.checkpoints.summary.html"
+          controller: 'JobPlanCheckpointsController'
+  
+    .state "single-job.plan.checkpoints.history",
+      url: "/history"
+      views:
+        'checkpoints-view':
+          templateUrl: "partials/jobs/job.plan.node.checkpoints.history.html"
+          controller: 'JobPlanCheckpointsController'
+  
+    .state "single-job.plan.checkpoints.config",
+      url: "/config"
+      views:
+        'checkpoints-view':
+          templateUrl: "partials/jobs/job.plan.node.checkpoints.config.html"
+          controller: 'JobPlanCheckpointsController'
+  
+    .state "single-job.plan.checkpoints.details",
+      url: "/details/{checkpointId}"
+      views:
+        'checkpoints-view':
+          templateUrl: "partials/jobs/job.plan.node.checkpoints.details.html"
+          controller: 'JobPlanCheckpointDetailsController'
+
+  .state "single-job.plan.backpressure",
+    url: "/backpressure"
+    views:
+      'node-details':
+        templateUrl: "partials/jobs/job.plan.node-list.backpressure.html"
+        controller: 'JobPlanBackPressureController'
+
+  .state "single-job.timeline",
+    url: "/timeline"
+    views:
+      details:
+        templateUrl: "partials/jobs/job.timeline.html"
+
+  .state "single-job.timeline.vertex",
+    url: "/{vertexId}"
+    views:
+      vertex:
+        templateUrl: "partials/jobs/job.timeline.vertex.html"
+        controller: 'JobTimelineVertexController'
+
+  .state "single-job.exceptions",
+    url: "/exceptions"
+    views:
+      details:
+        templateUrl: "partials/jobs/job.exceptions.html"
+        controller: 'JobExceptionsController'
+
+  .state "single-job.config",
+    url: "/config"
+    views:
+      details:
+        templateUrl: "partials/jobs/job.config.html"
+
+  $urlRouterProvider.otherwise "/completed-jobs"
diff --git a/flink-runtime-web/web-dashboard/gulpfile.js b/flink-runtime-web/web-dashboard/gulpfile.js
index 984411621025e..0c868cd6539cd 100644
--- a/flink-runtime-web/web-dashboard/gulpfile.js
+++ b/flink-runtime-web/web-dashboard/gulpfile.js
@@ -111,7 +111,7 @@ gulp.task('vendor-scripts', function() {
  });
 
 gulp.task('scripts', function() {
-  stream = gulp.src([ paths.src + 'scripts/config.js', paths.src + 'scripts/**/*.coffee'] )
+  stream = gulp.src([ paths.src + 'scripts/config.js', paths.src + 'scripts/**/*.coffee', '!' + paths.src + 'scripts/index_hs.coffee'] )
     .pipe(plumber())
     .pipe(sourcemaps.init())
     .pipe(coffee({ bare: true }))
@@ -126,6 +126,22 @@ gulp.task('scripts', function() {
   stream.pipe(gulp.dest(paths.dest + 'js/'))
 });
 
+gulp.task('scripts_hs', function() {
+  stream = gulp.src([ paths.src + 'scripts/config.js', paths.src + 'scripts/**/*.coffee', '!' + paths.src + 'scripts/index.coffee'] )
+    .pipe(plumber())
+    .pipe(sourcemaps.init())
+    .pipe(coffee({ bare: true }))
+    .pipe(ngAnnotate())
+    .pipe(concat('index.js'))
+    .pipe(sourcemaps.write());
+
+  if (environment == 'production') {
+    stream.pipe(uglify())
+  }
+
+  stream.pipe(gulp.dest(paths.dest + 'js/hs'))
+});
+
 gulp.task('html', function() {
   gulp.src(paths.src + 'index.jade')
     .pipe(plumber())
@@ -135,6 +151,15 @@ gulp.task('html', function() {
     .pipe(gulp.dest(paths.dest))
 });
 
+gulp.task('html_hs', function() {
+  gulp.src(paths.src + 'index_hs.jade')
+    .pipe(plumber())
+    .pipe(jade({
+      pretty: true
+    }))
+    .pipe(gulp.dest(paths.dest))
+});
+
 gulp.task('partials', function() {
   gulp.src(paths.src + 'partials/**/*.jade')
     .pipe(plumber())
@@ -179,7 +204,7 @@ gulp.task('serve', serve({
 }));
 
 gulp.task('vendor', ['vendor-styles', 'vendor-scripts']);
-gulp.task('compile', ['html', 'partials','styles', 'scripts']);
+gulp.task('compile', ['html', 'html_hs', 'partials','styles', 'scripts', 'scripts_hs']);
 
 gulp.task('default', ['fonts', 'assets', 'vendor', 'compile']);
 gulp.task('dev', ['set-development', 'default']);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/history/FsJobArchivist.java b/flink-runtime/src/main/java/org/apache/flink/runtime/history/FsJobArchivist.java
new file mode 100644
index 0000000000000..1160d59867005
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/history/FsJobArchivist.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.history;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.flink.core.fs.FSDataInputStream;
+import org.apache.flink.core.fs.FileSystem;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
+import org.apache.flink.runtime.jobmanager.JobManagerOptions;
+import org.apache.flink.runtime.webmonitor.WebMonitorUtils;
+import org.apache.flink.runtime.webmonitor.history.ArchivedJson;
+import org.apache.flink.runtime.webmonitor.history.JsonArchivist;
+import org.apache.flink.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Utility class for writing an archive file to a {@link FileSystem} and reading it back.
+ */
+public class FsJobArchivist {
+
+	private static final Logger LOG = LoggerFactory.getLogger(FsJobArchivist.class);
+	private static final JsonFactory jacksonFactory = new JsonFactory();
+	private static final ObjectMapper mapper = new ObjectMapper();
+
+	private static final String ARCHIVE = "archive";
+	private static final String PATH = "path";
+	private static final String JSON = "json";
+
+	private FsJobArchivist() {
+	}
+
+	/**
+	 * Writes the given {@link AccessExecutionGraph} to the {@link FileSystem} pointed to by {@link JobManagerOptions#ARCHIVE_DIR}.
+	 *
+	 * @param rootPath directory to which the archive should be written to
+	 * @param graph  graph to archive
+	 * @return path to where the archive was written, or null if no archive was created
+	 * @throws IOException
+	 */
+	public static Path archiveJob(Path rootPath, AccessExecutionGraph graph) throws IOException {
+		try {
+			FileSystem fs = rootPath.getFileSystem();
+			Path path = new Path(rootPath, graph.getJobID().toString());
+			OutputStream out = fs.create(path, FileSystem.WriteMode.NO_OVERWRITE);
+
+			try (JsonGenerator gen = jacksonFactory.createGenerator(out, JsonEncoding.UTF8)) {
+				gen.writeStartObject();
+				gen.writeArrayFieldStart(ARCHIVE);
+				for (JsonArchivist archiver : WebMonitorUtils.getJsonArchivists()) {
+					for (ArchivedJson archive : archiver.archiveJsonWithPath(graph)) {
+						gen.writeStartObject();
+						gen.writeStringField(PATH, archive.getPath());
+						gen.writeStringField(JSON, archive.getJson());
+						gen.writeEndObject();
+					}
+				}
+				gen.writeEndArray();
+				gen.writeEndObject();
+			} catch (Exception e) {
+				fs.delete(path, false);
+				throw e;
+			}
+			LOG.info("Job {} has been archived at {}.", graph.getJobID(), path);
+			return path;
+		} catch (IOException e) {
+			LOG.error("Failed to archive job.", e);
+			throw e;
+		}
+	}
+
+	/**
+	 * Reads the given archive file and returns a {@link Collection} of contained {@link ArchivedJson}.
+	 *
+	 * @param file archive to extract
+	 * @return collection of archived jsons
+	 * @throws IOException if the file can't be opened, read or doesn't contain valid json
+	 */
+	public static Collection<ArchivedJson> getArchivedJsons(Path file) throws IOException {
+		try (FSDataInputStream input = file.getFileSystem().open(file);
+			ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+			IOUtils.copyBytes(input, output);
+
+			JsonNode archive = mapper.readTree(output.toByteArray());
+
+			Collection<ArchivedJson> archives = new ArrayList<>();
+			for (JsonNode archivePart : archive.get(ARCHIVE)) {
+				String path = archivePart.get(PATH).asText();
+				String json = archivePart.get(JSON).asText();
+				archives.add(new ArchivedJson(path, json));
+			}
+			return archives;
+		}
+	}
+}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerOptions.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerOptions.java
index 279a70e077971..b56a0b3490b7f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerOptions.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerOptions.java
@@ -32,6 +32,13 @@ public class JobManagerOptions {
 	public static final ConfigOption<Integer> MAX_ATTEMPTS_HISTORY_SIZE =
 			key("job-manager.max-attempts-history-size").defaultValue(16);
 
+	/**
+	 * The location where the {@link JobManager} stores the archives for finished jobs.
+	 */
+	public static final ConfigOption<String> ARCHIVE_DIR =
+			key("jobmanager.archive.fs.dir")
+				.noDefaultValue();
+
 	private JobManagerOptions() {
 		throw new IllegalAccessError();
 	}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
index 87df0d168ed01..2baadb50b2fa7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorUtils.java
@@ -24,8 +24,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
+import java.net.URI;
 import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.Configuration;
+import org.apache.flink.core.fs.Path;
 import org.apache.flink.runtime.execution.ExecutionState;
 import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
 import org.apache.flink.runtime.executiongraph.AccessExecutionJobVertex;
@@ -33,6 +35,7 @@
 import org.apache.flink.runtime.jobgraph.JobStatus;
 import org.apache.flink.runtime.leaderretrieval.LeaderRetrievalService;
 import org.apache.flink.runtime.messages.webmonitor.JobDetails;
+import org.apache.flink.runtime.webmonitor.history.JsonArchivist;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +43,7 @@
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -143,6 +147,24 @@ public static WebMonitor startWebRuntimeMonitor(
 		}
 	}
 
+	public static JsonArchivist[] getJsonArchivists() {
+		try {
+			String classname = "org.apache.flink.runtime.webmonitor.WebRuntimeMonitor";
+			Class<? extends WebMonitor> clazz = Class.forName(classname).asSubclass(WebMonitor.class);
+			Method method = clazz.getMethod("getJsonArchivists");
+			JsonArchivist[] result = (JsonArchivist[]) method.invoke(null);
+			return result;
+		} catch (ClassNotFoundException e) {
+			LOG.error("Could not load web runtime monitor. " +
+				"Probably reason: flink-runtime-web is not in the classpath");
+			LOG.debug("Caught exception", e);
+			return new JsonArchivist[0];
+		} catch (Throwable t) {
+			LOG.error("Failed to retrieve archivers from web runtime monitor.", t);
+			return new JsonArchivist[0];
+		}
+	}
+
 	public static Map<String, String> fromKeyValueJsonArray(String jsonString) {
 		try {
 			Map<String, String> map = new HashMap<>();
@@ -192,6 +214,32 @@ public static JobDetails createDetailsForJob(AccessExecutionGraph job) {
 				countsPerStatus, numTotalTasks);
 	}
 
+	/**
+	 * Checks and normalizes the given URI. This method first checks the validity of the
+	 * URI (scheme and path are not null) and then normalizes the URI to a path.
+	 *
+	 * @param archiveDirUri The URI to check and normalize.
+	 * @return A normalized URI as a Path.
+	 *
+	 * @throws IllegalArgumentException Thrown, if the URI misses scheme or path. 
+	 */
+	public static Path validateAndNormalizeUri(URI archiveDirUri) {
+		final String scheme = archiveDirUri.getScheme();
+		final String path = archiveDirUri.getPath();
+
+		// some validity checks
+		if (scheme == null) {
+			throw new IllegalArgumentException("The scheme (hdfs://, file://, etc) is null. " +
+				"Please specify the file system scheme explicitly in the URI.");
+		}
+		if (path == null) {
+			throw new IllegalArgumentException("The path to store the job archive data in is null. " +
+				"Please specify a directory path for the archiving the job data.");
+		}
+
+		return new Path(archiveDirUri);
+	}
+
 	/**
 	 * Private constructor to prevent instantiation.
 	 */
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/history/ArchivedJson.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/history/ArchivedJson.java
index 22e011c15034b..2e72f1af79dc0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/history/ArchivedJson.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/history/ArchivedJson.java
@@ -27,6 +27,7 @@
  * resembling the REST API.
  */
 public class ArchivedJson {
+
 	private final String path;
 	private final String json;
 	
@@ -42,4 +43,19 @@ public String getPath() {
 	public String getJson() {
 		return json;
 	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof ArchivedJson) {
+			ArchivedJson other = (ArchivedJson) obj;
+			return this.path.equals(other.path) && this.json.equals(other.json);
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public String toString() {
+		return path +":" + json;
+	}
 }
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 9d53aa28ff4f1..33cc512193350 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -30,7 +30,7 @@ import grizzled.slf4j.Logger
 import org.apache.flink.api.common.JobID
 import org.apache.flink.api.common.time.Time
 import org.apache.flink.configuration._
-import org.apache.flink.core.fs.FileSystem
+import org.apache.flink.core.fs.{FileSystem, Path}
 import org.apache.flink.core.io.InputSplitAssigner
 import org.apache.flink.metrics.groups.UnregisteredMetricsGroup
 import org.apache.flink.metrics.{Gauge, MetricGroup}
@@ -2472,6 +2472,7 @@ object JobManager {
     RestartStrategyFactory,
     FiniteDuration, // timeout
     Int, // number of archived jobs
+    Option[Path], // archive path
     LeaderElectionService,
     SubmittedJobGraphStore,
     CheckpointRecoveryFactory,
@@ -2490,6 +2491,21 @@ object JobManager {
     val archiveCount = configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_ARCHIVE_COUNT,
       ConfigConstants.DEFAULT_JOB_MANAGER_WEB_ARCHIVE_COUNT)
 
+    val archiveDir = configuration.getString(JobManagerOptions.ARCHIVE_DIR)
+
+    val archivePath = if (archiveDir != null) {
+      try {
+        Option.apply(
+          WebMonitorUtils.validateAndNormalizeUri(new Path(archiveDir).toUri))
+      } catch {
+        case e: Exception =>
+          LOG.warn(s"Failed to initialize archive directory in '$archiveDir'.", e)
+          Option.empty
+      }
+    } else {
+      LOG.info("No archive directory was configured, jobs wil not be archived.")
+      Option.empty
+    }
 
     var blobServer: BlobServer = null
     var instanceManager: InstanceManager = null
@@ -2576,6 +2592,7 @@ object JobManager {
       restartStrategy,
       timeout,
       archiveCount,
+      archivePath,
       leaderElectionService,
       submittedJobGraphs,
       checkpointRecoveryFactory,
@@ -2648,6 +2665,7 @@ object JobManager {
     restartStrategy,
     timeout,
     archiveCount,
+    archivePath,
     leaderElectionService,
     submittedJobGraphs,
     checkpointRecoveryFactory,
@@ -2658,7 +2676,7 @@ object JobManager {
       ioExecutor,
       None)
 
-    val archiveProps = getArchiveProps(archiveClass, archiveCount)
+    val archiveProps = getArchiveProps(archiveClass, archiveCount, archivePath)
 
     // start the archiver with the given name, or without (avoid name conflicts)
     val archive: ActorRef = archiveActorName match {
@@ -2697,8 +2715,11 @@ object JobManager {
     (jobManager, archive)
   }
 
-  def getArchiveProps(archiveClass: Class[_ <: MemoryArchivist], archiveCount: Int): Props = {
-    Props(archiveClass, archiveCount)
+  def getArchiveProps(
+      archiveClass: Class[_ <: MemoryArchivist],
+      archiveCount: Int,
+      archivePath: Option[Path]): Props = {
+    Props(archiveClass, archiveCount, archivePath)
   }
 
   def getJobManagerProps(
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/MemoryArchivist.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/MemoryArchivist.scala
index 7f8fcd3b6733d..d83f2cd90774a 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/MemoryArchivist.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/MemoryArchivist.scala
@@ -23,16 +23,21 @@ import java.util
 import akka.actor.ActorRef
 import grizzled.slf4j.Logger
 import org.apache.flink.api.common.JobID
+import org.apache.flink.configuration.Configuration
+import org.apache.flink.core.fs.Path
 import org.apache.flink.runtime.jobgraph.JobStatus
 import org.apache.flink.runtime.messages.accumulators._
 import org.apache.flink.runtime.webmonitor.WebMonitorUtils
 import org.apache.flink.runtime.{FlinkActor, LogMessages}
 import org.apache.flink.runtime.messages.webmonitor._
 import org.apache.flink.runtime.executiongraph.{ArchivedExecutionGraph, ExecutionGraph}
+import org.apache.flink.runtime.history.FsJobArchivist
 import org.apache.flink.runtime.messages.ArchiveMessages._
 import org.apache.flink.runtime.messages.JobManagerMessages._
+import org.apache.flink.runtime.state.filesystem.FsStateBackend
 
 import scala.collection.mutable
+import scala.concurrent.future
 
 /**
  * Actor which stores terminated Flink jobs. The number of stored Flink jobs is set by max_entries.
@@ -54,9 +59,12 @@ import scala.collection.mutable
  *
  *  - [[RequestJobCounts]] returns the number of finished, canceled, and failed jobs as a Tuple3
  *
- * @param max_entries Maximum number of stored Flink jobs
+ * @param maxEntries Maximum number of stored Flink jobs
+ * @param archivePath Optional path of the job archive directory
  */
-class MemoryArchivist(private val max_entries: Int)
+class MemoryArchivist(
+    private val maxEntries: Int,
+    private val archivePath: Option[Path])
   extends FlinkActor
   with LogMessages {
 
@@ -96,6 +104,8 @@ class MemoryArchivist(private val max_entries: Int)
         case _ =>
       }
 
+      archiveJsonFiles(graph)
+
       trimHistory()
 
     case msg : InfoMessage => handleWebServerInfoMessage(msg, sender())
@@ -183,6 +193,27 @@ class MemoryArchivist(private val max_entries: Int)
     }
   }
 
+  private def archiveJsonFiles(graph: ArchivedExecutionGraph) {
+    // a suspended job is expected to continue on another job manager,
+    // so we aren't archiving it yet.
+    if (archivePath.isDefined && graph.getState.isGloballyTerminalState) {
+      try {
+        val p = FsStateBackend.validateAndNormalizeUri(archivePath.get.toUri)
+        future {
+          try {
+            FsJobArchivist.archiveJob(p, graph)
+          } catch {
+            case e: Exception =>
+              log.error("Failed to archive job.", e)
+          }
+        }(context.dispatcher)
+      } catch {
+        case e: Exception =>
+          log.warn(s"Failed to create Path for $archivePath. Job will not be archived.", e)
+      }
+    }
+  }
+
   // --------------------------------------------------------------------------
   //  Request Responses
   // --------------------------------------------------------------------------
@@ -218,7 +249,7 @@ class MemoryArchivist(private val max_entries: Int)
    * * if more than max_entries are in the queue.
    */
   private def trimHistory(): Unit = {
-    while (graphs.size > max_entries) {
+    while (graphs.size > maxEntries) {
       // get first graph inserted
       val (jobID, value) = graphs.head
       graphs.remove(jobID)
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
index adace0be42125..21e0d28629576 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala
@@ -25,6 +25,7 @@ import akka.actor.{ActorRef, ActorSystem, Props}
 import org.apache.flink.api.common.JobID
 import org.apache.flink.api.common.io.FileOutputFormat
 import org.apache.flink.configuration.{ConfigConstants, Configuration, QueryableStateOptions}
+import org.apache.flink.core.fs.Path
 import org.apache.flink.runtime.checkpoint.CheckpointRecoveryFactory
 import org.apache.flink.runtime.clusterframework.FlinkResourceManager
 import org.apache.flink.runtime.clusterframework.standalone.StandaloneResourceManager
@@ -43,7 +44,7 @@ import org.apache.flink.runtime.memory.MemoryManager
 import org.apache.flink.runtime.messages.JobManagerMessages
 import org.apache.flink.runtime.messages.JobManagerMessages.{RunningJobsStatus, StoppingFailure, StoppingResponse}
 import org.apache.flink.runtime.metrics.MetricRegistry
-import org.apache.flink.runtime.taskexecutor.{TaskManagerServices, TaskManagerServicesConfiguration, TaskManagerConfiguration}
+import org.apache.flink.runtime.taskexecutor.{TaskManagerConfiguration, TaskManagerServices, TaskManagerServicesConfiguration}
 import org.apache.flink.runtime.taskmanager.{TaskManager, TaskManagerLocation}
 import org.apache.flink.runtime.util.EnvironmentInformation
 
@@ -122,6 +123,7 @@ class LocalFlinkMiniCluster(
     restartStrategyFactory,
     timeout,
     archiveCount,
+    archivePath,
     leaderElectionService,
     submittedJobGraphStore,
     checkpointRecoveryFactory,
@@ -139,7 +141,8 @@ class LocalFlinkMiniCluster(
     val archive = system.actorOf(
       getArchiveProps(
         memoryArchivistClass,
-        archiveCount),
+        archiveCount,
+        archivePath),
       archiveName)
 
     system.actorOf(
@@ -247,8 +250,11 @@ class LocalFlinkMiniCluster(
   // Props for the distributed components
   //------------------------------------------------------------------------------------------------
 
-  def getArchiveProps(archiveClass: Class[_ <: MemoryArchivist], archiveCount: Int): Props = {
-    JobManager.getArchiveProps(archiveClass, archiveCount)
+  def getArchiveProps(
+      archiveClass: Class[_ <: MemoryArchivist],
+      archiveCount: Int,
+      arhivePath: Option[Path]): Props = {
+    JobManager.getArchiveProps(archiveClass, archiveCount, Option.empty)
   }
 
   def getJobManagerProps(
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
index 32358c0c85a29..cb59be85ff0ea 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerHARecoveryTest.java
@@ -33,6 +33,7 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.HighAvailabilityOptions;
 import org.apache.flink.core.fs.FSDataInputStream;
+import org.apache.flink.core.fs.Path;
 import org.apache.flink.runtime.akka.AkkaUtils;
 import org.apache.flink.runtime.akka.ListeningBehaviour;
 import org.apache.flink.runtime.blob.BlobServer;
@@ -171,7 +172,7 @@ public void testJobRecoveryWhenLosingLeadership() throws Exception {
 			InstanceManager instanceManager = new InstanceManager();
 			instanceManager.addInstanceListener(scheduler);
 
-			archive = system.actorOf(Props.create(MemoryArchivist.class, 10));
+			archive = system.actorOf(JobManager.getArchiveProps(MemoryArchivist.class, 10, Option.<Path>empty()));
 
 			Props jobManagerProps = Props.create(
 				TestingJobManager.class,
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/history/ArchivedJsonTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/history/ArchivedJsonTest.java
new file mode 100644
index 0000000000000..c3883bc768ac4
--- /dev/null
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/webmonitor/history/ArchivedJsonTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.flink.runtime.webmonitor.history;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ArchivedJsonTest {
+
+	@Test
+	public void testEquals() {
+		ArchivedJson original = new ArchivedJson("path", "json");
+		ArchivedJson twin = new ArchivedJson("path", "json");
+		ArchivedJson identicalPath = new ArchivedJson("path", "hello");
+		ArchivedJson identicalJson = new ArchivedJson("hello", "json");
+
+		Assert.assertEquals(original, original);
+		Assert.assertEquals(original, twin);
+		Assert.assertNotEquals(original, identicalPath);
+		Assert.assertNotEquals(original, identicalJson);
+	}
+}
diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingMemoryArchivist.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingMemoryArchivist.scala
index 48a1ddd6a9efc..3de5786c23e30 100644
--- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingMemoryArchivist.scala
+++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingMemoryArchivist.scala
@@ -18,6 +18,7 @@
 
 package org.apache.flink.runtime.testingUtils
 
+import org.apache.flink.core.fs.Path
 import org.apache.flink.runtime.jobmanager.MemoryArchivist
 import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.{ExecutionGraphFound, ExecutionGraphNotFound, RequestExecutionGraph}
 
@@ -25,7 +26,8 @@ import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.{Executio
   *
   * @param maxEntries number of maximum number of archived jobs
   */
-class TestingMemoryArchivist(maxEntries: Int) extends MemoryArchivist(maxEntries) {
+class TestingMemoryArchivist(maxEntries: Int, archivePath: Option[Path])
+  extends MemoryArchivist(maxEntries, archivePath) {
 
   override def handleMessage: Receive = {
     handleTestingMessage orElse super.handleMessage

From 9999e6f1a527021427169db95d58d318080c8d2a Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Mon, 20 Mar 2017 21:47:13 +0100
Subject: [PATCH 3/4] Rebuild web frontend

---
 .../web-dashboard/web/index_hs.html           | 55 +++++++++++++++++++
 .../web-dashboard/web/js/hs/index.js          |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 flink-runtime-web/web-dashboard/web/index_hs.html
 create mode 100644 flink-runtime-web/web-dashboard/web/js/hs/index.js

diff --git a/flink-runtime-web/web-dashboard/web/index_hs.html b/flink-runtime-web/web-dashboard/web/index_hs.html
new file mode 100644
index 0000000000000..870fe4195d9a1
--- /dev/null
+++ b/flink-runtime-web/web-dashboard/web/index_hs.html
@@ -0,0 +1,55 @@
+
+<!--
+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.
+
+--><!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Apache Flink History Server</title>
+    <link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
+    <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="images/manifest.json">
+    <link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#aa1919">
+    <link rel="shortcut icon" href="images/favicon.ico">
+    <meta name="msapplication-config" content="images/browserconfig.xml">
+    <meta name="theme-color" content="#ffffff">
+    <link rel="stylesheet" href="css/vendor.css" type="text/css">
+    <link rel="stylesheet" href="css/index.css" type="text/css">
+    <script src="js/vendor.js"></script>
+    <script src="js/hs/index.js"></script>
+  </head>
+  <body ng-app="flinkApp" ng-strict-di>
+    <div id="sidebar" ng-class="{ 'sidebar-visible': sidebarVisible }">
+      <nav class="navbar navbar-inverse navbar-static-top">
+        <div class="navbar-header"><a ui-sref="completed-jobs" class="navbar-brand"><img alt="Apache Flink Dashboard" src="images/flink-logo.png" class="logo"></a><a ui-sref="completed-jobs" class="navbar-brand navbar-brand-text">Apache Flink Dashboard</a></div>
+      </nav>
+      <div class="navbar navbar-sidebar">
+        <ul class="nav">
+          <li><a ui-sref="completed-jobs" ui-sref-active="active"><i class="fa fa-check-circle fa-fw"></i> 
+              Completed Jobs</a></li>
+        </ul>
+      </div>
+    </div>
+    <div id="content" ng-class="{ 'sidebar-visible': sidebarVisible }">
+      <div id="main" ui-view="main"></div>
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/flink-runtime-web/web-dashboard/web/js/hs/index.js b/flink-runtime-web/web-dashboard/web/js/hs/index.js
new file mode 100644
index 0000000000000..374c0c1986575
--- /dev/null
+++ b/flink-runtime-web/web-dashboard/web/js/hs/index.js
@@ -0,0 +1,2 @@
+angular.module("flinkApp",["ui.router","angularMoment","dndLists"]).run(["$rootScope",function(e){return e.sidebarVisible=!1,e.showSidebar=function(){return e.sidebarVisible=!e.sidebarVisible,e.sidebarClass="force-show"}}]).value("flinkConfig",{jobServer:"","refresh-interval":1e4}).value("watermarksConfig",{noWatermark:-0x8000000000000000}).run(["JobsService","MainService","flinkConfig","$interval",function(e,t,r,n){return t.loadConfig().then(function(t){return angular.extend(r,t),e.listJobs(),n(function(){return e.listJobs()},r["refresh-interval"])})}]).config(["$uiViewScrollProvider",function(e){return e.useAnchorScroll()}]).run(["$rootScope","$state",function(e,t){return e.$on("$stateChangeStart",function(e,r,n,o){if(r.redirectTo)return e.preventDefault(),t.go(r.redirectTo,n)})}]).config(["$stateProvider","$urlRouterProvider",function(e,t){return e.state("completed-jobs",{url:"/completed-jobs",views:{main:{templateUrl:"partials/jobs/completed-jobs.html",controller:"CompletedJobsController"}}}).state("single-job",{url:"/jobs/{jobid}","abstract":!0,views:{main:{templateUrl:"partials/jobs/job.html",controller:"SingleJobController"}}}).state("single-job.plan",{url:"",redirectTo:"single-job.plan.subtasks",views:{details:{templateUrl:"partials/jobs/job.plan.html",controller:"JobPlanController"}}}).state("single-job.plan.subtasks",{url:"",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.subtasks.html",controller:"JobPlanSubtasksController"}}}).state("single-job.plan.metrics",{url:"/metrics",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.metrics.html",controller:"JobPlanMetricsController"}}}).state("single-job.plan.watermarks",{url:"/watermarks",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.watermarks.html"}}}).state("single-job.plan.taskmanagers",{url:"/taskmanagers",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.taskmanagers.html",controller:"JobPlanTaskManagersController"}}}).state("single-job.plan.accumulators",{url:"/accumulators",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.accumulators.html",controller:"JobPlanAccumulatorsController"}}}).state("single-job.plan.checkpoints",{url:"/checkpoints",redirectTo:"single-job.plan.checkpoints.overview",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.checkpoints.html",controller:"JobPlanCheckpointsController"}}}).state("single-job.plan.checkpoints.overview",{url:"/overview",views:{"checkpoints-view":{templateUrl:"partials/jobs/job.plan.node.checkpoints.overview.html",controller:"JobPlanCheckpointsController"}}}).state("single-job.plan.checkpoints.summary",{url:"/summary",views:{"checkpoints-view":{templateUrl:"partials/jobs/job.plan.node.checkpoints.summary.html",controller:"JobPlanCheckpointsController"}}}).state("single-job.plan.checkpoints.history",{url:"/history",views:{"checkpoints-view":{templateUrl:"partials/jobs/job.plan.node.checkpoints.history.html",controller:"JobPlanCheckpointsController"}}}).state("single-job.plan.checkpoints.config",{url:"/config",views:{"checkpoints-view":{templateUrl:"partials/jobs/job.plan.node.checkpoints.config.html",controller:"JobPlanCheckpointsController"}}}).state("single-job.plan.checkpoints.details",{url:"/details/{checkpointId}",views:{"checkpoints-view":{templateUrl:"partials/jobs/job.plan.node.checkpoints.details.html",controller:"JobPlanCheckpointDetailsController"}}}).state("single-job.plan.backpressure",{url:"/backpressure",views:{"node-details":{templateUrl:"partials/jobs/job.plan.node-list.backpressure.html",controller:"JobPlanBackPressureController"}}}).state("single-job.timeline",{url:"/timeline",views:{details:{templateUrl:"partials/jobs/job.timeline.html"}}}).state("single-job.timeline.vertex",{url:"/{vertexId}",views:{vertex:{templateUrl:"partials/jobs/job.timeline.vertex.html",controller:"JobTimelineVertexController"}}}).state("single-job.exceptions",{url:"/exceptions",views:{details:{templateUrl:"partials/jobs/job.exceptions.html",controller:"JobExceptionsController"}}}).state("single-job.config",{url:"/config",views:{details:{templateUrl:"partials/jobs/job.config.html"}}}),t.otherwise("/completed-jobs")}]),angular.module("flinkApp").directive("bsLabel",["JobsService",function(e){return{transclude:!0,replace:!0,scope:{getLabelClass:"&",status:"@"},template:"<span title='{{status}}' ng-class='getLabelClass()'><ng-transclude></ng-transclude></span>",link:function(t,r,n){return t.getLabelClass=function(){return"label label-"+e.translateLabelState(n.status)}}}}]).directive("bpLabel",["JobsService",function(e){return{transclude:!0,replace:!0,scope:{getBackPressureLabelClass:"&",status:"@"},template:"<span title='{{status}}' ng-class='getBackPressureLabelClass()'><ng-transclude></ng-transclude></span>",link:function(t,r,n){return t.getBackPressureLabelClass=function(){return"label label-"+e.translateBackPressureLabelState(n.status)}}}}]).directive("indicatorPrimary",["JobsService",function(e){return{replace:!0,scope:{getLabelClass:"&",status:"@"},template:"<i title='{{status}}' ng-class='getLabelClass()' />",link:function(t,r,n){return t.getLabelClass=function(){return"fa fa-circle indicator indicator-"+e.translateLabelState(n.status)}}}}]).directive("tableProperty",function(){return{replace:!0,scope:{value:"="},template:"<td title=\"{{value || 'None'}}\">{{value || 'None'}}</td>"}}),angular.module("flinkApp").filter("amDurationFormatExtended",["angularMomentConfig",function(e){var t;return t=function(e,t,r){return"undefined"==typeof e||null===e?"":moment.duration(e,t).format(r,{trim:!1})},t.$stateful=e.statefulFilters,t}]).filter("humanizeDuration",function(){return function(e,t){var r,n,o,i,s,a;return"undefined"==typeof e||null===e?"":(i=e%1e3,a=Math.floor(e/1e3),s=a%60,a=Math.floor(a/60),o=a%60,a=Math.floor(a/60),n=a%24,a=Math.floor(a/24),r=a,0===r?0===n?0===o?0===s?i+"ms":s+"s ":o+"m "+s+"s":t?n+"h "+o+"m":n+"h "+o+"m "+s+"s":t?r+"d "+n+"h":r+"d "+n+"h "+o+"m "+s+"s")}}).filter("limit",function(){return function(e){return e.length>73&&(e=e.substring(0,35)+"..."+e.substring(e.length-35,e.length)),e}}).filter("humanizeText",function(){return function(e){return e?e.replace(/&gt;/g,">").replace(/<br\/>/g,""):""}}).filter("humanizeBytes",function(){return function(e){var t,r;return r=["B","KB","MB","GB","TB","PB","EB"],t=function(e,n){var o;return o=Math.pow(1024,n),e<o?(e/o).toFixed(2)+" "+r[n]:e<1e3*o?(e/o).toPrecision(3)+" "+r[n]:t(e,n+1)},"undefined"==typeof e||null===e?"":e<1e3?e+" B":t(e,1)}}).filter("toLocaleString",function(){return function(e){return e.toLocaleString()}}).filter("toUpperCase",function(){return function(e){return e.toUpperCase()}}).filter("percentage",function(){return function(e){return(100*e).toFixed(0)+"%"}}).filter("humanizeWatermark",["watermarksConfig",function(e){return function(t){return isNaN(t)||t<=e.noWatermark?"No Watermark":t}}]).filter("increment",function(){return function(e){return parseInt(e)+1}}),angular.module("flinkApp").service("MainService",["$http","flinkConfig","$q",function(e,t,r){return this.loadConfig=function(){var n;return n=r.defer(),e.get(t.jobServer+"config").success(function(e,t,r,o){return n.resolve(e)}),n.promise},this}]),angular.module("flinkApp").controller("JobManagerConfigController",["$scope","JobManagerConfigService",function(e,t){return t.loadConfig().then(function(t){return null==e.jobmanager&&(e.jobmanager={}),e.jobmanager.config=t})}]).controller("JobManagerLogsController",["$scope","JobManagerLogsService",function(e,t){return t.loadLogs().then(function(t){return null==e.jobmanager&&(e.jobmanager={}),e.jobmanager.log=t}),e.reloadData=function(){return t.loadLogs().then(function(t){return e.jobmanager.log=t})}}]).controller("JobManagerStdoutController",["$scope","JobManagerStdoutService",function(e,t){return t.loadStdout().then(function(t){return null==e.jobmanager&&(e.jobmanager={}),e.jobmanager.stdout=t}),e.reloadData=function(){return t.loadStdout().then(function(t){return e.jobmanager.stdout=t})}}]),angular.module("flinkApp").service("JobManagerConfigService",["$http","flinkConfig","$q",function(e,t,r){var n;return n={},this.loadConfig=function(){var n;return n=r.defer(),e.get(t.jobServer+"jobmanager/config").success(function(e,t,r,o){return o=e,n.resolve(e)}),n.promise},this}]).service("JobManagerLogsService",["$http","flinkConfig","$q",function(e,t,r){var n;return n={},this.loadLogs=function(){var o;return o=r.defer(),e.get(t.jobServer+"jobmanager/log").success(function(e,t,r,i){return n=e,o.resolve(e)}),o.promise},this}]).service("JobManagerStdoutService",["$http","flinkConfig","$q",function(e,t,r){var n;return n={},this.loadStdout=function(){var o;return o=r.defer(),e.get(t.jobServer+"jobmanager/stdout").success(function(e,t,r,i){return n=e,o.resolve(e)}),o.promise},this}]),angular.module("flinkApp").controller("RunningJobsController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){return e.jobObserver=function(){return e.jobs=n.getJobs("running")},n.registerObserver(e.jobObserver),e.$on("$destroy",function(){return n.unRegisterObserver(e.jobObserver)}),e.jobObserver()}]).controller("CompletedJobsController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){return e.jobObserver=function(){return e.jobs=n.getJobs("finished")},n.registerObserver(e.jobObserver),e.$on("$destroy",function(){return n.unRegisterObserver(e.jobObserver)}),e.jobObserver()}]).controller("SingleJobController",["$scope","$state","$stateParams","JobsService","MetricsService","$rootScope","flinkConfig","$interval","$q","watermarksConfig",function(e,t,r,n,o,i,s,a,l,u){var c,d;return e.jobid=r.jobid,e.job=null,e.plan=null,e.watermarks={},e.vertices=null,e.backPressureOperatorStats={},d=a(function(){return n.loadJob(r.jobid).then(function(t){return e.job=t,e.$broadcast("reload")})},s["refresh-interval"]),e.$on("$destroy",function(){return e.job=null,e.plan=null,e.watermarks={},e.vertices=null,e.backPressureOperatorStats=null,a.cancel(d)}),e.cancelJob=function(e){return angular.element(e.currentTarget).removeClass("btn").removeClass("btn-default").html("Cancelling..."),n.cancelJob(r.jobid).then(function(e){return{}})},e.stopJob=function(e){return angular.element(e.currentTarget).removeClass("btn").removeClass("btn-default").html("Stopping..."),n.stopJob(r.jobid).then(function(e){return{}})},n.loadJob(r.jobid).then(function(t){return e.job=t,e.vertices=t.vertices,e.plan=t.plan,o.setupMetrics(r.jobid,t.vertices)}),c=function(t){var r,n,i,s;return i=function(t){return function(t){var r,n,i,s;return r=l.defer(),i=e.job.jid,s=function(){var e,r,o;for(o=[],n=e=0,r=t.parallelism-1;0<=r?e<=r:e>=r;n=0<=r?++e:--e)o.push(n+".currentLowWatermark");return o}(),o.getMetrics(i,t.id,s).then(function(e){var t,n,o,i,s,a,l;o=NaN,l={},i=e.values;for(t in i)a=i[t],s=t.replace(".currentLowWatermark",""),l[s]=a,(isNaN(o)||a<o)&&(o=a);return n=!isNaN(o)&&o>u.noWatermark?o:NaN,r.resolve({lowWatermark:n,watermarks:l})}),r.promise}}(this),r=l.defer(),s={},n=t.length,angular.forEach(t,function(e){return function(e,t){var o;return o=e.id,i(e).then(function(e){if(s[o]=e,t>=n-1)return r.resolve(s)})}}(this)),r.promise},e.hasWatermark=function(t){return e.watermarks[t]&&!isNaN(e.watermarks[t].lowWatermark)},e.$watch("plan",function(t){if(t)return c(t.nodes).then(function(t){return e.watermarks=t})}),e.$on("reload",function(){if(e.plan)return c(e.plan.nodes).then(function(t){return e.watermarks=t})})}]).controller("JobPlanController",["$scope","$state","$stateParams","$window","JobsService",function(e,t,r,n,o){return e.nodeid=null,e.nodeUnfolded=!1,e.stateList=o.stateList(),e.changeNode=function(t){return t!==e.nodeid?(e.nodeid=t,e.vertex=null,e.subtasks=null,e.accumulators=null,e.operatorCheckpointStats=null,e.$broadcast("reload"),e.$broadcast("node:change",e.nodeid)):(e.nodeid=null,e.nodeUnfolded=!1,e.vertex=null,e.subtasks=null,e.accumulators=null,e.operatorCheckpointStats=null)},e.deactivateNode=function(){return e.nodeid=null,e.nodeUnfolded=!1,e.vertex=null,e.subtasks=null,e.accumulators=null,e.operatorCheckpointStats=null},e.toggleFold=function(){return e.nodeUnfolded=!e.nodeUnfolded}}]).controller("JobPlanSubtasksController",["$scope","JobsService",function(e,t){var r;return r=function(){return t.getSubtasks(e.nodeid).then(function(t){return e.subtasks=t})},!e.nodeid||e.vertex&&e.vertex.st||r(),e.$on("reload",function(t){if(e.nodeid)return r()})}]).controller("JobPlanTaskManagersController",["$scope","JobsService",function(e,t){var r;return r=function(){return t.getTaskManagers(e.nodeid).then(function(t){return e.taskmanagers=t})},!e.nodeid||e.vertex&&e.vertex.st||r(),e.$on("reload",function(t){if(e.nodeid)return r()})}]).controller("JobPlanAccumulatorsController",["$scope","JobsService",function(e,t){var r;return r=function(){return t.getAccumulators(e.nodeid).then(function(t){return e.accumulators=t.main,e.subtaskAccumulators=t.subtasks})},!e.nodeid||e.vertex&&e.vertex.accumulators||r(),e.$on("reload",function(t){if(e.nodeid)return r()})}]).controller("JobPlanCheckpointsController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){var o;return e.checkpointDetails={},e.checkpointDetails.id=-1,n.getCheckpointConfig().then(function(t){return e.checkpointConfig=t}),o=function(){return n.getCheckpointStats().then(function(t){if(null!==t)return e.checkpointStats=t})},o(),e.$on("reload",function(e){return o()})}]).controller("JobPlanCheckpointDetailsController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){var o,i;return e.subtaskDetails={},e.checkpointDetails.id=r.checkpointId,o=function(t){return n.getCheckpointDetails(t).then(function(t){return null!==t?e.checkpoint=t:e.unknown_checkpoint=!0})},i=function(t,r){return n.getCheckpointSubtaskDetails(t,r).then(function(t){if(null!==t)return e.subtaskDetails[r]=t})},o(r.checkpointId),e.nodeid&&i(r.checkpointId,e.nodeid),e.$on("reload",function(t){if(o(r.checkpointId),e.nodeid)return i(r.checkpointId,e.nodeid)}),e.$on("$destroy",function(){return e.checkpointDetails.id=-1})}]).controller("JobPlanBackPressureController",["$scope","JobsService",function(e,t){var r;return r=function(){if(e.now=Date.now(),e.nodeid)return t.getOperatorBackPressure(e.nodeid).then(function(t){return e.backPressureOperatorStats[e.nodeid]=t})},r(),e.$on("reload",function(e){return r()})}]).controller("JobTimelineVertexController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){var o;return o=function(){return n.getVertex(r.vertexId).then(function(t){return e.vertex=t})},o(),e.$on("reload",function(e){return o()})}]).controller("JobExceptionsController",["$scope","$state","$stateParams","JobsService",function(e,t,r,n){return n.loadExceptions().then(function(t){return e.exceptions=t})}]).controller("JobPropertiesController",["$scope","JobsService",function(e,t){return e.changeNode=function(r){return r!==e.nodeid?(e.nodeid=r,t.getNode(r).then(function(t){return e.node=t})):(e.nodeid=null,e.node=null)}}]).controller("JobPlanMetricsController",["$scope","JobsService","MetricsService",function(e,t,r){var n;if(e.dragging=!1,e.window=r.getWindow(),e.availableMetrics=null,e.$on("$destroy",function(){return r.unRegisterObserver()}),n=function(){return t.getVertex(e.nodeid).then(function(t){return e.vertex=t}),r.getAvailableMetrics(e.jobid,e.nodeid).then(function(t){return e.availableMetrics=t,e.metrics=r.getMetricsSetup(e.jobid,e.nodeid).names,r.registerObserver(e.jobid,e.nodeid,function(t){return e.$broadcast("metrics:data:update",t.timestamp,t.values)})})},e.dropped=function(t,o,i,s,a){return r.orderMetrics(e.jobid,e.nodeid,i,o),e.$broadcast("metrics:refresh",i),n(),!1},e.dragStart=function(){return e.dragging=!0},e.dragEnd=function(){return e.dragging=!1},e.addMetric=function(t){return r.addMetric(e.jobid,e.nodeid,t.id),n()},e.removeMetric=function(t){return r.removeMetric(e.jobid,e.nodeid,t),n()},e.setMetricSize=function(t,o){return r.setMetricSize(e.jobid,e.nodeid,t,o),n()},e.getValues=function(t){return r.getValues(e.jobid,e.nodeid,t)},e.$on("node:change",function(t,r){if(!e.dragging)return n()}),e.nodeid)return n()}]),angular.module("flinkApp").directive("vertex",["$state",function(e){return{template:"<svg class='timeline secondary' width='0' height='0'></svg>",scope:{data:"="},link:function(e,t,r){var n,o,i;i=t.children()[0],o=t.width(),angular.element(i).attr("width",o),(n=function(e){var t,r,n;return d3.select(i).selectAll("*").remove(),n=[],angular.forEach(e.subtasks,function(e,t){var r;return r=[{label:"Scheduled",color:"#666",borderColor:"#555",starting_time:e.timestamps.SCHEDULED,ending_time:e.timestamps.DEPLOYING,type:"regular"},{label:"Deploying",color:"#aaa",borderColor:"#555",starting_time:e.timestamps.DEPLOYING,ending_time:e.timestamps.RUNNING,type:"regular"}],e.timestamps.FINISHED>0&&r.push({label:"Running",color:"#ddd",borderColor:"#555",starting_time:e.timestamps.RUNNING,ending_time:e.timestamps.FINISHED,type:"regular"}),n.push({label:"("+e.subtask+") "+e.host,times:r})}),t=d3.timeline().stack().tickFormat({format:d3.time.format("%L"),tickSize:1}).prefix("single").labelFormat(function(e){return e}).margin({left:100,right:0,top:0,bottom:0}).itemHeight(30).relativeTime(),r=d3.select(i).datum(n).call(t)})(e.data)}}}]).directive("timeline",["$state",function(e){return{template:"<svg class='timeline' width='0' height='0'></svg>",scope:{vertices:"=",jobid:"="},link:function(t,r,n){var o,i,s,a;s=r.children()[0],i=r.width(),angular.element(s).attr("width",i),a=function(e){return e.replace("&gt;",">")},o=function(r){var n,o,i;return d3.select(s).selectAll("*").remove(),i=[],angular.forEach(r,function(e){if(e["start-time"]>-1)return"scheduled"===e.type?i.push({times:[{label:a(e.name),color:"#cccccc",borderColor:"#555555",starting_time:e["start-time"],ending_time:e["end-time"],type:e.type}]}):i.push({times:[{label:a(e.name),color:"#d9f1f7",borderColor:"#62cdea",starting_time:e["start-time"],ending_time:e["end-time"],link:e.id,type:e.type}]})}),n=d3.timeline().stack().click(function(r,n,o){if(r.link)return e.go("single-job.timeline.vertex",{jobid:t.jobid,vertexId:r.link})}).tickFormat({format:d3.time.format("%L"),tickSize:1}).prefix("main").margin({left:0,right:0,top:0,bottom:0}).itemHeight(30).showBorderLine().showHourTimeline(),o=d3.select(s).datum(i).call(n)},t.$watch(n.vertices,function(e){if(e)return o(e)})}}}]).directive("split",function(){return{compile:function(e,t){return Split(e.children(),{sizes:[50,50],direction:"vertical"})}}}).directive("jobPlan",["$timeout",function(e){return{template:"<svg class='graph'><g /></svg> <svg class='tmp' width='1' height='1'><g /></svg> <div class='btn-group zoom-buttons'> <a class='btn btn-default zoom-in' ng-click='zoomIn()'><i class='fa fa-plus' /></a> <a class='btn btn-default zoom-out' ng-click='zoomOut()'><i class='fa fa-minus' /></a> </div>",scope:{plan:"=",watermarks:"=",setNode:"&"},link:function(e,t,r){var n,o,i,s,a,l,u,c,d,f,p,g,m,h,b,v,k,j,S,w,C,$,J,M,y;p=null,C=d3.behavior.zoom(),y=[],h=r.jobid,S=t.children()[0],j=t.children().children()[0],w=t.children()[1],l=d3.select(S),u=d3.select(j),c=d3.select(w),n=t.width(),angular.element(t.children()[0]).width(n),v=0,b=0,e.zoomIn=function(){var e,t,r;if(C.scale()<2.99)return e=C.translate(),t=e[0]*(C.scale()+.1/C.scale()),r=e[1]*(C.scale()+.1/C.scale()),C.scale(C.scale()+.1),C.translate([t,r]),u.attr("transform","translate("+t+","+r+") scale("+C.scale()+")"),v=C.scale(),b=C.translate()},e.zoomOut=function(){var e,t,r;if(C.scale()>.31)return C.scale(C.scale()-.1),e=C.translate(),t=e[0]*(C.scale()-.1/C.scale()),r=e[1]*(C.scale()-.1/C.scale()),C.translate([t,r]),u.attr("transform","translate("+t+","+r+") scale("+C.scale()+")"),v=C.scale(),b=C.translate()},i=function(e){var t;return t="",null==e.ship_strategy&&null==e.local_strategy||(t+="<div class='edge-label'>",null!=e.ship_strategy&&(t+=e.ship_strategy),void 0!==e.temp_mode&&(t+=" ("+e.temp_mode+")"),void 0!==e.local_strategy&&(t+=",<br>"+e.local_strategy),t+="</div>"),t},m=function(e){return"partialSolution"===e||"nextPartialSolution"===e||"workset"===e||"nextWorkset"===e||"solutionSet"===e||"solutionDelta"===e},g=function(e,t){return"mirror"===t?"node-mirror":m(t)?"node-iteration":"node-normal"},s=function(e,t,r,n){var o,i;return o="<div href='#/jobs/"+h+"/vertex/"+e.id+"' class='node-label "+g(e,t)+"'>",o+="mirror"===t?"<h3 class='node-name'>Mirror of "+e.operator+"</h3>":"<h3 class='node-name'>"+e.operator+"</h3>",""===e.description?o+="":(i=e.description,i=M(i),o+="<h4 class='step-name'>"+i+"</h4>"),null!=e.step_function?o+=f(e.id,r,n):(m(t)&&(o+="<h5>"+t+" Node</h5>"),""!==e.parallelism&&(o+="<h5>Parallelism: "+e.parallelism+"</h5>"),void 0!==e.lowWatermark&&(o+="<h5>Low Watermark: "+e.lowWatermark+"</h5>"),void 0!==e.operator&&e.operator_strategy&&(o+="<h5>Operation: "+M(e.operator_strategy)+"</h5>")),o+="</div>"},f=function(e,t,r){var n,o;return o="svg-"+e,n="<svg class='"+o+"' width="+t+" height="+r+"><g /></svg>"},M=function(e){var t;for("<"===e.charAt(0)&&(e=e.replace("<","&lt;"),e=e.replace(">","&gt;")),t="";e.length>30;)t=t+e.substring(0,30)+"<br>",e=e.substring(30,e.length);return t+=e},a=function(e,t,r,n,o,i){return null==n&&(n=!1),r.id===t.partial_solution?e.setNode(r.id,{label:s(r,"partialSolution",o,i),labelType:"html","class":g(r,"partialSolution")}):r.id===t.next_partial_solution?e.setNode(r.id,{label:s(r,"nextPartialSolution",o,i),labelType:"html","class":g(r,"nextPartialSolution")}):r.id===t.workset?e.setNode(r.id,{label:s(r,"workset",o,i),labelType:"html","class":g(r,"workset")}):r.id===t.next_workset?e.setNode(r.id,{label:s(r,"nextWorkset",o,i),labelType:"html","class":g(r,"nextWorkset")}):r.id===t.solution_set?e.setNode(r.id,{label:s(r,"solutionSet",o,i),labelType:"html","class":g(r,"solutionSet")}):r.id===t.solution_delta?e.setNode(r.id,{label:s(r,"solutionDelta",o,i),labelType:"html","class":g(r,"solutionDelta")}):e.setNode(r.id,{label:s(r,"",o,i),labelType:"html","class":g(r,"")})},o=function(e,t,r,n,o){return e.setEdge(o.id,r.id,{label:i(o),labelType:"html",arrowhead:"normal"})},k=function(e,t){var r,n,i,s,l,u,d,f,p,g,m,h,b,v;for(n=[],null!=t.nodes?v=t.nodes:(v=t.step_function,i=!0),s=0,u=v.length;s<u;s++)if(r=v[s],p=0,f=0,r.step_function&&(b=new dagreD3.graphlib.Graph({multigraph:!0,compound:!0}).setGraph({nodesep:20,edgesep:0,ranksep:20,rankdir:"LR",marginx:10,marginy:10}),y[r.id]=b,k(b,r),m=new dagreD3.render,c.select("g").call(m,b),p=b.graph().width,f=b.graph().height,angular.element(w).empty()),a(e,t,r,i,p,f),n.push(r.id),null!=r.inputs)for(h=r.inputs,l=0,d=h.length;l<d;l++)g=h[l],o(e,t,r,n,g);return e},J=function(e,t){var r,n,o;for(n in e.nodes){if(r=e.nodes[n],r.id===t)return r;if(null!=r.step_function)for(o in r.step_function)if(r.step_function[o].id===t)return r.step_function[o]}},$=function(e,t){var r,n,o,i;if(!_.isEmpty(t))for(i=e.nodes,r=0,n=i.length;r<n;r++)o=i[r],t[o.id]&&!isNaN(t[o.id].lowWatermark)&&(o.lowWatermark=t[o.id].lowWatermark);return e},b=0,v=0,d=function(){var t,r,n,o,i,s;if(e.plan){p=new dagreD3.graphlib.Graph({multigraph:!0,compound:!0}).setGraph({nodesep:70,edgesep:0,ranksep:50,rankdir:"LR",marginx:40,marginy:40}),k(p,$(e.plan,e.watermarks)),u.selectAll("*").remove(),u.attr("transform","scale(1)"),n=new dagreD3.render,u.call(n,p);for(t in y)o=y[t],l.select("svg.svg-"+t+" g").call(n,o);return r=.5,i=Math.floor((angular.element(S).width()-p.graph().width*r)/2),s=Math.floor((angular.element(S).height()-p.graph().height*r)/2),0!==v&&0!==b?(C.scale(v).translate(b),u.attr("transform","translate("+b+") scale("+v+")")):(C.scale(r).translate([i,s]),u.attr("transform","translate("+i+", "+s+") scale("+C.scale()+")")),C.on("zoom",function(){var e;return e=d3.event,v=e.scale,b=e.translate,u.attr("transform","translate("+b+") scale("+v+")")}),C(l),u.selectAll(".node").on("click",function(t){return e.setNode({nodeid:t})})}},e.$watch(r.plan,function(e){if(e)return d()}),e.$watch(r.watermarks,function(t){if(t&&e.plan)return d()})}}}]),angular.module("flinkApp").service("JobsService",["$http","flinkConfig","$log","amMoment","$q","$timeout",function(e,t,r,n,o,i){var s,a,l,u,c,d;return s=null,a=null,l={},c={running:[],finished:[],cancelled:[],failed:[]},u=[],d=function(){return angular.forEach(u,function(e){return e()})},this.registerObserver=function(e){return u.push(e)},this.unRegisterObserver=function(e){var t;return t=u.indexOf(e),u.splice(t,1)},this.stateList=function(){return["SCHEDULED","DEPLOYING","RUNNING","FINISHED","FAILED","CANCELING","CANCELED"]},this.translateLabelState=function(e){switch(e.toLowerCase()){case"finished":return"success";case"failed":return"danger";case"scheduled":return"default";case"deploying":return"info";case"running":return"primary";case"canceling":return"warning";case"pending":return"info";case"total":return"black";default:return"default"}},this.setEndTimes=function(e){return angular.forEach(e,function(e,t){if(!(e["end-time"]>-1))return e["end-time"]=e["start-time"]+e.duration})},this.processVertices=function(e){return angular.forEach(e.vertices,function(e,t){return e.type="regular"}),e.vertices.unshift({name:"Scheduled","start-time":e.timestamps.CREATED,"end-time":e.timestamps.CREATED+1,type:"scheduled"})},this.listJobs=function(){var r;return r=o.defer(),e.get(t.jobServer+"joboverview").success(function(e){return function(t,n,o,i){return angular.forEach(t,function(t,r){switch(r){case"running":return c.running=e.setEndTimes(t);case"finished":return c.finished=e.setEndTimes(t);case"cancelled":return c.cancelled=e.setEndTimes(t);case"failed":return c.failed=e.setEndTimes(t)}}),r.resolve(c),d()}}(this)),r.promise},this.getJobs=function(e){return c[e]},this.getAllJobs=function(){return c},this.loadJob=function(r){return s=null,l.job=o.defer(),e.get(t.jobServer+"jobs/"+r).success(function(n){return function(o,i,a,u){return n.setEndTimes(o.vertices),n.processVertices(o),e.get(t.jobServer+"jobs/"+r+"/config").success(function(e){return o=angular.extend(o,e),s=o,l.job.resolve(s)})}}(this)),l.job.promise},this.getNode=function(e){var t,r;return r=function(e,t){var n,o,i,s;for(n=0,o=t.length;n<o;n++){if(i=t[n],i.id===e)return i;if(i.step_function&&(s=r(e,i.step_function)),s)return s}return null},t=o.defer(),l.job.promise.then(function(n){return function(o){var i;return i=r(e,s.plan.nodes),i.vertex=n.seekVertex(e),t.resolve(i)}}(this)),t.promise},this.seekVertex=function(e){var t,r,n,o;for(n=s.vertices,t=0,r=n.length;t<r;t++)if(o=n[t],o.id===e)return o;return null},this.getVertex=function(r){var n;return n=o.defer(),l.job.promise.then(function(o){return function(i){var a;return a=o.seekVertex(r),e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r+"/subtasktimes").success(function(e){return a.subtasks=e.subtasks,n.resolve(a)})}}(this)),n.promise},this.getSubtasks=function(r){var n;return n=o.defer(),l.job.promise.then(function(o){return function(o){return e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r).success(function(e){var t;return t=e.subtasks,n.resolve(t)})}}(this)),n.promise},this.getTaskManagers=function(r){var n;return n=o.defer(),l.job.promise.then(function(o){return function(o){return e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r+"/taskmanagers").success(function(e){var t;return t=e.taskmanagers,n.resolve(t)})}}(this)),n.promise},this.getAccumulators=function(r){var n;return n=o.defer(),l.job.promise.then(function(o){return function(o){return console.log(s.jid),e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r+"/accumulators").success(function(o){var i;return i=o["user-accumulators"],e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r+"/subtasks/accumulators").success(function(e){var t;return t=e.subtasks,n.resolve({main:i,subtasks:t})})})}}(this)),n.promise},this.getCheckpointConfig=function(){var r;return r=o.defer(),l.job.promise.then(function(n){return function(n){return e.get(t.jobServer+"jobs/"+s.jid+"/checkpoints/config").success(function(e){return angular.equals({},e)?r.resolve(null):r.resolve(e)})}}(this)),r.promise},this.getCheckpointStats=function(){var r;return r=o.defer(),l.job.promise.then(function(n){return function(n){return e.get(t.jobServer+"jobs/"+s.jid+"/checkpoints").success(function(e,t,n,o){return angular.equals({},e)?r.resolve(null):r.resolve(e)})}}(this)),r.promise},this.getCheckpointDetails=function(r){var n;return n=o.defer(),l.job.promise.then(function(o){return function(o){return e.get(t.jobServer+"jobs/"+s.jid+"/checkpoints/details/"+r).success(function(e){return angular.equals({},e)?n.resolve(null):n.resolve(e)})}}(this)),n.promise},this.getCheckpointSubtaskDetails=function(r,n){var i;return i=o.defer(),l.job.promise.then(function(o){return function(o){return e.get(t.jobServer+"jobs/"+s.jid+"/checkpoints/details/"+r+"/subtasks/"+n).success(function(e){return angular.equals({},e)?i.resolve(null):i.resolve(e)})}}(this)),i.promise},this.getOperatorBackPressure=function(r){var n;return n=o.defer(),e.get(t.jobServer+"jobs/"+s.jid+"/vertices/"+r+"/backpressure").success(function(e){return function(e){return n.resolve(e)}}(this)),n.promise},this.translateBackPressureLabelState=function(e){switch(e.toLowerCase()){case"in-progress":return"danger";case"ok":return"success";case"low":return"warning";case"high":return"danger";default:return"default"}},this.loadExceptions=function(){var r;return r=o.defer(),l.job.promise.then(function(n){return function(n){return e.get(t.jobServer+"jobs/"+s.jid+"/exceptions").success(function(e){return s.exceptions=e,r.resolve(e)})}}(this)),r.promise},this.cancelJob=function(r){return e.get(t.jobServer+"jobs/"+r+"/yarn-cancel")},this.stopJob=function(t){return e.get("jobs/"+t+"/yarn-stop")},this}]),angular.module("flinkApp").directive("metricsGraph",function(){return{template:'<div class="panel panel-default panel-metric"> <div class="panel-heading"> <span class="metric-title">{{metric.id}}</span> <div class="buttons"> <div class="btn-group"> <button type="button" ng-class="[btnClasses, {active: metric.size != \'big\'}]" ng-click="setSize(\'small\')">Small</button> <button type="button" ng-class="[btnClasses, {active: metric.size == \'big\'}]" ng-click="setSize(\'big\')">Big</button> </div> <a title="Remove" class="btn btn-default btn-xs remove" ng-click="removeMetric()"><i class="fa fa-close" /></a> </div> </div> <div class="panel-body"> <svg /> </div> </div>',replace:!0,scope:{metric:"=",window:"=",removeMetric:"&",setMetricSize:"=",getValues:"&"},link:function(e,t,r){return e.btnClasses=["btn","btn-default","btn-xs"],e.value=null,e.data=[{values:e.getValues()}],e.options={x:function(e,t){return e.x},y:function(e,t){return e.y},xTickFormat:function(e){return d3.time.format("%H:%M:%S")(new Date(e))},yTickFormat:function(e){var t,r,n,o;for(r=!1,n=0,o=1,t=Math.abs(e);!r&&n<50;)Math.pow(10,n)<=t&&t<Math.pow(10,n+o)?r=!0:n+=o;return r&&n>6?e/Math.pow(10,n)+"E"+n:""+e}},e.showChart=function(){return d3.select(t.find("svg")[0]).datum(e.data).transition().duration(250).call(e.chart)},e.chart=nv.models.lineChart().options(e.options).showLegend(!1).margin({top:15,left:60,bottom:30,right:30}),e.chart.yAxis.showMaxMin(!1),e.chart.tooltip.hideDelay(0),e.chart.tooltip.contentGenerator(function(e){return"<p>"+d3.time.format("%H:%M:%S")(new Date(e.point.x))+" | "+e.point.y+"</p>"}),nv.utils.windowResize(e.chart.update),e.setSize=function(t){return e.setMetricSize(e.metric,t)},e.showChart(),e.$on("metrics:data:update",function(t,r,n){return e.value=parseFloat(n[e.metric.id]),e.data[0].values.push({x:r,y:e.value}),e.data[0].values.length>e.window&&e.data[0].values.shift(),e.showChart(),e.chart.clearHighlights(),e.chart.tooltip.hidden(!0)}),t.find(".metric-title").qtip({content:{text:e.metric.id},position:{my:"bottom left",at:"top left"},style:{classes:"qtip-light qtip-timeline-bar"}})}}}),angular.module("flinkApp").service("MetricsService",["$http","$q","flinkConfig","$interval",function(e,t,r,n){return this.metrics={},this.values={},this.watched={},this.observer={jobid:null,nodeid:null,callback:null
+},this.refresh=n(function(e){return function(){return angular.forEach(e.metrics,function(t,r){return angular.forEach(t,function(t,n){var o;if(o=[],angular.forEach(t,function(e,t){return o.push(e.id)}),o.length>0)return e.getMetrics(r,n,o).then(function(t){if(r===e.observer.jobid&&n===e.observer.nodeid&&e.observer.callback)return e.observer.callback(t)})})})}}(this),r["refresh-interval"]),this.registerObserver=function(e,t,r){return this.observer.jobid=e,this.observer.nodeid=t,this.observer.callback=r},this.unRegisterObserver=function(){return this.observer={jobid:null,nodeid:null,callback:null}},this.setupMetrics=function(e,t){return this.setupLS(),this.watched[e]=[],angular.forEach(t,function(t){return function(r,n){if(r.id)return t.watched[e].push(r.id)}}(this))},this.getWindow=function(){return 100},this.setupLS=function(){return null==sessionStorage.flinkMetrics&&this.saveSetup(),this.metrics=JSON.parse(sessionStorage.flinkMetrics)},this.saveSetup=function(){return sessionStorage.flinkMetrics=JSON.stringify(this.metrics)},this.saveValue=function(e,t,r){if(null==this.values[e]&&(this.values[e]={}),null==this.values[e][t]&&(this.values[e][t]=[]),this.values[e][t].push(r),this.values[e][t].length>this.getWindow())return this.values[e][t].shift()},this.getValues=function(e,t,r){var n;return null==this.values[e]?[]:null==this.values[e][t]?[]:(n=[],angular.forEach(this.values[e][t],function(e){return function(e,t){if(null!=e.values[r])return n.push({x:e.timestamp,y:e.values[r]})}}(this)),n)},this.setupLSFor=function(e,t){if(null==this.metrics[e]&&(this.metrics[e]={}),null==this.metrics[e][t])return this.metrics[e][t]=[]},this.addMetric=function(e,t,r){return this.setupLSFor(e,t),this.metrics[e][t].push({id:r,size:"small"}),this.saveSetup()},this.removeMetric=function(e){return function(t,r,n){var o;if(null!=e.metrics[t][r])return o=e.metrics[t][r].indexOf(n),o===-1&&(o=_.findIndex(e.metrics[t][r],{id:n})),o!==-1&&e.metrics[t][r].splice(o,1),e.saveSetup()}}(this),this.setMetricSize=function(e){return function(t,r,n,o){var i;if(null!=e.metrics[t][r])return i=e.metrics[t][r].indexOf(n.id),i===-1&&(i=_.findIndex(e.metrics[t][r],{id:n.id})),i!==-1&&(e.metrics[t][r][i]={id:n.id,size:o}),e.saveSetup()}}(this),this.orderMetrics=function(e,t,r,n){return this.setupLSFor(e,t),angular.forEach(this.metrics[e][t],function(o){return function(i,s){if(i.id===r.id&&(o.metrics[e][t].splice(s,1),s<n))return n-=1}}(this)),this.metrics[e][t].splice(n,0,r),this.saveSetup()},this.getMetricsSetup=function(e){return function(t,r){return{names:_.map(e.metrics[t][r],function(e){return _.isString(e)?{id:e,size:"small"}:e})}}}(this),this.getAvailableMetrics=function(n){return function(o,i){var s;return n.setupLSFor(o,i),s=t.defer(),e.get(r.jobServer+"jobs/"+o+"/vertices/"+i+"/metrics").success(function(e){var t;return t=[],angular.forEach(e,function(e,r){var s;if(s=n.metrics[o][i].indexOf(e.id),s===-1&&(s=_.findIndex(n.metrics[o][i],{id:e.id})),s===-1)return t.push(e)}),s.resolve(t)}),s.promise}}(this),this.getAllAvailableMetrics=function(n){return function(n,o){var i;return i=t.defer(),e.get(r.jobServer+"jobs/"+n+"/vertices/"+o+"/metrics").success(function(e){return i.resolve(e)}),i.promise}}(this),this.getMetrics=function(n,o,i){var s,a;return s=t.defer(),a=i.join(","),e.get(r.jobServer+"jobs/"+n+"/vertices/"+o+"/metrics?get="+a).success(function(e){return function(t){var r,i;return i={},angular.forEach(t,function(e,t){return i[e.id]=parseInt(e.value)}),r={timestamp:Date.now(),values:i},e.saveValue(n,o,r),s.resolve(r)}}(this)),s.promise},this.setupLS(),this}]),angular.module("flinkApp").controller("JobSubmitController",["$scope","JobSubmitService","$interval","flinkConfig","$state","$location",function(e,t,r,n,o,i){var s;return e.yarn=i.absUrl().indexOf("/proxy/application_")!==-1,e.loadList=function(){return t.loadJarList().then(function(t){return e.address=t.address,e.noaccess=t.error,e.jars=t.files})},e.defaultState=function(){return e.plan=null,e.error=null,e.state={selected:null,parallelism:"",savepointPath:"",allowNonRestoredState:!1,"entry-class":"","program-args":"","plan-button":"Show Plan","submit-button":"Submit","action-time":0}},e.defaultState(),e.uploader={},e.loadList(),s=r(function(){return e.loadList()},n["refresh-interval"]),e.$on("$destroy",function(){return r.cancel(s)}),e.selectJar=function(t){return e.state.selected===t?e.defaultState():(e.defaultState(),e.state.selected=t)},e.deleteJar=function(r,n){return e.state.selected===n&&e.defaultState(),angular.element(r.currentTarget).removeClass("fa-remove").addClass("fa-spin fa-spinner"),t.deleteJar(n).then(function(e){if(angular.element(r.currentTarget).removeClass("fa-spin fa-spinner").addClass("fa-remove"),null!=e.error)return alert(e.error)})},e.loadEntryClass=function(t){return e.state["entry-class"]=t},e.getPlan=function(){var r;if("Show Plan"===e.state["plan-button"])return r=(new Date).getTime(),e.state["action-time"]=r,e.state["submit-button"]="Submit",e.state["plan-button"]="Getting Plan",e.error=null,e.plan=null,t.getPlan(e.state.selected,{"entry-class":e.state["entry-class"],parallelism:e.state.parallelism,"program-args":e.state["program-args"]}).then(function(t){if(r===e.state["action-time"])return e.state["plan-button"]="Show Plan",e.error=t.error,e.plan=t.plan})},e.runJob=function(){var r;if("Submit"===e.state["submit-button"])return r=(new Date).getTime(),e.state["action-time"]=r,e.state["submit-button"]="Submitting",e.state["plan-button"]="Show Plan",e.error=null,t.runJob(e.state.selected,{"entry-class":e.state["entry-class"],parallelism:e.state.parallelism,"program-args":e.state["program-args"],savepointPath:e.state.savepointPath,allowNonRestoredState:e.state.allowNonRestoredState}).then(function(t){if(r===e.state["action-time"]&&(e.state["submit-button"]="Submit",e.error=t.error,null!=t.jobid))return o.go("single-job.plan.subtasks",{jobid:t.jobid})})},e.nodeid=null,e.changeNode=function(t){return t!==e.nodeid?(e.nodeid=t,e.vertex=null,e.subtasks=null,e.accumulators=null,e.$broadcast("reload")):(e.nodeid=null,e.nodeUnfolded=!1,e.vertex=null,e.subtasks=null,e.accumulators=null)},e.clearFiles=function(){return e.uploader={}},e.uploadFiles=function(t){return e.uploader={},1===t.length?(e.uploader.file=t[0],e.uploader.upload=!0):e.uploader.error="Did ya forget to select a file?"},e.startUpload=function(){var t,r;return null!=e.uploader.file?(t=new FormData,t.append("jarfile",e.uploader.file),e.uploader.upload=!1,e.uploader.success="Initializing upload...",r=new XMLHttpRequest,r.upload.onprogress=function(t){return e.uploader.success=null,e.uploader.progress=parseInt(100*t.loaded/t.total)},r.upload.onerror=function(t){return e.uploader.progress=null,e.uploader.error="An error occurred while uploading your file"},r.upload.onload=function(t){return e.uploader.progress=null,e.uploader.success="Saving..."},r.onreadystatechange=function(){var t;if(4===r.readyState)return t=JSON.parse(r.responseText),null!=t.error?(e.uploader.error=t.error,e.uploader.success=null):e.uploader.success="Uploaded!"},r.open("POST",n.jobServer+"jars/upload"),r.send(t)):console.log("Unexpected Error. This should not happen")}}]).filter("getJarSelectClass",function(){return function(e,t){return e===t?"fa-check-square":"fa-square-o"}}),angular.module("flinkApp").service("JobSubmitService",["$http","flinkConfig","$q",function(e,t,r){return this.loadJarList=function(){var n;return n=r.defer(),e.get(t.jobServer+"jars/").success(function(e,t,r,o){return n.resolve(e)}),n.promise},this.deleteJar=function(n){var o;return o=r.defer(),e["delete"](t.jobServer+"jars/"+encodeURIComponent(n)).success(function(e,t,r,n){return o.resolve(e)}),o.promise},this.getPlan=function(n,o){var i;return i=r.defer(),e.get(t.jobServer+"jars/"+encodeURIComponent(n)+"/plan",{params:o}).success(function(e,t,r,n){return i.resolve(e)}),i.promise},this.runJob=function(n,o){var i;return i=r.defer(),e.post(t.jobServer+"jars/"+encodeURIComponent(n)+"/run",{},{params:o}).success(function(e,t,r,n){return i.resolve(e)}),i.promise},this}]),angular.module("flinkApp").controller("OverviewController",["$scope","OverviewService","JobsService","$interval","flinkConfig",function(e,t,r,n,o){var i;return e.jobObserver=function(){return e.runningJobs=r.getJobs("running"),e.finishedJobs=r.getJobs("finished")},r.registerObserver(e.jobObserver),e.$on("$destroy",function(){return r.unRegisterObserver(e.jobObserver)}),e.jobObserver(),t.loadOverview().then(function(t){return e.overview=t}),i=n(function(){return t.loadOverview().then(function(t){return e.overview=t})},o["refresh-interval"]),e.$on("$destroy",function(){return n.cancel(i)})}]),angular.module("flinkApp").service("OverviewService",["$http","flinkConfig","$q",function(e,t,r){var n;return n={},this.loadOverview=function(){var o;return o=r.defer(),e.get(t.jobServer+"overview").success(function(e,t,r,i){return n=e,o.resolve(e)}),o.promise},this}]),angular.module("flinkApp").controller("AllTaskManagersController",["$scope","TaskManagersService","$interval","flinkConfig",function(e,t,r,n){var o;return t.loadManagers().then(function(t){return e.managers=t}),o=r(function(){return t.loadManagers().then(function(t){return e.managers=t})},n["refresh-interval"]),e.$on("$destroy",function(){return r.cancel(o)})}]).controller("SingleTaskManagerController",["$scope","$stateParams","SingleTaskManagerService","$interval","flinkConfig",function(e,t,r,n,o){var i;return e.metrics={},r.loadMetrics(t.taskmanagerid).then(function(t){return e.metrics=t[0]}),i=n(function(){return r.loadMetrics(t.taskmanagerid).then(function(t){return e.metrics=t[0]})},o["refresh-interval"]),e.$on("$destroy",function(){return n.cancel(i)})}]).controller("SingleTaskManagerLogsController",["$scope","$stateParams","SingleTaskManagerService","$interval","flinkConfig",function(e,t,r,n,o){return e.log={},e.taskmanagerid=t.taskmanagerid,r.loadLogs(t.taskmanagerid).then(function(t){return e.log=t}),e.reloadData=function(){return r.loadLogs(t.taskmanagerid).then(function(t){return e.log=t})}}]).controller("SingleTaskManagerStdoutController",["$scope","$stateParams","SingleTaskManagerService","$interval","flinkConfig",function(e,t,r,n,o){return e.stdout={},e.taskmanagerid=t.taskmanagerid,r.loadStdout(t.taskmanagerid).then(function(t){return e.stdout=t}),e.reloadData=function(){return r.loadStdout(t.taskmanagerid).then(function(t){return e.stdout=t})}}]),angular.module("flinkApp").service("TaskManagersService",["$http","flinkConfig","$q",function(e,t,r){return this.loadManagers=function(){var n;return n=r.defer(),e.get(t.jobServer+"taskmanagers").success(function(e,t,r,o){return n.resolve(e.taskmanagers)}),n.promise},this}]).service("SingleTaskManagerService",["$http","flinkConfig","$q",function(e,t,r){return this.loadMetrics=function(n){var o;return o=r.defer(),e.get(t.jobServer+"taskmanagers/"+n).success(function(e,t,r,n){return o.resolve(e.taskmanagers)}),o.promise},this.loadLogs=function(n){var o;return o=r.defer(),e.get(t.jobServer+"taskmanagers/"+n+"/log").success(function(e,t,r,n){return o.resolve(e)}),o.promise},this.loadStdout=function(n){var o;return o=r.defer(),e.get(t.jobServer+"taskmanagers/"+n+"/stdout").success(function(e,t,r,n){return o.resolve(e)}),o.promise},this}]);
\ No newline at end of file

From 5d58c9ce0561ea3bfe4532ce664513f0f6f19aa5 Mon Sep 17 00:00:00 2001
From: zentol <chesnay@apache.org>
Date: Tue, 21 Mar 2017 10:35:54 +0100
Subject: [PATCH 4/4] fix caching

---
 .../history/HistoryServerStaticFileServerHandler.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
index 77b69edc59619..31e9bbcd355b9 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/history/HistoryServerStaticFileServerHandler.java
@@ -211,7 +211,7 @@ private void respondWithFile(ChannelHandlerContext ctx, HttpRequest request, Str
 		StaticFileServerHandler.setContentTypeHeader(response, file);
 
 		// the job overview should be updated as soon as possible
-		if (!requestPath.equals("/joboverview")) {
+		if (!requestPath.equals("/joboverview.json")) {
 			StaticFileServerHandler.setDateAndCacheHeaders(response, file);
 		}
 		if (HttpHeaders.isKeepAlive(request)) {