You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@chukwa.apache.org by ey...@apache.org on 2015/06/25 22:48:50 UTC
[19/22] chukwa git commit: CHUKWA-765. Minor stylesheets clean up.
(Eric Yang)
CHUKWA-765. Minor stylesheets clean up. (Eric Yang)
Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo
Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/be0e0cf1
Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/be0e0cf1
Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/be0e0cf1
Branch: refs/heads/master
Commit: be0e0cf1d2ac98bc820abded5dc6e353800df8b6
Parents: c914d34
Author: Eric Yang <ey...@apache.org>
Authored: Tue Jun 23 16:56:48 2015 -0700
Committer: Eric Yang <ey...@apache.org>
Committed: Tue Jun 23 16:56:48 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../chukwa/datastore/ChukwaHBaseStore.java | 4 +-
src/main/web/hicc/ajax-solr/chukwa/index.html | 11 +-
.../web/hicc/ajax-solr/chukwa/js/logsearch.js | 14 +-
src/main/web/hicc/css/login.css | 20 +--
src/main/web/hicc/home/css/jquery.gridster.css | 2 +
src/main/web/hicc/home/index.html | 136 +++++++++----------
src/main/web/hicc/jsp/heatmap.jsp | 2 +-
8 files changed, 98 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e46c2a..5356e3e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ CHUKWA-765. Minor stylesheets clean up. (Eric Yang)
+
CHUKWA-759. Configuration for Chukwa to monitor HBase. (Eric Yang)
CHUKWA-757. Updated Hadoop configuration to stream data to Chukwa. (Eric Yang)
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java b/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
index d75a350..cade66a 100644
--- a/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
+++ b/src/main/java/org/apache/hadoop/chukwa/datastore/ChukwaHBaseStore.java
@@ -772,7 +772,7 @@ public class ChukwaHBaseStore {
widget = new Widget();
widget.setTitle("CPU Heatmap");
widget.setSrc(new URI("/hicc/jsp/heatmap.jsp"));
- widget.setCol(3);
+ widget.setCol(1);
widget.setRow(1);
widget.setSize_x(5);
widget.setSize_y(1);
@@ -784,7 +784,7 @@ public class ChukwaHBaseStore {
widget.setTitle("Log Search");
widget.setSrc(new URI("/hicc/ajax-solr/chukwa"));
widget.setCol(1);
- widget.setRow(4);
+ widget.setRow(1);
widget.setSize_x(7);
widget.setSize_y(4);
createWidget(widget);
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/ajax-solr/chukwa/index.html
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/ajax-solr/chukwa/index.html b/src/main/web/hicc/ajax-solr/chukwa/index.html
index a27128c..91b3dc1 100644
--- a/src/main/web/hicc/ajax-solr/chukwa/index.html
+++ b/src/main/web/hicc/ajax-solr/chukwa/index.html
@@ -32,9 +32,6 @@
<script src="js/jquery-ui.min.js"></script>
<link rel="stylesheet" href="css/jquery-ui.min.css">
-<!-- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js"></script>
-
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.24/themes/smoothness/jquery-ui.css">-->
<script data-main="js/logsearch" src="js/require.min.js"></script>
<style>
p {
@@ -46,7 +43,7 @@ p {
<div id="wrap" class="container-fluid">
<h1>Log Search</h1>
<div class="row">
- <div class="col-md-5 col-lg-5">
+ <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
<h2>Current Selection</h2>
<ul id="selection"></ul>
@@ -69,13 +66,13 @@ p {
<!-- <h2>By Country</h2>
<div id="countries"></div>
- <div id="preview"></div>
+ <div id="preview"></div> -->
<h2>By Date</h2>
- <div id="calendar"></div> -->
+ <div id="calendar"></div>
</div>
- <div class="col-md-7 col-lg-7">
+ <div class="col-xs-12 col-sm-7 col-md-7 col-lg-7">
<div id="result">
<div id="navigation">
<ul id="pager"></ul>
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js b/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
index b843ff9..b3175dd 100644
--- a/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
+++ b/src/main/web/hicc/ajax-solr/chukwa/js/logsearch.js
@@ -22,7 +22,7 @@ require.config({
core: '../../core',
managers: '../../managers',
widgets: '../../widgets',
- reuters: '../widgets'
+ logsearch: '../widgets'
},
urlArgs: "bust=" + (new Date()).getTime()
});
@@ -32,12 +32,12 @@ require.config({
define([
'managers/Manager.jquery',
'core/ParameterStore',
- 'reuters/ResultWidget',
- 'reuters/TagcloudWidget',
- 'reuters/CurrentSearchWidget.9',
- 'reuters/AutocompleteWidget',
- 'reuters/CountryCodeWidget',
- 'reuters/CalendarWidget',
+ 'logsearch/ResultWidget',
+ 'logsearch/TagcloudWidget',
+ 'logsearch/CurrentSearchWidget.9',
+ 'logsearch/AutocompleteWidget',
+ 'logsearch/CountryCodeWidget',
+ 'logsearch/CalendarWidget',
'widgets/jquery/PagerWidget'
], function () {
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/css/login.css
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/css/login.css b/src/main/web/hicc/css/login.css
index b28c03c..a413c28 100644
--- a/src/main/web/hicc/css/login.css
+++ b/src/main/web/hicc/css/login.css
@@ -17,14 +17,18 @@
* under the License.
*/
body {
- margin: 15px 0 0 15px;
- padding: 1px; /*background: #2370cf;*/
- font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
- color: #000;
- min-height: 100%;
- width: 100%;
- background-image: url('images/bg.jpg');
- background-size: 100% auto;
+ margin: 15px 0 0 15px;
+ padding: 1px; /*background: #2370cf;*/
+ font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ color: #000;
+ min-height: 100%;
+ width: 100%;
+ background-image: url('images/bg.jpg');
+ background-repeat: no-repeat;
+ background-size: cover;
+}
+@media (min-width: 1120px), (min-height: 630px) {
+ body { background-size: auto; }
}
.form-signin {
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/home/css/jquery.gridster.css
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/home/css/jquery.gridster.css b/src/main/web/hicc/home/css/jquery.gridster.css
index ff5c6e9..6c8969e 100755
--- a/src/main/web/hicc/home/css/jquery.gridster.css
+++ b/src/main/web/hicc/home/css/jquery.gridster.css
@@ -65,6 +65,8 @@ body {
box-shadow: 0 0 5px rgba(0,0,0,0.3);
z-index: 2;
position: absolute;
+ min-width: 140px;
+ min-height: 140px;
}
.ready .gs-w:not(.preview-holder) {
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/home/index.html
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/home/index.html b/src/main/web/hicc/home/index.html
index 78c117c..f83de5c 100755
--- a/src/main/web/hicc/home/index.html
+++ b/src/main/web/hicc/home/index.html
@@ -17,9 +17,10 @@
<!DOCTYPE html>
<html lang="en" class="no-js">
<head>
- <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="0" />
+ <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate" />
+ <meta http-equiv="cache-control" content="max-age=0" />
+ <meta http-equiv="pragma" content="no-cache" />
+ <meta http-equiv="expires" content="0" />
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -39,46 +40,46 @@
<ul><li><iframe id="frame"></iframe></li></ul>
</div>
- <div class="container">
- <ul id="gn-menu" class="gn-menu-main">
- <li class="gn-trigger">
- <a class="gn-icon gn-icon-menu"><span>Menu</span></a>
- <nav class="gn-menu-wrapper">
- <div class="gn-scroller">
- <ul class="gn-menu">
- <li class="gn-search-item">
- <input placeholder="Search" id="url" type="search" class="gn-search">
- <a class="gn-icon gn-icon-search"><span>Search</span></a>
- </li>
- <li><a class="gn-icon gn-icon-illustrator" onclick="setDashboard('default')">User Activities</a></li>
- <li><a class="gn-icon gn-icon-article" onclick="setDashboard('system')">System Activities</a></li>
- <li><a class="gn-icon gn-icon-pictures" onclick="showFrame('graph-explorer.html')">Graph Explorer</a></li>
- <li><a class="gn-icon gn-icon-cog" onclick="showFrame('settings')">Settings</a></li>
- <li><a class="gn-icon gn-icon-help" onclick="showFrame('help')">Help</a></li>
- </ul>
- </div><!-- /gn-scroller -->
- </nav>
- </li>
- <li><a href="index.html">Chukwa</a></li>
- <li>
- <div class="toggle-btn-grp">
- <div><input type="radio" name="period" value="last1hr" onclick="setTime()" /><label class="toggle-btn">H</label></div>
- <div><input type="radio" name="period" value="last24hr" onclick="setTime()" /><label class="toggle-btn">D</label></div>
- <div><input type="radio" name="period" value="last30d" onclick="setTime()" /><label class="toggle-btn">M</label></div>
- <div><input type="radio" name="period" value="lastyear" onclick="setTime()" /><label class="toggle-btn">Y</label></div>
- </div>
- </li>
- <li><span id="username"></span></li>
- <li><a class="gn-icon-poweroff" onclick="logout()"><span> </span></a></li>
- </ul>
- </div><!-- /container -->
- <div class="gridster">
- <ul/>
- </div>
+ <div class="container">
+ <ul id="gn-menu" class="gn-menu-main">
+ <li class="gn-trigger">
+ <a class="gn-icon gn-icon-menu"><span>Menu</span></a>
+ <nav class="gn-menu-wrapper">
+ <div class="gn-scroller">
+ <ul class="gn-menu">
+ <li class="gn-search-item">
+ <input placeholder="Search" id="url" type="search" class="gn-search">
+ <a class="gn-icon gn-icon-search"><span>Search</span></a>
+ </li>
+ <li><a class="gn-icon gn-icon-illustrator" onclick="setDashboard('default')">User Activities</a></li>
+ <li><a class="gn-icon gn-icon-article" onclick="setDashboard('system')">System Activities</a></li>
+ <li><a class="gn-icon gn-icon-pictures" onclick="showFrame('graph-explorer.html')">Graph Explorer</a></li>
+ <li><a class="gn-icon gn-icon-cog" onclick="showFrame('settings')">Settings</a></li>
+ <li><a class="gn-icon gn-icon-help" onclick="showFrame('help')">Help</a></li>
+ </ul>
+ </div><!-- /gn-scroller -->
+ </nav>
+ </li>
+ <li><a href="index.html">Chukwa</a></li>
+ <li>
+ <div class="toggle-btn-grp">
+ <div><input type="radio" name="period" value="last1hr" onclick="setTime()" /><label class="toggle-btn">H</label></div>
+ <div><input type="radio" name="period" value="last24hr" onclick="setTime()" /><label class="toggle-btn">D</label></div>
+ <div><input type="radio" name="period" value="last30d" onclick="setTime()" /><label class="toggle-btn">M</label></div>
+ <div><input type="radio" name="period" value="lastyear" onclick="setTime()" /><label class="toggle-btn">Y</label></div>
+ </div>
+ </li>
+ <li><span id="username"></span></li>
+ <li><a class="gn-icon-poweroff" onclick="logout()"><span> </span></a></li>
+ </ul>
+ </div><!-- /container -->
+ <div class="gridster">
+ <ul/>
+ </div>
- <script src="js/classie.js"></script>
- <script src="js/gnmenu.js"></script>
- <script>
+ <script src="js/classie.js"></script>
+ <script src="js/gnmenu.js"></script>
+ <script>
var dashboard = 'default';
var widgets = [];
@@ -181,7 +182,6 @@ function load() {
});
}
);
-
}
// Save Dashboard
@@ -227,40 +227,40 @@ function showFrame(target) {
var gnMenu = new gnMenu( document.getElementById( 'gn-menu' ) );
$(function(){ //DOM Ready
-$.getJSON('/hicc/v1/session/key/period',
- function(data) {
- var value = (data['period'] == null) ? "last1hr" : data['period'];
- $("input[name=period][value=" + value + "]").attr('checked', 'checked');
- }
-);
+ $.getJSON('/hicc/v1/session/key/period',
+ function(data) {
+ var value = (data['period'] == null) ? "last1hr" : data['period'];
+ $("input[name=period][value=" + value + "]").attr('checked', 'checked');
+ }
+ );
-$( "#url" ).keydown(function( event ) {
- if ( event.which == 13 ) {
- event.preventDefault();
- var title = $('#url').val();
- if(title in widgetsToUrl) {
- var url = widgetsToUrl[title];
- var gridster = $(".gridster ul").gridster().data('gridster');
- gridster.add_widget(url, 1, 1, 1, 1);
- setTimeout(function(){ save(); }, 3000);
+ $( "#url" ).keydown(function( event ) {
+ if ( event.which == 13 ) {
+ event.preventDefault();
+ var title = $('#url').val();
+ if(title in widgetsToUrl) {
+ var url = widgetsToUrl[title];
+ var gridster = $(".gridster ul").gridster().data('gridster');
+ gridster.add_widget(url, 1, 1, 1, 1);
+ setTimeout(function(){ save(); }, 3000);
+ }
}
- }
-});
+ });
-$.ajax({
+ $.ajax({
url: '/hicc/v1/dashboard/whoami',
cache: false
}).done(function( html ) {
$('#username').append(html);
});
-$.getJSON('/hicc/v1/session/key/dashboard',
- function(data) {
- var value = (data['dashboard'] == null) ? "default" : data['dashboard'];
- dashboard = value;
- load();
- }
-);
+ $.getJSON('/hicc/v1/session/key/dashboard',
+ function(data) {
+ var value = (data['dashboard'] == null) ? "default" : data['dashboard'];
+ dashboard = value;
+ load();
+ }
+ );
});
http://git-wip-us.apache.org/repos/asf/chukwa/blob/be0e0cf1/src/main/web/hicc/jsp/heatmap.jsp
----------------------------------------------------------------------
diff --git a/src/main/web/hicc/jsp/heatmap.jsp b/src/main/web/hicc/jsp/heatmap.jsp
index 4f1f4fe..b16e718 100644
--- a/src/main/web/hicc/jsp/heatmap.jsp
+++ b/src/main/web/hicc/jsp/heatmap.jsp
@@ -115,7 +115,7 @@
$('#yLabel').html(data.series + " <%= yLabel %>(s)");
var config = {
element: document.getElementById("heatmapArea"),
- radius: data.radius/2,
+ radius: data.radius/6,
opacity: 50,
legend: {
position: 'br',