http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-clients/src/main/resources/web-docs/js/program.js ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/resources/web-docs/js/program.js b/flink-clients/src/main/resources/web-docs/js/program.js new file mode 100644 index 0000000..c443dab --- /dev/null +++ b/flink-clients/src/main/resources/web-docs/js/program.js @@ -0,0 +1,240 @@ +/*! + * 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. + */ + +var maxColumnWidth = 200; +var minColumnWidth = 100; + +// global variable for the currently requested plan +var pactPlanRequested = 0; + +/* + * This function toggels the child checkbox on and of, depending on the parent's state + */ +function toggleShowPlanBox(box) +{ + var child = $('#suspendJobDuringPlanCheck'); + + if (box.is(':checked')) { + child.attr('disabled', false); + } + else { + child.attr('disabled', true); + } +} + +/* + * Shows an error message below the upload field. + */ +function showUploadError(message) +{ + $('#upload_error_text').fadeOut("fast", function () { $('#upload_error_text')[0].innerHTML = "" + message; + $('#upload_error_text').fadeIn("slow"); } ); +} + +/* + * Checks the selected file and triggers an upload, if all is correct. + */ +function processUpload() +{ + + var filename = $('#upload_file_input').val(); + var len = filename.length; + if (len == 0) { + showUploadError("Please select a file."); + } + else if (len > 4 && filename.substr(len - 4, len) == ".jar") { + $('#upload_form')[0].submit(); + } + else { + showUploadError("Please select a .jar file."); + } +} + +/* + * This function makes sure only one checkbox is selected. + * Upon selection it initializes the drawing of the pact plan. + * Upon deselection, it clears the pact plan. + */ +function toggleCheckboxes(box) +{ + + if (box.is(':checked')) { + $('.jobItemCheckbox').attr('checked', false); + box.attr('checked', true); + var id = box.parentsUntil('.JobListItems').parent().attr('id').substr(4); + + $('#mainCanvas').html(''); + $('#planDescription').html(''); + pactPlanRequested = id; + + $.ajax({ + type: "GET", + url: "pactPlan", + data: { job: id }, + success: function(response) { showPreviewPlan(response); } + }); + } + else { + $('#mainCanvas').html(''); + $('#planplanDescription').html(''); + } +} + +/* + * Function that takes the returned plan and draws it. + */ +function showPreviewPlan(data) +{ + //TODO check again the stuff below +// // check whether this one is still selected +// var active = $('.jobItemCheckbox:checked'); +// var id = active.parentsUntil('.JobListItems').parent().attr('id').substr(4); +// +// if (pactPlanRequested == id) { +// if (data == undefined || data.jobname == undefined || data.jobname != pactPlanRequested || data.plan == undefined) { +// pactPlanRequested = 0; +// } +// +// if(data.description != undefined) { +// $('#planDescription').html(data.description); +// } + + $("#mainCanvas").empty(); + var svgElement = "<div id=\"attach\"><svg id=\"svg-main\" width=500 height=500><g transform=\"translate(20, 20)\"/></svg></div>"; + $("#mainCanvas").append(svgElement); + drawGraph(data.plan, "#svg-main"); + pactPlanRequested = 0; + + //activate zoom buttons + activateZoomButtons(); +// } +} + +/* + * Asynchronously loads the jobs and creates a list of them. + */ +function loadJobList() +{ + $.get("jobs", { action: "list" }, createJobList); +} + +/* + * Triggers an AJAX request to delete a job. + */ +function deleteJob(id) +{ + var name = id.substr(4); + $.get("jobs", { action: "delete", filename: name }, loadJobList); +} + +/* + * Creates and lists the returned jobs. + */ +function createJobList(data) +{ + var markup = ""; + + var lines = data.split("\n"); + for (var i = 0; i < lines.length; i++) + { + if (lines[i] == null || lines[i].length == 0) { + continue; + + } + + var name = null; + var date = null; + var tabIx = lines[i].indexOf("\t"); + + if (tabIx > 0) { + name = lines[i].substr(0, tabIx); + if (tabIx < lines[i].length - 1) { + date = lines[i].substr(tabIx + 1); + } + else { + date = "unknown date"; + } + } + else { + name = lines[i]; + date = "unknown date"; + } + + + markup += '<div id="job_' + name + '" class="JobListItems"><table class="table"><tr>'; + markup += '<td width="30px;"><input class="jobItemCheckbox" type="checkbox"></td>'; + markup += '<td><p class="JobListItemsName">' + name + '</p></td>'; + markup += '<td><p class="JobListItemsDate">' + date + '</p></td>'; + markup += '<td width="30px"><img class="jobItemDeleteIcon" src="img/delete-icon.png" width="24" height="24" /></td>'; + markup += '</tr></table></div>'; + } + + // add the contents + $('#jobsContents').html(markup); + + // register the event handler that triggers the delete when the delete icon is clicked + $('.jobItemDeleteIcon').click(function () { deleteJob($(this).parentsUntil('.JobListItems').parent().attr('id')); } ); + + // register the event handler, that ensures only one checkbox is active + $('.jobItemCheckbox').change(function () { toggleCheckboxes($(this)) }); +} + +/* + * Function that checks and launches a pact job. + */ +function runJob () +{ + var job = $('.jobItemCheckbox:checked'); + if (job.length == 0) { + $('#run_error_text').fadeOut("fast", function () { $('#run_error_text')[0].innerHTML = "Select a job to run."; + $('#run_error_text').fadeIn("slow"); } ); + return; + } + + var jobName = job.parentsUntil('.JobListItems').parent().attr('id').substr(4); + var showPlan = $('#showPlanCheck').is(':checked'); + var suspendPlan = $('#suspendJobDuringPlanCheck').is(':checked'); + var args = $('#commandLineArgsField').attr('value'); //TODO? Replace with .val() ? + + var url = "runJob?" + $.param({ action: "submit", job: jobName, arguments: args, show_plan: showPlan, suspend: suspendPlan}); + + window.location = url; +} + +/* + * Document initialization. + */ +$(document).ready(function () +{ + // hide the error text sections + $('#upload_error_text').fadeOut("fast"); + $('#run_error_text').fadeOut("fast"); + + // register the event listener that keeps the hidden file form and the text fied in sync + $('#upload_file_input').change(function () { $('#upload_file_name_text').val($(this).val()) } ); + + // register the event handler for the upload button + $('#upload_submit_button').click(processUpload); + $('#run_button').click(runJob); + + // register the event handler that (in)activates the plan display checkbox + $('#showPlanCheck').change(function () { toggleShowPlanBox ($(this)); }); + + // start the ajax load of the jobs + loadJobList(); +});
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-clients/src/main/resources/web-docs/launch.html ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/resources/web-docs/launch.html b/flink-clients/src/main/resources/web-docs/launch.html new file mode 100755 index 0000000..7564177 --- /dev/null +++ b/flink-clients/src/main/resources/web-docs/launch.html @@ -0,0 +1,110 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<!-- +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. +--> +<html> + +<head> + <title>Flink Query Interface</title> + + <meta http-equiv="content-type" content="text/html; charset=UTF-8"> + + <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" /> + <link rel="stylesheet" type="text/css" href="css/pactgraphs.css" /> + <link rel="stylesheet" type="text/css" href="css/graph.css" /> + <link rel="stylesheet" type="text/css" href="css/overlay.css" /> + <link rel="stylesheet" type="text/css" href="css/bootstrap.css" /> <!-- Changed Stuff --> + <script type="text/javascript" src="js/jquery-2.1.0.js"></script> + <script type="text/javascript" src="js/graphCreator.js"></script> + <script type="text/javascript" src="js/d3.js" charset="utf-8"></script> + <script type="text/javascript" src="js/dagre-d3.js"></script> + <script type="text/javascript" src="js/bootstrap.min.js"></script> + <script type="text/javascript" src="js/jquery.tools.min.js"></script> + + + <script type="text/javascript" src="js/program.js"></script> + +</head> + +<body> + <div class="mainHeading" style="min-width: 1225px;"> + <h1 style="margin-top:0"><img src="img/flink-logo.png" width="100" height="100" alt="Flink Logo" />Flink Web Submission Client + <div style="position:absolute; top:40px; right:110px;"> + <button id="zoomIn" type="button" class="btn btn-default">Zoom In</button> + <button id="zoomOut" type="button" class="btn btn-default">Zoom Out</button> + </div> + </h1> + </div> + + <!-- the main panel with the jobs list and the preview pane --> + <div style="position: absolute; top: 110px; bottom: 210px; left: 0px; right: 0px; min-width: 1225px;"> + <div id="jobsContents" class="boxed" style="position: absolute; top: 0px; bottom: 0px; left: 0px; width: 450px; overflow: auto;"></div> + <div class="boxed" style="position: absolute; top: 0px; bottom: 0px; left: 460px; right: 0px; overflow: auto;"> + <div id="mainCanvas" class="canvas" style="position: relative; height: 100%"></div> + </div> + </div> + + <!-- the footer containing the box with the run properties and the box with the upload field --> + <div class="footer" style="min-width: 1225px;"> + + <div class="boxed" style="float: left; width: 700px; height: 200px; position: relative;"> + <h3>Select program...</h3> + <div style="margin-top: 30px;"> + <div> + <div id="planDescription"></div> + </div> + <div style="text-align: right;"> + <span class="formLabel">Arguments:</span> + <input id="commandLineArgsField" type="text" name="commandLine" style="width: 580px;"/> + </div> + <div class="spaced" style="margin-left: 20px;"> + <input type="checkbox" id="showPlanCheck" checked="checked"><span class="formLabel">Show optimizer plan</span> + <div id="suspendOption"><span> </span><input type="checkbox" id="suspendJobDuringPlanCheck" checked="checked"><span class="formLabel">Suspend execution while showing plan</span></div> + </div> + </div> + <div class="footer" style="text-align: right;"> + <span id="run_error_text" class="error_text"></span> + <input id="run_button" type="button" value="Run Job" style="width: 75px; margin-left: 100px;"/> + </div> + </div> + + <div class="boxed" style="float: left; width: 500px; height: 150px; position: relative;"> + <h3>Select a new program to upload...</h3> + <form id="upload_form" action="jobs" enctype="multipart/form-data" method="POST"> + <div style="position: relative; margin-top: 30px;"> + <input id="upload_file_name_text" type="text" name="file_name" disabled="disabled" style="position: absolute; top: 0px; right: 85px; width: 380px; z-index: 3;"/> + <input type="button" value="Browse" style="width: 75px; position: absolute; right: 0px; top: 0px; z-index: 1;" /> + <input id="upload_file_input" class="translucent" type="file" name="upload_jar_file" style="position: absolute; right: 0px; top: 0px; height: 30px; width=75px; z-index: 2;" /> + </div> + </form> + <div class="footer" style="text-align: right;"> + <span id="upload_error_text" class="error_text"></span> + <input id="upload_submit_button" type="button" value="Upload" style="width: 75px; margin-left: 100px;"/> + </div> + </div> + + </div> + + <!-- the overlay --> + <div class="simple_overlay" id="propertyO"> + <div id="propertyCanvas" class="propertyCanvas"> + </div> + </div> +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java index 386ae5e..4e87581 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java @@ -250,11 +250,6 @@ public final class ConfigConstants { public static final String JOB_MANAGER_WEB_PORT_KEY = "jobmanager.web.port"; /** - * The parameter defining the directory containing the web documents for the jobmanager web frontend. - */ - public static final String JOB_MANAGER_WEB_ROOT_PATH_KEY = "jobmanager.web.rootpath"; - - /** * The config parameter defining the path to the htaccess file protecting the web frontend. */ public static final String JOB_MANAGER_WEB_ACCESS_FILE_KEY = "jobmanager.web.access"; @@ -275,11 +270,6 @@ public final class ConfigConstants { public static final String WEB_FRONTEND_PORT_KEY = "webclient.port"; /** - * The config parameter defining the directory containing the web documents. - */ - public static final String WEB_ROOT_PATH_KEY = "webclient.rootpath"; - - /** * The config parameter defining the temporary data directory for the web client. */ public static final String WEB_TMP_DIR_KEY = "webclient.tempdir"; @@ -299,9 +289,6 @@ public final class ConfigConstants { */ public static final String WEB_ACCESS_FILE_KEY = "webclient.access"; - // ----------------------------- YARN Client ---------------------------- - - public static final String YARN_AM_PRC_PORT = "yarn.am.rpc.port"; // ------------------------------ AKKA ------------------------------------ @@ -550,16 +537,6 @@ public final class ConfigConstants { public static final int DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT = 8081; /** - * The default directory name of the info server - */ - public static final String DEFAULT_JOB_MANAGER_WEB_PATH_NAME = "web-docs-infoserver"; - - /** - * The default path of the directory for info server containing the web documents. - */ - public static final String DEFAULT_JOB_MANAGER_WEB_ROOT_PATH = "./resources/"+DEFAULT_JOB_MANAGER_WEB_PATH_NAME+"/"; - - /** * The default number of archived jobs for the jobmanager */ public static final int DEFAULT_JOB_MANAGER_WEB_ARCHIVE_COUNT = 5; @@ -573,11 +550,6 @@ public final class ConfigConstants { public static final int DEFAULT_WEBCLIENT_PORT = 8080; /** - * The default path of the directory containing the web documents. - */ - public static final String DEFAULT_WEB_ROOT_DIR = "./resources/web-docs/"; - - /** * The default directory to store temporary objects (e.g. during file uploads). */ public static final String DEFAULT_WEB_TMP_DIR = System.getProperty("java.io.tmpdir") == null ? "/tmp" : System @@ -599,10 +571,6 @@ public final class ConfigConstants { */ public static final String DEFAULT_WEB_ACCESS_FILE_PATH = null; - // ----------------------------- YARN ---------------------------- - - public static final int DEFAULT_YARN_AM_RPC_PORT = 10245; - // ------------------------------ Akka Values ------------------------------ public static String DEFAULT_AKKA_TRANSPORT_HEARTBEAT_INTERVAL = "1000 ms"; @@ -635,19 +603,6 @@ public final class ConfigConstants { */ public static final String LOCAL_INSTANCE_MANAGER_NUMBER_TASK_MANAGER = "localinstancemanager.numtaskmanager"; - - // ----------------------------- Deprecated -------------------------------- - - /** - * The default definition for an instance type, if no other configuration is provided. - */ - public static final String DEFAULT_INSTANCE_TYPE = "default,1,1,1,1,0"; // minimalistic instance type until "cloud" model is fully removed. - - /** - * The default index for the default instance type. - */ - public static final int DEFAULT_DEFAULT_INSTANCE_TYPE_INDEX = 1; - // ------------------------------------------------------------------------ /** http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 17e17da..93c0667 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -31,7 +31,7 @@ under the License. <artifactId>flink-dist</artifactId> <name>flink-dist</name> - <packaging>pom</packaging> + <packaging>jar</packaging> <dependencies> <!-- BINARIES --> @@ -162,35 +162,71 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4</version><!--$NO-MVN-MAN-VER$--> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> <executions> - <!-- Uber-jar --> <execution> - <id>uber-jar</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>shade</goal> </goals> - <configuration> - <archiverConfig> - <!-- https://jira.codehaus.org/browse/MASSEMBLY-449 --> - <fileMode>420</fileMode> <!-- 420(dec) = 644(oct) --> - <directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) --> - <defaultDirectoryMode>493</defaultDirectoryMode> - </archiverConfig> - <archive> - <manifest> - <mainClass>org.apache.flink.yarn.Client</mainClass> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - <descriptors> - <descriptor>src/main/assemblies/yarn-uberjar.xml</descriptor> - </descriptors> + <configuration combine.self="override"> + <shadedArtifactAttached>false</shadedArtifactAttached> + <finalName>${project.artifactId}-${project.version}-yarn-uberjar</finalName> + <artifactSet> + <excludes> + <exclude>org.apache.flink:flink-java-examples</exclude> + <exclude>org.apache.flink:flink-scala-examples</exclude> + <exclude>org.apache.flink:flink-streaming-examples</exclude> + </excludes> + </artifactSet> + <transformers> + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource>reference.conf</resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Main-Class>org.apache.flink.yarn.Client</Main-Class> + </manifestEntries> + </transformer> + </transformers> </configuration> </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.4</version> + <executions> + <!--<!– Uber-jar –>--> + <!--<execution>--> + <!--<id>uber-jar</id>--> + <!--<phase>package</phase>--> + <!--<goals>--> + <!--<goal>single</goal>--> + <!--</goals>--> + <!--<configuration>--> + <!--<archiverConfig>--> + <!--<!– https://jira.codehaus.org/browse/MASSEMBLY-449 –>--> + <!--<fileMode>420</fileMode> <!– 420(dec) = 644(oct) –>--> + <!--<directoryMode>493</directoryMode> <!– 493(dec) = 755(oct) –>--> + <!--<defaultDirectoryMode>493</defaultDirectoryMode>--> + <!--</archiverConfig>--> + <!--<archive>--> + <!--<manifest>--> + <!--<mainClass>org.apache.flink.yarn.Client</mainClass>--> + <!--<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>--> + <!--<addDefaultImplementationEntries>true</addDefaultImplementationEntries>--> + <!--</manifest>--> + <!--</archive>--> + <!--<descriptors>--> + <!--<descriptor>src/main/assemblies/yarn-uberjar.xml</descriptor>--> + <!--</descriptors>--> + <!--</configuration>--> + <!--</execution>--> <!-- yarn bin directory --> <execution> http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-dist/src/main/assemblies/bin.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml index 0dc0196..18c8b3d 100644 --- a/flink-dist/src/main/assemblies/bin.xml +++ b/flink-dist/src/main/assemblies/bin.xml @@ -103,26 +103,6 @@ under the License. <fileMode>0644</fileMode> </fileSet> - <fileSet> - <!-- copy files for compiler web frontend --> - <directory>../flink-clients/resources</directory> - <outputDirectory>resources</outputDirectory> - <fileMode>0644</fileMode> - <excludes> - <exclude>*etc/users</exclude> - </excludes> - </fileSet> - - <fileSet> - <!-- copy files for Jobmanager web frontend --> - <directory>../flink-runtime/resources</directory> - <outputDirectory>resources</outputDirectory> - <fileMode>0644</fileMode> - <excludes> - <exclude>*etc/users</exclude> - </excludes> - </fileSet> - <!-- copy the tools --> <fileSet> <directory>src/main/flink-bin/tools</directory> http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-dist/src/main/assemblies/yarn-uberjar.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/yarn-uberjar.xml b/flink-dist/src/main/assemblies/yarn-uberjar.xml index 54be9de..d677230 100644 --- a/flink-dist/src/main/assemblies/yarn-uberjar.xml +++ b/flink-dist/src/main/assemblies/yarn-uberjar.xml @@ -56,16 +56,6 @@ under the License. <fileSets> <!-- copy files for Jobmanager web frontend --> <fileSet> - <directory>../nephele/nephele-server/resources</directory> - <outputDirectory>resources</outputDirectory> - <fileMode>0644</fileMode> - <excludes> - <exclude>*etc/users</exclude> - </excludes> - </fileSet> - - <!-- copy files for Jobmanager web frontend --> - <fileSet> <directory>../flink-runtime/resources</directory> <outputDirectory>resources</outputDirectory> <fileMode>0644</fileMode> http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-dist/src/main/flink-bin/LICENSE ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE index 133aeaf..5183b59 100644 --- a/flink-dist/src/main/flink-bin/LICENSE +++ b/flink-dist/src/main/flink-bin/LICENSE @@ -367,7 +367,7 @@ The Apache Flink project bundles the following fonts under the Open Font License (OFT) - http://scripts.sil.org/OFL/ - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy - -> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts" + -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts" ----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-dist/src/main/resources/flink-conf.yaml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml new file mode 100644 index 0000000..65a87b9 --- /dev/null +++ b/flink-dist/src/main/resources/flink-conf.yaml @@ -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. +################################################################################ + + +#============================================================================== +# Common +#============================================================================== + +jobmanager.rpc.address: localhost + +jobmanager.rpc.port: 6123 + +jobmanager.heap.mb: 256 + +taskmanager.heap.mb: 512 + +taskmanager.numberOfTaskSlots: -1 + +parallelization.degree.default: 1 + +#============================================================================== +# Web Frontend +#============================================================================== + +jobmanager.web.port: 8081 + +webclient.port: 8080 + +#============================================================================== +# Advanced +#============================================================================== + +# The number of buffers for the network stack. +# +# taskmanager.network.numberOfBuffers: 2048 + +# Directories for temporary files. +# +# Add a delimited list for multiple directories, using the system directory +# delimiter (colon ':' on unix) or a comma, e.g.: +# /data1/tmp:/data2/tmp:/data3/tmp +# +# Note: Each directory entry is read from and written to by a different I/O +# thread. You can include the same directory multiple times in order to create +# multiple I/O threads against that directory. This is for example relevant for +# high-throughput RAIDs. +# +# If not specified, the system-specific Java temporary directory (java.io.tmpdir +# property) is taken. +# +# taskmanager.tmp.dirs: /tmp + +# Path to the Hadoop configuration directory. +# +# This configuration is used when writing into HDFS. Unless specified otherwise, +# HDFS file creation will use HDFS default settings with respect to block-size, +# replication factor, etc. +# +# You can also directly specify the paths to hdfs-default.xml and hdfs-site.xml +# via keys 'fs.hdfs.hdfsdefault' and 'fs.hdfs.hdfssite'. +# +# fs.hdfs.hadoopconf: /path/to/hadoop/conf/ http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-runtime/resources/web-docs-infoserver/analyze.html ---------------------------------------------------------------------- diff --git a/flink-runtime/resources/web-docs-infoserver/analyze.html b/flink-runtime/resources/web-docs-infoserver/analyze.html deleted file mode 100644 index 998542e..0000000 --- a/flink-runtime/resources/web-docs-infoserver/analyze.html +++ /dev/null @@ -1,155 +0,0 @@ -<!DOCTYPE html> -<!-- -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. ---> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <title>Dashboard - Apache Flink</title> - - <!-- Bootstrap core CSS --> - <link href="css/bootstrap.css" rel="stylesheet"> - - <!-- Add custom CSS here --> - <link href="css/sb-admin.css" rel="stylesheet"> - <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css"> - - <!-- Page Specific CSS --> - <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" /> - <link rel="stylesheet" type="text/css" href="css/timeline.css"> - - <!-- Scripts from Google --> - <!-- This should be loaded first to ensure the availability of google.load for the scripts --> - <script type="text/javascript" src="https://www.google.com/jsapi";></script> - - <!-- Scripts from Bootstrap --> - <script src="js/jquery-2.1.0.js"></script> - <script src="js/bootstrap.js"></script> - - <!-- Scripts from Flink --> - <script type="text/javascript" src="js/jquery.flot.min.js"></script> - <script type="text/javascript" src="js/helpers.js"></script> - <script type="text/javascript" src="js/jcanvas.min.js"></script> - <script type="text/javascript" src="js/timeline.js"></script> - <script type="text/javascript" src="js/helpers.js"></script> - <script type="text/javascript" src="js/analyzer.js"></script> - - <!-- Load Menu --> - <script type="text/javascript"> - $(document).ready(function() { - $.ajax({ url : "menu?get=analyze", type : "GET", cache: false, success : function(html) { - $("#side-menu").empty(); - $("#side-menu").append(html); - }, dataType : "html", - }); - }); - </script> - </head> - - <body> - - <div id="wrapper"> - - <!-- Sidebar --> - <nav class='navbar navbar-inverse navbar-fixed-top' role='navigation'> - <!-- Brand and toggle get grouped for better mobile display --> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <table> - <tr> - <td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td> - <td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td> - </tr> - </table> - </div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> - <ul id="side-menu" class="nav navbar-nav side-nav"> - <!-- Filled via script --> - </ul> - <ul class="nav navbar-nav navbar-right navbar-user"> - <li class="dropdown user-dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li> - <li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li> - </ul> - </li> - </ul> - </div><!-- /.navbar-collapse --> - </nav> - - <div id="page-wrapper"> - <div class="panel panel-primary"> - <div class="panel-heading"> - <h3 id="jobtitle" class="panel-title"> Running Jobs</h3> - </div> - <div id="jobs" class="panel-body"> - <div id="started"> - Scheduled: <span id="time"></span> - </div> - <div id="runtime"> - Runtime: <span id="run"></span> - </div> - <div id="endstatus"> - Status: <span id="status"></span> - </div> - <div id="control"> - <!-- <span id="flow" class="btn">Flow Layout</span><span id="stack" class="btn">Stack Layout</span> --> - <div class="btn-toolbar"> - <button id="flow" type="button" class="btn btn-info">Flow Layout</button> - <button id="stack" type="button" class="btn btn-info">Stack Layout</button> - </div> - </div> - <div id="job_timeline"></div> - </div> - </div> - <div class="panel panel-primary"> - <div class="panel-heading"> - <h3 class="panel-title"> Tasks</h3> - </div> - <div id="vertices" class="panel-body"> - Select a task by clicking on the corresponding bar in the Job Overview section. - </div> - </div> - - <div class="panel panel-primary"> - <div class="panel-heading"> - <div class="panel-title">Accumulator Results</div> - </div> - <div id="accumulators" class="panel-body"> - The job does not have any accumulators - </div> - </div> - - </div><!-- /#page-wrapper --> - - </div><!-- /#wrapper --> - - </body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-runtime/resources/web-docs-infoserver/blank-page.html ---------------------------------------------------------------------- diff --git a/flink-runtime/resources/web-docs-infoserver/blank-page.html b/flink-runtime/resources/web-docs-infoserver/blank-page.html deleted file mode 100644 index 855f6ab..0000000 --- a/flink-runtime/resources/web-docs-infoserver/blank-page.html +++ /dev/null @@ -1,116 +0,0 @@ -<!DOCTYPE html> -<!-- -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. ---> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <title>Dashboard - Apache Flink</title> - - <!-- Bootstrap core CSS --> - <link href="css/bootstrap.css" rel="stylesheet"> - - <!-- Add custom CSS here --> - <link href="css/sb-admin.css" rel="stylesheet"> - <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css"> - - <!-- Page Specific CSS --> - <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" /> - - <!-- Scripts from Bootstrap --> - <script src="js/jquery-2.1.0.js"></script> - <script src="js/bootstrap.js"></script> - - <!-- Scripts from Flink --> - <script type="text/javascript" src="js/jquery.flot.min.js"></script> - <script type="text/javascript" src="js/helpers.js"></script> - <script type="text/javascript" src="js/jcanvas.min.js"></script> - - <!-- Load Menu --> - <script type="text/javascript"> - $(document).ready(function() { - $.ajax({ url : "menu?get=...", type : "GET", cache: false, success : function(html) { - $("#side-menu").empty(); - $("#side-menu").append(html); - }, dataType : "html", - }); - }); - </script> - </head> - - <body> - - <div id="wrapper"> - - <!-- Sidebar --> - <nav class='navbar navbar-inverse navbar-fixed-top' role='navigation'> - <!-- Brand and toggle get grouped for better mobile display --> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <table> - <tr> - <td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td> - <td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td> - </tr> - </table> - </div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> - <ul id="side-menu" class="nav navbar-nav side-nav"> - <!-- Filled via script --> - </ul> - <ul class="nav navbar-nav navbar-right navbar-user"> - <li class="dropdown user-dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li> - <li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li> - </ul> - </li> - </ul> - </div><!-- /.navbar-collapse --> - </nav> - - <div id="page-wrapper"> - - <div class="row"> - <div class="col-lg-12"> - <h1>Blank Page <small>A Blank Slate</small></h1> - <ol class="breadcrumb"> - <li><a href="index.html"><i class="icon-dashboard"></i> Dashboard</a></li> - <li class="active"><i class="icon-file-alt"></i> Blank Page</li> - </ol> - </div> - </div><!-- /.row --> - - </div><!-- /#page-wrapper --> - - </div><!-- /#wrapper --> - - </body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-runtime/resources/web-docs-infoserver/configuration.html ---------------------------------------------------------------------- diff --git a/flink-runtime/resources/web-docs-infoserver/configuration.html b/flink-runtime/resources/web-docs-infoserver/configuration.html deleted file mode 100644 index 90d2cfc..0000000 --- a/flink-runtime/resources/web-docs-infoserver/configuration.html +++ /dev/null @@ -1,122 +0,0 @@ -<!DOCTYPE html> -<!-- -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. ---> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <title>Dashboard - Apache Flink</title> - - <!-- Bootstrap core CSS --> - <link href="css/bootstrap.css" rel="stylesheet"> - - <!-- Add custom CSS here --> - <link href="css/sb-admin.css" rel="stylesheet"> - <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css"> - - <!-- Page Specific CSS --> - <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" /> - - <!-- Scripts from Bootstrap --> - <script src="js/jquery-2.1.0.js"></script> - <script src="js/bootstrap.js"></script> - - <!-- Scripts from Flink --> - <script type="text/javascript" src="js/jquery.flot.min.js"></script> - <script type="text/javascript" src="js/helpers.js"></script> - <script type="text/javascript" src="js/configuration.js"></script> - <script type="text/javascript" src="js/jcanvas.min.js"></script> - - <!-- Load Menu --> - <script type="text/javascript"> - $(document).ready(function() { - $.ajax({ url : "menu?get=configuration", type : "GET", cache: false, success : function(html) { - $("#side-menu").empty(); - $("#side-menu").append(html); - }, dataType : "html", - }); - }); - </script> - </head> - - <body> - - <div id="wrapper"> - - <!-- Sidebar --> - <nav class='navbar navbar-inverse navbar-fixed-top' role='navigation'> - <!-- Brand and toggle get grouped for better mobile display --> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <table> - <tr> - <td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td> - <td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td> - </tr> - </table> - </div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> - <ul id="side-menu" class="nav navbar-nav side-nav"> - <!-- Filled via script --> - </ul> - <ul class="nav navbar-nav navbar-right navbar-user"> - <li class="dropdown user-dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li> - <li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li> - </ul> - </li> - </ul> - </div><!-- /.navbar-collapse --> - </nav> - - <div id="page-wrapper"> - - <div class="row"> - <div class="col-lg-12"> - <h1>Configuration <small>Overview about the configuration settings of Flink</small></h1> - <ol class="breadcrumb"> - <li><a href="index.html"><i class="icon-dashboard"></i> Dashboard</a></li> - <li class="active"><i class="icon-file-alt"></i> Configuration</li> - </ol> - </div> - <div class="col-lg-12"><h3>Global Configuration</h2></div> - <div class="col-lg-12"> - <div class="table-responsive" id="confTable"> - </div> - </div> - </div><!-- /.row --> - - </div><!-- /#page-wrapper --> - - </div><!-- /#wrapper --> - - </body> -</html> \ No newline at end of file
