Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Dec 2020 10:30:51 +0000 (UTC)
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557126 - in head: . sysutils sysutils/datadog sysutils/datadog-agent sysutils/datadog-agent/files
Message-ID:  <202012061030.0B6AUp0U069636@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mikael
Date: Sun Dec  6 10:30:51 2020
New Revision: 557126
URL: https://svnweb.freebsd.org/changeset/ports/557126

Log:
  sysutils/datadog: rename to sysutils/datadog-agent
  
  Rename to sysutils/datadog-agent
  Various fix / improvements to the port
  
  PR:		251079
  Submitted by:	uros@gruber.si (maintainer)

Added:
  head/sysutils/datadog-agent/
     - copied from r557125, head/sysutils/datadog/
  head/sysutils/datadog-agent/files/datadog-dogstatsd.in   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_apm__nix.go   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_process__agent.go   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-pkg_config_log.go   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-pkg_secrets_check__rights__nix.go   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-vendor_github.com_DataDog_gopsutil_disk_disk__freebsd.go   (contents, props changed)
  head/sysutils/datadog-agent/files/patch-vendor_github.com_shirou_gopsutil_disk_disk__freebsd.go   (contents, props changed)
Deleted:
  head/sysutils/datadog/
Modified:
  head/MOVED
  head/sysutils/Makefile
  head/sysutils/datadog-agent/Makefile
  head/sysutils/datadog-agent/distinfo
  head/sysutils/datadog-agent/files/patch-cmd_agent_common_common__nix.go
  head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd.go
  head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd__test.go
  head/sysutils/datadog-agent/files/pkg-message.in
  head/sysutils/datadog-agent/pkg-descr
  head/sysutils/datadog-agent/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/MOVED	Sun Dec  6 10:30:51 2020	(r557126)
@@ -15771,3 +15771,4 @@ devel/py-XStatic-tv4|devel/py-xstatic-tv4|2020-12-05|U
 textproc/py-MarkupSafe|textproc/py-markupsafe|2020-12-05|Use lowercase PORTNAME and path
 devel/py-git_semver|devel/py-git-semver|2020-12-05|Rename to match upstream naming
 devel/py-readme_renderer|devel/py-readme-renderer|2020-12-05|Rename to match upstream naming
+sysutils/datadog|sysutils/datadog-agent|2020-12-06|Renamed

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/Makefile	Sun Dec  6 10:30:51 2020	(r557126)
@@ -231,7 +231,7 @@
     SUBDIR += daemontools-encore
     SUBDIR += daggy
     SUBDIR += dar
-    SUBDIR += datadog
+    SUBDIR += datadog-agent
     SUBDIR += dateutils
     SUBDIR += dc3dd
     SUBDIR += dcfldd

Modified: head/sysutils/datadog-agent/Makefile
==============================================================================
--- head/sysutils/datadog/Makefile	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/datadog-agent/Makefile	Sun Dec  6 10:30:51 2020	(r557126)
@@ -1,327 +1,327 @@
 # $FreeBSD$
 
-PORTNAME=	datadog
-DISTVERSIONPREFIX=	${PORTNAME}-
+PORTNAME=	datadog-agent
 DISTVERSION=	7.23.1
-CATEGORIES=	sysutils
+PORTREVISION=	1
+CATEGORIES=	sysutils net www
 
 MAINTAINER=	uros@gruber.si
-COMMENT=	Datadog Server and Application monitoring agent
+COMMENT=	Datadog Agent: collect metrics and events from your systems and apps
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	various cgo modules fail on non-x86 architectures
-
-BUILD_DEPENDS=	go>=1.15:lang/go \
-		cmake>=3.18:devel/cmake \
+BUILD_DEPENDS=	cmake>=3.18:devel/cmake \
+		go>=1.15:lang/go \
 		go-bindata>0:devel/go-bindata
 
-USES=		go python:3.7+
+USES=		go:modules python:3.7+
 
-DATADOG_PREFIX=	${PREFIX}/bin/${PORTNAME}
-LOGDIR=		/var/log/${PORTNAME}
-RUNDIR=		/var/run/${PORTNAME}
-
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
-GH_ACCOUNT=	DataDog
-GH_PROJECT=	datadog-agent
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-GH_SUBDIR=	src/github.com/DataDog/datadog-agent
-GH_TAGNAME=	${DISTVERSION}
-
-# For list of modules you can check:
-# https://github.com/DataDog/datadog-agent/blob/${DISTVERSION}/Gopkg.toml
+GH_ACCOUNT=	datadog
 GH_TUPLE=	\
-		DataDog:agent-payload:v4.44.0:datadog_agent_payload/src/github.com/DataDog/agent-payload \
-		DataDog:cast:1ee8c8bd14a3:datadog_cast/src/github.com/spf13/cast \
-		DataDog:datadog-go:v3.5.0:datadog_datadog_go/src/github.com/DataDog/datadog-go \
-		DataDog:datadog-operator:9c71245c6822:datadog_datadog_operator/src/github.com/DataDog/datadog-operator \
-		DataDog:dd-trace-go:v1.23.1:datadog_dd_trace_go/src/gopkg.in/DataDog/dd-trace-go.v1 \
-		DataDog:ebpf:7a8f7d072a50:datadog_ebpf/src/github.com/DataDog/ebpf \
-		DataDog:gobpf:5f8313cb4d71:datadog_gobpf/src/github.com/iovisor/gobpf \
-		DataDog:gohai:e17d616e422a:datadog_gohai/src/github.com/DataDog/gohai \
-		DataDog:gopsutil:1b53412ef321:datadog_gopsutil/src/github.com/DataDog/gopsutil \
-		DataDog:mmh3:f5b682d8c981:datadog_mmh3/src/github.com/DataDog/mmh3 \
-		DataDog:viper:v1.8.0:datadog_viper/src/github.com/spf13/viper \
-		DataDog:watermarkpodautoscaler:v0.1.0:datadog_watermarkpodautoscaler/src/github.com/DataDog/watermarkpodautoscaler \
-		DataDog:zstd:2bf71ec48360:datadog_zstd/src/github.com/DataDog/zstd \
-		Knetic:govaluate:v3.0.0:knetic_govaluate/src/gopkg.in/Knetic/govaluate.v3 \
-		Masterminds:goutils:v1.1.0:masterminds_goutils/src/github.com/Masterminds/goutils \
-		Masterminds:semver:v1.5.0:masterminds_semver/src/github.com/Masterminds/semver \
-		Masterminds:sprig:v2.22.0:masterminds_sprig/src/github.com/Masterminds/sprig \
-		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/src/github.com/Microsoft/go-winio \
-		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/src/github.com/Microsoft/hcsshim \
-		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/src/github.com/NYTimes/gziphandler \
-		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/src/github.com/PuerkitoBio/purell \
-		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/src/github.com/PuerkitoBio/urlesc \
-		StackExchange:wmi:e0a55b97c705:stackexchange_wmi/src/github.com/StackExchange/wmi \
-		alecthomas:participle:v0.4.4:alecthomas_participle/src/github.com/alecthomas/participle \
-		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/src/github.com/alecthomas/repr \
-		armon:go-metrics:v0.3.0:armon_go_metrics/src/github.com/armon/go-metrics \
-		aws:aws-sdk-go:v1.30.5:aws_aws_sdk_go/src/github.com/aws/aws-sdk-go \
-		beevik:ntp:v0.3.0:beevik_ntp/src/github.com/beevik/ntp \
-		benesch:cgosymbolizer:bec6fe6e597b:benesch_cgosymbolizer/src/github.com/benesch/cgosymbolizer \
-		beorn7:perks:v1.0.1:beorn7_perks/src/github.com/beorn7/perks \
-		bhmj:jsonslice:92c3edaad8e2:bhmj_jsonslice/src/github.com/bhmj/jsonslice \
-		blabber:go-freebsd-sysctl:dcd5a22:go_freebsd_sysctl/src/github.com/blabber/go-freebsd-sysctl \
-		blang:semver:v3.5.1:blang_semver/src/github.com/blang/semver \
-		bmizerany:pat:6226ea591a40:bmizerany_pat/src/github.com/bmizerany/pat \
-		cenkalti:backoff:v2.2.1:cenkalti_backoff/src/github.com/cenkalti/backoff \
-		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/src/go.opencensus.io \
-		cespare:xxhash:v1.1.0:cespare_xxhash/src/github.com/cespare/xxhash \
-		cihub:seelog:d2c6e5aa9fbf:cihub_seelog/src/github.com/cihub/seelog \
-		clbanning:mxj:v1.8.4:clbanning_mxj/src/github.com/clbanning/mxj \
-		cloudfoundry:bbs:d7bc971db0db:cloudfoundry_bbs/src/code.cloudfoundry.org/bbs \
-		cloudfoundry:cfhttp:v2.0.0:cloudfoundry_cfhttp/src/code.cloudfoundry.org/cfhttp/v2 \
-		cloudfoundry:garden:061eda450ad9:cloudfoundry_garden/src/code.cloudfoundry.org/garden \
-		cloudfoundry:lager:v2.0.0:cloudfoundry_lager/src/code.cloudfoundry.org/lager \
-		cloudfoundry:tlsconfig:bbe0f8da39b3:cloudfoundry_tlsconfig/src/code.cloudfoundry.org/tlsconfig \
-		containerd:cgroups:b44481373989:containerd_cgroups/src/github.com/containerd/cgroups \
-		containerd:containerd:v1.2.13:containerd_containerd/src/github.com/containerd/containerd \
-		containerd:continuity:0f16d7a0959c:containerd_continuity/src/github.com/containerd/continuity \
-		containerd:fifo:ff969a566b00:containerd_fifo/src/github.com/containerd/fifo \
-		containerd:typeurl:v1.0.0:containerd_typeurl/src/github.com/containerd/typeurl \
-		coreos:etcd:v3.3.15:coreos_etcd/src/github.com/coreos/etcd \
-		coreos:go-semver:v0.3.0:coreos_go_semver/src/github.com/coreos/go-semver \
-		coreos:go-systemd:40e2722dffea:coreos_go_systemd/src/github.com/coreos/go-systemd \
-		coreos:pkg:399ea9e2e55f:coreos_pkg/src/github.com/coreos/pkg \
-		datadog:extendeddaemonset:94ec1f3a5192:datadog_extendeddaemonset/src/github.com/datadog/extendeddaemonset \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/src/github.com/davecgh/go-spew \
-		dgraph-io:ristretto:v0.0.3:dgraph_io_ristretto/src/github.com/dgraph-io/ristretto \
-		dgryski:go-jump:e1f439676b57:dgryski_go_jump/src/github.com/dgryski/go-jump \
-		docker:distribution:0ac367fd6bee:docker_distribution/src/github.com/docker/distribution \
-		docker:go-connections:v0.4.0:docker_go_connections/src/github.com/docker/go-connections \
-		docker:go-events:e31b211e4f1c:docker_go_events/src/github.com/docker/go-events \
-		docker:go-units:v0.4.0:docker_go_units/src/github.com/docker/go-units \
-		docker:spdystream:449fdfce4d96:docker_spdystream/src/github.com/docker/spdystream \
-		dsnet:compress:v0.0.1:dsnet_compress/src/github.com/dsnet/compress \
-		dustin:go-humanize:v1.0.0:dustin_go_humanize/src/github.com/dustin/go-humanize \
-		elastic:go-libaudit:v0.4.0:elastic_go_libaudit/src/github.com/elastic/go-libaudit \
-		emicklei:go-restful-swagger12:7524189396c6:emicklei_go_restful_swagger12/src/github.com/emicklei/go-restful-swagger12 \
-		emicklei:go-restful:v2.9.6:emicklei_go_restful/src/github.com/emicklei/go-restful \
-		etcd-io:etcd:3cf2f69b5738:etcd_io_etcd/src/go.etcd.io/etcd \
-		evanphx:json-patch:v4.5.0:evanphx_json_patch/src/github.com/evanphx/json-patch \
-		fatih:color:v1.9.0:fatih_color/src/github.com/fatih/color \
-		florianl:go-conntrack:v0.2.0:florianl_go_conntrack/src/github.com/florianl/go-conntrack \
-		florianl:go-tc:v0.1.0:florianl_go_tc/src/github.com/florianl/go-tc \
-		freddierice:go-losetup:fc9adea44124:freddierice_go_losetup/src/github.com/freddierice/go-losetup \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/src/github.com/fsnotify/fsnotify \
-		ghodss:yaml:25d852aebe32:ghodss_yaml/src/github.com/ghodss/yaml \
-		go-inf:inf:v0.9.1:go_inf_inf/src/gopkg.in/inf.v0 \
-		go-ini:ini:v1.55.0:go_ini_ini/src/github.com/go-ini/ini \
-		go-ole:go-ole:v1.2.4:go_ole_go_ole/src/github.com/go-ole/go-ole \
-		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/src/github.com/go-openapi/jsonpointer \
-		go-openapi:jsonreference:v0.19.2:go_openapi_jsonreference/src/github.com/go-openapi/jsonreference \
-		go-openapi:spec:v0.19.8:go_openapi_spec/src/github.com/go-openapi/spec \
-		go-openapi:swag:v0.19.5:go_openapi_swag/src/github.com/go-openapi/swag \
-		go-yaml:yaml:v2.2.8:go_yaml_yaml/src/gopkg.in/yaml.v2 \
-		gobwas:glob:v0.2.3:gobwas_glob/src/github.com/gobwas/glob \
-		godbus:dbus:v4.1.0:godbus_dbus/src/github.com/godbus/dbus \
-		gogo:googleapis:v1.3.2:gogo_googleapis/src/github.com/gogo/googleapis \
-		gogo:protobuf:v1.3.1:gogo_protobuf/src/github.com/gogo/protobuf \
-		golang:appengine:v1.6.5:golang_appengine/src/google.golang.org/appengine \
-		golang:crypto:75b288015ac9:golang_crypto/src/golang.org/x/crypto \
-		golang:glog:23def4e6c14b:golang_glog/src/github.com/golang/glog \
-		golang:groupcache:8c9f03a8e57e:golang_groupcache/src/github.com/golang/groupcache \
-		golang:mobile:d2bd2a29d028:golang_mobile/src/golang.org/x/mobile \
-		golang:net:c89045814202:golang_net/src/golang.org/x/net \
-		golang:oauth2:bf48bf16ab8d:golang_oauth2/src/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.2:golang_protobuf/src/github.com/golang/protobuf \
-		golang:snappy:v0.0.1:golang_snappy/src/github.com/golang/snappy \
-		golang:sync:cd5d95a43a6e:golang_sync/src/golang.org/x/sync \
-		golang:sys:196b9ba8737a:golang_sys/src/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/src/golang.org/x/text \
-		golang:time:555d28b269f0:golang_time/src/golang.org/x/time \
-		golang:tools:82bb89366a1e:golang_tools/src/golang.org/x/tools \
-		golang:xerrors:5ec99f83aff1:golang_xerrors/src/golang.org/x/xerrors \
-		gomodules:jsonpatch:v3.0.1:gomodules_jsonpatch/src/gomodules.xyz/jsonpatch/v3 \
-		gomodules:orderedmap:v0.1.0:gomodules_orderedmap/src/gomodules.xyz/orderedmap \
-		google:go-cmp:v0.4.0:google_go_cmp/src/github.com/google/go-cmp \
-		google:go-genproto:09dca8ec2884:google_go_genproto/src/google.golang.org/genproto \
-		google:gofuzz:v1.0.0:google_gofuzz/src/github.com/google/gofuzz \
-		google:gopacket:v1.1.17:google_gopacket/src/github.com/google/gopacket \
-		google:uuid:v1.1.1:google_uuid/src/github.com/google/uuid \
-		googleapis:gnostic:v0.3.1:googleapis_gnostic/src/github.com/googleapis/gnostic \
-		gorilla:mux:v1.7.4:gorilla_mux/src/github.com/gorilla/mux \
-		grpc-ecosystem:go-grpc-middleware:v1.2.0:grpc_ecosystem_go_grpc_middleware/src/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/src/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc-ecosystem:grpc-gateway:v1.12.2:grpc_ecosystem_grpc_gateway/src/github.com/grpc-ecosystem/grpc-gateway \
-		grpc:grpc-go:v1.26.0:grpc_grpc_go/src/google.golang.org/grpc \
-		hashicorp:consul:v1.4.0:hashicorp_consul_api/src/github.com/hashicorp/consul \
-		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/src/github.com/hashicorp/errwrap \
-		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \
-		hashicorp:go-hclog:v0.12.0:hashicorp_go_hclog/src/github.com/hashicorp/go-hclog \
-		hashicorp:go-immutable-radix:v1.1.0:hashicorp_go_immutable_radix/src/github.com/hashicorp/go-immutable-radix \
-		hashicorp:go-multierror:v1.0.0:hashicorp_go_multierror/src/github.com/hashicorp/go-multierror \
-		hashicorp:go-rootcerts:v1.0.2:hashicorp_go_rootcerts/src/github.com/hashicorp/go-rootcerts \
-		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/src/github.com/hashicorp/golang-lru \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/src/github.com/hashicorp/hcl \
-		hashicorp:serf:v0.8.5:hashicorp_serf/src/github.com/hashicorp/serf \
-		hectane:go-acl:da78bae5fc95:hectane_go_acl/src/github.com/hectane/go-acl \
-		huandu:xstrings:v1.2.0:huandu_xstrings/src/github.com/huandu/xstrings \
-		ianlancetaylor:cgosymbolizer:f5072df9c550:ianlancetaylor_cgosymbolizer/src/github.com/ianlancetaylor/cgosymbolizer \
-		imdario:mergo:v0.3.7:imdario_mergo/src/github.com/imdario/mergo \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/src/github.com/inconshreveable/mousetrap \
-		itchyny:astgen-go:aaa595cf980e:itchyny_astgen_go/src/github.com/itchyny/astgen-go \
-		itchyny:gojq:v0.10.2:itchyny_gojq/src/github.com/itchyny/gojq \
-		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/src/github.com/jmespath/go-jmespath \
-		json-iterator:go:v1.1.9:json_iterator_go/src/github.com/json-iterator/go \
-		kardianos:osext:2bc1f35cddc0:kardianos_osext/src/github.com/kardianos/osext \
-		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/src/github.com/konsorten/go-windows-terminal-sequences \
-		kubernetes-incubator:custom-metrics-apiserver:3d9be26a50eb:kubernetes_incubator_custom_metrics_apiserver/src/github.com/kubernetes-incubator/custom-metrics-apiserver \
-		kubernetes-sigs:controller-runtime:v0.5.2:kubernetes_sigs_controller_runtime/src/sigs.k8s.io/controller-runtime \
-		kubernetes-sigs:structured-merge-diff:6149e4549fca:kubernetes_sigs_structured_merge_diff/src/sigs.k8s.io/structured-merge-diff \
-		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/src/sigs.k8s.io/yaml \
-		kubernetes:api:35e52d86657a:kubernetes_api/src/k8s.io/api \
-		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/src/k8s.io/apiextensions-apiserver \
-		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/src/k8s.io/apimachinery \
-		kubernetes:apiserver:5190913f932d:kubernetes_apiserver/src/k8s.io/apiserver \
-		kubernetes:autoscaler:fa95810cfc1e:kubernetes_autoscaler/src/k8s.io/autoscaler/vertical-pod-autoscaler \
-		kubernetes:client-go:bec269661e48:kubernetes_client_go/src/k8s.io/client-go \
-		kubernetes:cloud-provider:20453efc2458:kubernetes_cloud_provider/src/k8s.io/cloud-provider \
-		kubernetes:component-base:039242c015a9:kubernetes_component_base/src/k8s.io/component-base \
-		kubernetes:cri-api:608eb1dad4ac:kubernetes_cri_api/src/k8s.io/cri-api \
-		kubernetes:klog:4ad0115ba9e4:kubernetes_klog/src/k8s.io/klog \
-		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/src/k8s.io/kube-openapi \
-		kubernetes:kube-state-metrics:dbbe062e36a4:kubernetes_kube_state_metrics/src/k8s.io/kube-state-metrics \
-		kubernetes:kubernetes:v1.16.2:kubernetes_kubernetes/src/k8s.io/kubernetes \
-		kubernetes:metrics:3b1a734dba6e:kubernetes_metrics/src/k8s.io/metrics \
-		kubernetes:utils:94aeca20bf09:kubernetes_utils/src/k8s.io/utils \
-		lestrrat-go:strftime:v1.0.1:lestrrat_go_strftime/src/github.com/lestrrat-go/strftime \
-		lxn:walk:02935bac0ab8:lxn_walk/src/github.com/lxn/walk \
-		lxn:win:2da648fda5b4:lxn_win/src/github.com/lxn/win \
-		magiconair:properties:v1.8.1:magiconair_properties/src/github.com/magiconair/properties \
-		mailru:easyjson:b2ccc519800e:mailru_easyjson/src/github.com/mailru/easyjson \
-		mattn:go-colorable:v0.1.6:mattn_go_colorable/src/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/src/github.com/mattn/go-isatty \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
-		mdlayher:netlink:v1.1.0:mdlayher_netlink/src/github.com/mdlayher/netlink \
-		mholt:archiver:26cf5bb32d07:mholt_archiver/src/github.com/mholt/archiver \
-		miekg:dns:v1.1.31:miekg_dns/src/github.com/miekg/dns \
-		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/src/github.com/mitchellh/copystructure \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/src/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/src/github.com/mitchellh/mapstructure \
-		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/src/github.com/mitchellh/reflectwalk \
-		moby:sys:mountinfo/v0.1.3:moby_sys_mountinfo/src/github.com/moby/sys \
-		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/src/github.com/modern-go/concurrent \
-		modern-go:reflect2:v1.0.1:modern_go_reflect2/src/github.com/modern-go/reflect2 \
-		munnerz:goautoneg:a547fc61f48d:munnerz_goautoneg/src/github.com/munnerz/goautoneg \
-		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/src/gopkg.in/natefinch/lumberjack.v2 \
-		nwaples:rardecode:v1.1.0:nwaples_rardecode/src/github.com/nwaples/rardecode \
-		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/src/github.com/opencontainers/go-digest \
-		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/src/github.com/opencontainers/image-spec \
-		opencontainers:runc:6cc515888830:opencontainers_runc/src/github.com/opencontainers/runc \
-		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/src/github.com/opencontainers/runtime-spec \
-		openshift:api:32369d4db2ad:openshift_api/src/github.com/openshift/api \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/src/github.com/patrickmn/go-cache \
-		pbnjay:strptime:5c05b0d668c9:pbnjay_strptime/src/github.com/pbnjay/strptime \
-		pborman:uuid:v1.2.0:pborman_uuid/src/github.com/pborman/uuid \
-		pelletier:go-toml:v1.2.0:pelletier_go_toml/src/github.com/pelletier/go-toml \
-		philhofer:fwd:v1.0.0:philhofer_fwd/src/github.com/philhofer/fwd \
-		pierrec:lz4:v2.5.0:pierrec_lz4/src/github.com/pierrec/lz4 \
-		pkg:errors:v0.9.1:pkg_errors/src/github.com/pkg/errors \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/src/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v0.9.2:prometheus_client_golang/src/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/src/github.com/prometheus/client_model \
-		prometheus:common:v0.9.1:prometheus_common/src/github.com/prometheus/common \
-		prometheus:procfs:v0.0.6:prometheus_procfs/src/github.com/prometheus/procfs \
-		robfig:cron:v3.0.0:robfig_cron_v3/src/github.com/robfig/cron/v3 \
-		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/src/github.com/samuel/go-zookeeper \
-		shirou:gopsutil:d5eecd68:shirou_gopsutil/src/github.com/shirou/gopsutil \
-		shirou:w32:bb4de0191aa4:shirou_w32/src/github.com/shirou/w32 \
-		shuLhan:go-bindata:v3.4.0:shulhan_go_bindata/src/github.com/shuLhan/go-bindata \
-		sirupsen:logrus:v1.6.0:sirupsen_logrus/src/github.com/sirupsen/logrus \
-		soniah:gosnmp:v1.26.0:soniah_gosnmp/src/github.com/soniah/gosnmp \
-		spf13:afero:v1.2.2:spf13_afero/src/github.com/spf13/afero \
-		spf13:cobra:v0.0.5:spf13_cobra/src/github.com/spf13/cobra \
-		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/src/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.5:spf13_pflag/src/github.com/spf13/pflag \
-		stretchr:objx:v0.2.0:stretchr_objx/src/github.com/stretchr/objx \
-		stretchr:testify:v1.5.1:stretchr_testify/src/github.com/stretchr/testify \
-		syndtr:gocapability:d98352740cb2:syndtr_gocapability/src/github.com/syndtr/gocapability \
-		tedsuo:rata:v1.0.0:tedsuo_rata/src/github.com/tedsuo/rata \
-		tinylib:msgp:v1.1.2:tinylib_msgp/src/github.com/tinylib/msgp \
-		twmb:murmur3:v1.1.3:twmb_murmur3/src/github.com/twmb/murmur3 \
-		uber-go:atomic:v1.6.0:uber_go_atomic/src/go.uber.org/atomic \
-		uber-go:multierr:v1.5.0:uber_go_multierr/src/go.uber.org/multierr \
-		uber-go:zap:v1.14.1:uber_go_zap/src/go.uber.org/zap \
-		ulikunitz:xz:v0.5.7:ulikunitz_xz/src/github.com/ulikunitz/xz \
-		urfave:negroni:v1.0.0:urfave_negroni/src/github.com/urfave/negroni \
-		vishvananda:netlink:v1.1.0:vishvananda_netlink \
-		vishvananda:netns:0a2b9b5464df:vishvananda_netns/src/github.com/vishvananda/netns \
-		vito:go-sse:v1.0.0:vito_go_sse/src/github.com/vito/go-sse \
-		vmihailenco:msgpack:v4.3.11:vmihailenco_msgpack_v4/src/github.com/vmihailenco/msgpack/v4 \
-		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/src/github.com/vmihailenco/tagparser \
-		zorkian:go-datadog-api:v2.29.0:zorkian_go_datadog_api/src/gopkg.in/zorkian/go-datadog-api.v2
+		DataDog:agent-payload:v4.44.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: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 \
+		DataDog:mmh3:f5b682d8c981:datadog_mmh3/vendor/github.com/DataDog/mmh3 \
+		DataDog:viper:v1.8.0:datadog_viper/vendor/github.com/spf13/viper \
+		DataDog:watermarkpodautoscaler:v0.1.0:datadog_watermarkpodautoscaler/vendor/github.com/DataDog/watermarkpodautoscaler \
+		DataDog:zstd:2bf71ec48360:datadog_zstd/vendor/github.com/DataDog/zstd \
+		Knetic:govaluate:v3.0.0:knetic_govaluate/vendor/gopkg.in/Knetic/govaluate.v3 \
+		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
+		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
+		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
+		Microsoft:go-winio:fc70bd9a86b5:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
+		NYTimes:gziphandler:v1.1.1:nytimes_gziphandler/vendor/github.com/NYTimes/gziphandler \
+		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
+		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
+		StackExchange:wmi:e0a55b97c705:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+		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 \
+		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 \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		bhmj:jsonslice:92c3edaad8e2:bhmj_jsonslice/vendor/github.com/bhmj/jsonslice \
+		blabber:go-freebsd-sysctl:503969f39d8f:blabber_go_freebsd_sysctl/vendor/github.com/blabber/go-freebsd-sysctl \
+		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
+		bmizerany:pat:6226ea591a40:bmizerany_pat/vendor/github.com/bmizerany/pat \
+		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
+		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
+		cihub:seelog:d2c6e5aa9fbf:cihub_seelog/vendor/github.com/cihub/seelog \
+		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
+		cloudfoundry:bbs:d7bc971db0db:cloudfoundry_bbs/vendor/code.cloudfoundry.org/bbs \
+		cloudfoundry:cfhttp:v2.0.0:cloudfoundry_cfhttp/vendor/code.cloudfoundry.org/cfhttp/v2 \
+		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 \
+		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 \
+		containerd:fifo:ff969a566b00:containerd_fifo/vendor/github.com/containerd/fifo \
+		containerd:typeurl:v1.0.0:containerd_typeurl/vendor/github.com/containerd/typeurl \
+		coreos:etcd:v3.3.15:coreos_etcd/vendor/github.com/coreos/etcd \
+		coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
+		coreos:go-systemd:40e2722dffea:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
+		coreos:pkg:399ea9e2e55f:coreos_pkg/vendor/github.com/coreos/pkg \
+		datadog:extendeddaemonset:94ec1f3a5192:datadog_extendeddaemonset/vendor/github.com/datadog/extendeddaemonset \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		dgraph-io:ristretto:v0.0.3:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
+		dgryski:go-jump:e1f439676b57:dgryski_go_jump/vendor/github.com/dgryski/go-jump \
+		docker:distribution:0ac367fd6bee:docker_distribution/vendor/github.com/docker/distribution \
+		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
+		docker:go-events:e31b211e4f1c:docker_go_events/vendor/github.com/docker/go-events \
+		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
+		docker:spdystream:449fdfce4d96:docker_spdystream/vendor/github.com/docker/spdystream \
+		dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		elastic:go-libaudit:v0.4.0:elastic_go_libaudit/vendor/github.com/elastic/go-libaudit \
+		emicklei:go-restful-swagger12:7524189396c6:emicklei_go_restful_swagger12/vendor/github.com/emicklei/go-restful-swagger12 \
+		emicklei:go-restful:v2.9.6:emicklei_go_restful/vendor/github.com/emicklei/go-restful \
+		etcd-io:etcd:3cf2f69b5738:etcd_io_etcd/vendor/go.etcd.io/etcd \
+		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 \
+		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 \
+		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
+		go-ini:ini:v1.55.0:go_ini_ini/vendor/github.com/go-ini/ini \
+		go-ole:go-ole:v1.2.4:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
+		go-openapi:jsonpointer:v0.19.3:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
+		go-openapi:jsonreference:v0.19.2:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
+		go-openapi:spec:v0.19.8:go_openapi_spec/vendor/github.com/go-openapi/spec \
+		go-openapi:swag:v0.19.5:go_openapi_swag/vendor/github.com/go-openapi/swag \
+		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
+		godbus:dbus:v4.1.0:godbus_dbus/vendor/github.com/godbus/dbus \
+		gogo:googleapis:v1.3.2:gogo_googleapis/vendor/github.com/gogo/googleapis \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
+		golang:glog:23def4e6c14b:golang_glog/vendor/github.com/golang/glog \
+		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:mobile:d2bd2a29d028:golang_mobile/vendor/golang.org/x/mobile \
+		golang:net:c89045814202:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
+		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:196b9ba8737a:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		golang:tools:82bb89366a1e:golang_tools/vendor/golang.org/x/tools \
+		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+		gomodules:jsonpatch:v3.0.1:gomodules_jsonpatch/vendor/gomodules.xyz/jsonpatch/v3 \
+		gomodules:orderedmap:v0.1.0:gomodules_orderedmap/vendor/gomodules.xyz/orderedmap \
+		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:09dca8ec2884:google_go_genproto/vendor/google.golang.org/genproto \
+		google:gofuzz:v1.0.0:google_gofuzz/vendor/github.com/google/gofuzz \
+		google:gopacket:v1.1.17:google_gopacket/vendor/github.com/google/gopacket \
+		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		googleapis:gnostic:v0.3.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		gorilla:mux:v1.7.4:gorilla_mux/vendor/github.com/gorilla/mux \
+		grpc-ecosystem:go-grpc-middleware:v1.2.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
+		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
+		grpc-ecosystem:grpc-gateway:v1.12.2:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
+		grpc:grpc-go:v1.26.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:consul:v1.4.0:hashicorp_consul_api/vendor/github.com/hashicorp/consul \
+		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
+		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-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 \
+		hashicorp:serf:v0.8.5:hashicorp_serf/vendor/github.com/hashicorp/serf \
+		hectane:go-acl:da78bae5fc95:hectane_go_acl/vendor/github.com/hectane/go-acl \
+		huandu:xstrings:v1.2.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
+		ianlancetaylor:cgosymbolizer:f5072df9c550:ianlancetaylor_cgosymbolizer/vendor/github.com/ianlancetaylor/cgosymbolizer \
+		imdario:mergo:v0.3.7:imdario_mergo/vendor/github.com/imdario/mergo \
+		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		itchyny:astgen-go:aaa595cf980e:itchyny_astgen_go/vendor/github.com/itchyny/astgen-go \
+		itchyny:gojq:v0.10.2:itchyny_gojq/vendor/github.com/itchyny/gojq \
+		jmespath:go-jmespath:v0.3.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
+		json-iterator:go:v1.1.9:json_iterator_go/vendor/github.com/json-iterator/go \
+		kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
+		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		kubernetes-incubator:custom-metrics-apiserver:3d9be26a50eb:kubernetes_incubator_custom_metrics_apiserver/vendor/github.com/kubernetes-incubator/custom-metrics-apiserver \
+		kubernetes-sigs:controller-runtime:v0.5.2:kubernetes_sigs_controller_runtime/vendor/sigs.k8s.io/controller-runtime \
+		kubernetes-sigs:structured-merge-diff:6149e4549fca:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff \
+		kubernetes-sigs:yaml:v1.1.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
+		kubernetes:api:35e52d86657a:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apiextensions-apiserver:5357c4baaf65:kubernetes_apiextensions_apiserver/vendor/k8s.io/apiextensions-apiserver \
+		kubernetes:apimachinery:a2eda9f80ab8:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:apiserver:5190913f932d:kubernetes_apiserver/vendor/k8s.io/apiserver \
+		kubernetes:autoscaler:fa95810cfc1e:kubernetes_autoscaler/vendor/k8s.io/autoscaler/vertical-pod-autoscaler \
+		kubernetes:client-go:bec269661e48:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:cloud-provider:20453efc2458:kubernetes_cloud_provider/vendor/k8s.io/cloud-provider \
+		kubernetes:component-base:039242c015a9:kubernetes_component_base/vendor/k8s.io/component-base \
+		kubernetes:cri-api:608eb1dad4ac:kubernetes_cri_api/vendor/k8s.io/cri-api \
+		kubernetes:klog:4ad0115ba9e4:kubernetes_klog/vendor/k8s.io/klog \
+		kubernetes:kube-openapi:30be4d16710a:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:kube-state-metrics:dbbe062e36a4:kubernetes_kube_state_metrics/vendor/k8s.io/kube-state-metrics \
+		kubernetes:kubernetes:v1.16.2:kubernetes_kubernetes/vendor/k8s.io/kubernetes \
+		kubernetes:metrics:3b1a734dba6e:kubernetes_metrics/vendor/k8s.io/metrics \
+		kubernetes:utils:94aeca20bf09:kubernetes_utils/vendor/k8s.io/utils \
+		lestrrat-go:strftime:v1.0.1:lestrrat_go_strftime/vendor/github.com/lestrrat-go/strftime \
+		lxn:walk:02935bac0ab8:lxn_walk/vendor/github.com/lxn/walk \
+		lxn:win:2da648fda5b4:lxn_win/vendor/github.com/lxn/win \
+		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
+		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
+		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		mdlayher:netlink:v1.1.0:mdlayher_netlink/vendor/github.com/mdlayher/netlink \
+		mholt:archiver:26cf5bb32d07:mholt_archiver/vendor/github.com/mholt/archiver \
+		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
+		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
+		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: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 \
+		munnerz:goautoneg:a547fc61f48d:munnerz_goautoneg/vendor/github.com/munnerz/goautoneg \
+		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
+		nwaples:rardecode:v1.1.0:nwaples_rardecode/vendor/github.com/nwaples/rardecode \
+		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
+		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
+		opencontainers:runc:6cc515888830:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
+		openshift:api:32369d4db2ad:openshift_api/vendor/github.com/openshift/api \
+		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		pbnjay:strptime:5c05b0d668c9:pbnjay_strptime/vendor/github.com/pbnjay/strptime \
+		pborman:uuid:v1.2.0:pborman_uuid/vendor/github.com/pborman/uuid \
+		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
+		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
+		pierrec:lz4:v2.5.0:pierrec_lz4/vendor/github.com/pierrec/lz4 \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		prometheus:client_golang:v0.9.2:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.9.1:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.6:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		robfig:cron:v3.0.0:robfig_cron_v3/vendor/github.com/robfig/cron/v3 \
+		samuel:go-zookeeper:2cc03de413da:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
+		shirou:gopsutil:v2.20.3:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
+		shirou:w32:bb4de0191aa4:shirou_w32/vendor/github.com/shirou/w32 \
+		shuLhan:go-bindata:v3.4.0:shulhan_go_bindata/vendor/github.com/shuLhan/go-bindata \
+		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		soniah:gosnmp:v1.26.0:soniah_gosnmp/vendor/github.com/soniah/gosnmp \
+		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cobra:v1.0.0:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \
+		syndtr:gocapability:d98352740cb2:syndtr_gocapability/vendor/github.com/syndtr/gocapability \
+		tedsuo:rata:v1.0.0:tedsuo_rata/vendor/github.com/tedsuo/rata \
+		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: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: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 \
+		vmihailenco:tagparser:v0.1.1:vmihailenco_tagparser/vendor/github.com/vmihailenco/tagparser \
+		zorkian:go-datadog-api:v2.29.0:zorkian_go_datadog_api/vendor/gopkg.in/zorkian/go-datadog-api.v2
 
-USE_RC_SUBR=	${PORTNAME}-process-agent ${PORTNAME}-trace-agent ${PORTNAME}-agent
+DATADOG_PREFIX=	${PREFIX}/bin/${PORTNAME}
+ETCDIR=		${PREFIX}/etc/datadog
+LOGDIR=		/var/log/datadog
+RUNDIR=		/var/run/datadog
 
-USERS=		${PORTNAME}
-GROUPS=		${PORTNAME}
+USERS=	datadog
+GROUPS=	${USERS}
 
 SUB_FILES=	pkg-message
-SUB_LIST=	DATADOG_PREFIX=${DATADOG_PREFIX} \
-		ETCDIR=${ETCDIR} \
+SUB_LIST=	RUNDIR=${RUNDIR} \
 		LOGDIR=${LOGDIR} \
-		PORTNAME=${PORTNAME} \
-		PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		RUNDIR=${RUNDIR} \
-		USER=${USERS}
+		PYTHON_CMD=${PYTHON_CMD} \
+		USER=${USERS} \
+		PORTNAME=${PORTNAME} \
+		DATADOG_PREFIX=${DATADOG_PREFIX}
 
-PLIST_SUB+=	DATADOG_PREFIX=${DATADOG_PREFIX} \
-		ETCDIR=${ETCDIR} \
-		GROUP=${GROUPS} \
+PLIST_SUB+=	RUNDIR=${RUNDIR} \
 		LOGDIR=${LOGDIR} \
+		USER=${USERS} \
+		GROUP=${GROUPS} \
 		PORTNAME=${PORTNAME} \
-		RUNDIR=${RUNDIR} \
-		USER=${USERS}
+		DATADOG_PREFIX=${DATADOG_PREFIX}
 
-OPTIONS_DEFINE=		DOCS APM CONSUL PYTHON EC2 ETCD GCE JMX LOG PROCESS ZK ZLIB
-OPTIONS_DEFAULT=	DOCS EC2 GCE LOG PYTHON PROCESS ZLIB
+OPTIONS_DEFINE=	DOCS PYTHON SECRETS JMX ZSTD
+OPTIONS_DEFAULT=	PYTHON PROCESS LOG
 
-APM_DESC=	Make the APM agent execution available
-CONSUL_DESC=	Enable consul as a configuration store
+OPTIONS_GROUP=		AGENTS STORE META
+OPTIONS_GROUP_AGENTS=	LOG APM PROCESS DOGSTATSD
+OPTIONS_GROUP_STORE=	CONSUL ZK ETCD
+OPTIONS_GROUP_META=	EC2 GCE
+
 DOCS_DESC=	Install documentation
-EC2_DESC=	Enable EC2 hostname detection and metadata collection
+PYTHON_DESC=	Embed the Python interpreter
+SECRETS_DESC=	Enable secrets support in configuration files
+CONSUL_DESC=	Enable consul as a configuration store
+ZK_DESC=	Enable Zookeeper as a configuration store
 ETCD_DESC=	Enable Etcd as a configuration store
+EC2_DESC=	Enable EC2 hostname detection and metadata collection
 GCE_DESC=	Enable GCE hostname detection and metadata collection
 JMX_DESC=	Enable the JMX-fetch bridge
 LOG_DESC=	Enable the log agent
-PROCESS_DESC=	Enable the process agent
-PYTHON_DESC=	Embed the Python interpreter
-ZK_DESC=	Enable Zookeeper as a configuration store
-ZLIB_DESC=	Use zlib
+APM_DESC=	Build the APM agent
+PROCESS_DESC=	Build the process agent
+DOGSTATSD_DESC=	Build the dogstatsd agent
+ZSTD_DESC=	Use Zstandard instead of Zlib
 
-APM_VARS=	agent_build_tags+=apm
+PYTHON_VARS=	agent_build_tags+=python
+SECRETS_VARS=	agent_build_tags+=secrets
 CONSUL_VARS=	agent_build_tags+=consul
-EC2_VARS=	agent_build_tags+=ec2
+ZSTD_VARS=	agent_build_tags+=zstd
+ZK_VARS=	agent_build_tags+=zk
 ETCD_VARS=	agent_build_tags+=etcd
+EC2_VARS=	agent_build_tags+=ec2
 GCE_VARS=	agent_build_tags+=gce
 JMX_VARS=	agent_build_tags+=jmx
 LOG_VARS=	agent_build_tags+=log
-PROCESS_VARS=	agent_build_tags+=process
-PYTHON_VARS=	agent_build_tags+=python
-ZK_VARS=	agent_build_tags+=zk
-ZLIB_VARS=	agent_build_tags+=zlib
+APM_VARS=	agent_build_tags+=apm use_rc_subr+=datadog-trace-agent
+PROCESS_VARS=	agent_build_tags+=process use_rc_subr+=datadog-process-agent
+DOGSTATSD_VARS=	use_rc_subr+=datadog-dogstatsd
 
-USE_LDCONFIG=	yes
+OPTIONS_SUB=	yes
 
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
-LD_FLAG_STRING=		-s -X '${GO_PKGNAME}/pkg/version.AgentVersion=${DISTVERSION}' -X '${GO_PKGNAME}/pkg/config.DefaultPython=3'
+ALL_TARGET=		./cmd/agent
+APM_ALL_TARGET=		./cmd/trace-agent
+PROCESS_ALL_TARGET=	./cmd/process-agent
+DOGSTATSD_ALL_TARGET=	./cmd/dogstatsd
+GO_TARGET=	${ALL_TARGET}
 
-DATADOG_BINARIES=	agent dogstatsd trace-agent process-agent
+USE_RC_SUBR=	${PORTNAME}
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/vendor/github.com/vishvananda
-	@${RLN} ${WRKSRC_mdlayher_netlink} ${WRKSRC}/vendor/github.com/vishvananda/netlink
-	@${RM} ${WRKSRC}/go.mod
+CGO_CFLAGS=	-w -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common
+CGO_LDFLAGS=	-L${WRKSRC}/rtloader/rtloader
+GO_BUILDFLAGS=	-tags '${AGENT_BUILD_TAGS}' \
+    -ldflags="-s -X 'github.com/DataDog/${GH_PROJECT}/pkg/version.AgentVersion=${DISTVERSION}' -X 'github.com/DataDog/${GH_PROJECT}/pkg/config.DefaultPython=3'"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/datadog-agent|${ETCDIR}|g' \
+	@${REINPLACE_CMD} 's|/etc/datadog-agent|${ETCDIR}|g' \
 		${WRKSRC}/pkg/config/config_template.yaml \
 		${WRKSRC}/cmd/agent/common/common_nix.go \
 		${WRKSRC}/pkg/config/config_nix.go \
@@ -329,73 +329,93 @@ post-patch:
 		${WRKSRC}/cmd/process-agent/main.go \
 		${WRKSRC}/pkg/config/config.go
 
-	@${REINPLACE_CMD} -e 's|/opt/datadog-agent/run|${RUNDIR}|g' \
+	@${REINPLACE_CMD} 's|/opt/datadog-agent/run|${RUNDIR}|g' \
 		${WRKSRC}/pkg/config/config.go \
 		${WRKSRC}/pkg/config/config_nix.go  \
 		${WRKSRC}/pkg/config/config_template.yaml
 
-	@${REINPLACE_CMD} -e 's|/opt/datadog-agent/etc|${ETCDIR}|g' \
+	@${REINPLACE_CMD} 's|/opt/datadog-agent/etc|${ETCDIR}|g' \
 		${WRKSRC}/pkg/trace/flags/flags_nix.go
 
+	@${REINPLACE_CMD} 's|/opt/datadog-agent/embedded/bin|${DATADOG_PREFIX}|g' \
+		${WRKSRC}/cmd/agent/dist/conf.d/process_agent.yaml.default \
+		${WRKSRC}/cmd/agent/dist/conf.d/apm.yaml.default
+
+	@${REINPLACE_CMD} -e 's|/opt/datadog-agent/bin/agent|${DATADOG_PREFIX}|g' \
+		${WRKSRC}/pkg/trace/config/config_nix.go \
+		${WRKSRC}/pkg/process/config/config_nix.go
+
 pre-build:
 # Build rtloader (Previously called six)
-	(cd ${WRKSRC}/rtloader && ${SETENV} ${MAKE_ENV} ${BUILD_ENV} \
-		cmake -DBUILD_DEMO:BOOL=OFF \
-		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-DDISABLE_PYTHON2:BOOL=ON -DDISABLE_PYTHON3:BOOL=OFF && make -C .)
+	(cd ${WRKSRC}/rtloader && \
+		${SETENV} ${MAKE_ENV} ${BUILD_ENV} ${LOCALBASE}/bin/cmake \
+		-DBUILD_DEMO:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
+		-DDISABLE_PYTHON2:BOOL=ON -DDISABLE_PYTHON3:BOOL=OFF && \
+		${MAKE_CMD} -C .)
 
 # Generate go source from templates
-	${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
-	${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
+	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go
+	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go
 
-do-build:
-# Build go binaries
-.for bin in ${DATADOG_BINARIES}
-	(cd ${WRKSRC}/cmd/${bin}; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		CGO_CFLAGS="-w -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common" \
-		CGO_LDFLAGS="-L${WRKSRC}/rtloader/rtloader" ${GO_CMD} build -tags \
-		'${AGENT_BUILD_TAGS}' -o ${WRKSRC}/cmd/${bin}/${bin} -ldflags "${LD_FLAG_STRING}")
-.endfor
-
 post-build:
 # Generate config files
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
-	${WRKSRC}/pkg/config/config_template.yaml \
-	${WRKSRC}/cmd/agent/dist/datadog.yaml
+	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \
+		${WRKSRC}/pkg/config/config_template.yaml \
+		${WRKSRC}/cmd/agent/dist/datadog.yaml
 
-	${SETENV} ${MAKE_ENV} ${BUILD_ENV} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
-	${WRKSRC}/pkg/config/config_template.yaml \
-	${WRKSRC}/cmd/agent/dist/system-probe.yaml
+	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \
+		${WRKSRC}/pkg/config/config_template.yaml \
+		${WRKSRC}/cmd/agent/dist/system-probe.yaml
 
+	${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \
+		${WRKSRC}/pkg/config/config_template.yaml \
+		${WRKSRC}/cmd/agent/dist/dogstatsd.yaml
+
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADOG_PREFIX}
-	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
-	${MKDIR} ${STAGEDIR}${LOGDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${RUNDIR}
+	${MKDIR} \
+		${STAGEDIR}${DATADOG_PREFIX} \
+		${STAGEDIR}${ETCDIR}/conf.d \
+		${STAGEDIR}${LOGDIR} \
+		${STAGEDIR}${DOCSDIR} \
+		${STAGEDIR}${RUNDIR}
 
 .for doc in README.md CHANGELOG.rst CONTRIBUTING.md LICENSE
 	(${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
 
-	# Install binaries
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/process-agent/process-agent ${STAGEDIR}${DATADOG_PREFIX}/process-agent
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/trace-agent/trace-agent ${STAGEDIR}${DATADOG_PREFIX}/trace-agent
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/agent/agent	${STAGEDIR}${DATADOG_PREFIX}/agent
-	cd ${WRKSRC}/cmd/agent && ${COPYTREE_SHARE} dist ${STAGEDIR}${DATADOG_PREFIX}
-	cd ${WRKSRC}/pkg/status && ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADOG_PREFIX}/dist
+	# Install dist config
+.for conf in cpu.d file_handle.d go_expvar.d io.d jmx.d load.d memory.d ntp.d tcp_queue_length.d uptime.d
+	(cd ${WRKSRC}/cmd/agent/dist/conf.d && ${COPYTREE_SHARE} ${conf} ${STAGEDIR}${ETCDIR}/conf.d)
+.endfor
 
+	cd ${WRKSRC}/cmd/agent/dist/conf.d && \
+		${CP} apm.yaml.default process_agent.yaml.default ${STAGEDIR}${ETCDIR}/conf.d
+
 	# Install rtloader library
-	cd ${WRKSRC}/rtloader && make -C . ${INSTALL} DESTDIR=${STAGEDIR}
+	${MAKE_CMD} -C ${WRKSRC}/rtloader ${INSTALL} DESTDIR=${STAGEDIR}
 
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/agent ${STAGEDIR}${DATADOG_PREFIX}/agent
+
+do-install-APM-on:
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/trace-agent ${STAGEDIR}${DATADOG_PREFIX}/trace-agent
+
+do-install-PROCESS-on:
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/process-agent ${STAGEDIR}${DATADOG_PREFIX}/process-agent
+
+do-install-DOGSTATSD-on:
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/dogstatsd ${STAGEDIR}${DATADOG_PREFIX}/dogstatsd
+
 post-install:
 	# Install configuration files
 	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/datadog.yaml \
-		${STAGEDIR}${ETCDIR}/datadog.yaml.example
+		${STAGEDIR}${ETCDIR}/datadog.yaml.sample
 
-	# Strip binaries
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdatadog-agent-rtloader.so.0.1.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdatadog-agent-three.so
+	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/system-probe.yaml \
+		${STAGEDIR}${ETCDIR}/system-probe.yaml.sample
+
+	${INSTALL_DATA} ${WRKSRC}/cmd/agent/dist/system-probe.yaml \
+		${STAGEDIR}${ETCDIR}/dogstatsd.yaml.sample
+
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*so*
 
 .include <bsd.port.mk>

Modified: head/sysutils/datadog-agent/distinfo
==============================================================================
--- head/sysutils/datadog/distinfo	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/datadog-agent/distinfo	Sun Dec  6 10:30:51 2020	(r557126)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1605050321
-SHA256 (DataDog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = c5af3d3686e691178ae3327ab76cf5269bf0c4a785da6aec27ecff4d854c0af8
-SIZE (DataDog-datadog-agent-datadog-7.23.1-7.23.1_GH0.tar.gz) = 17094861
+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
 SHA256 (DataDog-cast-1ee8c8bd14a3_GH0.tar.gz) = a08d42ae7a184a72e2976ae24cb236aace4938c28042a2de562566f3584845f5
@@ -63,8 +63,8 @@ SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (bhmj-jsonslice-92c3edaad8e2_GH0.tar.gz) = f705d8b8fd8f34587d4afa7bf805dc46368d9a445d53812781a913d16cb1afaf
 SIZE (bhmj-jsonslice-92c3edaad8e2_GH0.tar.gz) = 31946
-SHA256 (blabber-go-freebsd-sysctl-dcd5a22_GH0.tar.gz) = 3a5bdf29ca9a69d72d4547f1532cc3a5f1f5bf34ef1f5f05f33bde51541a8236
-SIZE (blabber-go-freebsd-sysctl-dcd5a22_GH0.tar.gz) = 1571
+SHA256 (blabber-go-freebsd-sysctl-503969f39d8f_GH0.tar.gz) = 5cfcac0fc94f1ac84f98797be0527f86b46abaeb1f58dadd680c99494c2d424f
+SIZE (blabber-go-freebsd-sysctl-503969f39d8f_GH0.tar.gz) = 2118
 SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57
 SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831
 SHA256 (bmizerany-pat-6226ea591a40_GH0.tar.gz) = a6504edb0215f793394b2cd15d6711d760446e7e5964720b0aa7848f66204384
@@ -273,7 +273,7 @@ SHA256 (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = c03
 SIZE (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = 4898
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983
-SHA256 (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 542244e3c2c3bb0d73e6614ef58bdf1462c5d9fb0b8f751b0829b4244ae0da89
+SHA256 (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 2c6158e313b14f2f769fd6c37c9490ddf9abb00c73076da8f9d5bc12025979d5
 SIZE (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 21803302
 SHA256 (kubernetes-sigs-controller-runtime-v0.5.2_GH0.tar.gz) = da772a6aa77b46916e34716d34f7825d0a63c8d881404b72d0a621a381cd4e10
 SIZE (kubernetes-sigs-controller-runtime-v0.5.2_GH0.tar.gz) = 265957
@@ -391,8 +391,8 @@ SHA256 (robfig-cron-v3.0.0_GH0.tar.gz) = 2dce669075c1b
 SIZE (robfig-cron-v3.0.0_GH0.tar.gz) = 25276
 SHA256 (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = dac23a1f2a63f6f79f8d2bc30d6a36e9b28b4e15013381b11b102f489505fc53
 SIZE (samuel-go-zookeeper-2cc03de413da_GH0.tar.gz) = 40257
-SHA256 (shirou-gopsutil-d5eecd68_GH0.tar.gz) = 4e7f41465ef6323fa98e1e4aa534d78f0a2b828fa58fe688fe4655907715e7c0
-SIZE (shirou-gopsutil-d5eecd68_GH0.tar.gz) = 138939
+SHA256 (shirou-gopsutil-v2.20.3_GH0.tar.gz) = 57fb3b6d6aa1ba68e0bdf778485eacd2f18814fc62356b4df0ebf7cb8ebcf1ba
+SIZE (shirou-gopsutil-v2.20.3_GH0.tar.gz) = 136318
 SHA256 (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 9392c79053e1137f6e5716d5c3f28a9639c7aed9292a1ca4b8f41fa9202dbba8
 SIZE (shirou-w32-bb4de0191aa4_GH0.tar.gz) = 44336
 SHA256 (shuLhan-go-bindata-v3.4.0_GH0.tar.gz) = f0762bc7b2f8c2a6d6f42ced7f8774efa09bc0a5ef3471fd5d86027fcd796bf3
@@ -403,8 +403,8 @@ SHA256 (soniah-gosnmp-v1.26.0_GH0.tar.gz) = 9c8d6cb3de
 SIZE (soniah-gosnmp-v1.26.0_GH0.tar.gz) = 67923
 SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
 SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157
-SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423
-SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126
+SHA256 (spf13-cobra-v1.0.0_GH0.tar.gz) = 58dbfe1b4dbc6751575e94d1e62d073098e0b41790bc1c7a7a95ec6b870ac697
+SIZE (spf13-cobra-v1.0.0_GH0.tar.gz) = 128897
 SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
 SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
@@ -431,8 +431,6 @@ SHA256 (ulikunitz-xz-v0.5.7_GH0.tar.gz) = f398b805bd38
 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

Added: head/sysutils/datadog-agent/files/datadog-dogstatsd.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/datadog-agent/files/datadog-dogstatsd.in	Sun Dec  6 10:30:51 2020	(r557126)
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: datadog_dogstatsd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# datadog_dogstatsd_enable (bool):	Set to NO by default.
+#				Set it to YES to enable Datadog dogstatsd.
+# datadog_dogstatsd_user (user):	Set user to run Datadog dogstatsd.
+#				Default is "%%USER%%".
+# datadog_dogstatsd_conf (path):	Path to Datadog dogstatsd configuration file.
+#				Default is %%ETCDIR%%/datadog.yaml
+
+. /etc/rc.subr
+
+name=datadog_dogstatsd
+rcvar=datadog_dogstatsd_enable
+
+load_rc_config $name
+
+: ${datadog_dogstatsd_enable:="NO"}
+: ${datadog_dogstatsd_user:="%%USER%%"}
+: ${datadog_dogstatsd_conf:="%%ETCDIR%%/datadog.yaml"}
+
+command="%%DATADOG_PREFIX%%/dogstatsd"
+command_args="-c ${datadog_dogstatsd_conf}"
+
+required_files=%%ETCDIR%%/datadog.yaml
+pidfile="%%RUNDIR%%/datadog-dogstatsd.pid"
+
+start_cmd="${name}_start start $@"
+stop_cmd="${name}_stop stop $@"
+status_cmd="${name}_status"
+
+datadog_dogstatsd_status()
+{
+	rc_pid=`check_pidfile ${pidfile} ${command}`
+	if [ -n "${rc_pid}" ]; then
+		echo "Datadog dogstatsd is running as pid ${rc_pid}."
+	else
+		echo "Datadog dogstatsd is not running."
+		return 1
+	fi
+}
+
+datadog_dogstatsd_start() {
+	/usr/sbin/daemon -f -p ${pidfile} -u ${datadog_dogstatsd_user} ${command} start ${command_args}
+	return $?
+}
+
+datadog_dogstatsd_stop() {
+	rc_pid=`check_pidfile ${pidfile} ${command}`
+	if [ -n "${rc_pid}" ]; then
+		kill ${rc_pid}
+	else
+		echo "Datadog dogstatsd is not running."
+	fi
+}
+
+run_rc_command "$@"

Modified: head/sysutils/datadog-agent/files/patch-cmd_agent_common_common__nix.go
==============================================================================
--- head/sysutils/datadog/files/patch-cmd_agent_common_common__nix.go	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/datadog-agent/files/patch-cmd_agent_common_common__nix.go	Sun Dec  6 10:30:51 2020	(r557126)
@@ -1,4 +1,4 @@
---- cmd/agent/common/common_nix.go.orig	2020-10-26 08:53:53 UTC
+--- cmd/agent/common/common_nix.go.orig	2020-11-23 20:15:00 UTC
 +++ cmd/agent/common/common_nix.go
 @@ -12,7 +12,6 @@ import (
  	"path/filepath"
@@ -8,3 +8,15 @@
  )
  
  const (
+@@ -26,9 +25,9 @@ const (
+ 
+ var (
+ 	// PyChecksPath holds the path to the python checks from integrations-core shipped with the agent
+-	PyChecksPath = filepath.Join(_here, "..", "..", "checks.d")
++	PyChecksPath = filepath.Join(DefaultConfPath, "checks.d")
+ 	// DistPath holds the path to the folder containing distribution files
+-	distPath = filepath.Join(_here, "dist")
++	distPath = filepath.Join(DefaultConfPath, "dist")
+ )
+ 
+ // GetDistPath returns the fully qualified path to the 'dist' directory

Added: head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_apm__nix.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_apm__nix.go	Sun Dec  6 10:30:51 2020	(r557126)
@@ -0,0 +1,11 @@
+--- pkg/collector/corechecks/embed/apm_nix.go.orig	2020-11-23 14:42:53 UTC
++++ pkg/collector/corechecks/embed/apm_nix.go
+@@ -23,7 +23,7 @@ const apm_binary_name = "trace-agent" //nolint:golint
+ 
+ func getAPMAgentDefaultBinPath() (string, error) {
+ 	here, _ := executable.Folder()
+-	binPath := filepath.Join(here, "..", "..", "embedded", "bin", apm_binary_name)
++	binPath := filepath.Join(here, apm_binary_name)
+ 	_, err := os.Stat(binPath)
+ 	if err == nil {
+ 		return binPath, nil

Added: head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_process__agent.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_embed_process__agent.go	Sun Dec  6 10:30:51 2020	(r557126)
@@ -0,0 +1,11 @@
+--- pkg/collector/corechecks/embed/process_agent.go.orig	2020-11-23 17:16:28 UTC
++++ pkg/collector/corechecks/embed/process_agent.go
+@@ -216,7 +216,7 @@ func init() {
+ 
+ func getProcessAgentDefaultBinPath() (string, error) {
+ 	here, _ := executable.Folder()
+-	binPath := filepath.Join(here, "..", "..", "embedded", "bin", "process-agent")
++	binPath := filepath.Join(here, "process-agent")
+ 	if _, err := os.Stat(binPath); err == nil {
+ 		return binPath, nil
+ 	}

Modified: head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd.go
==============================================================================
--- head/sysutils/datadog/files/patch-pkg_collector_corechecks_system_file__handles__freebsd.go	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd.go	Sun Dec  6 10:30:51 2020	(r557126)
@@ -10,14 +10,17 @@
 +package system
 +
 +import (
++	"github.com/DataDog/datadog-agent/pkg/aggregator"
 +	"github.com/DataDog/datadog-agent/pkg/autodiscovery/integration"
 +	"github.com/DataDog/datadog-agent/pkg/collector/check"
 +	core "github.com/DataDog/datadog-agent/pkg/collector/corechecks"
 +	"github.com/DataDog/datadog-agent/pkg/util/log"
-+	"github.com/DataDog/datadog-agent/pkg/aggregator"
 +	"github.com/blabber/go-freebsd-sysctl/sysctl"
 +)
 +
++// For testing purpose
++var getInt64 = sysctl.GetInt64
++
 +const fileHandlesCheckName = "file_handle"
 +
 +type fhCheck struct {
@@ -31,19 +34,19 @@
 +	if err != nil {
 +		return err
 +	}
-+	openFh, err := sysctl.GetInt64("kern.openfiles")
++	openFh, err := getInt64("kern.openfiles")
 +	if err != nil {
 +		log.Warnf("Error getting kern.openfiles value %v", err)
 +		return err
 +	}
-+	maxFh, err := sysctl.GetInt64("kern.maxfiles")
++	maxFh, err := getInt64("kern.maxfiles")
 +	if err != nil {
 +		log.Warnf("Error getting kern.maxfiles value %v", err)
 +		return err
 +	}
 +	log.Debugf("Submitting kern.openfiles %v", openFh)
 +	log.Debugf("Submitting kern.maxfiles %v", maxFh)
-+	sender.Gauge("system.fs.file_handles.in_use", float64(openFh), "", nil)
++	sender.Gauge("system.fs.file_handles.used", float64(openFh), "", nil)
 +	sender.Gauge("system.fs.file_handles.max", float64(maxFh), "", nil)
 +	sender.Commit()
 +

Modified: head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd__test.go
==============================================================================
--- head/sysutils/datadog/files/patch-pkg_collector_corechecks_system_file__handles__freebsd__test.go	Sun Dec  6 10:14:30 2020	(r557125)
+++ head/sysutils/datadog-agent/files/patch-pkg_collector_corechecks_system_file__handles__freebsd__test.go	Sun Dec  6 10:30:51 2020	(r557126)
@@ -5,31 +5,34 @@
 +// under the Apache License Version 2.0.
 +// This product includes software developed at Datadog (https://www.datadoghq.com/).
 +// Copyright 2016-2019 Datadog, Inc.
-+// +build !freebsd
++// +build freebsd
 +
 +package system
 +

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012061030.0B6AUp0U069636>