License changed to AGPL, logging and progressbars via own UI package, logging to file, various naming conventions in code changed, performance speedup while merging objects, got rid of BuildDate

Author: lkarlslund

Diff for: _go.work

@@ -0,0 +1,6 @@
+go 1.18
+
+use (
+  .
+  ../stringdedup
+)

Diff for: adalanche/main.go

@@ -8,14 +8,14 @@ import (
 	_ "github.com/lkarlslund/adalanche/modules/integrations/activedirectory/collect"
 	_ "github.com/lkarlslund/adalanche/modules/integrations/localmachine/analyze"
 	_ "github.com/lkarlslund/adalanche/modules/quickmode"
-	"github.com/rs/zerolog/log"
+	"github.com/lkarlslund/adalanche/modules/ui"
 )
 
 func main() {
 	err := cli.Run()
 
 	if err != nil {
-		log.Error().Msg(err.Error())
+		ui.Error().Msg(err.Error())
 		os.Exit(1)
 	}
 }

Diff for: build.cmd

@@ -1,7 +1,5 @@
 @echo off
 
-set BUILDDATE=%DATE:~-4%%DATE:~3,2%%DATE:~0,2%
-
 for /F "usebackq delims=" %%a in (`git rev-parse --short HEAD`) do set COMMIT=%%a
 for /F "usebackq delims=" %%a in (`git describe --tags --exclude latest`) do set VERSION=%%a
 for /F "usebackq delims=" %%a in (`git status --porcelain`) do set dirtyfiles="%%a"
@@ -11,7 +9,7 @@ if not [%dirtyfiles%] == [] (
   set VERSION=%VERSION%-local-changes
 )
 
-set LDFLAGS=-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche -X github.com/lkarlslund/adalanche/modules/version.Builddate=%BUILDDATE% -X github.com/lkarlslund/adalanche/modules/version.Commit=%COMMIT% -X github.com/lkarlslund/adalanche/modules/version.Version=%VERSION%
+set LDFLAGS=-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche -X github.com/lkarlslund/adalanche/modules/version.Commit=%COMMIT% -X github.com/lkarlslund/adalanche/modules/version.Version=%VERSION%
 set GOARCH=amd64
 set GOOS=windows
 go build -ldflags "%LDFLAGS%" -o adalanche-windows-x64-%VERSION%.exe ./adalanche
@@ -21,13 +19,14 @@ set GOOS=linux
 go build -ldflags "%LDFLAGS%" -o adalanche-linux-x64-%VERSION% ./adalanche
 
 set GOARCH=arm64
+set GOOS=windows
+go build -ldflags "%LDFLAGS%" -o adalanche-windows-arm64-%VERSION%.exe ./adalanche
 set GOOS=linux
 go build -ldflags "%LDFLAGS%" -o adalanche-linux-arm64-%VERSION% ./adalanche
 set GOOS=darwin
 go build -ldflags "%LDFLAGS%" -o adalanche-osx-m1-%VERSION% ./adalanche
 
-set LDFLAGS=-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche-collector -X github.com/lkarlslund/adalanche/modules/version.Builddate=%BUILDDATE% -X github.com/lkarlslund/adalanche/modules/version.Commit=%COMMIT% -X github.com/lkarlslund/adalanche/modules/version.Version=%VERSION%
+set LDFLAGS=-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche-collector -X github.com/lkarlslund/adalanche/modules/version.Commit=%COMMIT% -X github.com/lkarlslund/adalanche/modules/version.Version=%VERSION%
 set GOARCH=386
 set GOOS=windows
 go build -ldflags "%LDFLAGS%" -o adalanche-collector-windows-386-%VERSION%.exe ./collector
-

Diff for: build.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-BUILDDATE=`date +%Y%m%d`
 COMMIT=`git rev-parse --short HEAD`
 VERSION=`git describe --tags --exclude latest`
 
@@ -10,15 +9,16 @@ fi
 
 EXIT_STATUS=0
 
-LDFLAGS="-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche -X github.com/lkarlslund/adalanche/modules/version.Builddate=$BUILDDATE -X github.com/lkarlslund/adalanche/modules/version.Commit=$COMMIT -X github.com/lkarlslund/adalanche/modules/version.Version=$VERSION"
+LDFLAGS="-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche -X github.com/lkarlslund/adalanche/modules/version.Commit=$COMMIT -X github.com/lkarlslund/adalanche/modules/version.Version=$VERSION"
 
 GOOS=windows GOARCH=amd64 go build -ldflags "$LDFLAGS" -o adalanche-windows-x64-$VERSION.exe ./adalanche || EXIT_STATUS=$?
+GOOS=windows GOARCH=arm64 go build -ldflags "$LDFLAGS" -o adalanche-windows-arm64-$VERSION.exe ./adalanche || EXIT_STATUS=$?
 GOOS=darwin GOARCH=amd64 go build -ldflags "$LDFLAGS" -o adalanche-osx-x64-$VERSION ./adalanche || EXIT_STATUS=$?
 GOOS=darwin GOARCH=arm64 go build -ldflags "$LDFLAGS" -o adalanche-osx-m1-$VERSION ./adalanche || EXIT_STATUS=$?
 GOOS=linux GOARCH=amd64 go build -ldflags "$LDFLAGS" -o adalanche-linux-x64-$VERSION ./adalanche || EXIT_STATUS=$?
 GOOS=linux GOARCH=arm64 go build -ldflags "$LDFLAGS" -o adalanche-linux-arm64-$VERSION ./adalanche || EXIT_STATUS=$?
 
-LDFLAGS="-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche-collector -X github.com/lkarlslund/adalanche/modules/version.Builddate=$BUILDDATE -X github.com/lkarlslund/adalanche/modules/version.Commit=$COMMIT -X github.com/lkarlslund/adalanche/modules/version.Version=$VERSION"
+LDFLAGS="-X github.com/lkarlslund/adalanche/modules/version.Program=adalanche-collector -X github.com/lkarlslund/adalanche/modules/version.Commit=$COMMIT -X github.com/lkarlslund/adalanche/modules/version.Version=$VERSION"
 
 GOOS=windows GOARCH=386 go build -ldflags "$LDFLAGS" -o adalanche-collector-windows-386-$VERSION.exe ./collector || EXIT_STATUS=$?
 

Diff for: collector/main.go

@@ -5,10 +5,8 @@ import (
 	"os"
 
 	"github.com/lkarlslund/adalanche/modules/integrations/localmachine/collect"
+	"github.com/lkarlslund/adalanche/modules/ui"
 	"github.com/lkarlslund/adalanche/modules/version"
-	"github.com/mattn/go-colorable"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )
 
@@ -19,19 +17,30 @@ import (
 var (
 	wrapcollector = &cobra.Command{}
 	datapath      = wrapcollector.Flags().String("outputpath", "", "Dump output JSON file in this folder")
-	debuglogging  = wrapcollector.Flags().Bool("debug", false, "Debug logging")
+	loglevel      = wrapcollector.Flags().String("loglevel", "info", "Console log level")
+	logfile       = wrapcollector.Flags().String("logfile", "", "Log file")
+	logfilelevel  = wrapcollector.Flags().String("logfilelevel", "info", "Log file log level")
 )
 
 func init() {
 	wrapcollector.RunE = Execute
 }
 
 func Execute(cmd *cobra.Command, args []string) error {
-	if !*debuglogging {
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
+	ll, err := ui.LogLevelString(*loglevel)
+	if err != nil {
+		ui.Error().Msgf("Invalid log level: %v - use one of: %v", *loglevel, ui.LogLevelStrings())
 	} else {
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		log.Info().Msg("Debug logging enabled")
+		ui.SetDefaultLoglevel(ll)
+	}
+
+	if *logfile != "" {
+		ll, err = ui.LogLevelString(*logfilelevel)
+		if err != nil {
+			ui.Error().Msgf("Invalid log file log level: %v - use one of: %v", *logfilelevel, ui.LogLevelStrings())
+		} else {
+			ui.SetLogFile(*logfile, ll)
+		}
 	}
 
 	// Ensure the data folder is available
@@ -46,15 +55,10 @@ func Execute(cmd *cobra.Command, args []string) error {
 }
 
 func main() {
-	log.Logger = log.Output(zerolog.ConsoleWriter{
-		Out:        colorable.NewColorableStdout(),
-		TimeFormat: "15:04:05.06",
-	})
-
-	log.Info().Msg(version.VersionString())
+	ui.Info().Msg(version.VersionString())
 
 	err := wrapcollector.Execute()
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to execute")
+		ui.Error().Err(err).Msg("Failed to execute")
 	}
 }

Diff for: go.mod

@@ -36,19 +36,22 @@ require (
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/spf13/cobra v1.3.0
 	github.com/tinylib/msgp v1.1.6
-	golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	golang.org/x/text v0.3.7
 )
 
 require (
+	atomicgo.dev/cursor v0.1.1 // indirect
+	atomicgo.dev/keyboard v0.2.8 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect
 	github.com/absfs/absfs v0.0.0-20200602175035-e49edc9fef15 // indirect
 	github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
 	github.com/antchfx/xpath v1.2.0 // indirect
 	github.com/asergeyev/nradix v0.0.0-20170505151046-3872ab85bb56 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cloudflare/buffer v0.0.0-20190408164202-7cab898e1166 // indirect
+	github.com/containerd/console v1.0.3 // indirect
 	github.com/crewjam/rfc5424 v0.1.0 // indirect
 	github.com/dmarkham/enumer v1.5.5 // indirect
 	github.com/elastic/beats v7.6.2+incompatible // indirect
@@ -66,13 +69,15 @@ require (
 	github.com/google/go-write v0.0.0-20181107114627-56629a6b2542 // indirect
 	github.com/google/renameio v0.1.0 // indirect; DONT CHANGE FROM v0.1.0
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/gookit/color v1.5.0 // indirect
 	github.com/gravwell/gcfg v1.2.9-0.20210818172109-3d05a45a2665 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/inhies/go-bytesize v0.0.0-20210819104631-275770b98743 // indirect
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.15.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/lithammer/fuzzysearch v1.1.5 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -84,15 +89,17 @@ require (
 	github.com/pascaldekloe/name v1.0.0 // indirect
 	github.com/philhofer/fwd v1.1.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/pterm/pterm v0.12.45 // indirect
 	github.com/rickb777/plural v1.2.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
 	golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect