Skip to content

Commit 03cd431

Browse files
haetamoudihaetamoudi
committed
Merge branch 'main' into handle-multiline-processor
2 parents 2c439bb + f64d3fc commit 03cd431

31 files changed

Lines changed: 520 additions & 141 deletions

‎.buildkite/pipeline.trigger.integration.tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ STACK_COMMAND_TESTS=(
2020
test-stack-command-7x
2121
test-stack-command-86
2222
test-stack-command-8x
23+
test-stack-command-9x
2324
test-stack-command-with-apm-server
2425
)
2526

‎.buildkite/pipeline.yml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,21 @@ steps:
7474
- step: unit-tests-linux
7575
allow_failure: false
7676

77-
- label: ":windows: Run stack tests"
78-
key: stack-tests-windows
79-
command: ".buildkite/scripts/stack_tests_windows.ps1"
80-
agents:
81-
provider: "gcp"
82-
image: "${WINDOWS_AGENT_IMAGE}"
83-
depends_on:
84-
- step: check-static
85-
allow_failure: false
86-
- step: unit-tests-windows
87-
allow_failure: false
88-
artifact_paths:
89-
- 'C:\ProgramData\chocolatey\logs\chocolatey.log'
77+
# Disable step due to docker errors: https://buildkite.com/elastic/elastic-package/builds/4023#0191ff3a-f18b-4e43-9219-4957da065c37/1827-1829
78+
# Related issue: https://github.com/elastic/elastic-package/issues/2107
79+
# - label: ":windows: Run stack tests"
80+
# key: stack-tests-windows
81+
# command: ".buildkite/scripts/stack_tests_windows.ps1"
82+
# agents:
83+
# provider: "gcp"
84+
# image: "${WINDOWS_AGENT_IMAGE}"
85+
# depends_on:
86+
# - step: check-static
87+
# allow_failure: false
88+
# - step: unit-tests-windows
89+
# allow_failure: false
90+
# artifact_paths:
91+
# - 'C:\ProgramData\chocolatey\logs\chocolatey.log'
9092

9193
- wait: ~
9294
continue_on_failure: true

‎.buildkite/scripts/stack_tests_windows.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fixCRLF
4545

4646
withGolang $env:GO_VERSION
4747
withDocker $env:DOCKER_VERSION
48-
withDockerCompose $env:DOCKER_COMPOSE_VERSION
48+
withDockerCompose $env:DOCKER_COMPOSE_VERSION.Substring(1)
4949

5050
Write-Host "--- Docker Info"
5151
docker info

.github/workflows/updatecli/updatecli.d/bump-latest-snapshot-version.yml renamed to .github/workflows/updatecli/updatecli.d/bump-latest-8x-snapshot-version.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
name: Bump latest elastic-stack test version
3-
pipelineid: 'bump-latest-elastic-stack-version'
2+
name: Bump latest 8.x-SNAPSHOT elastic-stack test version
3+
pipelineid: 'bump-latest-8x-elastic-stack-version'
44

55
actions:
66
default:
@@ -29,7 +29,7 @@ sources:
2929
name: Get latest snapshot build
3030
kind: json
3131
spec:
32-
file: https://storage.googleapis.com/artifacts-api/snapshots/main.json
32+
file: https://storage.googleapis.com/artifacts-api/snapshots/8.x.json
3333
key: .build_id
3434

3535
targets:

‎.github/workflows/updatecli/updatecli.d/bump-latest-9x-snapshot-version.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
name: Bump latest 9.x-SNAPSHOT elastic-stack test version
3+
pipelineid: 'bump-latest-9x-elastic-stack-version'
4+
5+
actions:
6+
default:
7+
title: '[updatecli] Update latest snapshot to {{ source "latestSnapshot" }}'
8+
kind: github/pullrequest
9+
scmid: default
10+
spec:
11+
labels:
12+
- automation
13+
- dependency
14+
15+
scms:
16+
default:
17+
kind: github
18+
spec:
19+
owner: '{{ .scm.owner }}'
20+
repository: '{{ .scm.repository }}'
21+
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
22+
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
23+
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
24+
commitusingapi: true
25+
branch: main
26+
27+
sources:
28+
latestSnapshot:
29+
name: Get latest snapshot build
30+
kind: json
31+
spec:
32+
file: https://storage.googleapis.com/artifacts-api/snapshots/main.json
33+
key: .build_id
34+
35+
targets:
36+
update-snapshot:
37+
name: '[updatecli] Update latest snapshot to {{ source "latestSnapshot" }}'
38+
kind: file
39+
sourceid: latestSnapshot
40+
scmid: default
41+
spec:
42+
file: Makefile
43+
matchpattern: '(./scripts/test-stack-command.sh) 9\.[^\s]+-SNAPSHOT'
44+
replacepattern: '$1 {{ source "latestSnapshot" }}-SNAPSHOT'

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.2
1+
1.23.1

‎Makefile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,25 @@ test-stack-command-oldest:
6666
./scripts/test-stack-command.sh 7.14.2
6767

6868
test-stack-command-7x:
69-
./scripts/test-stack-command.sh 7.17.24-SNAPSHOT
69+
./scripts/test-stack-command.sh 7.17.25-SNAPSHOT
7070

7171
# Keeping a test for 8.6 because it has an specific configuration file.
7272
test-stack-command-86:
7373
./scripts/test-stack-command.sh 8.6.2
7474

7575
test-stack-command-8x:
76-
./scripts/test-stack-command.sh 8.16.0-a744fd5c-SNAPSHOT
76+
./scripts/test-stack-command.sh 8.16.0-4b6c1c4e-SNAPSHOT
77+
78+
test-stack-command-9x:
79+
./scripts/test-stack-command.sh 9.0.0-SNAPSHOT
7780

7881
test-stack-command-with-apm-server:
7982
APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh
8083

8184
test-stack-command-with-self-monitor:
8285
SELF_MONITOR_ENABLED=true ./scripts/test-stack-command.sh
8386

84-
test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-800 test-stack-command-8x test-stack-command-with-apm-server
87+
test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-800 test-stack-command-8x test-stack-command-9x test-stack-command-with-apm-server
8588

8689
test-check-packages: test-check-packages-with-kind test-check-packages-other test-check-packages-parallel test-check-packages-with-custom-agent test-check-packages-benchmarks test-check-packages-false-positives test-check-packages-with-logstash
8790

‎cmd/create_package.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func createPackageCommandAction(cmd *cobra.Command, args []string) error {
4949
Name: "type",
5050
Prompt: &survey.Select{
5151
Message: "Package type:",
52-
Options: []string{"input", "integration"},
52+
Options: []string{"input", "integration", "content"},
5353
Default: "integration",
5454
},
5555
Validate: survey.Required,

‎cmd/install.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
1414
"github.com/elastic/elastic-package/internal/install"
15+
"github.com/elastic/elastic-package/internal/kibana"
1516
"github.com/elastic/elastic-package/internal/packages"
1617
"github.com/elastic/elastic-package/internal/packages/installer"
1718
"github.com/elastic/elastic-package/internal/stack"
@@ -34,6 +35,7 @@ func setupInstallCommand() *cobraext.Command {
3435
cmd.Flags().StringP(cobraext.ZipPackageFilePathFlagName, cobraext.ZipPackageFilePathFlagShorthand, "", cobraext.ZipPackageFilePathFlagDescription)
3536
cmd.Flags().Bool(cobraext.BuildSkipValidationFlagName, false, cobraext.BuildSkipValidationFlagDescription)
3637
cmd.Flags().StringP(cobraext.ProfileFlagName, "p", "", fmt.Sprintf(cobraext.ProfileFlagDescription, install.ProfileNameEnvVar))
38+
cmd.Flags().Bool(cobraext.TLSSkipVerifyFlagName, false, cobraext.TLSSkipVerifyFlagDescription)
3739

3840
return cobraext.NewCommand(cmd, cobraext.ContextPackage)
3941
}
@@ -57,7 +59,13 @@ func installCommandAction(cmd *cobra.Command, _ []string) error {
5759
return err
5860
}
5961

60-
kibanaClient, err := stack.NewKibanaClientFromProfile(profile)
62+
var opts []kibana.ClientOption
63+
tlsSkipVerify, _ := cmd.Flags().GetBool(cobraext.TLSSkipVerifyFlagName)
64+
if tlsSkipVerify {
65+
opts = append(opts, kibana.TLSSkipVerify())
66+
}
67+
68+
kibanaClient, err := stack.NewKibanaClientFromProfile(profile, opts...)
6169
if err != nil {
6270
return fmt.Errorf("could not create kibana client: %w", err)
6371
}

‎go.mod‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/elastic/elastic-package
22

33
go 1.22.1
44

5-
toolchain go1.22.5
5+
toolchain go1.23.1
66

77
require (
88
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -37,46 +37,46 @@ require (
3737
github.com/shirou/gopsutil/v3 v3.24.5
3838
github.com/spf13/cobra v1.8.1
3939
github.com/stretchr/testify v1.9.0
40-
golang.org/x/tools v0.24.0
40+
golang.org/x/tools v0.25.0
4141
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
4242
gopkg.in/yaml.v3 v3.0.1
4343
gotest.tools/gotestsum v1.12.0
44-
helm.sh/helm/v3 v3.15.4
44+
helm.sh/helm/v3 v3.16.1
4545
honnef.co/go/tools v0.5.1
46-
k8s.io/apimachinery v0.31.0
47-
k8s.io/cli-runtime v0.31.0
48-
k8s.io/client-go v0.31.0
46+
k8s.io/apimachinery v0.31.1
47+
k8s.io/cli-runtime v0.31.1
48+
k8s.io/client-go v0.31.1
4949
)
5050

5151
require (
52-
dario.cat/mergo v1.0.0 // indirect
52+
dario.cat/mergo v1.0.1 // indirect
5353
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5454
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
5555
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5656
github.com/Masterminds/goutils v1.1.1 // indirect
57-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
57+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5858
github.com/Microsoft/go-winio v0.6.1 // indirect
5959
github.com/PaesslerAG/gval v1.2.1 // indirect
6060
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
6161
github.com/Pallinder/go-randomdata v1.2.0 // indirect
6262
github.com/ProtonMail/go-crypto v1.0.0 // indirect
6363
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
6464
github.com/andybalholm/brotli v1.0.4 // indirect
65-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
65+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6666
github.com/bitfield/gotestdox v0.2.2 // indirect
6767
github.com/blang/semver/v4 v4.0.0 // indirect
6868
github.com/chai2010/gettext-go v1.0.2 // indirect
6969
github.com/cloudflare/circl v1.3.7 // indirect
7070
github.com/creasty/defaults v1.8.0 // indirect
71-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
71+
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
7272
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7373
github.com/dnephin/pflag v1.0.7 // indirect
7474
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
7575
github.com/elastic/gojsonschema v1.2.1 // indirect
7676
github.com/elastic/kbncontent v0.1.4 // indirect
7777
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
7878
github.com/emirpasic/gods v1.18.1 // indirect
79-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
79+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
8080
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
8181
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8282
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -103,7 +103,7 @@ require (
103103
github.com/hashicorp/errwrap v1.1.0 // indirect
104104
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
105105
github.com/hashicorp/go-multierror v1.1.1 // indirect
106-
github.com/huandu/xstrings v1.4.0 // indirect
106+
github.com/huandu/xstrings v1.5.0 // indirect
107107
github.com/imdario/mergo v0.3.16 // indirect
108108
github.com/inconshreveable/mousetrap v1.1.0 // indirect
109109
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -143,10 +143,10 @@ require (
143143
github.com/russross/blackfriday/v2 v2.1.0 // indirect
144144
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
145145
github.com/shoenig/go-m1cpu v0.1.6 // indirect
146-
github.com/shopspring/decimal v1.3.1 // indirect
146+
github.com/shopspring/decimal v1.4.0 // indirect
147147
github.com/skeema/knownhosts v1.2.2 // indirect
148148
github.com/spf13/afero v1.11.0 // indirect
149-
github.com/spf13/cast v1.6.0 // indirect
149+
github.com/spf13/cast v1.7.0 // indirect
150150
github.com/spf13/pflag v1.0.5 // indirect
151151
github.com/stretchr/objx v0.5.2 // indirect
152152
github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -161,27 +161,27 @@ require (
161161
github.com/yusufpapurcu/wmi v1.2.4 // indirect
162162
go.mongodb.org/mongo-driver v1.11.1 // indirect
163163
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
164-
golang.org/x/crypto v0.26.0 // indirect
164+
golang.org/x/crypto v0.27.0 // indirect
165165
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
166-
golang.org/x/mod v0.20.0 // indirect
167-
golang.org/x/net v0.28.0 // indirect
166+
golang.org/x/mod v0.21.0 // indirect
167+
golang.org/x/net v0.29.0 // indirect
168168
golang.org/x/oauth2 v0.21.0 // indirect
169169
golang.org/x/sync v0.8.0 // indirect
170-
golang.org/x/sys v0.23.0 // indirect
171-
golang.org/x/term v0.23.0 // indirect
172-
golang.org/x/text v0.17.0 // indirect
170+
golang.org/x/sys v0.25.0 // indirect
171+
golang.org/x/term v0.24.0 // indirect
172+
golang.org/x/text v0.18.0 // indirect
173173
golang.org/x/time v0.5.0 // indirect
174174
google.golang.org/protobuf v1.34.2 // indirect
175175
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
176176
gopkg.in/inf.v0 v0.9.1 // indirect
177177
gopkg.in/warnings.v0 v0.1.2 // indirect
178178
gopkg.in/yaml.v2 v2.4.0 // indirect
179-
k8s.io/api v0.31.0 // indirect
180-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
181-
k8s.io/component-base v0.30.3 // indirect
179+
k8s.io/api v0.31.1 // indirect
180+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
181+
k8s.io/component-base v0.31.0 // indirect
182182
k8s.io/klog/v2 v2.130.1 // indirect
183183
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
184-
k8s.io/kubectl v0.30.3 // indirect
184+
k8s.io/kubectl v0.31.0 // indirect
185185
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
186186
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
187187
sigs.k8s.io/kustomize/api v0.17.2 // indirect

0 commit comments

Comments
 (0)