Skip to content

Commit 05f8903

Browse files
ericywlericywl
authored
Merge branch 'main' into functionaltests-migration-deprecations
2 parents 85c11fb + c6e5846 commit 05f8903

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

‎NOTICE-fips.txt‎

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

17671767
--------------------------------------------------------------------------------
17681768
Dependency : github.com/elastic/go-sysinfo
1769-
Version: v1.15.2
1769+
Version: v1.15.3
17701770
Licence type (autodetected): Apache-2.0
17711771
--------------------------------------------------------------------------------
17721772

1773-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE.txt:
1773+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].3/LICENSE.txt:
17741774

17751775

17761776
Apache License

‎NOTICE.txt‎

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

17671767
--------------------------------------------------------------------------------
17681768
Dependency : github.com/elastic/go-sysinfo
1769-
Version: v1.15.2
1769+
Version: v1.15.3
17701770
Licence type (autodetected): Apache-2.0
17711771
--------------------------------------------------------------------------------
17721772

1773-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE.txt:
1773+
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].3/LICENSE.txt:
17741774

17751775

17761776
Apache License

‎docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ x-logging: &default-logging
1010
max-size: "1g"
1111
services:
1212
elasticsearch:
13-
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-94eefa61-SNAPSHOT
13+
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-1b31494f-SNAPSHOT
1414
ports:
1515
- 9200:9200
1616
healthcheck:
@@ -41,7 +41,7 @@ services:
4141
logging: *default-logging
4242

4343
kibana:
44-
image: docker.elastic.co/kibana/kibana:9.1.0-94eefa61-SNAPSHOT
44+
image: docker.elastic.co/kibana/kibana:9.1.0-1b31494f-SNAPSHOT
4545
ports:
4646
- 5601:5601
4747
healthcheck:
@@ -60,7 +60,7 @@ services:
6060
logging: *default-logging
6161

6262
metricbeat:
63-
image: docker.elastic.co/beats/metricbeat:9.1.0-94eefa61-SNAPSHOT
63+
image: docker.elastic.co/beats/metricbeat:9.1.0-1b31494f-SNAPSHOT
6464
environment:
6565
ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
6666
ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/elastic/elastic-transport-go/v8 v8.6.1
1717
github.com/elastic/gmux v0.3.2
1818
github.com/elastic/go-docappender/v2 v2.7.0
19-
github.com/elastic/go-sysinfo v1.15.2
19+
github.com/elastic/go-sysinfo v1.15.3
2020
github.com/elastic/go-ucfg v0.8.8
2121
github.com/go-sourcemap/sourcemap v2.1.4+incompatible
2222
github.com/gofrs/flock v0.12.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt
195195
github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko=
196196
github.com/elastic/go-structform v0.0.12 h1:HXpzlAKyej8T7LobqKDThUw7BMhwV6Db24VwxNtgxCs=
197197
github.com/elastic/go-structform v0.0.12/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4=
198-
github.com/elastic/go-sysinfo v1.15.2 h1:rgUFj4xRnxdAaxh4IhuGzHINWT8WrwUe5D338LLRC0s=
199-
github.com/elastic/go-sysinfo v1.15.2/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk=
198+
github.com/elastic/go-sysinfo v1.15.3 h1:W+RnmhKFkqPTCRoFq2VCTmsT4p/fwpo+3gKNQsn1XU0=
199+
github.com/elastic/go-sysinfo v1.15.3/go.mod h1:K/cNrqYTDrSoMh2oDkYEMS2+a72GRxMvNP+GC+vRIlo=
200200
github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk=
201201
github.com/elastic/go-ucfg v0.8.8/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA=
202202
github.com/elastic/go-windows v1.0.2 h1:yoLLsAsV5cfg9FLhZ9EXZ2n2sQFKeDYrHenkcivY4vI=

‎systemtest/monitoring_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestMonitoring(t *testing.T) {
7272
Output json.RawMessage
7373
}
7474

75-
assert.Eventually(t, func() bool {
75+
require.Eventually(t, func() bool {
7676
metrics.Libbeat = nil
7777
metrics.Output = nil
7878
getBeatsMonitoringStats(t, srv, &metrics)
@@ -95,8 +95,8 @@ func TestMonitoring(t *testing.T) {
9595
assert.Equal(t, int64(0), gjson.GetBytes(metrics.Libbeat, "output.events.active").Int())
9696
assert.Equal(t, int64(0), gjson.GetBytes(metrics.Libbeat, "output.events.failed").Int())
9797
assert.Equal(t, int64(0), gjson.GetBytes(metrics.Libbeat, "output.events.toomany").Int())
98-
assert.GreaterOrEqual(t, int64(N), gjson.GetBytes(metrics.Libbeat, "output.events.total").Int())
99-
assert.GreaterOrEqual(t, int64(N), gjson.GetBytes(metrics.Libbeat, "pipeline.events.total").Int())
98+
assert.GreaterOrEqual(t, gjson.GetBytes(metrics.Libbeat, "output.events.total").Int(), int64(N))
99+
assert.GreaterOrEqual(t, gjson.GetBytes(metrics.Libbeat, "pipeline.events.total").Int(), int64(N))
100100
assert.Equal(t, "elasticsearch", gjson.GetBytes(metrics.Libbeat, "output.type").Str)
101101

102102
bulkRequestsAvailable := gjson.GetBytes(metrics.Output, "elasticsearch.bulk_requests.available")

‎testing/infra/k8s/base/stack/apm-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: apm-server
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.1.0-94eefa61-SNAPSHOT
7+
version: 9.1.0-1b31494f-SNAPSHOT
88
count: 1
99
http:
1010
tls:

‎testing/infra/k8s/base/stack/elasticsearch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elasticsearch
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.1.0-94eefa61-SNAPSHOT
7+
version: 9.1.0-1b31494f-SNAPSHOT
88
auth:
99
fileRealm:
1010
- secretName: elasticsearch-admin

‎testing/infra/k8s/base/stack/kibana.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: kibana
55
spec:
66
# TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
7-
version: 9.1.0-94eefa61-SNAPSHOT
7+
version: 9.1.0-1b31494f-SNAPSHOT
88
count: 1
99
elasticsearchRef:
1010
name: elasticsearch

0 commit comments

Comments
 (0)