Merge pull request #2061 from MaxAnderson95/fix/lm-mapping-field

Fix for LogicMonitor resource_mapping field

Author: csatib02

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_clusteroutputs.yaml

@@ -4378,7 +4378,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:
@@ -12050,7 +12049,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_outputs.yaml

@@ -11107,7 +11107,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml

@@ -4375,7 +4375,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:
@@ -12047,7 +12046,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml

@@ -11104,7 +11104,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml

@@ -4375,7 +4375,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:
@@ -12047,7 +12046,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

config/crd/bases/logging.banzaicloud.io_outputs.yaml

@@ -11104,7 +11104,6 @@ spec:
                     type: string
                 required:
                 - company_name
-                - resource_mapping
                 type: object
               logdna:
                 properties:

docs/configuration/plugins/outputs/lm_logs.md

@@ -107,7 +107,7 @@ When true, appends additional metadata to the log
 
 Default: false
 
-### resource_mapping (string, required) {#logicmonitorlogs-resource_mapping}
+### resource_mapping (string, optional) {#logicmonitorlogs-resource_mapping}
 
 The mapping that defines the source of the log event to the LM resource. In this case, the <event_key> in the incoming event is mapped to the value of <lm_property> 
 

pkg/sdk/logging/model/output/lm_logs.go

@@ -69,7 +69,7 @@ type LMLogsOutputConfig struct {
 	// LogicMonitor account domain. For eg. for url test.logicmonitor.com, company_domain is logicmonitor.com (default: logicmonitor.com)
 	CompanyDomain string `json:"company_domain,omitempty" plugin:"default:logicmonitor.com"`
 	// The mapping that defines the source of the log event to the LM resource. In this case, the <event_key> in the incoming event is mapped to the value of <lm_property>
-	ResourceMapping string `json:"resource_mapping"`
+	ResourceMapping string `json:"resource_mapping,omitempty"`
 	// LM API Token access ID
 	// +docLink:"Secret,../secret/"
 	AccessID *secret.Secret `json:"access_id,omitempty"`

pkg/sdk/logging/model/output/lm_logs_test.go

@@ -144,3 +144,36 @@ force_encoding: "UTF-8"
 	test := render.NewOutputPluginTest(t, s)
 	test.DiffResult(expected)
 }
+
+func TestLMLogsOutputConfigWithoutResourceMapping(t *testing.T) {
+	CONFIG := []byte(`
+company_name: mycompany
+access_id:
+  value: "my_access_id"
+access_key:
+  value: "my_access_key"
+`)
+
+	expected := `
+  <match **>
+  @type lm
+  @id test
+  access_id my_access_id
+  access_key my_access_key
+  company_domain logicmonitor.com
+  company_name mycompany
+  flush_interval 60s
+  <buffer tag,time>
+	@type file
+	path /buffers/test.*.buffer
+	retry_forever true
+	timekey 10m
+	timekey_wait 1m
+  </buffer>
+</match>
+`
+	s := &output.LMLogsOutputConfig{}
+	require.NoError(t, yaml.Unmarshal(CONFIG, s))
+	test := render.NewOutputPluginTest(t, s)
+	test.DiffResult(expected)
+}