fix top lists: reset host counters in each export cycle

tophost/exporter.go

@@ -1,7 +1,6 @@
 package tophost
 
 import (
-	"fmt"
 	"time"
 
 	"omi-gitlab.e-technik.uni-ulm.de/bwnetflow/kafka/consumer_dashboard/prometheus"
@@ -12,13 +11,13 @@ type Exporter struct {
 	promExporter        prometheus.Exporter
 	hostlistBytes       topHosts
 	hostlistConnections topHosts
+	maxHosts            int
 }
 
 // Initialize the top host exporter
 func (exporter *Exporter) Initialize(promExporter prometheus.Exporter, maxHosts int, exportInterval time.Duration) {
 	exporter.promExporter = promExporter
-	exporter.hostlistBytes = make(topHosts, maxHosts)
-	exporter.hostlistConnections = make(topHosts, maxHosts)
+	exporter.maxHosts = maxHosts
 	ticker := time.NewTicker(exportInterval)
 	quit := make(chan struct{})
 	go func() {
@@ -46,6 +45,10 @@ func (exporter *Exporter) Consider(ipSrc string, ipDst string, bytes uint64) {
 
 // runs one export cycle of current snapshot
 func (exporter *Exporter) exportTraffic() {
+	// create empty top host list
+	exporter.hostlistBytes = make(topHosts, exporter.maxHosts)
+
+	// walk through rawHost list
 	length := 0
 	rawHostsBytes.Range(func(key, value interface{}) bool {
 		length++
@@ -55,9 +58,11 @@ func (exporter *Exporter) exportTraffic() {
 		currentValue := value.(uint64)
 		exporter.hostlistBytes.addHost(currentIP, currentValue)
 
+		// remove from rawHosts list
+		rawHostsBytes.Delete(currentIP)
+
 		return true
 	})
-	fmt.Printf("byHostBytes length: %d\n", length)
 
 	// push hostlist to promExporter
 	for _, host := range exporter.hostlistBytes {
@@ -67,6 +72,10 @@ func (exporter *Exporter) exportTraffic() {
 
 // runs one export cycle of current snapshot
 func (exporter *Exporter) exportConnections() {
+	// create empty top host list
+	exporter.hostlistConnections = make(topHosts, exporter.maxHosts)
+
+	// walk through rawHost list
 	length := 0
 	rawHostsConnections.Range(func(key, value interface{}) bool {
 		length++
@@ -76,9 +85,11 @@ func (exporter *Exporter) exportConnections() {
 		currentValue := value.(uint64)
 		exporter.hostlistConnections.addHost(currentIP, currentValue)
 
+		// remove from rawHosts list
+		rawHostsConnections.Delete(currentIP)
+
 		return true
 	})
-	fmt.Printf("byHostConnections length: %d\n", length)
 
 	// push hostlist to promExporter
 	for _, host := range exporter.hostlistConnections {