sysutils/datadog-agent: Update to 7.24.1

- Loosen cmake requirement
- Add additional info about memory
- Upgrade agent to 7.24.1

PR:		252514
Submitted by:	uros@gruber.si (maintainer)

3 files changed, 46 insertions, 19 deletions

diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile
index 173934a49bbb..335bb23fec0f 100644
--- a/sysutils/datadog-agent/Makefile
+++ b/sysutils/datadog-agent/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	datadog-agent
-DISTVERSION=	7.23.1
-PORTREVISION=	1
+DISTVERSION=	7.24.1
 CATEGORIES=	sysutils net www
 
 MAINTAINER=	uros@gruber.si
@@ -11,8 +10,7 @@ COMMENT=	Datadog Agent: collect metrics and events from your systems and apps
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake>=3.18:devel/cmake \
-		go>=1.15:lang/go \
+BUILD_DEPENDS=	cmake>=3.12:devel/cmake \
 		go-bindata>0:devel/go-bindata
 
 USES=		go:modules python:3.7+
@@ -21,12 +19,12 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	datadog
 GH_TUPLE=	\
-		DataDog:agent-payload:v4.44.0:datadog_agent_payload/vendor/github.com/DataDog/agent-payload \
+		DataDog:agent-payload:v4.46.0:datadog_agent_payload/vendor/github.com/DataDog/agent-payload \
 		DataDog:cast:1ee8c8bd14a3:datadog_cast/vendor/github.com/spf13/cast \
 		DataDog:datadog-go:v3.5.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
 		DataDog:datadog-operator:9c71245c6822:datadog_datadog_operator/vendor/github.com/DataDog/datadog-operator \
 		DataDog:dd-trace-go:v1.23.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
-		DataDog:ebpf:7a8f7d072a50:datadog_ebpf/vendor/github.com/DataDog/ebpf \
+		DataDog:ebpf:a91a2d800994:datadog_ebpf/vendor/github.com/DataDog/ebpf \
 		DataDog:gobpf:5f8313cb4d71:datadog_gobpf/vendor/github.com/iovisor/gobpf \
 		DataDog:gohai:e17d616e422a:datadog_gohai/vendor/github.com/DataDog/gohai \
 		DataDog:gopsutil:1b53412ef321:datadog_gopsutil/vendor/github.com/DataDog/gopsutil \
@@ -47,6 +45,7 @@ GH_TUPLE=	\
 		alecthomas:participle:v0.4.4:alecthomas_participle/vendor/github.com/alecthomas/participle \
 		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/vendor/github.com/alecthomas/repr \
 		armon:go-metrics:v0.3.0:armon_go_metrics/vendor/github.com/armon/go-metrics \
+		avast:retry-go:v2.7.0:avast_retry_go/vendor/github.com/avast/retry-go \
 		aws:aws-sdk-go:v1.30.5:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beevik:ntp:v0.3.0:beevik_ntp/vendor/github.com/beevik/ntp \
 		benesch:cgosymbolizer:bec6fe6e597b:benesch_cgosymbolizer/vendor/github.com/benesch/cgosymbolizer \
@@ -65,6 +64,7 @@ GH_TUPLE=	\
 		cloudfoundry:garden:061eda450ad9:cloudfoundry_garden/vendor/code.cloudfoundry.org/garden \
 		cloudfoundry:lager:v2.0.0:cloudfoundry_lager/vendor/code.cloudfoundry.org/lager \
 		cloudfoundry:tlsconfig:bbe0f8da39b3:cloudfoundry_tlsconfig/vendor/code.cloudfoundry.org/tlsconfig \
+		cobaugh:osrelease:a93a0a55a249:cobaugh_osrelease/vendor/github.com/cobaugh/osrelease \
 		containerd:cgroups:b44481373989:containerd_cgroups/vendor/github.com/containerd/cgroups \
 		containerd:containerd:v1.2.13:containerd_containerd/vendor/github.com/containerd/containerd \
 		containerd:continuity:0f16d7a0959c:containerd_continuity/vendor/github.com/containerd/continuity \
@@ -92,7 +92,7 @@ GH_TUPLE=	\
 		evanphx:json-patch:v4.5.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
 		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
 		florianl:go-conntrack:v0.2.0:florianl_go_conntrack/vendor/github.com/florianl/go-conntrack \
-		florianl:go-tc:v0.1.0:florianl_go_tc/vendor/github.com/florianl/go-tc \
+		florianl:go-tc:v0.2.0:florianl_go_tc/vendor/github.com/florianl/go-tc \
 		freddierice:go-losetup:fc9adea44124:freddierice_go_losetup/vendor/github.com/freddierice/go-losetup \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		ghodss:yaml:25d852aebe32:ghodss_yaml/vendor/github.com/ghodss/yaml \
@@ -141,7 +141,7 @@ GH_TUPLE=	\
 		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-hclog:v0.12.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
 		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
-		hashicorp:go-multierror:v1.0.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
+		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
 		hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
@@ -191,6 +191,7 @@ GH_TUPLE=	\
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		moby:moby:v17.12.0-ce:moby_moby/vendor/github.com/docker/docker \
 		moby:sys:mountinfo/v0.1.3:moby_sys_mountinfo/vendor/github.com/moby/sys \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
@@ -232,10 +233,12 @@ GH_TUPLE=	\
 		tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \
 		twmb:murmur3:v1.1.3:twmb_murmur3/vendor/github.com/twmb/murmur3 \
 		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:automaxprocs:v1.2.0:uber_go_automaxprocs/vendor/go.uber.org/automaxprocs \
 		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.14.1:uber_go_zap/vendor/go.uber.org/zap \
 		ulikunitz:xz:v0.5.7:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
 		urfave:negroni:v1.0.0:urfave_negroni/vendor/github.com/urfave/negroni \
+		vishvananda:netlink:v1.1.0:vishvananda_netlink \
 		vishvananda:netns:0a2b9b5464df:vishvananda_netns/vendor/github.com/vishvananda/netns \
 		vito:go-sse:v1.0.0:vito_go_sse/vendor/github.com/vito/go-sse \
 		vmihailenco:msgpack:v4.3.11:vmihailenco_msgpack_v4/vendor/github.com/vmihailenco/msgpack/v4 \
diff --git a/sysutils/datadog-agent/distinfo b/sysutils/datadog-agent/distinfo
index e01499f07f04..90d3832c96fe 100644
--- a/sysutils/datadog-agent/distinfo
+++ b/sysutils/datadog-agent/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1607081211
-SHA256 (datadog-datadog-agent-7.23.1_GH0.tar.gz) = c5af3d3686e691178ae3327ab76cf5269bf0c4a785da6aec27ecff4d854c0af8
-SIZE (datadog-datadog-agent-7.23.1_GH0.tar.gz) = 17094861
-SHA256 (DataDog-agent-payload-v4.44.0_GH0.tar.gz) = 2973cc263df1e2812fc1a2d60a602f52cfe57688c760a3fe97ff4b84a7836105
-SIZE (DataDog-agent-payload-v4.44.0_GH0.tar.gz) = 119685
+TIMESTAMP = 1610104349
+SHA256 (datadog-datadog-agent-7.24.1_GH0.tar.gz) = 147e85c48809318ed453a286fd9a2e32a74e6621429590bd1e127a32f68b0552
+SIZE (datadog-datadog-agent-7.24.1_GH0.tar.gz) = 17245055
+SHA256 (DataDog-agent-payload-v4.46.0_GH0.tar.gz) = 57020bf13fc1632c7b0145341d407d0c644c64dd7939f5582685207d6ea15a4c
+SIZE (DataDog-agent-payload-v4.46.0_GH0.tar.gz) = 119950
 SHA256 (DataDog-cast-1ee8c8bd14a3_GH0.tar.gz) = a08d42ae7a184a72e2976ae24cb236aace4938c28042a2de562566f3584845f5
 SIZE (DataDog-cast-1ee8c8bd14a3_GH0.tar.gz) = 11120
 SHA256 (DataDog-datadog-go-v3.5.0_GH0.tar.gz) = 721355b04eae2cb9cbe5a15ba0a880243b1a35f1912aff5d6818e259734c12c3
@@ -11,8 +11,8 @@ SHA256 (DataDog-datadog-operator-9c71245c6822_GH0.tar.gz) = 91a0eb7a539b0eff413e
 SIZE (DataDog-datadog-operator-9c71245c6822_GH0.tar.gz) = 6239719
 SHA256 (DataDog-dd-trace-go-v1.23.1_GH0.tar.gz) = 9df7513920324790e2c844b4073b4f27fccf1bfd9f8ece526da0f730dd8a894c
 SIZE (DataDog-dd-trace-go-v1.23.1_GH0.tar.gz) = 504005
-SHA256 (DataDog-ebpf-7a8f7d072a50_GH0.tar.gz) = ca7e7690791c4f2c9d77229f19bbdd19a16a6846d01e04ec76ebba97a35a5ddb
-SIZE (DataDog-ebpf-7a8f7d072a50_GH0.tar.gz) = 1172804
+SHA256 (DataDog-ebpf-a91a2d800994_GH0.tar.gz) = 43a264db45c013a569749e93d7c707698473123f13080318b4bffefc84e94977
+SIZE (DataDog-ebpf-a91a2d800994_GH0.tar.gz) = 1191986
 SHA256 (DataDog-gobpf-5f8313cb4d71_GH0.tar.gz) = 9457f83aa7acb704689e68e2bfde016fb19551a73c8f173d581a79f79e491a8e
 SIZE (DataDog-gobpf-5f8313cb4d71_GH0.tar.gz) = 73594
 SHA256 (DataDog-gohai-e17d616e422a_GH0.tar.gz) = 411bc5b1202d0cf9e3d59e1cc25bfeac28c7c45c1ed5d3ad1a04d5bc757a0e06
@@ -53,6 +53,8 @@ SHA256 (alecthomas-repr-d37bc2a10ba1_GH0.tar.gz) = 935e4ade182b6cf97ad598f956c15
 SIZE (alecthomas-repr-d37bc2a10ba1_GH0.tar.gz) = 4958
 SHA256 (armon-go-metrics-v0.3.0_GH0.tar.gz) = 448c93a6ef30ba432ee80e03e8188bc44575f90df5b2a74b2b03414efa80b483
 SIZE (armon-go-metrics-v0.3.0_GH0.tar.gz) = 28377
+SHA256 (avast-retry-go-v2.7.0_GH0.tar.gz) = 4ac5c451ed209378b0d61266f357dc1507196ea9e38e79fc403fda615044eda9
+SIZE (avast-retry-go-v2.7.0_GH0.tar.gz) = 8851
 SHA256 (aws-aws-sdk-go-v1.30.5_GH0.tar.gz) = 8a047e718a427e6d9d8d781a86b69a9cb4a911f4de6fd8cc5e97dfbf86950cf5
 SIZE (aws-aws-sdk-go-v1.30.5_GH0.tar.gz) = 14438535
 SHA256 (beevik-ntp-v0.3.0_GH0.tar.gz) = 6a398b24ee7c4204f73881299a1860976b2a8d6f77c11895e2d06c6c657b5584
@@ -89,6 +91,8 @@ SHA256 (cloudfoundry-lager-v2.0.0_GH0.tar.gz) = 0313fe7382de243674193ca3b2f29544
 SIZE (cloudfoundry-lager-v2.0.0_GH0.tar.gz) = 26326
 SHA256 (cloudfoundry-tlsconfig-bbe0f8da39b3_GH0.tar.gz) = bf46cbc3a685748c2df39f3138f07e4fa5bc2aef974ec12c60563c98434485bd
 SIZE (cloudfoundry-tlsconfig-bbe0f8da39b3_GH0.tar.gz) = 13557
+SHA256 (cobaugh-osrelease-a93a0a55a249_GH0.tar.gz) = 10fb95f80822693bcdba3ccfb79b3963313f9631b98cc452b6b98a2e56c8b90a
+SIZE (cobaugh-osrelease-a93a0a55a249_GH0.tar.gz) = 3912
 SHA256 (containerd-cgroups-b44481373989_GH0.tar.gz) = b4fe29c4de4382b53e3ad6473865ea60b7fa34143fc54e7b4a8674f7542af313
 SIZE (containerd-cgroups-b44481373989_GH0.tar.gz) = 79314
 SHA256 (containerd-containerd-v1.2.13_GH0.tar.gz) = 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4
@@ -143,8 +147,8 @@ SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9
 SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
 SHA256 (florianl-go-conntrack-v0.2.0_GH0.tar.gz) = e91cf83e55f42ff99e1ebd494546a4fc89ecef2c05e4e3b1d41d6cffcbfa7fd8
 SIZE (florianl-go-conntrack-v0.2.0_GH0.tar.gz) = 22281
-SHA256 (florianl-go-tc-v0.1.0_GH0.tar.gz) = 39c966ffd0e0c00735fcde79b852885db8b07a8e2e755d757925f4336868b47f
-SIZE (florianl-go-tc-v0.1.0_GH0.tar.gz) = 33749
+SHA256 (florianl-go-tc-v0.2.0_GH0.tar.gz) = a2e05bd3ecb24c96f0a87d599b0f15f47dbb87267d8e828865851a4dbecfb20b
+SIZE (florianl-go-tc-v0.2.0_GH0.tar.gz) = 56032
 SHA256 (freddierice-go-losetup-fc9adea44124_GH0.tar.gz) = 148a30214841c2057a7da42edb4f4249127ee6fb842756bb94367f5bfac3b9e6
 SIZE (freddierice-go-losetup-fc9adea44124_GH0.tar.gz) = 3406
 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
@@ -241,8 +245,8 @@ SHA256 (hashicorp-go-hclog-v0.12.0_GH0.tar.gz) = 5e6e0bb93e825397507bc55b4bdeba5
 SIZE (hashicorp-go-hclog-v0.12.0_GH0.tar.gz) = 31223
 SHA256 (hashicorp-go-immutable-radix-v1.1.0_GH0.tar.gz) = 7c8eb6ecabcf4428e2f3b6bbb99c74d6c5e568ea1c42a029b284ae96dbccd57f
 SIZE (hashicorp-go-immutable-radix-v1.1.0_GH0.tar.gz) = 22073
-SHA256 (hashicorp-go-multierror-v1.0.0_GH0.tar.gz) = 5ae83eea62b2c845d41087c38c878741337e092db114b9a7ca9aebe5bf1dd264
-SIZE (hashicorp-go-multierror-v1.0.0_GH0.tar.gz) = 10066
+SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
+SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
 SHA256 (hashicorp-go-rootcerts-v1.0.2_GH0.tar.gz) = dca11d5ff16f3d29f632a7bf3c13cb9c87f021a5363faf22e4c45c8e073bf64c
 SIZE (hashicorp-go-rootcerts-v1.0.2_GH0.tar.gz) = 12242
 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
@@ -341,6 +345,8 @@ SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb17643
 SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
 SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
 SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
+SHA256 (moby-moby-v17.12.0-ce_GH0.tar.gz) = cc926e9b420b948556a0b534a642978baded65470be69e598772903185368df6
+SIZE (moby-moby-v17.12.0-ce_GH0.tar.gz) = 7199288
 SHA256 (moby-sys-mountinfo-v0.1.3_GH0.tar.gz) = 8d5459514cffb3ab1fd7b4f26442da97754df906c87d46379e184c3b66df35e2
 SIZE (moby-sys-mountinfo-v0.1.3_GH0.tar.gz) = 36847
 SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
@@ -423,6 +429,8 @@ SHA256 (twmb-murmur3-v1.1.3_GH0.tar.gz) = a23d93822b6b852fcaf393afe54bd4e115c016
 SIZE (twmb-murmur3-v1.1.3_GH0.tar.gz) = 12700
 SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
 SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
+SHA256 (uber-go-automaxprocs-v1.2.0_GH0.tar.gz) = 6e9e8e355a57b793397eda88b5f6e8e0da3fc5b3b51dcab95c865c0926d42067
+SIZE (uber-go-automaxprocs-v1.2.0_GH0.tar.gz) = 16007
 SHA256 (uber-go-multierr-v1.5.0_GH0.tar.gz) = 15fdd69d5f35e1c5c472d02b58fe3e229795d930398f9017c6c43a108504eaf1
 SIZE (uber-go-multierr-v1.5.0_GH0.tar.gz) = 12336
 SHA256 (uber-go-zap-v1.14.1_GH0.tar.gz) = 6d6a64adc83b084c777f8e6c876eb2953376a92e7099571119185a004d53b1f0
@@ -431,6 +439,8 @@ SHA256 (ulikunitz-xz-v0.5.7_GH0.tar.gz) = f398b805bd38c409db4779f398736ca51c5ac1
 SIZE (ulikunitz-xz-v0.5.7_GH0.tar.gz) = 478092
 SHA256 (urfave-negroni-v1.0.0_GH0.tar.gz) = 67a46587d15cb705e145e08270aa983ba08aadf5a9578850dca2b1e42b7cd561
 SIZE (urfave-negroni-v1.0.0_GH0.tar.gz) = 39408
+SHA256 (vishvananda-netlink-v1.1.0_GH0.tar.gz) = c72754916ac1551cea4e1f801d5b2c26c1476f11bd3130382a4a890822eb5929
+SIZE (vishvananda-netlink-v1.1.0_GH0.tar.gz) = 147026
 SHA256 (vishvananda-netns-0a2b9b5464df_GH0.tar.gz) = 15f89c51e1daf9b0c24d80ad38a2dbbec2efd7214e36120dc1383702387ec679
 SIZE (vishvananda-netns-0a2b9b5464df_GH0.tar.gz) = 8004
 SHA256 (vito-go-sse-v1.0.0_GH0.tar.gz) = 103e9ff88bf095bc8a86946cb256e8bf7b525e147de18598df72996afbd8af72
diff --git a/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_memory__nix.go b/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_memory__nix.go
new file mode 100644
index 000000000000..1c93d8d3ec0c
--- /dev/null
+++ b/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_memory__nix.go
@@ -0,0 +1,14 @@
+--- pkg/collector/corechecks/system/memory_nix.go.orig	2021-01-08 11:29:04 UTC
++++ pkg/collector/corechecks/system/memory_nix.go
+@@ -94,6 +94,11 @@ func (c *MemoryCheck) linuxSpecificVirtualMemoryCheck(
+ 	sender.Gauge("system.mem.commit_limit", float64(v.CommitLimit)/mbSize, "", nil)
+ 	sender.Gauge("system.mem.committed_as", float64(v.CommittedAS)/mbSize, "", nil)
+ 	sender.Gauge("system.swap.cached", float64(v.SwapCached)/mbSize, "", nil)
++	sender.Gauge("system.mem.active", float64(v.Active)/mbSize, "", nil)
++	sender.Gauge("system.mem.inactive", float64(v.Inactive)/mbSize, "", nil)
++	sender.Gauge("system.mem.buffers", float64(v.Buffers)/mbSize, "", nil)
++	sender.Gauge("system.mem.wired", float64(v.Wired)/mbSize, "", nil)
++	sender.Gauge("system.mem.laundry", float64(v.Laundry)/mbSize, "", nil)
+ 	return nil
+ }
+