Return-Path: 
 <accumulo-commits-return-43-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DC0FA9F72
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Mon, 17 Oct 2011 20:20:12 +0000 (UTC)
Received: (qmail 6965 invoked by uid 500); 17 Oct 2011 20:20:12 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 6936 invoked by uid 500); 17 Oct 2011 20:20:12 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 6929 invoked by uid 99); 17 Oct 2011 20:20:12 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2011 20:20:12 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2011 20:20:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8BF0D238888F;
	Mon, 17 Oct 2011 20:19:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1185352 - in
 /incubator/accumulo/trunk/src/server/src/main:
 java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 resources/web/screen.css
Date: Mon, 17 Oct 2011 20:19:48 -0000
To: accumulo-commits@incubator.apache.org
From: kturner@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111017201948.8BF0D238888F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kturner
Date: Mon Oct 17 20:19:48 2011
New Revision: 1185352

URL: http://svn.apache.org/viewvc?rev=1185352&view=rev
Log:
ACCUMULO-4 improved look of plots on monitor page

Modified:
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
    incubator/accumulo/trunk/src/server/src/main/resources/web/screen.css

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1185352&r1=1185351&r2=1185352&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java Mon Oct 17 20:19:48 2011
@@ -138,9 +138,9 @@ public class DefaultServlet extends Basi
 
 	@SuppressWarnings("unchecked")
 	private static void plotData(StringBuilder sb, String title, @SuppressWarnings("rawtypes") List data, boolean points){
-		sb.append("<center>");
+		sb.append("<div class=\"plotHeading\">");
 		sb.append(title);
-		sb.append("</center>");
+		sb.append("</div>");
 		sb.append("</br>");
 		String id = "c"+title.hashCode();
 		sb.append("<div id=\""+id+"\" style=\"width:" + GRAPH_WIDTH + "px;height:" + GRAPH_HEIGHT + "px;\"></div>\n");
@@ -153,17 +153,24 @@ public class DefaultServlet extends Basi
 		for(Pair<Long, ? extends Number> point : (List<Pair<Long, ? extends Number>>)data){
 			if(point.getSecond() == null)
 				continue;
+			
+			String y;
+			if(point.getSecond() instanceof Double)
+				y = String.format("%1.2f", point.getSecond());
+			else
+				y = point.getSecond().toString();
+			
 			sb.append(sep);
 			sep = ",";
-			sb.append("["+point.getFirst()+","+point.getSecond()+"]");
+			sb.append("["+point.getFirst()+","+y+"]");
 		}
 		
 		String opts = "lines: { show: true }";
 		if(points)
-			opts = "points: { show: true }";
+			opts = "points: { show: true, radius: 1 }";
 		
 		sb.append("    ];\n");
-		sb.append("    $.plot($(\"#"+id+"\"), [{ data: d1, "+opts+" }], {yaxis:{}, xaxis:{mode:\"time\",minTickSize: [1, \"minute\"],timeformat: \"%H:%M\", ticks:3}});");
+		sb.append("    $.plot($(\"#"+id+"\"), [{ data: d1, "+opts+", color:\"red\" }], {yaxis:{}, xaxis:{mode:\"time\",minTickSize: [1, \"minute\"],timeformat: \"%H:%M\", ticks:3}});");
 		sb.append("   });\n");
 		sb.append("</script>\n");
 	}
@@ -197,7 +204,7 @@ public class DefaultServlet extends Basi
 		sb.append("</tr></table>\n");
 		sb.append("<br/>\n");
 
-		sb.append("<p/><table>\n");
+		sb.append("<p/><table class=\"noborder\">\n");
 		
 		sb.append("<tr><td>\n");
 		plotData(sb, "Ingest (Entries/s)", Monitor.getIngestRateOverTime(), false);

Modified: incubator/accumulo/trunk/src/server/src/main/resources/web/screen.css
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/resources/web/screen.css?rev=1185352&r1=1185351&r2=1185352&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/resources/web/screen.css (original)
+++ incubator/accumulo/trunk/src/server/src/main/resources/web/screen.css Mon Oct 17 20:19:48 2011
@@ -271,4 +271,9 @@ pre.logevent {
 .center {
 	text-align: center;
 	padding: 0.5em;
+}
+
+.plotHeading {
+    text-align: center;
+    font-size: 1.5em;
 }
\ No newline at end of file