From 7caed7aae92a74d1f4f13f41be042d5a47b34412 Mon Sep 17 00:00:00 2001
From: Denny Lim <hi.iamdenny@gmail.com>
Date: Tue, 17 Jun 2014 05:34:15 +0000
Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20#164=20[inspect?=
 =?UTF-8?q?or]=203=EC=B6=95=20=EC=B0=A8=ED=8A=B8,=20amChart=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@4029 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../scripts/directives/jvmMemoryChart.js      | 12 ++++++--
 src/main/webapp/views/agentInfoMain.html      | 28 +++++++++----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/scripts/directives/jvmMemoryChart.js b/src/main/webapp/scripts/directives/jvmMemoryChart.js
index 6e37b4152..def58ce14 100644
--- a/src/main/webapp/scripts/directives/jvmMemoryChart.js
+++ b/src/main/webapp/scripts/directives/jvmMemoryChart.js
@@ -58,13 +58,21 @@ angular.module('pinpointApp')
                                     "id": "v1",
                                     "gridAlpha": 0,
                                     "axisAlpha": 1,
-                                    "position": "left"
+                                    "position": "left",
+//                                    "labelFunction": function (value, valueText, valueAxis) {
+//                                        return valueText + 'ms';
+//                                    }
+                                    "title": "Full GC (ms)"
                                 },
                                 {
                                     "id": "v2",
                                     "gridAlpha": 0,
                                     "axisAlpha": 1,
-                                    "position": "right"
+                                    "position": "right",
+//                                    "labelFunction": function (value, valueText, valueAxis) {
+//                                        return valueText + 'B';
+//                                    }
+                                    "title": "Memory (bytes)"
                                 }
                             ],
                             "graphs": [
diff --git a/src/main/webapp/views/agentInfoMain.html b/src/main/webapp/views/agentInfoMain.html
index 3f48cc2f1..0a0d6ebd4 100644
--- a/src/main/webapp/views/agentInfoMain.html
+++ b/src/main/webapp/views/agentInfoMain.html
@@ -11,6 +11,10 @@
             <div class="col-md-6">
                 <table class="table table-striped table-condensed" style="font-size:12px;">
                     <tbody>
+                    <tr>
+                        <td class="text-right">Application Name :</td>
+                        <td>{{info.applicationName}}</td>
+                    </tr>
                     <tr>
                         <td class="text-right">Agent Id :</td>
                         <td>{{info.agentId}}</td>
@@ -19,18 +23,14 @@
                         <td class="text-right">Hostname :</td>
                         <td>{{info.hostname}}</td>
                     </tr>
+                    <tr>
+                        <td class="text-right">IP :</td>
+                        <td>{{info.ip}} <a class="btn btn-default btn-xs" href="http://nsight.nhncorp.com/dashboard_server/{{info.ip}}" target="_blank" title="System resource monitoring site">NSight</a>
+                    </tr>
                     <tr>
                         <td class="text-right">Service Type :</td>
                         <td>{{info.serviceType}}</td>
                     </tr>
-                    <tr>
-                        <td class="text-right">Agent Version :</td>
-                        <td>{{info.agentVersion}}</td>
-                    </tr>
-                    <tr>
-                        <td class="text-right">Start Time :</td>
-                        <td>{{agent.startTime | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
-                    </tr>
                     </tbody>
                 </table>
             </div>
@@ -38,12 +38,8 @@
                 <table class="table table-striped table-condensed" style="font-size:12px;">
                     <tbody>
                     <tr>
-                        <td class="text-right">Application Name :</td>
-                        <td>{{info.applicationName}}</td>
-                    </tr>
-                    <tr>
-                        <td class="text-right">IP :</td>
-                        <td>{{info.ip}}</td>
+                        <td class="text-right">Agent Version :</td>
+                        <td>{{info.agentVersion}}</td>
                     </tr>
                     <tr>
                         <td class="text-right">PID :</td>
@@ -53,6 +49,10 @@
                         <td class="text-right">JVM GC Type :</td>
                         <td>{{info.jvmGcType}}</td>
                     </tr>
+                    <tr>
+                        <td class="text-right">Start Time :</td>
+                        <td>{{agent.startTime | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
+                    </tr>
                     <tr>
                         <td class="text-right">End Status :</td>
                         <td>{{agent.endStatus}} (last checked : {{agent.endTimeStamp | date:'yyyy-MM-dd HH:mm:ss Z'}})</td>