Merge ES default values to Sourcmeap configuration.

beater/config/config_test.go

@@ -85,7 +85,8 @@ func Test_UnpackConfig(t *testing.T) {
 						"cache": map[string]interface{}{
 							"expiration": 8 * time.Minute,
 						},
-						"index_pattern": "apm-test*",
+						"index_pattern":       "apm-test*",
+						"elasticsearch.hosts": []string{"localhost:9201", "localhost:9202"},
 					},
 					"library_pattern":       "^custom",
 					"exclude_from_grouping": "^grouping",
@@ -143,6 +144,11 @@ func Test_UnpackConfig(t *testing.T) {
 					SourceMapping: &SourceMapping{
 						Cache:        &Cache{Expiration: 8 * time.Minute},
 						IndexPattern: "apm-test*",
+						ESConfig: &elasticsearch.Config{
+							Hosts:    elasticsearch.Hosts{"localhost:9201", "localhost:9202"},
+							Protocol: "http",
+							Timeout:  5 * time.Second},
+						esConfigured: true,
 					},
 					LibraryPattern:      "^custom",
 					ExcludeFromGrouping: "^grouping",
@@ -256,6 +262,7 @@ func Test_UnpackConfig(t *testing.T) {
 							Expiration: 7 * time.Second,
 						},
 						IndexPattern: "apm-*-sourcemap*",
+						ESConfig:     elasticsearch.DefaultConfig(),
 					},
 					LibraryPattern:      "rum",
 					ExcludeFromGrouping: "^/webpack",
@@ -478,7 +485,7 @@ func TestNewConfig_ESConfig(t *testing.T) {
 	// no es config given
 	cfg, err := NewConfig(version, ucfg, nil)
 	require.NoError(t, err)
-	assert.Nil(t, cfg.RumConfig.SourceMapping.ESConfig)
+	assert.Equal(t, elasticsearch.DefaultConfig(), cfg.RumConfig.SourceMapping.ESConfig)
 	assert.Equal(t, elasticsearch.DefaultConfig(), cfg.APIKeyConfig.ESConfig)
 
 	// with es config

beater/config/rum.go

@@ -65,7 +65,9 @@ type SourceMapping struct {
 	Enabled      *bool                 `config:"enabled"`
 	IndexPattern string                `config:"index_pattern"`
 	ESConfig     *elasticsearch.Config `config:"elasticsearch"`
+
 	store        *sourcemap.Store
+	esConfigured bool
 }
 
 // IsEnabled indicates whether RUM endpoint is enabled or not
@@ -114,7 +116,7 @@ func (c *RumConfig) setup(log *logp.Logger, outputESCfg *common.Config) error {
 		return errors.Wrapf(err, "Invalid regex for `exclude_from_grouping`: ")
 	}
 
-	if c.SourceMapping == nil || c.SourceMapping.ESConfig != nil {
+	if c.SourceMapping == nil || c.SourceMapping.esConfigured {
 		return nil
 	}
 
@@ -124,11 +126,9 @@ func (c *RumConfig) setup(log *logp.Logger, outputESCfg *common.Config) error {
 		return nil
 	}
 	log.Info("Falling back to elasticsearch output for sourcemap storage")
-	esCfg := elasticsearch.DefaultConfig()
-	if err := outputESCfg.Unpack(esCfg); err != nil {
+	if err := outputESCfg.Unpack(c.SourceMapping.ESConfig); err != nil {
 		return errors.Wrap(err, "unpacking Elasticsearch config into Sourcemap config")
 	}
-	c.SourceMapping.ESConfig = esCfg
 	return nil
 }
 
@@ -140,20 +140,38 @@ func replaceVersion(pattern, version string) string {
 	return regexObserverVersion.ReplaceAllLiteralString(pattern, version)
 }
 
+func (s *SourceMapping) Unpack(inp *common.Config) error {
+	// this type is needed to avoid a custom Unpack method
+	type tmpSourceMapping SourceMapping
+
+	cfg := tmpSourceMapping(*defaultSourcemapping())
+	if err := inp.Unpack(&cfg); err != nil {
+		return errors.Errorf("error unpacking sourcemapping config: %w", err)
+	}
+	*s = SourceMapping(cfg)
+	if inp.HasField("elasticsearch") {
+		s.esConfigured = true
+	}
+	return nil
+}
+
+func defaultSourcemapping() *SourceMapping {
+	return &SourceMapping{
+		Cache:        &Cache{Expiration: defaultSourcemapCacheExpiration},
+		IndexPattern: defaultSourcemapIndexPattern,
+		ESConfig:     elasticsearch.DefaultConfig(),
+	}
+}
+
 func defaultRum(beatVersion string) *RumConfig {
 	return &RumConfig{
 		EventRate: &EventRate{
 			Limit:   defaultEventRateLimit,
 			LruSize: defaultEventRateLRUSize,
 		},
-		AllowOrigins: []string{allowAllOrigins},
-		AllowHeaders: []string{},
-		SourceMapping: &SourceMapping{
-			Cache: &Cache{
-				Expiration: defaultSourcemapCacheExpiration,
-			},
-			IndexPattern: defaultSourcemapIndexPattern,
-		},
+		AllowOrigins:        []string{allowAllOrigins},
+		AllowHeaders:        []string{},
+		SourceMapping:       defaultSourcemapping(),
 		LibraryPattern:      defaultLibraryPattern,
 		ExcludeFromGrouping: defaultExcludeFromGrouping,
 		BeatVersion:         beatVersion,

changelogs/head.asciidoc

@@ -11,6 +11,7 @@ https://github.com/elastic/apm-server/compare/7.6\...master[View commits]
 [float]
 ==== Bugfixes
 * Merge default values with custom Elasticsearch config for API Keys and add `required` tag for `host` {pull}3342[3342]
+* Merge default values with custom Sourcemap Elasticsearch config {pull}3355[3355]
 
 [float]
 ==== Intake API Changes