From 77c0e64cbb0e17ba91181f542eb14245dddcb3ab Mon Sep 17 00:00:00 2001
From: nhyatt <nhyatt@smoothnet.org>
Date: Sun, 27 Nov 2022 10:40:30 -0600
Subject: [PATCH] adds counter for total WH consumed

---
 cmd/export/config.go      |  8 +++++++-
 cmd/export/readMetrics.go | 14 +++++++++++---
 internal/tplink/tplink.go | 22 +++++++++++-----------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/cmd/export/config.go b/cmd/export/config.go
index 4b161c7..00c6410 100644
--- a/cmd/export/config.go
+++ b/cmd/export/config.go
@@ -63,6 +63,7 @@ type configPrometheus struct {
 	CurrentMa *prometheus.GaugeVec
 	VoltageMv *prometheus.GaugeVec
 	PowerMw   *prometheus.GaugeVec
+	TotalWh   *prometheus.CounterVec
 }
 
 func defaultConfig() *config {
@@ -87,6 +88,11 @@ func defaultConfig() *config {
 				Name:      "watts",
 				Help:      "current wattage",
 			}, []string{"device"}),
+			TotalWh: prometheus.NewCounterVec(prometheus.CounterOpts{
+				Namespace: "tplink",
+				Name:      "watt_hours",
+				Help:      "total watt hours",
+			}, []string{"device"}),
 		},
 	}
 }
@@ -323,7 +329,7 @@ func initialize() *config {
 	}
 	time.Now().Format(cfg.TimeFormat)
 
-	prometheus.MustRegister(cfg.Prometheus.CurrentMa, cfg.Prometheus.VoltageMv, cfg.Prometheus.PowerMw)
+	prometheus.MustRegister(cfg.Prometheus.CurrentMa, cfg.Prometheus.VoltageMv, cfg.Prometheus.PowerMw, cfg.Prometheus.TotalWh)
 
 	// print running config
 	cfg.printRunningConfig(cfgInfo)
diff --git a/cmd/export/readMetrics.go b/cmd/export/readMetrics.go
index 3dab45d..8d72cfa 100644
--- a/cmd/export/readMetrics.go
+++ b/cmd/export/readMetrics.go
@@ -10,8 +10,14 @@ import (
 )
 
 func (cfg *config) gatherMetrics() {
+	tracker := make(map[string]float64)
 	for {
 		for _, host := range cfg.Hosts {
+			log.Printf("[TRACE] Reading Metrics from %s.", host)
+			if _, isMapKey := tracker[host]; !isMapKey {
+				tracker[host] = float64(0)
+			}
+
 			d := tplink.Tplink{
 				Host: host,
 			}
@@ -20,9 +26,11 @@ func (cfg *config) gatherMetrics() {
 				log.Printf("[WARNING] Unable to read from device: %s: %v", host, err)
 				continue
 			}
-			cfg.Prometheus.CurrentMa.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.CurrentMa))
-			cfg.Prometheus.VoltageMv.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.VoltageMv))
-			cfg.Prometheus.PowerMw.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.PowerMw))
+			cfg.Prometheus.CurrentMa.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.CurrentMa / 1000.0))
+			cfg.Prometheus.VoltageMv.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.VoltageMv / 1000.0))
+			cfg.Prometheus.PowerMw.With(prometheus.Labels{"device": host}).Set(float64(m.Emeter.GetRealtime.PowerMw / 1000.0))
+			cfg.Prometheus.TotalWh.With(prometheus.Labels{"device": host}).Add(float64((m.Emeter.GetRealtime.TotalWh - tracker[host]) / 1000.0))
+			tracker[host] = m.Emeter.GetRealtime.TotalWh
 		}
 		time.Sleep(time.Duration(time.Second * 15))
 	}
diff --git a/internal/tplink/tplink.go b/internal/tplink/tplink.go
index 7aa94e9..e60b050 100644
--- a/internal/tplink/tplink.go
+++ b/internal/tplink/tplink.go
@@ -68,23 +68,23 @@ type SysInfo struct {
 	} `json:"system"`
 	Emeter struct {
 		GetRealtime struct {
-			CurrentMa int `json:"current_ma"`
-			VoltageMv int `json:"voltage_mv"`
-			PowerMw   int `json:"power_mw"`
-			TotalWh   int `json:"total_wh"`
-			ErrCode   int `json:"err_code"`
+			CurrentMa float64 `json:"current_ma"`
+			VoltageMv float64 `json:"voltage_mv"`
+			PowerMw   float64 `json:"power_mw"`
+			TotalWh   float64 `json:"total_wh"`
+			ErrCode   float64 `json:"err_code"`
 		} `json:"get_realtime"`
 		GetVgainIgain struct {
-			Vgain   int `json:"vgain"`
-			Igain   int `json:"igain"`
+			Vgain   float64 `json:"vgain"`
+			Igain   float64 `json:"igain"`
 			ErrCode int `json:"err_code"`
 		} `json:"get_vgain_igain"`
 		GetDaystat struct {
 			DayList []struct {
-				Year     int `json:"year"`
-				Month    int `json:"month"`
-				Day      int `json:"day"`
-				EnergyWh int `json:"energy_wh"`
+				Year     float64 `json:"year"`
+				Month    float64 `json:"month"`
+				Day      float64 `json:"day"`
+				EnergyWh float64 `json:"energy_wh"`
 			} `json:"day_list"`
 			ErrCode int `json:"err_code"`
 		} `json:"get_daystat"`