Merge pull request #41 from martinlindhe/fix_system_uptime

system: fix uptime calculation
prometheus-community · Nov 16, 2016 · 2808da6 · 2808da6
2 parents 5925816 + a3f44f6
commit 2808da6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/collector/system.go b/collector/system.go
@@ -55,7 +55,7 @@ func NewSystemCollector() (Collector, error) {
 		),
 		SystemUpTime: prometheus.NewDesc(
 			prometheus.BuildFQName(Namespace, subsystem, "system_up_time"),
-			"PerfOS_System.SystemUpTime",
+			"SystemUpTime/Frequency_Object",
 			nil,
 			nil,
 		),
@@ -81,17 +81,20 @@ func (c *SystemCollector) Collect(ch chan<- prometheus.Metric) error {
 type Win32_PerfRawData_PerfOS_System struct {
 	ContextSwitchesPersec     uint32
 	ExceptionDispatchesPersec uint32
+	Frequency_Object          uint64
 	ProcessorQueueLength      uint32
 	SystemCallsPersec         uint32
 	SystemUpTime              uint64
 	Threads                   uint32
+	Timestamp_Object          uint64
 }
 
 func (c *SystemCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
 	var dst []Win32_PerfRawData_PerfOS_System
 	if err := wmi.Query(wmi.CreateQuery(&dst, ""), &dst); err != nil {
 		return nil, err
 	}
+
 	ch <- prometheus.MustNewConstMetric(
 		c.ContextSwitchesTotal,
 		prometheus.GaugeValue,
@@ -115,7 +118,8 @@ func (c *SystemCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc
 	ch <- prometheus.MustNewConstMetric(
 		c.SystemUpTime,
 		prometheus.GaugeValue,
-		float64(dst[0].SystemUpTime),
+		// convert from Windows timestamp (1 jan 1601) to unix timestamp (1 jan 1970)
+		float64(dst[0].SystemUpTime-116444736000000000)/float64(dst[0].Frequency_Object),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.Threads,