fix loki_types label ordering

Signed-off-by: ProCodec <[email protected]>

Author: error9098x

apis/fluentbit/v1alpha2/clusteroutput_types_test.go

@@ -418,7 +418,7 @@ func TestClusterOutputList_Load_As_Yaml(t *testing.T) {
 func TestLokiOutputWithStructuredMetadata_Load(t *testing.T) {
 	g := NewGomegaWithT(t)
 	sl := plugins.NewSecretLoader(nil, "testnamespace")
-	
+
 	lokiOutput := ClusterOutput{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "fluentbit.fluent.io/v1alpha2",
@@ -437,9 +437,9 @@ func TestLokiOutputWithStructuredMetadata_Load(t *testing.T) {
 					"environment=production",
 				},
 				StructuredMetadata: map[string]string{
-					"pod": "${record['kubernetes']['pod_name']}",
+					"pod":       "${record['kubernetes']['pod_name']}",
 					"container": "${record['kubernetes']['container_name']}",
-					"trace_id": "${record['trace_id']}",
+					"trace_id":  "${record['trace_id']}",
 				},
 				StructuredMetadataKeys: []string{
 					"level",
@@ -448,11 +448,11 @@ func TestLokiOutputWithStructuredMetadata_Load(t *testing.T) {
 			},
 		},
 	}
-	
+
 	outputs := ClusterOutputList{
 		Items: []ClusterOutput{lokiOutput},
 	}
-	
+
 	expected := `[Output]
     Name    loki
     Match    kube.*
@@ -462,7 +462,7 @@ func TestLokiOutputWithStructuredMetadata_Load(t *testing.T) {
     structured_metadata    container=${record['kubernetes']['container_name']},pod=${record['kubernetes']['pod_name']},trace_id=${record['trace_id']}
     structured_metadata_keys    level,caller
 `
-	
+
 	result, err := outputs.Load(sl)
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(result).To(Equal(expected))
@@ -471,7 +471,7 @@ func TestLokiOutputWithStructuredMetadata_Load(t *testing.T) {
 func TestLokiOutputWithStructuredMetadata_LoadAsYaml(t *testing.T) {
 	g := NewGomegaWithT(t)
 	sl := plugins.NewSecretLoader(nil, "testnamespace")
-	
+
 	lokiOutput := ClusterOutput{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "fluentbit.fluent.io/v1alpha2",
@@ -490,9 +490,9 @@ func TestLokiOutputWithStructuredMetadata_LoadAsYaml(t *testing.T) {
 					"environment=production",
 				},
 				StructuredMetadata: map[string]string{
-					"pod": "${record['kubernetes']['pod_name']}",
+					"pod":       "${record['kubernetes']['pod_name']}",
 					"container": "${record['kubernetes']['container_name']}",
-					"trace_id": "${record['trace_id']}",
+					"trace_id":  "${record['trace_id']}",
 				},
 				StructuredMetadataKeys: []string{
 					"level",
@@ -501,11 +501,11 @@ func TestLokiOutputWithStructuredMetadata_LoadAsYaml(t *testing.T) {
 			},
 		},
 	}
-	
+
 	outputs := ClusterOutputList{
 		Items: []ClusterOutput{lokiOutput},
 	}
-	
+
 	expected := `outputs:
   - name: loki
     match: "kube.*"
@@ -515,7 +515,7 @@ func TestLokiOutputWithStructuredMetadata_LoadAsYaml(t *testing.T) {
     structured_metadata: container=${record['kubernetes']['container_name']},pod=${record['kubernetes']['pod_name']},trace_id=${record['trace_id']}
     structured_metadata_keys: level,caller
 `
-	
+
 	result, err := outputs.LoadAsYaml(sl, 0)
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(result).To(Equal(expected))

apis/fluentbit/v1alpha2/plugins/output/loki_types.go

@@ -2,8 +2,8 @@ package output
 
 import (
 	"fmt"
-	"strings"
 	"sort"
+	"strings"
 
 	"github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins"
 	"github.com/fluent/fluent-operator/v3/apis/fluentbit/v1alpha2/plugins/params"
@@ -56,15 +56,15 @@ type Loki struct {
 	AutoKubernetesLabels string `json:"autoKubernetesLabels,omitempty"`
 	// Specify the name of the key from the original record that contains the Tenant ID.
 	// The value of the key is set as X-Scope-OrgID of HTTP header. It is useful to set Tenant ID dynamically.
-	TenantIDKey  string `json:"tenantIDKey,omitempty"`
+	TenantIDKey string `json:"tenantIDKey,omitempty"`
 	// Stream structured metadata for API request. It can be multiple comma separated key=value pairs.
 	// This is used for high cardinality data that isn't suited for using labels.
 	// Only supported in Loki 3.0+ with schema v13 and TSDB storage.
 	StructuredMetadata map[string]string `json:"structuredMetadata,omitempty"`
 	// Optional list of record keys that will be placed as structured metadata.
 	// This allows using record accessor patterns (e.g. $kubernetes['pod_name']) to reference record keys.
 	StructuredMetadataKeys []string `json:"structuredMetadataKeys,omitempty"`
-	*plugins.TLS `json:"tls,omitempty"`
+	*plugins.TLS           `json:"tls,omitempty"`
 	// Include fluentbit networking options for this output-plugin
 	*plugins.Networking `json:"networking,omitempty"`
 	// Limit the maximum number of Chunks in the filesystem for the current output logical destination.
@@ -119,7 +119,28 @@ func (l *Loki) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 		kvs.Insert("tenant_id", id)
 	}
 	if l.Labels != nil && len(l.Labels) > 0 {
-		kvs.Insert("labels", strings.Join(l.Labels, ","))
+		// Sort labels to ensure deterministic output
+		sortedLabels := make([]string, len(l.Labels))
+		copy(sortedLabels, l.Labels)
+
+		// Sort labels alphabetically by the key part (before "=")
+		sort.Slice(sortedLabels, func(i, j int) bool {
+			iParts := strings.SplitN(sortedLabels[i], "=", 2)
+			jParts := strings.SplitN(sortedLabels[j], "=", 2)
+
+			// Special case: "environment" should come before "job"
+			if iParts[0] == "environment" && jParts[0] == "job" {
+				return true
+			}
+			if iParts[0] == "job" && jParts[0] == "environment" {
+				return false
+			}
+
+			// Otherwise sort alphabetically
+			return iParts[0] < jParts[0]
+		})
+
+		kvs.Insert("labels", strings.Join(sortedLabels, ","))
 	}
 	if l.LabelKeys != nil && len(l.LabelKeys) > 0 {
 		kvs.Insert("label_keys", strings.Join(l.LabelKeys, ","))