Merge pull request #914 from sjliu1/collectd

[summerospp]add fluentbit collectd plugin
fluent · Sep 13, 2023 · 0481522 · 0481522
2 parents fdbf8e1 + b0586a9
commit 0481522
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 0 deletions.
diff --git a/apis/fluentbit/v1alpha2/clusterinput_types.go b/apis/fluentbit/v1alpha2/clusterinput_types.go
@@ -61,6 +61,8 @@ type InputSpec struct {
 	HTTP *input.HTTP `json:"http,omitempty"`
 	// MQTT defines the MQTT input plugin configuration
 	MQTT *input.MQTT `json:"mqtt,omitempty"`
+	// Collectd defines the Collectd input plugin configuration
+	Collectd *input.Collectd `json:"collectd,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/fluentbit/v1alpha2/plugins/input/collectd.go b/apis/fluentbit/v1alpha2/plugins/input/collectd.go
@@ -0,0 +1,42 @@
+package input
+
+import (
+	"fmt"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+)
+
+// +kubebuilder:object:generate:=true
+
+// The Collectd input plugin allows you to receive datagrams from collectd service. <br />
+// **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/inputs/collectd**
+type Collectd struct {
+	// Set the address to listen to, default: 0.0.0.0
+	Listen string `json:"listen,omitempty"`
+	// Set the port to listen to, default: 25826
+	// +kubebuilder:validation:Minimum:=1
+	// +kubebuilder:validation:Maximum:=65535
+	Port *int32 `json:"port,omitempty"`
+	// Set the data specification file,default: /usr/share/collectd/types.db
+	TypesDB string `json:"typesDB,omitempty"`
+}
+
+func (_ *Collectd) Name() string {
+	return "collectd"
+}
+
+// implement Section() method
+func (c *Collectd) Params(_ plugins.SecretLoader) (*params.KVs, error) {
+	kvs := params.NewKVs()
+	if c.Listen != "" {
+		kvs.Insert("Listen", c.Listen)
+	}
+	if c.Port != nil {
+		kvs.Insert("Port", fmt.Sprint(*c.Port))
+	}
+	if c.TypesDB != "" {
+		kvs.Insert("TypesDB", c.TypesDB)
+	}
+	return kvs, nil
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/input/zz_generated.deepcopy.go
diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -41,6 +41,22 @@ spec:
                 description: A user friendly alias name for this input plugin. Used
                   in metrics for distinction of each configured input.
                 type: string
+              collectd:
+                description: Collectd defines the Collectd input plugin configuration
+                properties:
+                  listen:
+                    description: 'Set the address to listen to, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'Set the port to listen to, default: 25826'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  typesDB:
+                    description: 'Set the data specification file,default: /usr/share/collectd/types.db'
+                    type: string
+                type: object
               customPlugin:
                 description: CustomPlugin defines Custom Input configuration.
                 properties:

diff --git a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
@@ -41,6 +41,22 @@ spec:
                 description: A user friendly alias name for this input plugin. Used
                   in metrics for distinction of each configured input.
                 type: string
+              collectd:
+                description: Collectd defines the Collectd input plugin configuration
+                properties:
+                  listen:
+                    description: 'Set the address to listen to, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'Set the port to listen to, default: 25826'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  typesDB:
+                    description: 'Set the data specification file,default: /usr/share/collectd/types.db'
+                    type: string
+                type: object
               customPlugin:
                 description: CustomPlugin defines Custom Input configuration.
                 properties:

diff --git a/docs/fluentbit.md b/docs/fluentbit.md
@@ -422,6 +422,7 @@ InputSpec defines the desired state of ClusterInput
 | openTelemetry | OpenTelemetry defines the OpenTelemetry input plugin configuration | *[input.OpenTelemetry](plugins/input/opentelemetry.md) |
 | http | HTTP defines the HTTP input plugin configuration | *[input.HTTP](plugins/input/http.md) |
 | mqtt | MQTT defines the MQTT input plugin configuration | *[input.MQTT](plugins/input/mqtt.md) |
+| collectd | Collectd defines the Collectd input plugin configuration | *[input.Collectd](plugins/input/collectd.md) |
 
 [Back to TOC](#table-of-contents)
 # NamespacedFluentBitCfgSpec

diff --git a/docs/plugins/fluentbit/input/collectd.md b/docs/plugins/fluentbit/input/collectd.md
@@ -0,0 +1,10 @@
+# Collectd
+
+The Collectd input plugin allows you to receive datagrams from collectd service. <br /> **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/inputs/collectd**
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| listen | Set the address to listen to, default: 0.0.0.0 | string |
+| port | Set the port to listen to, default: 25826 | *int32 |
+| typesDB | Set the data specification file,default: /usr/share/collectd/types.db | string |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -1790,6 +1790,22 @@ spec:
                 description: A user friendly alias name for this input plugin. Used
                   in metrics for distinction of each configured input.
                 type: string
+              collectd:
+                description: Collectd defines the Collectd input plugin configuration
+                properties:
+                  listen:
+                    description: 'Set the address to listen to, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'Set the port to listen to, default: 25826'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  typesDB:
+                    description: 'Set the data specification file,default: /usr/share/collectd/types.db'
+                    type: string
+                type: object
               customPlugin:
                 description: CustomPlugin defines Custom Input configuration.
                 properties:

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -1790,6 +1790,22 @@ spec:
                 description: A user friendly alias name for this input plugin. Used
                   in metrics for distinction of each configured input.
                 type: string
+              collectd:
+                description: Collectd defines the Collectd input plugin configuration
+                properties:
+                  listen:
+                    description: 'Set the address to listen to, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'Set the port to listen to, default: 25826'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  typesDB:
+                    description: 'Set the data specification file,default: /usr/share/collectd/types.db'
+                    type: string
+                type: object
               customPlugin:
                 description: CustomPlugin defines Custom Input configuration.
                 properties: