Merge pull request fluent#1081 from chrono2002/lua2

LUA filter inline code support
chrono2002 · Mar 8, 2024 · 0957492 · 0957492
2 parents 82dc7a9 + 7cb0e1d
commit 0957492
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go b/apis/fluentbit/v1alpha2/plugins/filter/lua_types.go
@@ -3,6 +3,7 @@ package filter
 import (
 	"strconv"
 	"strings"
+	"regexp"
 
 	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
 	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
@@ -20,6 +21,8 @@ type Lua struct {
 	// Lua function name that will be triggered to do filtering.
 	// It's assumed that the function is declared inside the Script defined above.
 	Call string `json:"call"`
+	// Inline LUA code instead of loading from a path via script.
+	Code string `json:"code"`
 	// If these keys are matched, the fields are converted to integer.
 	// If more than one key, delimit by space.
 	// Note that starting from Fluent Bit v1.6 integer data types are preserved
@@ -45,7 +48,28 @@ func (l *Lua) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	if err != nil {
 		return kvs, err
 	}
-	kvs.Insert("script", "/fluent-bit/config/"+l.Script.Key)
+
+	if l.Code != "" {
+		var singleLineLua string = ""
+		var lineTrim = ""
+		for _, line := range strings.Split(strings.TrimSuffix(l.Code, "\n"), "\n") {
+			lineTrim = strings.TrimSpace(line)
+			if lineTrim != "" {
+				operator, _ := regexp.MatchString("^function |^if |^for |^else|^elseif |^end|--[[]+", lineTrim)
+				if operator {
+					singleLineLua = singleLineLua + lineTrim + " "
+				} else {
+					singleLineLua = singleLineLua + lineTrim + "; "
+				}
+			}
+		}
+		kvs.Insert("code", singleLineLua)
+	}
+
+	if l.Script.Key != "" {
+		kvs.Insert("script", "/fluent-bit/config/"+l.Script.Key)
+	}
+
 	kvs.Insert("call", l.Call)
 
 	if l.TypeIntKey != nil && len(l.TypeIntKey) > 0 {

diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml
@@ -289,6 +289,9 @@ spec:
                             do filtering. It's assumed that the function is declared
                             inside the Script defined above.
                           type: string
+                        code:
+                          description: Inline LUA code instead of loading from a path via script.
+                          type: string
                         protectedMode:
                           description: If enabled, Lua script will be executed in
                             protected mode. It prevents to crash when invalid Lua
@@ -341,7 +344,6 @@ spec:
                           type: array
                       required:
                       - call
-                      - script
                       type: object
                     modify:
                       description: Modify defines Modify Filter configuration.