Skip to content

Commit 8e04ee8

Browse files
kacper-murzynkacper-murzyn
authored
Kacper murzyn/7.48.0 final (#19981)
* Final updates for 7.48.0 * Changelog prelude for 7.48.0 added
1 parent 401bca3 commit 8e04ee8

File tree

7 files changed

+33
-28
lines changed

7 files changed

+33
-28
lines changed

‎go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ require (
4444
github.com/CycloneDX/cyclonedx-go v0.7.1
4545
github.com/DataDog/agent-payload/v5 v5.0.93
4646
github.com/DataDog/appsec-internal-go v1.0.1-0.20230723140106-7cb513f54ce1
47-
github.com/DataDog/datadog-agent/pkg/gohai v0.48.0-rc.10
48-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-rc.10
49-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-rc.10
50-
github.com/DataDog/datadog-agent/pkg/security/secl v0.48.0-rc.10
51-
github.com/DataDog/datadog-agent/pkg/trace v0.48.0-rc.10
52-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-rc.10
53-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-rc.10
54-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-rc.10
55-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-rc.10
47+
github.com/DataDog/datadog-agent/pkg/gohai v0.48.0
48+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0
49+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0
50+
github.com/DataDog/datadog-agent/pkg/security/secl v0.48.0
51+
github.com/DataDog/datadog-agent/pkg/trace v0.48.0
52+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0
53+
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0
54+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0
55+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0
5656
github.com/DataDog/datadog-go/v5 v5.3.0
5757
github.com/DataDog/datadog-operator v1.1.0
5858
github.com/DataDog/ebpf-manager v0.2.15
@@ -560,7 +560,7 @@ require (
560560
require github.com/lorenzosaino/go-sysctl v0.3.1
561561

562562
require (
563-
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-rc.10
563+
github.com/DataDog/datadog-agent/pkg/proto v0.48.0
564564
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.7.0
565565
github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000
566566
github.com/cloudfoundry-community/go-cfclient/v2 v2.0.1-0.20230503155151-3d15366c5820

‎pkg/trace/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ go 1.20
1010
replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
1111

1212
require (
13-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-rc.10
14-
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-rc.10
15-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-rc.10
16-
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-rc.10
17-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-rc.10
18-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-rc.10
19-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-rc.10
13+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0
14+
github.com/DataDog/datadog-agent/pkg/proto v0.48.0
15+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0
16+
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0
17+
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0
18+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0
19+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0
2020
github.com/DataDog/datadog-go/v5 v5.1.1
2121
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.7.0
2222
github.com/DataDog/sketches-go v1.4.2

‎pkg/util/cgroups/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ replace (
99
)
1010

1111
require (
12-
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-rc.10
13-
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-rc.10
12+
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0
13+
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0
1414
github.com/containerd/cgroups v1.0.4
1515
github.com/google/go-cmp v0.5.8
1616
github.com/karrick/godirwalk v1.17.0
1717
github.com/stretchr/testify v1.8.1
1818
)
1919

2020
require (
21-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-rc.10 // indirect
21+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0 // indirect
2222
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
2323
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
2424
github.com/davecgh/go-spew v1.1.1 // indirect

‎pkg/util/log/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber
66

77
require (
8-
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-rc.10
8+
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0
99
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
1010
github.com/stretchr/testify v1.8.1
1111
go.uber.org/zap v1.22.0

‎release.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030
},
3131
"release-a6": {
3232
"INTEGRATIONS_CORE_VERSION": "7.48.0",
33-
"OMNIBUS_SOFTWARE_VERSION": "7.48.0-rc.8",
34-
"OMNIBUS_RUBY_VERSION": "7.48.0-rc.9",
33+
"OMNIBUS_SOFTWARE_VERSION": "7.48.0",
34+
"OMNIBUS_RUBY_VERSION": "7.48.0",
3535
"JMXFETCH_VERSION": "0.47.10",
3636
"JMXFETCH_HASH": "8625f661e34b7180e9df726c69f9edcf71c82682510226948e8a3b37c45c4b9d",
3737
"SECURITY_AGENT_POLICIES_VERSION": "v0.48.1",
38-
"MACOS_BUILD_VERSION": "6.48.0-rc.1",
38+
"MACOS_BUILD_VERSION": "6.48.0",
3939
"WINDOWS_DDNPM_DRIVER": "release-signed",
4040
"WINDOWS_DDNPM_VERSION": "2.4.1",
4141
"WINDOWS_DDNPM_SHASUM": "f12af44306eac3ea15828fd12c24d44ae519692a94a0f1f5d4fa868c3e596b07"
4242
},
4343
"release-a7": {
4444
"INTEGRATIONS_CORE_VERSION": "7.48.0",
45-
"OMNIBUS_SOFTWARE_VERSION": "7.48.0-rc.8",
46-
"OMNIBUS_RUBY_VERSION": "7.48.0-rc.9",
45+
"OMNIBUS_SOFTWARE_VERSION": "7.48.0",
46+
"OMNIBUS_RUBY_VERSION": "7.48.0",
4747
"JMXFETCH_VERSION": "0.47.10",
4848
"JMXFETCH_HASH": "8625f661e34b7180e9df726c69f9edcf71c82682510226948e8a3b37c45c4b9d",
4949
"SECURITY_AGENT_POLICIES_VERSION": "v0.48.1",
50-
"MACOS_BUILD_VERSION": "7.48.0-rc.1",
50+
"MACOS_BUILD_VERSION": "7.48.0",
5151
"WINDOWS_DDNPM_DRIVER": "release-signed",
5252
"WINDOWS_DDNPM_VERSION": "2.4.1",
5353
"WINDOWS_DDNPM_SHASUM": "f12af44306eac3ea15828fd12c24d44ae519692a94a0f1f5d4fa868c3e596b07"

‎releasenotes/notes/prelude-release-7.48.0-70de3376720531f0.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
prelude:
2+
|
3+
Release on: 2023-10-10
4+
5+
- Please refer to the `7.48.0 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7480>`_ for the list of changes on the Core Checks

‎test/new-e2e/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go 1.20
99
replace github.com/DataDog/datadog-agent/test/fakeintake => ../fakeintake
1010

1111
require (
12-
github.com/DataDog/datadog-agent/test/fakeintake v0.48.0-rc.10
12+
github.com/DataDog/datadog-agent/test/fakeintake v0.48.0
1313
// Are you bumping github.com/DataDog/test-infra-definitions ?
1414
// You should bump `TEST_INFRA_DEFINITIONS_BUILDIMAGES` in `.gitlab-ci.yml`
1515
// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version

0 commit comments

Comments
 (0)