From 2c6402ebf1fe1d72a2b46e55a44e886f3a222bcd Mon Sep 17 00:00:00 2001
From: shinhwagk <shanghai_sl@hotmail.com>
Date: Thu, 13 Sep 2018 21:46:48 +0800
Subject: [PATCH] update

---
 collector/session-statistics.go | 13 ++++++-------
 collector/session-timemodel.go  | 14 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/collector/session-statistics.go b/collector/session-statistics.go
index 9c207c4..8ef2f64 100644
--- a/collector/session-statistics.go
+++ b/collector/session-statistics.go
@@ -17,7 +17,7 @@ func init() {
 
 // NewSesstatCollector .
 func NewSesstatCollector() Collector {
-	desc := createNewDesc("session", "statistic", "empty", []string{"class", "name", "username", "sid"}, nil)
+	desc := createNewDesc("session", "statistic", "empty", []string{"class", "name", "username", "sid", "serial"}, nil)
 	return &sesstatCollector{desc}
 }
 
@@ -29,19 +29,19 @@ func (c *sesstatCollector) Update(db *sql.DB, ch chan<- prometheus.Metric) error
 	defer rows.Close()
 
 	for rows.Next() {
-		var sid, name, uname, class string
+		var sid, serial, name, uname, class string
 		var value float64
-		if err := rows.Scan(&sid, &name, &uname, &class, &value); err != nil {
+		if err := rows.Scan(&sid, &serial, &name, &uname, &class, &value); err != nil {
 			return err
 		}
 
-		ch <- prometheus.MustNewConstMetric(c.desc, prometheus.CounterValue, value, class, name, uname, sid)
+		ch <- prometheus.MustNewConstMetric(c.desc, prometheus.CounterValue, value, class, name, uname, sid, serial)
 	}
 	return nil
 }
 
 const sesstatSQL = `
-SELECT s.sid, sn.name, s.username,
+SELECT s.sid, s.serial#, sn.name, s.username,
        decode(sn.class,
               1,  'User',
               2,  'Read',
@@ -50,13 +50,12 @@ SELECT s.sid, sn.name, s.username,
               16, 'OS',
               32, 'Real Application Clusters',
               64, 'SQL',
-              128, 'Debug', 'null'),
+              128, 'Debug', 'Other'),
 				ss.value
 FROM v$sesstat ss, v$statname sn, v$session s
 WHERE s.sid = ss.sid
 	AND ss.statistic# = sn.statistic#
 	AND s.username IS NOT NULL
-  AND ss.value >= 1
   AND sn.name IN ('parse count (total)',	
                    'parse count (hard)',	
                    'parse count (failures)',	
diff --git a/collector/session-timemodel.go b/collector/session-timemodel.go
index 082ee05..bbac6b3 100644
--- a/collector/session-timemodel.go
+++ b/collector/session-timemodel.go
@@ -17,7 +17,7 @@ func init() {
 
 // NewSessTimeModelCollector .
 func NewSessTimeModelCollector() Collector {
-	desc := createNewDesc("session", "time_model", "oracle session level time model.", []string{"sid", "name", "username"}, nil)
+	desc := createNewDesc("session", "time_model", "oracle session level time model.", []string{"sid", "serial", "name", "username"}, nil)
 	return &sessTimeModelCollector{desc}
 }
 
@@ -29,12 +29,12 @@ func (c *sessTimeModelCollector) Update(db *sql.DB, ch chan<- prometheus.Metric)
 	defer rows.Close()
 
 	for rows.Next() {
-		var sid, uname, sname string
+		var sid, serial, uname, sname string
 		var value float64
-		if err := rows.Scan(&sid, &uname, &sname, &value); err != nil {
+		if err := rows.Scan(&sid, &serial, &uname, &sname, &value); err != nil {
 			return err
 		}
-		ch <- prometheus.MustNewConstMetric(c.desc, prometheus.CounterValue, value, sid, sname, uname)
+		ch <- prometheus.MustNewConstMetric(c.desc, prometheus.CounterValue, value, sid, serial, sname, uname)
 	}
 	return nil
 }
@@ -42,7 +42,7 @@ func (c *sessTimeModelCollector) Update(db *sql.DB, ch chan<- prometheus.Metric)
 const (
 	sessTimeModelSystemName = "sesstimemodel"
 	sessTimeModelSQL        = `
-	SELECT s.sid, s.username, stm.stat_name, SUM(stm.value) FROM v$sess_time_model stm, v$session s
-  WHERE stm.sid = s.sid AND s.username IS NOT NULL AND stm.value >= 1
-  GROUP BY s.username, stm.stat_name, s.sid`
+	SELECT s.sid, s.serial#, s.username, stm.stat_name, stm.value
+	FROM v$sess_time_model stm, v$session s
+  WHERE stm.sid = s.sid AND s.username IS NOT NULL`
 )