Skip to content

Commit

Permalink
Elasticsearch: add fail_on_detecting_es_version_retry_exceed support
Browse files Browse the repository at this point in the history
  • Loading branch information
@ipiticas
Ionut Piticas authored and ipiticas committed Jul 29, 2022
1 parent 14f8ed0 commit fb286b8
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 0 deletions.
8 changes: 8 additions & 0 deletions charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -1581,6 +1583,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -6392,6 +6396,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -7430,6 +7436,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down
8 changes: 8 additions & 0 deletions charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -1581,6 +1583,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -6386,6 +6390,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -7424,6 +7430,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -1581,6 +1583,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -6392,6 +6396,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -7430,6 +7436,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/logging.banzaicloud.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -1581,6 +1583,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -6386,6 +6390,8 @@ spec:
type: object
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down Expand Up @@ -7424,6 +7430,8 @@ spec:
type: boolean
exception_backup:
type: boolean
fail_on_detecting_es_version_retry_exceed:
type: boolean
fail_on_putting_template_retry_exceed:
type: boolean
flatten_hashes:
Expand Down
1 change: 1 addition & 0 deletions pkg/sdk/logging/model/output/aws_elasticsearch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ buffer:
@type aws-elasticsearch-service
@id test
exception_backup true
fail_on_detecting_es_version_retry_exceed true
fail_on_putting_template_retry_exceed true
flush_interval 1s
include_tag_key true
Expand Down
3 changes: 3 additions & 0 deletions pkg/sdk/logging/model/output/elasticsearch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ type ElasticsearchOutput struct {
// Indicates whether to fail when max_retry_putting_template is exceeded. If you have multiple output plugin, you could use this property to do not fail on fluentd statup.(default: true)
// +kubebuilder:validation:Optional
FailOnPuttingTemplateRetryExceed *bool `json:"fail_on_putting_template_retry_exceed,omitempty" plugin:"default:true"`
// fail_on_detecting_es_version_retry_exceed (default: true)
// +kubebuilder:validation:Optional
FailOnDetectingEsVersionRetryExceed *bool `json:"fail_on_detecting_es_version_retry_exceed,omitempty" plugin:"default:true"`
// You can specify times of retry obtaining Elasticsearch version.(default: 15)
MaxRetryGetEsVersion string `json:"max_retry_get_es_version,omitempty"`
// You can specify HTTP request timeout.(default: 5s)
Expand Down
1 change: 1 addition & 0 deletions pkg/sdk/logging/model/output/elasticsearch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ buffer:
@type elasticsearch
@id test
exception_backup true
fail_on_detecting_es_version_retry_exceed true
fail_on_putting_template_retry_exceed true
host elasticsearch-elasticsearch-cluster.default.svc.cluster.local
port 9200
Expand Down
5 changes: 5 additions & 0 deletions pkg/sdk/logging/model/output/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions pkg/sdk/static/gen/crds/generated.go
View file

Large diffs are not rendered by default.

0 comments on commit fb286b8

Please sign in to comment.