浏览代码

HADOOP-4884. Make tool tip date format match standard HICC format. Contributed by Eric Yang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@732640 13f79535-47bb-0310-9956-ffa450edef68
Christopher Douglas 16 年之前
父节点
当前提交
01e8889835
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 3 0
      CHANGES.txt
  2. 3 4
      src/contrib/chukwa/src/web/hicc/js/flot.extend.js

+ 3 - 0
CHANGES.txt

@@ -517,6 +517,9 @@ Release 0.20.0 - Unreleased
     HADOOP-4914. Add description fields to Chukwa init.d scripts (Eric Yang via
     HADOOP-4914. Add description fields to Chukwa init.d scripts (Eric Yang via
     cdouglas)
     cdouglas)
 
 
+    HADOOP-4884. Make tool tip date format match standard HICC format. (Eric
+    Yang via cdouglas)
+
 Release 0.19.1 - Unreleased
 Release 0.19.1 - Unreleased
 
 
   IMPROVEMENTS
   IMPROVEMENTS

+ 3 - 4
src/contrib/chukwa/src/web/hicc/js/flot.extend.js

@@ -26,7 +26,7 @@ wholePeriod=function () {
 
 
 options={
 options={
         points: { show: true },
         points: { show: true },
-        xaxis: {                timeformat: "%D/%O/%y<br/>%H:%M:%S",
+        xaxis: {                timeformat: "%y/%O/%D<br/>%H:%M:%S",
                 mode: "time"
                 mode: "time"
         },
         },
         selection: { mode: "xy" },
         selection: { mode: "xy" },
@@ -52,10 +52,9 @@ options={
                     $("#tooltip").remove();
                     $("#tooltip").remove();
                     var x = item.datapoint[0].toFixed(2),
                     var x = item.datapoint[0].toFixed(2),
                          y = item.stackValue.toFixed(2);
                          y = item.stackValue.toFixed(2);
-//item.datapoint[1].toFixed(2);
                     var dnow=new Date();
                     var dnow=new Date();
                     dnow.setTime(x);
                     dnow.setTime(x);
-	            var dita=leftPad(dnow.getUTCDate())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCFullYear()+" "+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
+	            var dita=leftPad(dnow.getUTCFullYear())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCDate()+" "+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
  
  
                     showTooltip(item.pageX, item.pageY,
                     showTooltip(item.pageX, item.pageY,
                                 item.series.label + ": " + y + "<br>Time: " + dita);
                                 item.series.label + ": " + y + "<br>Time: " + dita);
@@ -79,7 +78,7 @@ options={
                          y = item.datapoint[1].toFixed(2);
                          y = item.datapoint[1].toFixed(2);
                     var dnow=new Date();
                     var dnow=new Date();
                     dnow.setTime(x);
                     dnow.setTime(x);
-	            var dita=leftPad(dnow.getUTCDate())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCFullYear()+" "+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
+	            var dita=leftPad(dnow.getUTCFullYear())+"/"+leftPad(dnow.getUTCMonth()+1)+"/"+dnow.getUTCDate()+" "+leftPad(dnow.getUTCHours())+":"+leftPad(dnow.getUTCMinutes())+":"+leftPad(dnow.getUTCSeconds());
  
  
                     showTooltip(item.pageX, item.pageY,
                     showTooltip(item.pageX, item.pageY,
                                 item.series.label + ": " + y + "<br>Time: " + dita);
                                 item.series.label + ": " + y + "<br>Time: " + dita);