Get all recoveries if xpack.enabled is true

ycombinator · ycombinator · commit 4817f4887741 · 2018-08-27T18:10:23.000-07:00
diff --git a/metricbeat/module/elasticsearch/index_recovery/index_recovery.go b/metricbeat/module/elasticsearch/index_recovery/index_recovery.go
@@ -49,15 +49,17 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 
 	config := struct {
 		ActiveOnly bool `config:"index_recovery.active_only"`
+		XPack      bool `config:"xpack.enabled"`
 	}{
-		ActiveOnly: false,
+		ActiveOnly: true,
+		XPack:      false,
 	}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err
 	}
 
 	localRecoveryPath := recoveryPath
-	if config.ActiveOnly {
+	if !config.XPack && config.ActiveOnly {
 		localRecoveryPath = localRecoveryPath + "?active_only=true"
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,17 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {`
`49`	`49`
`50`	`50`	`config := struct {`
`51`	`51`	ActiveOnly bool `config:"index_recovery.active_only"`
	`52`	+ XPack bool `config:"xpack.enabled"`
`52`	`53`	`}{`
`53`		`- ActiveOnly: false,`
	`54`	`+ ActiveOnly: true,`
	`55`	`+ XPack: false,`
`54`	`56`	`}`
`55`	`57`	`if err := base.Module().UnpackConfig(&config); err != nil {`
`56`	`58`	`return nil, err`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`localRecoveryPath := recoveryPath`
`60`		`- if config.ActiveOnly {`
	`62`	`+ if !config.XPack && config.ActiveOnly {`
`61`	`63`	`localRecoveryPath = localRecoveryPath + "?active_only=true"`
`62`	`64`	`}`
`63`	`65`