[Heartbeat] Fix enabled flag usage in case of streams (#33293)

Fixes usage of Enabled incase of data streams Fixes #33270
elastic · Oct 10, 2022 · 7bddf80 · 7bddf80
1 parent 8dfa4d4
commit 7bddf80
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -83,6 +83,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Fix handling of empty array in httpjson input. {pull}32001[32001]
 
 *Heartbeat*
+- Fix broken disable feature for kibana configured monitors. {pull}33293[33293]
 
 
 *Metricbeat*

diff --git a/heartbeat/monitors/factory.go b/heartbeat/monitors/factory.go
@@ -115,15 +115,15 @@ func (NoopRunner) Stop() {
 
 // Create makes a new Runner for a new monitor with the given Config.
 func (f *RunnerFactory) Create(p beat.Pipeline, c *conf.C) (cfgfile.Runner, error) {
-	if !c.Enabled() {
-		return NoopRunner{}, nil
-	}
-
 	c, err := stdfields.UnnestStream(c)
 	if err != nil {
 		return nil, err
 	}
 
+	if !c.Enabled() {
+		return NoopRunner{}, nil
+	}
+
 	configEditor, err := newCommonPublishConfigs(f.info, f.beatLocation, c)
 	if err != nil {
 		return nil, err

diff --git a/heartbeat/monitors/factory_test.go b/heartbeat/monitors/factory_test.go
@@ -207,24 +207,38 @@ func TestPreProcessors(t *testing.T) {
 }
 
 func TestDisabledMonitor(t *testing.T) {
-	confMap := map[string]interface{}{
-		"type":    "test",
-		"enabled": "false",
+	testConfigs := []map[string]interface{}{
+		{
+			"type":     "test",
+			"enabled":  "false",
+			"schedule": "@every 10s",
+		},
+		{
+			"streams": []map[string]interface{}{
+				{
+					"type":     "test",
+					"enabled":  "false",
+					"schedule": "@every 10s",
+				},
+			},
+		},
 	}
 
-	conf, err := config.NewConfigFrom(confMap)
-	require.NoError(t, err)
+	for _, confMap := range testConfigs {
+		conf, err := config.NewConfigFrom(confMap)
+		require.NoError(t, err)
 
-	reg, built, closed := mockPluginsReg()
-	f, sched, fClose := makeMockFactory(reg)
-	defer fClose()
-	defer sched.Stop()
-	runner, err := f.Create(&MockPipeline{}, conf)
-	require.NoError(t, err)
-	require.IsType(t, runner, NoopRunner{})
+		reg, built, closed := mockPluginsReg()
+		f, sched, fClose := makeMockFactory(reg)
+		defer fClose()
+		defer sched.Stop()
+		runner, err := f.Create(&MockPipeline{}, conf)
+		require.NoError(t, err)
+		require.IsType(t, NoopRunner{}, runner)
 
-	require.Equal(t, 0, built.Load())
-	require.Equal(t, 0, closed.Load())
+		require.Equal(t, 0, built.Load())
+		require.Equal(t, 0, closed.Load())
+	}
 }
 
 func TestDuplicateMonitorIDs(t *testing.T) {