Merge branch 'develop'

Author: eze-kiel

Dockerfile

@@ -1,4 +1,4 @@
-FROM devopsworks/golang-upx:1.15 AS builder
+FROM devopsworks/golang-upx:1.16 AS builder
 
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \

main.go

@@ -32,7 +32,7 @@ func run(args []string, stdout io.Writer) error {
 	var confFile, pprofAddr, loglvl string
 	flag.StringVar(&confFile, "config", "config.yaml", "path to config file")
 	flag.StringVar(&pprofAddr, "pprof.addr", "", "pprof addr")
-	flag.StringVar(&loglvl, "log.lvl", "info", "log level. Can be {trace,debug,info,warn,error,fatal}")
+	flag.StringVar(&loglvl, "log.lvl", "debug", "log level. Can be {trace,debug,info,warn,error,fatal}")
 	flag.Parse()
 
 	fmt.Printf("scan-exporter version %s (built %s)\n", Version, BuildDate)

metrics/metrics.go

@@ -163,7 +163,7 @@ func (s *Server) Updater(metChan chan NewMetrics, pingChan chan PingInfo, pendin
 
 			// New ping metric has been received
 			if pm.IsResponding {
-				log.Info().Str("name", pm.Name).Str("ip", pm.IP).Str("rtt", pm.RTT.String()).Msgf("%s (%s) responds to ICMP requests", pm.Name, pm.IP)
+				log.Debug().Str("name", pm.Name).Str("ip", pm.IP).Str("rtt", pm.RTT.String()).Msgf("%s (%s) responds to ICMP requests", pm.Name, pm.IP)
 			} else {
 				log.Warn().Str("name", pm.Name).Str("ip", pm.IP).Str("rtt", "nil").Msgf("%s (%s) does not respond to ICMP requests", pm.Name, pm.IP)
 			}

scan/scan.go

@@ -19,12 +19,6 @@ import (
 	"golang.org/x/sync/semaphore"
 )
 
-type pinger struct {
-	ip     string
-	name   string
-	period string
-}
-
 type target struct {
 	ip         string
 	name       string
@@ -162,7 +156,7 @@ func (s *Scanner) Start(c *config.Conf) error {
 	for {
 		select {
 		case triggeredIP := <-trigger:
-			s.Logger.Debug().Msgf("received trigger for %s", triggeredIP)
+			s.Logger.Debug().Msgf("starting new scan for %s", triggeredIP)
 			if err := s.run(triggeredIP, scanIsOver, singleResult); err != nil {
 				s.Logger.Error().Err(err).Msg("error running scan")
 			}

scan/utils.go

@@ -1,9 +1,7 @@
 package scan
 
 import (
-	"errors"
 	"fmt"
-	"net"
 	"strconv"
 	"strings"
 	"time"
@@ -30,44 +28,6 @@ func getDuration(period string) (time.Duration, error) {
 	return t, nil
 }
 
-// getIP returns an external IP to bind on
-func getIP() (string, error) {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return "", err
-	}
-	for _, iface := range ifaces {
-		if iface.Flags&net.FlagUp == 0 {
-			continue // interface down
-		}
-		if iface.Flags&net.FlagLoopback != 0 {
-			continue // loopback interface
-		}
-		addrs, err := iface.Addrs()
-		if err != nil {
-			return "", err
-		}
-		for _, addr := range addrs {
-			var ip net.IP
-			switch v := addr.(type) {
-			case *net.IPNet:
-				ip = v.IP
-			case *net.IPAddr:
-				ip = v.IP
-			}
-			if ip == nil || ip.IsLoopback() {
-				continue
-			}
-			ip = ip.To4()
-			if ip == nil {
-				continue // not an ipv4 address
-			}
-			return ip.String(), nil
-		}
-	}
-	return "", errors.New("no critical error but impossible to find an external IP address")
-}
-
 // readPortsRange transforms a range of ports given in conf to an array of
 // effective ports
 func readPortsRange(ranges string) ([]int, error) {