add statistics query list on mondetailitem view

experdb · May 21, 2018 · 19597b4 · 19597b4
1 parent 2e3cd5f
commit 19597b4
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 53 deletions.
diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/Language/English.xml b/eXperDB_Monitoring_Client/iDast.MonPostgres/Language/English.xml
@@ -2412,6 +2412,10 @@
     <DESC>Report</DESC>
     <DATA><![CDATA[Report]]></DATA>
   </ROW>
+  <ROW ID="F297" PARAMS="0">
+    <DESC>Statistics</DESC>
+    <DATA><![CDATA[Statistics]]></DATA>
+  </ROW>
   <ROW ID="F300" PARAMS="0">
     <DESC>Control ConfigBox</DESC>
     <DATA><![CDATA[Configuration]]></DATA>

diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/Language/Korean.xml b/eXperDB_Monitoring_Client/iDast.MonPostgres/Language/Korean.xml
@@ -410,7 +410,7 @@
   </ROW>
   <ROW ID="F045" PARAMS="0">
     <DESC>TOTAL</DESC>
-    <DATA><![CDATA[Total]]></DATA>
+    <DATA><![CDATA[전체]]></DATA>
     <COMMENTS />
     <CATEGORY />
     <COLUMNS />
@@ -2412,6 +2412,10 @@
     <DESC>Report</DESC>
     <DATA><![CDATA[리포트]]></DATA>
   </ROW>
+  <ROW ID="F297" PARAMS="0">
+    <DESC>통계</DESC>
+    <DATA><![CDATA[통계]]></DATA>
+  </ROW>
   <ROW ID="F300" PARAMS="0">
     <DESC>Control ConfigBox</DESC>
     <DATA><![CDATA[설정]]></DATA>

diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/Querys/Querys.xml b/eXperDB_Monitoring_Client/iDast.MonPostgres/Querys/Querys.xml
@@ -845,7 +845,7 @@
           AND A.COLLECT_YN = 'Y' 
           AND A.DELETE_YN = 'N'
           AND E.SQL != 'BACKGROUND PROC'
-          AND E.SQL NOT LIKE 'SELECT /* DXMABT%'
+          AND E.SQL NOT LIKE 'SELECT /* EXPERDBMA%'
           AND E.SQL IS NOT NULL
           ORDER BY E.ELAPSED_TIME DESC, E.PROC_CPU_UTIL DESC)  BACKEND
         WHERE BACKEND.RNUM <= 30   
@@ -1467,6 +1467,7 @@
 				, SUM(OCCUPIED_TIME) OCCUPIED_TIME
 				, S.SQL 
         , COUNT(S.SQL) SQL_COUNT
+        , S.USER_NAME
 			FROM(
 					SELECT
 				      --A.INSTANCE_ID
@@ -1494,9 +1495,9 @@
               AND E.PROC_CPU_UTIL > 0
               AND E.SQL != 'BACKGROUND PROC'
               AND E.SQL != 'COMMIT'
-              AND E.SQL NOT LIKE 'SELECT /* DXMABT%'  
+              AND E.SQL NOT LIKE 'SELECT /* EXPERDBMA%'  
              GROUP BY E.DB_NAME, E.QUERY_START, E.PROCESS_ID ORDER BY MAX_CPU_USAGE DESC) S
-			GROUP BY S.DB_NAME, S.SQL
+			GROUP BY S.DB_NAME, S.SQL, S.USER_NAME
 			ORDER BY ELAPSED_TIME DESC
         ]]>
     </DATA>
@@ -1533,7 +1534,7 @@
               AND E.PROC_CPU_UTIL > 0
               AND E.SQL != 'BACKGROUND PROC'
               AND E.SQL != 'COMMIT'
-              AND E.SQL NOT LIKE 'SELECT /* DXMABT%'           
+              AND E.SQL NOT LIKE 'SELECT /* EXPERDBMA%'           
               GROUP BY A.INSTANCE_ID, E.DB_NAME, MD5(E.SQL), E.QUERY_START
         ]]>
     </DATA>
@@ -2006,7 +2007,7 @@
 			    AND A.COLLECT_YN = 'Y' 
 			    AND A.DELETE_YN = 'N'
 			    AND E.SQL != 'BACKGROUND PROC'
-			    AND E.SQL NOT LIKE 'SELECT /* DXMABT%'
+			    AND E.SQL NOT LIKE 'SELECT /* EXPERDBMA%'
 			    AND E.SQL IS NOT NULL
 			    ORDER BY E.ELAPSED_TIME DESC, E.PROC_CPU_UTIL DESC)  BACKEND
           WHERE BACKEND.RNUM <= 30   
@@ -2194,15 +2195,17 @@
               TB_BACKEND_RSC E
           WHERE E.REG_DATE {2}
           AND B.REG_DATE = E.REG_DATE
-          AND A.INSTANCE_ID = B.INSTANCE_ID
           AND A.INSTANCE_ID IN ({0})
+          AND A.INSTANCE_ID = B.INSTANCE_ID
           AND B.ACTV_REG_SEQ = E.ACTV_REG_SEQ
           AND A.COLLECT_YN = 'Y' 
           AND A.DELETE_YN = 'N'
           AND E.ELAPSED_TIME > 0
+          AND E.PROC_CPU_UTIL > 0
+          AND E.SQL IS NOT NULL
           AND E.SQL != 'BACKGROUND PROC'
+          AND E.SQL != 'COMMIT'
           AND E.SQL NOT LIKE 'SELECT /* EXPERDBMA%'
-          AND E.SQL IS NOT NULL
           AND E.COLLECT_DT BETWEEN {3} AND {4}
           GROUP BY A.INSTANCE_ID, E.DB_NAME, E.PROCESS_ID, QUERY_START, E.USER_NAME, E.CLIENT_ADDR, E.CLIENT_APP
           ORDER BY ELAPSED_TIME DESC, CPU_USAGE DESC

diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/Querys/clsQuerys.vb b/eXperDB_Monitoring_Client/iDast.MonPostgres/Querys/clsQuerys.vb
@@ -1088,7 +1088,7 @@
                 Else
                     subQuery = String.Format(" IN ('{0}','{1}')", StDate.ToString("yyyyMMdd"), edDate.ToString("yyyyMMdd"))
                 End If
-                strQuery = String.Format(strQuery, intInstanceID, subQuery, StDate.ToString("yyyy-MM-dd HH:mm:00"), edDate.ToString("yyyy-MM-dd HH:mm:59"))
+                strQuery = String.Format(strQuery, intInstanceID, subQuery, StDate.ToString("yyyy-MM-dd HH:mm:ss"), edDate.ToString("yyyy-MM-dd HH:mm:ss"))
 
                 Dim dtSet As DataSet = _ODBC.dbSelect(strQuery)
                 If dtSet IsNot Nothing AndAlso dtSet.Tables.Count > 0 Then