confgenerator: add resource_name label using modify fields. (#544)

* add resource_name label using hostName value.
* add integration test to verify resource_name.
* Update goldens.

confgenerator/confgenerator.go

@@ -216,7 +216,7 @@ func (l *Logging) generateFluentbitComponents(userAgent string, hostInfo *host.I
 					}
 					components = append(components, processor.Components(tag, strconv.Itoa(i))...)
 				}
-				components = append(components, setLogNameComponents(tag, rID, receiver.Type())...)
+				components = append(components, setLogNameComponents(tag, rID, receiver.Type(), hostInfo.Hostname)...)
 
 				// Logs ingested using the fluent_forward receiver must add the existing_tag
 				// on the record to the LogName. This is done with a Lua filter.

confgenerator/logging.go

@@ -21,12 +21,15 @@ import (
 )
 
 // setLogNameComponents generates a series of components that rewrites the tag on log entries tagged `tag` to be `logName`.
-func setLogNameComponents(tag, logName, receiverType string) []fluentbit.Component {
+func setLogNameComponents(tag, logName, receiverType string, hostName string) []fluentbit.Component {
 	return LoggingProcessorModifyFields{
 		Fields: map[string]*ModifyField{
 			"logName": {
 				DefaultValue: &logName,
 			},
+			`labels."compute.googleapis.com/resource_name"`: {
+				DefaultValue: &hostName,
+			},
 			// `labels."agent.googleapis.com/receiver_type"`: {
 			// 	StaticValue: &receiverType,
 			// },

confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_8f841e1624ad9de1bb98322777b1ac10.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "syslog" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_fluent_bit_main.conf

@@ -49,7 +49,7 @@
     Match  default_pipeline.syslog
     Name   lua
     call   process
-    script 10fdedaf5448c4114b7b329139f093fc.lua
+    script 8f841e1624ad9de1bb98322777b1ac10.lua
 
 [OUTPUT]
     Match_Regex                   ^(default_pipeline\.syslog)$

confgenerator/testdata/valid/linux/all-built_in_config/golden_8f841e1624ad9de1bb98322777b1ac10.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "syslog" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/all-built_in_config/golden_fluent_bit_main.conf

@@ -49,7 +49,7 @@
     Match  default_pipeline.syslog
     Name   lua
     call   process
-    script 10fdedaf5448c4114b7b329139f093fc.lua
+    script 8f841e1624ad9de1bb98322777b1ac10.lua
 
 [OUTPUT]
     Match_Regex                   ^(default_pipeline\.syslog)$

confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_8f841e1624ad9de1bb98322777b1ac10.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "syslog" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_fluent_bit_main.conf

@@ -49,7 +49,7 @@
     Match  default_pipeline.syslog
     Name   lua
     call   process
-    script 10fdedaf5448c4114b7b329139f093fc.lua
+    script 8f841e1624ad9de1bb98322777b1ac10.lua
 
 [OUTPUT]
     Match_Regex                   ^(default_pipeline\.syslog)$

confgenerator/testdata/valid/linux/logging-custom_log_level/golden_8f841e1624ad9de1bb98322777b1ac10.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "syslog" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/logging-custom_log_level/golden_fluent_bit_main.conf

@@ -49,7 +49,7 @@
     Match  default_pipeline.syslog
     Name   lua
     call   process
-    script 10fdedaf5448c4114b7b329139f093fc.lua
+    script 8f841e1624ad9de1bb98322777b1ac10.lua
 
 [OUTPUT]
     Match_Regex                   ^(default_pipeline\.syslog)$

confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_01ed2bd46e1d099a101cc74ed368a1fc.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "test_syslog_source_id_tcp" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_13322ed6829712e9e8004b6705b58020.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "log_source_id2" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_c540c13717430f9798e74730652c5612.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "test_syslog_source_id_udp" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end

confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_fc00cb02b9b88c98bb35ef80a02c314d.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local __field_0 = (function()
+if record["logging.googleapis.com/labels"] == nil
+then
+return nil
+end
+return record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"]
+end)();
+local __field_1 = (function()
+return record["logging.googleapis.com/logName"]
+end)();
+local v = __field_0;
+if v == nil then v = "" end;
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["compute.googleapis.com/resource_name"] = value
+end)(v)
+local v = __field_1;
+if v == nil then v = "log_source_id1" end;
+(function(value)
+record["logging.googleapis.com/logName"] = value
+end)(v)
+return 2, timestamp, record
+end