diff options
| author | zsxwing <zsxwing@gmail.com> | 2015-05-13 10:01:26 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2015-05-13 10:01:26 -0700 |
| commit | bec938f777a2e18757c7d04504d86a5342e2b49e (patch) | |
| tree | dce2eb2e1b252d9f6f1fa4f202703e5a7dfcc4dc /streaming | |
| parent | 0da254fb2903c01e059fa7d0dc81df5740312b35 (diff) | |
| download | spark-bec938f777a2e18757c7d04504d86a5342e2b49e.tar.gz spark-bec938f777a2e18757c7d04504d86a5342e2b49e.tar.bz2 spark-bec938f777a2e18757c7d04504d86a5342e2b49e.zip | |
[SPARK-7589] [STREAMING] [WEBUI] Make "Input Rate" in the Streaming page consistent with other pages
This PR makes "Input Rate" in the Streaming page consistent with Job and Stage pages.
Author: zsxwing <zsxwing@gmail.com>
Closes #6102 from zsxwing/SPARK-7589 and squashes the following commits:
2745225 [zsxwing] Make "Input Rate" in the Streaming page consistent with other pages
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala index ff0f2b18dc..efce8c58fb 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala @@ -244,17 +244,6 @@ private[ui] class StreamingPage(parent: StreamingTab) val maxEventRate = eventRateForAllStreams.max.map(_.ceil.toLong).getOrElse(0L) val minEventRate = 0L - // JavaScript to show/hide the InputDStreams sub table. - val triangleJs = - s"""$$('#inputs-table').toggle('collapsed'); - |var status = false; - |if ($$(this).html() == '$BLACK_RIGHT_TRIANGLE_HTML') { - |$$(this).html('$BLACK_DOWN_TRIANGLE_HTML');status = true;} - |else {$$(this).html('$BLACK_RIGHT_TRIANGLE_HTML');status = false;} - |window.history.pushState('', - | document.title, window.location.pathname + '?show-streams-detail=' + status);""" - .stripMargin.replaceAll("\\n", "") // it must be only one single line - val batchInterval = UIUtils.convertToTimeUnit(listener.batchDuration, normalizedUnit) val jsCollector = new JsCollector @@ -326,10 +315,18 @@ private[ui] class StreamingPage(parent: StreamingTab) <td style="vertical-align: middle;"> <div style="width: 160px;"> <div> - {if (hasStream) { - <span id="triangle" onclick={Unparsed(triangleJs)}>{Unparsed(BLACK_RIGHT_TRIANGLE_HTML)}</span> - }} - <strong>Input Rate</strong> + { + if (hasStream) { + <span class="expand-input-rate"> + <span class="expand-input-rate-arrow arrow-closed"></span> + <a data-toggle="tooltip" title="Show/hide details of each receiver" data-placement="right"> + <strong>Input Rate</strong> + </a> + </span> + } else { + <strong>Input Rate</strong> + } + } </div> <div>Avg: {eventRateForAllStreams.formattedAvg} events/sec</div> </div> |