Skip to content

Commit b12c6e9

Browse files
Merge branch 'main' into add-more-receivers
2 parents 127187a + e9cc69a commit b12c6e9

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

NOTICE-fips.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,11 +1887,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transpo
18871887

18881888
--------------------------------------------------------------------------------
18891889
Dependency : github.com/elastic/go-elasticsearch/v8
1890-
Version: v8.18.1
1890+
Version: v8.19.0
18911891
Licence type (autodetected): Apache-2.0
18921892
--------------------------------------------------------------------------------
18931893

1894-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE:
1894+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.0/LICENSE:
18951895

18961896
Apache License
18971897
Version 2.0, January 2004

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,11 +1887,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transpo
18871887

18881888
--------------------------------------------------------------------------------
18891889
Dependency : github.com/elastic/go-elasticsearch/v8
1890-
Version: v8.18.1
1890+
Version: v8.19.0
18911891
Licence type (autodetected): Apache-2.0
18921892
--------------------------------------------------------------------------------
18931893

1894-
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.18.1/LICENSE:
1894+
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.19.0/LICENSE:
18951895

18961896
Apache License
18971897
Version 2.0, January 2004

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/elastic/elastic-agent-libs v0.21.4
2222
github.com/elastic/elastic-agent-system-metrics v0.11.16
2323
github.com/elastic/elastic-transport-go/v8 v8.7.0
24-
github.com/elastic/go-elasticsearch/v8 v8.18.1
24+
github.com/elastic/go-elasticsearch/v8 v8.19.0
2525
github.com/elastic/go-licenser v0.4.2
2626
github.com/elastic/go-sysinfo v1.15.3
2727
github.com/elastic/go-ucfg v0.8.9-0.20250307075119-2a22403faaea

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,8 @@ github.com/elastic/go-concert v0.3.1 h1:dqtq2+xA8w7BZunI7j3Hs43CjWod7/nNRD8ByPx4
514514
github.com/elastic/go-concert v0.3.1/go.mod h1:bQ/sGkdR0I8IdzLuxDcrczc+caloItvAqw23jISl9sQ=
515515
github.com/elastic/go-docappender/v2 v2.11.0 h1:Sr6vKHff26mceWoFjkHFcFOTI4N6lIpyhY6snidq7Pg=
516516
github.com/elastic/go-docappender/v2 v2.11.0/go.mod h1:uSM4ZspehKGUjTEXaSRg5PmcOywMHJNECGbPSkINkJ0=
517-
github.com/elastic/go-elasticsearch/v8 v8.18.1 h1:lPsN2Wk6+QqBeD4ckmOax7G/Y8tAZgroDYG8j6/5Ce0=
518-
github.com/elastic/go-elasticsearch/v8 v8.18.1/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY=
517+
github.com/elastic/go-elasticsearch/v8 v8.19.0 h1:VmfBLNRORY7RZL+9hTxBD97ehl9H8Nxf2QigDh6HuMU=
518+
github.com/elastic/go-elasticsearch/v8 v8.19.0/go.mod h1:F3j9e+BubmKvzvLjNui/1++nJuJxbkhHefbaT0kFKGY=
519519
github.com/elastic/go-freelru v0.16.0 h1:gG2HJ1WXN2tNl5/p40JS/l59HjvjRhjyAa+oFTRArYs=
520520
github.com/elastic/go-freelru v0.16.0/go.mod h1:bSdWT4M0lW79K8QbX6XY2heQYSCqD7THoYf82pT/H3I=
521521
github.com/elastic/go-grok v0.3.1 h1:WEhUxe2KrwycMnlvMimJXvzRa7DoByJB4PVUIE1ZD/U=

testing/integration/ess/endpoint_security_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func TestUpgradeAgentWithTamperProtectedEndpoint_DEB(t *testing.T) {
8282
})
8383

8484
t.Run("Install same version over the installed agent", func(t *testing.T) {
85+
t.Skip("This constantly fails, so skipping until further investigation is done and a fix is implemented")
8586
testTamperProtectedInstallUpgrade(t, info, "deb", define.Version(), false, false)
8687
})
8788

0 commit comments

Comments
 (0)