Fix merge conflicts.

cmacknz · cmacknz · commit 39d6a0509d4b · 2022-01-25T13:04:32.000-05:00
diff --git a/metricbeat/module/kibana/settings/settings.go b/metricbeat/module/kibana/settings/settings.go
diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go
@@ -107,13 +107,9 @@ func (m *MetricSet) init() error {
 		return err
 	}
 
-<<<<<<< HEAD
-	kibanaVersion, err := kibana.GetVersion(statsHTTP, statsPath)
-=======
 	statsHTTP.SetHeaderDefault(productorigin.Header, productorigin.Beats)
 
-	kibanaVersion, err := kibana.GetVersion(statsHTTP, kibana.StatsPath)
->>>>>>> 5f3dd3e39d (Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#29966))
+	kibanaVersion, err := kibana.GetVersion(statsHTTP, statsPath)
 	if err != nil {
 		return err
 	}
diff --git a/metricbeat/module/kibana/status/status.go b/metricbeat/module/kibana/status/status.go
@@ -18,12 +18,9 @@
 package status
 
 import (
-<<<<<<< HEAD
 	"fmt"
 
-=======
 	"github.com/elastic/beats/v7/libbeat/common/productorigin"
->>>>>>> 5f3dd3e39d (Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#29966))
 	"github.com/elastic/beats/v7/metricbeat/helper"
 	"github.com/elastic/beats/v7/metricbeat/mb"
 	"github.com/elastic/beats/v7/metricbeat/mb/parse"

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,9 @@ func (m *MetricSet) init() error {`
`107`	`107`	`return err`
`108`	`108`	`}`
`109`	`109`
`110`		`-<<<<<<< HEAD`
`111`		`- kibanaVersion, err := kibana.GetVersion(statsHTTP, statsPath)`
`112`		`-=======`
`113`	`110`	`statsHTTP.SetHeaderDefault(productorigin.Header, productorigin.Beats)`
`114`	`111`
`115`		`- kibanaVersion, err := kibana.GetVersion(statsHTTP, kibana.StatsPath)`
`116`		`->>>>>>> 5f3dd3e39d (Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#29966))`
	`112`	`+ kibanaVersion, err := kibana.GetVersion(statsHTTP, statsPath)`
`117`	`113`	`if err != nil {`
`118`	`114`	`return err`
`119`	`115`	`}`