Merge branch 'master' into mobile-fields

elastic · Jun 16, 2021 · 8a24fa5 · 8a24fa5
2 parents d0d5b06 + 1c09eed
commit 8a24fa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -83,8 +83,9 @@ var libbeatConfigOverrides = func() []cfgfile.ConditionalOverride {
  return common.MustNewConfigFrom(map[string]interface{}{
  "output": map[string]interface{}{
  "elasticsearch": map[string]interface{}{
- "worker": cloudMatrix[cap].worker,
- "bulk_max_size": cloudMatrix[cap].bulkMaxSize,
+ "compression_level": 5, //default to medium compression on cloud
+ "worker": cloudMatrix[cap].worker,
+ "bulk_max_size": cloudMatrix[cap].bulkMaxSize,
  },
  },
  "queue": map[string]interface{}{

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -45,6 +45,10 @@ func TestCloudEnv(t *testing.T) {
  require.NoError(t, err)
  assert.Equal(t, int64(5), workers)
 
+ compression, err := cfg.Int("output.elasticsearch.compression_level", -1)
+ require.NoError(t, err)
+ assert.Equal(t, int64(5), compression)
+
  // bad cloud environment value
  os.Setenv(cloudEnv, "123")
  settings = DefaultSettings()