Skip to content

Commit

Permalink
Kacper murzyn/7.48.1 final (#20151)
Browse files Browse the repository at this point in the history
* Final updates for 7.48.1

* Add prelude for 7.48.1 release
  • Loading branch information
kacper-murzyn committed Oct 16, 2023
1 parent 94b86c6 commit e3fa058
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 26 deletions.
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ require (
github.com/CycloneDX/cyclonedx-go v0.7.1
github.com/DataDog/agent-payload/v5 v5.0.93
github.com/DataDog/appsec-internal-go v1.0.1-0.20230723140106-7cb513f54ce1
github.com/DataDog/datadog-agent/pkg/gohai v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/security/secl v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/trace v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/gohai v0.48.1
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1
github.com/DataDog/datadog-agent/pkg/security/secl v0.48.1
github.com/DataDog/datadog-agent/pkg/trace v0.48.1
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1
github.com/DataDog/datadog-go/v5 v5.3.0
github.com/DataDog/datadog-operator v1.1.0
github.com/DataDog/ebpf-manager v0.2.15
Expand Down Expand Up @@ -560,7 +560,7 @@ require (
require github.com/lorenzosaino/go-sysctl v0.3.1

require (
github.com/DataDog/datadog-agent/pkg/proto v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/proto v0.48.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0
github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000
github.com/cloudfoundry-community/go-cfclient/v2 v2.0.1-0.20230503155151-3d15366c5820
Expand Down
14 changes: 7 additions & 7 deletions pkg/trace/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ go 1.20
replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible

require (
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/proto v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1
github.com/DataDog/datadog-agent/pkg/proto v0.48.1
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1
github.com/DataDog/datadog-go/v5 v5.1.1
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0
github.com/DataDog/sketches-go v1.4.2
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/cgroups/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ replace (
)

require (
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/log v0.48.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1
github.com/containerd/cgroups v1.0.4
github.com/google/go-cmp v0.5.8
github.com/karrick/godirwalk v1.17.0
github.com/stretchr/testify v1.8.1
)

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber

require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1-rc.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/stretchr/testify v1.8.1
go.uber.org/zap v1.22.0
Expand Down
8 changes: 4 additions & 4 deletions release.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"SECURITY_AGENT_POLICIES_VERSION": "master"
},
"release-a6": {
"INTEGRATIONS_CORE_VERSION": "7.48.1-rc.1",
"OMNIBUS_SOFTWARE_VERSION": "7.48.1-rc.1",
"INTEGRATIONS_CORE_VERSION": "7.48.1",
"OMNIBUS_SOFTWARE_VERSION": "7.48.1",
"OMNIBUS_RUBY_VERSION": "7.48.0",
"JMXFETCH_VERSION": "0.47.10",
"JMXFETCH_HASH": "8625f661e34b7180e9df726c69f9edcf71c82682510226948e8a3b37c45c4b9d",
Expand All @@ -41,8 +41,8 @@
"WINDOWS_DDNPM_SHASUM": "57a53c23e0b40da1e75094058498f9982dc80f6aa7feb5a1c8aece6e08292840"
},
"release-a7": {
"INTEGRATIONS_CORE_VERSION": "7.48.1-rc.1",
"OMNIBUS_SOFTWARE_VERSION": "7.48.1-rc.1",
"INTEGRATIONS_CORE_VERSION": "7.48.1",
"OMNIBUS_SOFTWARE_VERSION": "7.48.1",
"OMNIBUS_RUBY_VERSION": "7.48.0",
"JMXFETCH_VERSION": "0.47.10",
"JMXFETCH_HASH": "8625f661e34b7180e9df726c69f9edcf71c82682510226948e8a3b37c45c4b9d",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
prelude:
|
Release on: 2023-10-16

- Please refer to the `7.48.1 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7481>`_ for the list of changes on the Core Checks
2 changes: 1 addition & 1 deletion test/new-e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ go 1.20
replace github.com/DataDog/datadog-agent/test/fakeintake => ../fakeintake

require (
github.com/DataDog/datadog-agent/test/fakeintake v0.48.1-rc.1
github.com/DataDog/datadog-agent/test/fakeintake v0.48.1
// Are you bumping github.com/DataDog/test-infra-definitions ?
// You should bump `TEST_INFRA_DEFINITIONS_BUILDIMAGES` in `.gitlab-ci.yml`
// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version
Expand Down

0 comments on commit e3fa058

Please sign in to comment.