Skip to content

Commit

Permalink
add cloudId and cloudAuth parameters to elastic
Browse files Browse the repository at this point in the history 
Signed-off-by: Fabian Schlager <[email protected]>
  • Loading branch information
@fschlager
fschlager committed May 15, 2024
1 parent 7234760 commit 98c3d5e
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 0 deletions.
5 changes: 5 additions & 0 deletions apis/fluentd/v1alpha1/plugins/output/es.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ type Elasticsearch struct {
Scheme *string `json:"scheme,omitempty"`
// Path defines the REST API endpoint of Elasticsearch to post write requests (default: nil).
Path *string `json:"path,omitempty"`
// Authenticate towards Elastic Cloud using CloudId. If set, cloudAuth must
// be set as well and host, port, user and password are ignored.
CloudId *string `json:"cloudId,omitempty"`
// Authenticate towards Elastic Cloud using cloudAuth.
CloudAuth *string `json:"cloudAuth,omitempty"`
// IndexName defines the placeholder syntax of Fluentd plugin API. See https://docs.fluentd.org/configuration/buffer-section.
IndexName *string `json:"indexName,omitempty"`
// If true, Fluentd uses the conventional index name format logstash-%Y.%m.%d (default: false). This option supersedes the index_name option.
Expand Down
8 changes: 8 additions & 0 deletions charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down
8 changes: 8 additions & 0 deletions charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/fluentd.fluent.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down
2 changes: 2 additions & 0 deletions docs/plugins/fluentd/output/es.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Elasticsearch defines the parameters for out_es output plugin
| hosts | Hosts defines a list of hosts if you want to connect to more than one Elasticsearch nodes | *string |
| scheme | Specify https if your Elasticsearch endpoint supports SSL (default: http). | *string |
| path | Path defines the REST API endpoint of Elasticsearch to post write requests (default: nil). | *string |
| cloudId | Authenticate towards Elastic Cloud using CloudId. If set, cloudAuth must be set as well and host, port, user and password are ignored. | *string |
| cloudAuth | Authenticate towards Elastic Cloud using cloudAuth. | *string |
| indexName | IndexName defines the placeholder syntax of Fluentd plugin API. See https://docs.fluentd.org/configuration/buffer-section. | *string |
| logstashFormat | If true, Fluentd uses the conventional index name format logstash-%Y.%m.%d (default: false). This option supersedes the index_name option. | *bool |
| logstashPrefix | LogstashPrefix defines the logstash prefix index name to write events when logstash_format is true (default: logstash). | *string |
Expand Down
16 changes: 16 additions & 0 deletions manifests/setup/fluent-operator-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7494,6 +7494,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down Expand Up @@ -32138,6 +32146,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down
16 changes: 16 additions & 0 deletions manifests/setup/setup.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7494,6 +7494,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down Expand Up @@ -32138,6 +32146,14 @@ spec:
x-kubernetes-map-type: atomic
type: object
type: object
cloudAuth:
description: Authenticate towards Elastic Cloud using cloudAuth.
type: string
cloudId:
description: Authenticate towards Elastic Cloud using CloudId.
If set, cloudAuth must be set as well and host, port,
user and password are ignored.
type: string
host:
description: 'The hostname of your Elasticsearch node (default:
localhost).'
Expand Down

0 comments on commit 98c3d5e

Please sign in to comment.