-
Notifications
You must be signed in to change notification settings - Fork 528
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dependabot/go_modules/systemtest/dependencie…
…s-fc70d95b2e
- Loading branch information
Showing
25 changed files
with
281 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -478,11 +478,11 @@ License Version 2.0. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/elastic-agent-client/v7 | ||
| Version: v7.17.0 | ||
| Version: v7.17.1 | ||
| Licence type (autodetected): Elastic | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].0/LICENSE.txt: | ||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected].1/LICENSE.txt: | ||
|
|
||
| ELASTIC LICENSE AGREEMENT | ||
|
|
||
|
|
@@ -1555,11 +1555,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/ | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/go-elasticsearch/v8 | ||
| Version: v8.17.0 | ||
| Version: v8.17.1 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/[email protected].0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/[email protected].1/LICENSE: | ||
|
|
||
| Apache License | ||
| Version 2.0, January 2004 | ||
|
|
@@ -5346,11 +5346,11 @@ THE SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/net | ||
| Version: v0.34.0 | ||
| Version: v0.35.0 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.34.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.35.0/LICENSE: | ||
|
|
||
| Copyright 2009 The Go Authors. | ||
|
|
||
|
|
@@ -7923,11 +7923,11 @@ Contents of probable licence file $GOMODCACHE/github.com/ebitengine/[email protected]. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/elastic-transport-go/v8 | ||
| Version: v8.6.0 | ||
| Version: v8.6.1 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/[email protected].0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/[email protected].1/LICENSE: | ||
|
|
||
| Apache License | ||
| Version 2.0, January 2004 | ||
|
|
@@ -16972,11 +16972,11 @@ THE SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/crypto | ||
| Version: v0.32.0 | ||
| Version: v0.33.0 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.32.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.33.0/LICENSE: | ||
|
|
||
| Copyright 2009 The Go Authors. | ||
|
|
||
|
|
@@ -17083,11 +17083,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : golang.org/x/text | ||
| Version: v0.21.0 | ||
| Version: v0.22.0 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.21.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.22.0/LICENSE: | ||
|
|
||
| Copyright 2009 The Go Authors. | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| user_name = "USER" | ||
|
|
||
| # APM bench | ||
|
|
||
| worker_instance_type = "c6i.2xlarge" | ||
|
|
||
| # Elastic Cloud | ||
|
|
||
| # The number of AZs the APM Server should span. | ||
| apm_server_zone_count = 1 | ||
| # The Elasticsearch cluster node size. | ||
| elasticsearch_size = "128g" | ||
| # The number of AZs the Elasticsearch cluster should have. | ||
| elasticsearch_zone_count = 2 | ||
| # APM server instance size | ||
| apm_server_size = "16g" | ||
| # Number of shards for the ES indices | ||
| apm_shards = 4 | ||
|
|
||
| # Standalone | ||
|
|
||
| standalone_apm_server_instance_size = "c6id.2xlarge" | ||
| standalone_moxy_instance_size = "c6i.4xlarge" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| user_name = "USER" | ||
|
|
||
| # APM bench | ||
|
|
||
| worker_instance_type = "c6i.large" | ||
|
|
||
| # Elastic Cloud | ||
|
|
||
| # The number of AZs the APM Server should span. | ||
| apm_server_zone_count = 1 | ||
| # The Elasticsearch cluster node size. | ||
| elasticsearch_size = "16g" | ||
| # The number of AZs the Elasticsearch cluster should have. | ||
| elasticsearch_zone_count = 2 | ||
| # APM server instance size | ||
| apm_server_size = "1g" | ||
|
|
||
| # Standalone | ||
|
|
||
| standalone_apm_server_instance_size = "c6id.large" | ||
| standalone_moxy_instance_size = "c6i.xlarge" |
Oops, something went wrong.