Merge pull request #27 from intel/prep280

add commits for v2.8.0

.gitignore

@@ -13,6 +13,9 @@ src/collector/collector_arm64
 src/rdmsr/rdmsrx
 src/wrmsr/wrmsrx
 src/msrbusy/msrbusy
+src/pmu2metrics/pmu2metrics
+src/pmu2metrics/pmu2metrics-with-perf
+src/pmu2metrics/resources/perf
 src/calcfreq/calcfreq
 # src
 async-profiler
@@ -47,3 +50,5 @@ src/reporter/debug_out/*
 __debug_bin*.log
 # other
 src/orchestrator/targets
+src/pmu2metrics/sys
+src/pmu2metrics/scripts

builder/Dockerfile → Dockerfile

@@ -26,12 +26,15 @@ RUN cp /usr/local/lib/libz.a /usr/lib/x86_64-linux-gnu/libz.a
 RUN curl -s https://gitlab.com/akihe/radamsa/uploads/a2228910d0d3c68d19c09cee3943d7e5/radamsa-0.6.c.gz | gzip -d | cc -O2 -x c -o /usr/local/bin/radamsa -
 
 # Install Go
-ARG GO_VERSION="1.21.1"
+ARG GO_VERSION="1.21.4"
 RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
 RUN rm go${GO_VERSION}.linux-amd64.tar.gz
 ENV PATH="$PATH:/usr/local/go/bin"
 
+# Create directory where pre-built third party components will be built after user change
+RUN mkdir prebuilt && chmod 777 prebuilt
+
 # so that build output files have the correct owner
 # add non-root user
 ARG USERNAME
@@ -46,5 +49,19 @@ RUN if [ ! -z "${LOCALBUILD}" ] ; then \
 # Run container as non-root user from here onwards
 USER ${USERNAME}
 
+# Build third-party components
+COPY src/Makefile prebuilt/
+RUN cd prebuilt && make -j4 prebuilt_tools
+# intent here is to fill out the go package cache
+RUN mkdir prebuilt/x
+COPY src prebuilt/x
+RUN cd prebuilt/x/orchestrator && go get -d ./...
+RUN cd prebuilt/x/reporter && go get -d ./...
+RUN cd prebuilt/x/collector && go get -d ./...
+RUN cd prebuilt/x/rdmsr && go get -d ./...
+RUN cd prebuilt/x/wrmsr && go get -d ./...
+RUN cd prebuilt/x/msrbusy && go get -d ./...
+RUN cd prebuilt/x/pmu2metrics && go get -d ./...
+
 # run bash script and process the input command
 ENTRYPOINT [ "/bin/bash", "/scripts/entrypoint"]

Makefile

@@ -23,8 +23,13 @@ dist-amd64: tools
 	cd dist && tar -czf $(TARBALL) svr-info
 	cd dist && md5sum $(TARBALL) > $(TARBALL).md5
 	rm -rf dist/svr-info
+	rm -rf dist/tools
+	mkdir -p dist/tools
+	cp src/orchestrator/resources/* dist/tools
+	cp src/pmu2metrics/pmu2metrics-with-perf dist/tools
+	cd dist/tools && tar -xf collector_deps_amd64.tgz && rm collector_deps_*.tgz *.yaml.tmpl
 
-dist: dist-amd64 oss
+dist: dist-amd64
 
 oss:
 	cd src && make oss-source

RELEASE_NOTES

@@ -7,6 +7,24 @@ Fully Supported Platforms
 - Operating Systems: Ubuntu 16.04, 18.04, 20.04, 22.04, CentOS 7, Amazon Linux 2, Debian 11, RHEL 9, Rocky Linux 8
   Note: svr-info may work on other micro-architectures and Linux distributions, but has not been thoroughly tested
 
+2.8.0
+Bugs Fixed
+- Turbo on/off incorrectly reported on Excel Brief Report summary field
+Features Added
+- PMU-based metrics added to profiling options, e.g., -profile pmu or -profile all
+- Package and DRAM power stats added to profiling options, e.g., -profile power or -profile all
+- Option to skip configuration data collection when profiling or analyzing, e.g., -profile all -noconfig
+- Recognize DLB and QAT accelerators on SRF and GNR
+- ISA table extended to show availability of newest ISAs
+- Add recognition of temperature related entries in System Event Log to Insights
+- Recognize GNR, SRF, and AMD Bergamo CPUs
+- upgraded to MLC v3.11
+Known Issues
+- Frequency measurement benchmark not yet supported on GNR and SRF
+- The storage micro-benchmark may not run on CentOS due to OS locale settings.
+- CPU cache sizes are reported in aggregate on Ubuntu 20.04 and newer.
+- DRAM population and CPU frequencies may not be accurate on some public cloud IaaS VMs.
+
 2.7.4
 Bugs Fixed
 - false positive Vulnerability for CVE-2022-40982 ("Downfall") on some ICX systems

builder/build_docker_image

@@ -4,6 +4,6 @@ docker image build                         \
     --build-arg USERNAME="${USER}"         \
     --build-arg USERID="$(id -u ${USER})"  \
     --build-arg LOCALBUILD="true"          \
-    --file builder/Dockerfile              \
+    --file Dockerfile                      \
     --tag svr_info_builder:v4              \
     .

builder/scripts/entrypoint

@@ -5,7 +5,7 @@ if [ "$1" = "shell" ]; then
     /bin/bash
 elif [ "$1" = "build" ]; then
     echo "Starting Build"
-    cd workdir && make clean && make dist
+    cd workdir && make dist
 elif [ "$1" = "test" ]; then
     echo "Starting Tests"
     cd workdir && make test

go.work

@@ -1,4 +1,6 @@
-go 1.20
+go 1.21
+
+toolchain go1.21.3
 
 use ./src/collector
 
@@ -23,3 +25,5 @@ use ./src/pkg/msr
 use ./src/pkg/progress
 
 use ./src/pkg/target
+
+use ./src/pmu2metrics

go.work.sum

@@ -1,15 +1,29 @@
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/hyperjumptech/hyper-mux v1.1.0/go.mod h1:qdok3j+/VEtFvJ+YOotTNskGg2BXg3UJTbycU2xFDvE=
 github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
 github.com/xuri/excelize/v2 v2.7.0 h1:Hri/czwyRCW6f6zrCDWXcXKshlq4xAZNpNOpdfnFhEw=
 github.com/xuri/excelize/v2 v2.7.0/go.mod h1:ebKlRoS+rGyLMyUx3ErBECXs/HNYqyj+PbkkKRK5vSI=
 golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=

src/Makefile

@@ -10,9 +10,10 @@ VERSION_NUMBER := $(shell cat ${VERSION_FILE})
 VERSION := $(VERSION_NUMBER)_$(COMMIT_DATE)_$(COMMIT_ID)
 
 default: check orchestrator
-.PHONY: default test check format_check format linux-source collector reporter orchestrator rdmsr wrmsr msrbusy reset clean tools libs async-profiler calcfreq cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci mlc perf spectre-meltdown-checker sshpass stress-ng sysstat turbostat oss-source
+.PHONY: default test check format_check format linux-source collector reporter orchestrator pmu2metrics rdmsr wrmsr msrbusy reset clean tools libs async-profiler calcfreq cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci mlc perf spectre-meltdown-checker sshpass stress-ng sysstat turbostat oss-source
 
-collector_tools: async-profiler calcfreq cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci mlc msrbusy perf rdmsr wrmsr spectre-meltdown-checker stress-ng sysstat turbostat
+prebuilt_tools: async-profiler cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci perf spectre-meltdown-checker sshpass stress-ng sysstat turbostat
+other_tools: calcfreq mlc msrbusy pmu2metrics pmu2metrics-with-perf rdmsr wrmsr
 
 test:
 	cd pkg/commandfile && go test -v -vet=all .
@@ -27,22 +28,23 @@ test:
 	cd rdmsr && go test -v -vet=all .
 	cd wrmsr && go test -v -vet=all .
 	cd msrbusy && go test -v -vet=all .
+	cd pmu2metrics && go test -v -vet=all .
 
 format:
-	gofmt -l -w -s pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/
+	gofmt -l -w -s pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/ pmu2metrics/ rdmsr/ wrmsr/
 
 lint:
-	golint -set_exit_status pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/
+	golint -set_exit_status pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/ pmu2metrics/ rdmsr/ wrmsr/
 
 format_check:
 	@echo "Running gofmt -l to check for code formatting issues..."
-	@test -z $(shell gofmt -l -s pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/) || { echo "[WARN] Formatting issues detected. Resolve with 'make format'"; exit 1; }
+	@test -z $(shell gofmt -l -s pkg/commandfile/ pkg/core/ pkg/cpu/ pkg/progress/ pkg/target/ orchestrator/ collector/ reporter/ pmu2metrics/ rdmsr/ wrmsr/) || { echo "[WARN] Formatting issues detected. Resolve with 'make format'"; exit 1; }
 	@echo "gofmt detected no issues"
 
 check: format_check
 
-orchestrator: sshpass reporter collector collector-deps
-	cp sshpass/sshpass orchestrator/resources/
+orchestrator: reporter collector collector-deps
+	cp /prebuilt/sshpass/sshpass orchestrator/resources/
 	cp reporter/reporter orchestrator/resources/
 	cp collector/collector orchestrator/resources/
 	cp collector/collector_arm64 orchestrator/resources/
@@ -64,6 +66,15 @@ wrmsr:
 msrbusy:
 	cd msrbusy && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o msrbusy
 
+pmu2metrics:
+	rm -f pmu2metrics/resources/perf
+	cd pmu2metrics && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o pmu2metrics
+
+pmu2metrics-with-perf:
+	cp /prebuilt/linux/tools/perf/perf pmu2metrics/resources
+	cd pmu2metrics && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags '-s -w -X main.gVersion=$(VERSION)' -o pmu2metrics-with-perf
+	rm pmu2metrics/resources/perf
+
 ASYNCPROFILER_VERSION := 2.9
 async-profiler:
 ifeq ("$(wildcard async-profiler)","")
@@ -103,7 +114,7 @@ ifeq ("$(wildcard ethtool)","")
 else
 	cd ethtool && git checkout master && git pull
 endif
-	cd ethtool && git checkout v5.15
+	cd ethtool && git checkout v6.5
 ifeq ("$(wildcard ethtool/Makefile)","")
 	cd ethtool && ./autogen.sh && ./configure enable_netlink=no
 endif
@@ -115,7 +126,7 @@ ifeq ("$(wildcard fio)","")
 else
 	cd fio && git checkout master && git pull
 endif
-	cd fio && git checkout fio-3.28
+	cd fio && git checkout fio-3.36
 ifeq ("$(wildcard fio/config.log)","")
 	cd fio && ./configure --build-static --disable-native
 endif
@@ -170,7 +181,7 @@ ifeq ("$(wildcard mlc)","")
 else
 	cd mlc && git checkout master && git pull
 endif
-	-cd mlc && git checkout v3.10
+	-cd mlc && git checkout v3.11
 	-cd mlc && make version && STATIC="-static" make
 
 perf: linux-source
@@ -226,56 +237,52 @@ endif
 turbostat: linux-source
 	cd linux/tools/power/x86/turbostat && make
 
-collector-deps-amd64: collector_tools
+collector-deps-amd64: other_tools
 	$(eval TMPDIR := $(shell mktemp -d build.XXXXXX))
 	cp calcfreq/calcfreq $(TMPDIR)
-	cp cpuid/cpuid $(TMPDIR)
-	cp dmidecode/dmidecode $(TMPDIR)
-	cp ethtool/ethtool $(TMPDIR)
-	cp fio/fio $(TMPDIR)
-	cp ipmitool/src/ipmitool.static $(TMPDIR)/ipmitool
-	cp lshw/src/lshw-static $(TMPDIR)/lshw
-	cp lspci/lspci $(TMPDIR)
-	cp lspci/pci.ids.gz $(TMPDIR)
+	cp /prebuilt/cpuid/cpuid $(TMPDIR)
+	cp /prebuilt/dmidecode/dmidecode $(TMPDIR)
+	cp /prebuilt/ethtool/ethtool $(TMPDIR)
+	cp /prebuilt/fio/fio $(TMPDIR)
+	cp /prebuilt/ipmitool/src/ipmitool.static $(TMPDIR)/ipmitool
+	cp /prebuilt/lshw/src/lshw-static $(TMPDIR)/lshw
+	cp /prebuilt/lspci/lspci $(TMPDIR)
+	cp /prebuilt/lspci/pci.ids.gz $(TMPDIR)
 	-cp mlc/mlc $(TMPDIR)
 	cp msrbusy/msrbusy $(TMPDIR)
-	cp linux/tools/perf/perf $(TMPDIR)
-	cp -R async-profiler $(TMPDIR)
-	cp flamegraph/stackcollapse-perf.pl $(TMPDIR)
+	cp /prebuilt/linux/tools/perf/perf $(TMPDIR)
+	cp -R /prebuilt/async-profiler $(TMPDIR)
+	cp /prebuilt/flamegraph/stackcollapse-perf.pl $(TMPDIR)
+	cp pmu2metrics/pmu2metrics $(TMPDIR)
 	cp rdmsr/rdmsrx $(TMPDIR)
 	cp wrmsr/wrmsrx $(TMPDIR)
-	cp spectre-meltdown-checker/spectre-meltdown-checker.sh $(TMPDIR)
-	cp stress-ng/stress-ng $(TMPDIR)
-	cp sysstat/mpstat $(TMPDIR)
-	cp sysstat/iostat $(TMPDIR)
-	cp sysstat/sar $(TMPDIR)
-	cp sysstat/sadc $(TMPDIR)
-	cp linux/tools/power/x86/turbostat/turbostat $(TMPDIR)
+	cp /prebuilt/spectre-meltdown-checker/spectre-meltdown-checker.sh $(TMPDIR)
+	cp /prebuilt/stress-ng/stress-ng $(TMPDIR)
+	cp /prebuilt/sysstat/mpstat $(TMPDIR)
+	cp /prebuilt/sysstat/iostat $(TMPDIR)
+	cp /prebuilt/sysstat/sar $(TMPDIR)
+	cp /prebuilt/sysstat/sadc $(TMPDIR)
+	cp /prebuilt/linux/tools/power/x86/turbostat/turbostat $(TMPDIR)
 	-cp -r ../bin/* $(TMPDIR)
 	for f in $(TMPDIR)/*; do strip -s -p --strip-unneeded $$f; done
 	cd $(TMPDIR) && tar -czf ../orchestrator/resources/collector_deps_amd64.tgz .
 	rm -rf $(TMPDIR)
 
-collector-deps-arm64: spectre-meltdown-checker
+collector-deps-arm64:
 	$(eval TMPDIR := $(shell mktemp -d build.XXXXXX))
-	cp spectre-meltdown-checker/spectre-meltdown-checker.sh $(TMPDIR)
+	cp /prebuilt/spectre-meltdown-checker/spectre-meltdown-checker.sh $(TMPDIR)
 	cd $(TMPDIR) && tar -czf ../orchestrator/resources/collector_deps_arm64.tgz .
 	rm -rf $(TMPDIR)
 
 collector-deps: collector-deps-amd64 collector-deps-arm64
 
 clean:
-	rm -rf async-profiler cpuid dmidecode ethtool fio flamegraph ipmitool linux lshw lspci mlc spectre-meltdown-checker sshpass stress-ng sysstat oss_source.* linux-*.xz cpuid-*.gz glibc-*.bz2 libcrypt*.gz zlib.*.gz
+	rm -rf mlc *.tar.*
 	rm -f calcfreq/calcfreq
 	rm -f collector/collector
 	rm -f collector/collector_arm64
-	rm -f collector/collector.exe
 	rm -f reporter/reporter
-	rm -f reporter/reporter_arm64
-	rm -f reporter/reporter.exe
 	rm -f orchestrator/orchestrator
-	rm -f orchestrator/orchestrator_arm64
-	rm -f orchestrator/orchestrator.exe
 	rm -f orchestrator/resources/collector
 	rm -f orchestrator/resources/collector_arm64
 	rm -f orchestrator/resources/collector_deps_amd64.tgz
@@ -285,22 +292,23 @@ clean:
 	rm -f rdmsr/rdmsrx
 	rm -f wrmsr/wrmsrx
 	rm -f msrbusy/msrbusy
+	rm -f pmu2metrics/pmu2metrics
 
 reset:
-	cd cpuid && make clean
-	cd dmidecode && git clean -fdx && git reset --hard
-	cd ethtool && git clean -fdx && git reset --hard
-	cd fio && git clean -fdx && git reset --hard
-	cd flamegraph && git clean -fdx && git reset --hard
-	cd ipmitool && git clean -fdx && git reset --hard
-	cd lshw && git clean -fdx && git reset --hard
-	cd lspci && git clean -fdx && git reset --hard
+	cd /prebuilt/cpuid && make clean
+	cd /prebuilt/dmidecode && git clean -fdx && git reset --hard
+	cd /prebuilt/ethtool && git clean -fdx && git reset --hard
+	cd /prebuilt/fio && git clean -fdx && git reset --hard
+	cd /prebuilt/flamegraph && git clean -fdx && git reset --hard
+	cd /prebuilt/ipmitool && git clean -fdx && git reset --hard
+	cd /prebuilt/lshw && git clean -fdx && git reset --hard
+	cd /prebuilt/lspci && git clean -fdx && git reset --hard
 	-cd mlc && git clean -fdx && git reset --hard
-	cd linux/tools/perf && make clean
-	cd sshpass && make clean
-	cd stress-ng && git clean -fdx && git reset --hard
-	cd sysstat && git clean -fdx && git reset --hard
-	cd linux/tools/power/x86/turbostat && make clean
+	cd /prebuilt/linux/tools/perf && make clean
+	cd /prebuilt/sshpass && make clean
+	cd /prebuilt/stress-ng && git clean -fdx && git reset --hard
+	cd /prebuilt/sysstat && git clean -fdx && git reset --hard
+	cd /prebuilt/linux/tools/power/x86/turbostat && make clean
 
 # not used in build but required in oss archive file because some of the tools are statically linked
 glibc-2.19.tar.bz2:
@@ -312,5 +320,5 @@ libcrypt.tar.gz:
 libs: glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz
 
 oss-source: reset libs
-	tar --exclude-vcs -czf oss_source.tgz async-profiler/ dmidecode/ ethtool/ fio/ flamegraph/ ipmitool/ linux/ lshw/ lspci/ spectre-meltdown-checker/ sshpass/ sysstat/ stress-ng/ glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz
+	tar --exclude-vcs -czf oss_source.tgz /prebuilt/async-profiler/ /prebuilt/dmidecode/ /prebuilt/ethtool/ /prebuilt/fio/ /prebuilt/flamegraph/ /prebuilt/ipmitool/ /prebuilt/linux/ /prebuilt/lshw/ /prebuilt/lspci/ /prebuilt/spectre-meltdown-checker/ /prebuilt/sshpass/ /prebuilt/sysstat/ /prebuilt/stress-ng/ glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz
 	md5sum oss_source.tgz > oss_source.tgz.md5

src/collector/go.mod

@@ -1,6 +1,6 @@
 module intel.com/svr-info/collector/v2
 
-go 1.20
+go 1.21
 
 require (
 	gopkg.in/yaml.v2 v2.4.0
@@ -10,9 +10,9 @@ require (
 )
 
 require (
-	github.com/creasty/defaults v1.6.0 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	github.com/creasty/defaults v1.7.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
 
 replace intel.com/svr-info/pkg/core => ../pkg/core