Fix generation of data stream namespace used in Beat configuration (#47140) (#47144)

* Fix comparison

* Add unit test

* Adding CHANGELOG entry

* Fix unit test

(cherry picked from commit 7c3d7c1)

Co-authored-by: Shaunak Kashyap <[email protected]>

Author: mergify[bot]

changelog/fragments/1760572941-fix-ds-namespace.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: Allows users to customize their data stream namespace to "generic".
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: all
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: https://github.com/owner/repo/1234
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234

x-pack/libbeat/management/generate.go

@@ -342,7 +342,7 @@ func metadataFromDatastreamValues(defaultDataStreamType string, expected *proto.
 	if newNamespace := streamExpected.GetDataStream().GetNamespace(); newNamespace != "" {
 		setNamespace = newNamespace
 	}
-	if newNamespace := expected.GetDataStream().GetNamespace(); newNamespace != "" && newNamespace != DefaultDatasetName {
+	if newNamespace := expected.GetDataStream().GetNamespace(); newNamespace != "" && newNamespace != DefaultNamespaceName {
 		setNamespace = newNamespace
 	}
 

x-pack/libbeat/management/generate_test.go

@@ -178,7 +178,7 @@ func TestOutputIndex(t *testing.T) {
 	}
 	inStream := map[string]interface{}{}
 	outStream := injectIndexStream(dataStreamType, unit, stream, inStream)
-	require.Equal(t, "synthetics-icmp-default", outStream["index"])
+	require.Equal(t, "synthetics-icmp-example", outStream["index"])
 
 	//test Defaults
 	emptyStream := &proto.Stream{DataStream: &proto.DataStream{}}
@@ -222,6 +222,165 @@ func findFieldsInProcessors(t *testing.T, configFields map[string]interface{}, c
 	}
 }
 
+func TestMetadataFromDatastreamValues(t *testing.T) {
+	cases := map[string]struct {
+		defaultDataStreamType string
+		expected              *proto.UnitExpectedConfig
+		streamExpected        *proto.Stream
+
+		expectedStreamType string
+		expectedDataset    string
+		expectedNamespace  string
+	}{
+		// defaults test case
+		"default_type": {
+			defaultDataStreamType: "logs",
+
+			expectedStreamType: "logs",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  DefaultNamespaceName,
+		},
+
+		// type test cases
+		"type_from_expected": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Type: "expected-metrics",
+				},
+			},
+
+			expectedStreamType: "expected-metrics",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  DefaultNamespaceName,
+		},
+		"type_from_stream": {
+			defaultDataStreamType: "logs",
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Type: "stream-metrics",
+				},
+			},
+
+			expectedStreamType: "stream-metrics",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  DefaultNamespaceName,
+		},
+		"type_from_both": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Type: "expected-metrics",
+				},
+			},
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Type: "stream-metrics",
+				},
+			},
+
+			expectedStreamType: "expected-metrics",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  DefaultNamespaceName,
+		},
+
+		// dataset test cases
+		"dataset_from_expected": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Dataset: "expected-dataset",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    "expected-dataset",
+			expectedNamespace:  DefaultNamespaceName,
+		},
+		"dataset_from_stream": {
+			defaultDataStreamType: "logs",
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Dataset: "stream-dataset",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    "stream-dataset",
+			expectedNamespace:  DefaultNamespaceName,
+		},
+		"dataset_from_both": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Dataset: "expected-dataset",
+				},
+			},
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Dataset: "stream-dataset",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    "expected-dataset",
+			expectedNamespace:  DefaultNamespaceName,
+		},
+
+		// namespace test cases
+		"namespace_from_expected": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Namespace: "expected-namespace",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  "expected-namespace",
+		},
+		"namespace_from_stream": {
+			defaultDataStreamType: "logs",
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Namespace: "stream-namespace",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  "stream-namespace",
+		},
+		"namespace_from_both": {
+			defaultDataStreamType: "logs",
+			expected: &proto.UnitExpectedConfig{
+				DataStream: &proto.DataStream{
+					Namespace: "expected-namespace",
+				},
+			},
+			streamExpected: &proto.Stream{
+				DataStream: &proto.DataStream{
+					Namespace: "stream-namespace",
+				},
+			},
+
+			expectedStreamType: "logs",
+			expectedDataset:    DefaultDatasetName,
+			expectedNamespace:  "expected-namespace",
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			streamType, dataset, namespace := metadataFromDatastreamValues(tc.defaultDataStreamType, tc.expected, tc.streamExpected)
+			require.Equal(t, tc.expectedStreamType, streamType)
+			require.Equal(t, tc.expectedDataset, dataset)
+			require.Equal(t, tc.expectedNamespace, namespace)
+		})
+	}
+}
+
 func buildConfigMap(t *testing.T, unitRaw *proto.UnitExpectedConfig, agentInfo *client.AgentInfo) mapstr.M {
 	reloadCfg, err := generateBeatConfig(unitRaw, agentInfo)
 	require.NoError(t, err, "error in generateBeatConfig")