Merge pull request #2023 from verdel/feat/loki-tenant-id-in-axosyslog

Add support for Loki tenant-id to SyslogNGClusterOutput/SyslogNGOutput

Author: pepov

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

@@ -1468,6 +1468,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

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

@@ -1468,6 +1468,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

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

@@ -1465,6 +1465,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

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

@@ -1465,6 +1465,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

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

@@ -1465,6 +1465,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

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

@@ -1465,6 +1465,8 @@ spec:
                     type: integer
                   template:
                     type: string
+                  tenant-id:
+                    type: string
                   time_reopen:
                     type: integer
                   timestamp:

docs/configuration/plugins/syslogng-outputs/loki.md

@@ -86,6 +86,11 @@ The number of times syslog-ng OSE attempts to send a message to this destination
 Template for customizing the log message format. 
 
 
+### tenant-id (string, optional) {#lokioutput-tenant-id}
+
+Sets the tenant ID for multi-tenant scenarios. See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-loki/#tenant-id) for more information. 
+
+
 ### time_reopen (int, optional) {#lokioutput-time_reopen}
 
 The time to wait in seconds before a dead connection is reestablished.

pkg/sdk/logging/model/syslogng/config/output_tests/loki_test.go

@@ -189,6 +189,29 @@ func TestLokiOutputTable(t *testing.T) {
 			config: `destination "output_default_test-loki-buffer-out" {
 	loki(url("test.local") disk_buffer(disk_buf_size(1000) reliable(yes) compaction(yes) dir("/buffers") mem_buf_length(1000) mem_buf_size(1000) qout_size(1000)) batch-lines(2000) batch-timeout(10) workers(3) persist_name("output_default_test-loki-buffer-out") log-fifo-size(1000));
 };
+`,
+		},
+		{
+			name: "test_tenant",
+			output: v1beta1.SyslogNGOutput{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "default",
+					Name:      "test-loki-out",
+				},
+				Spec: v1beta1.SyslogNGOutputSpec{
+					Loki: &output.LokiOutput{
+						URL:          "test.local",
+						BatchLines:   2000,
+						BatchTimeout: 10,
+						Workers:      3,
+						LogFIFOSize:  1000,
+						TenantID: "test-tenant",
+					},
+				},
+			},
+			config: `destination "output_default_test-loki-out" {
+	loki(url("test.local") batch-lines(2000) batch-timeout(10) workers(3) persist_name("output_default_test-loki-out") log-fifo-size(1000) tenant-id("test-tenant"));
+};
 `,
 		},
 	}

pkg/sdk/logging/model/syslogng/output/loki.go

@@ -93,4 +93,7 @@ type LokiOutput struct {
 	Timestamp string `json:"timestamp,omitempty"`
 	// Template for customizing the log message format.
 	Template string `json:"template,omitempty"`
+	// Sets the tenant ID for multi-tenant scenarios.
+	// See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-loki/#tenant-id) for more information.
+	TenantID string `json:"tenant-id,omitempty"`
 }