Skip to content

Commit

Permalink
Support without OpenSearch curator component
Browse files Browse the repository at this point in the history
Signed-off-by: dehaocheng <[email protected]>
  • Loading branch information
wenchajun committed Aug 23, 2023
1 parent 0b2a497 commit 989abbd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions deploy/cluster-configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ spec:
password: ""
externalElasticsearchHost: ""
externalElasticsearchPort: ""
curator:
enabled: false
opensearch: # Storage backend for logging, events and auditing.
# master:
# volumeSize: 4Gi # The volume size of Opensearch master nodes.
Expand All @@ -85,6 +87,8 @@ spec:
password: "admin"
externalOpensearchHost: ""
externalOpensearchPort: ""
curator:
enabled: true
dashboard:
enabled: false
alerting: # (CPU: 0.1 Core, Memory: 100 MiB) It enables users to customize alerting policies to send messages to receivers in time with different time intervals and alerting levels to choose from.
Expand Down
3 changes: 2 additions & 1 deletion roles/common/tasks/escurator-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@
{{ kubesphere_dir }}/elasticsearch-curator/elasticsearch-curator-1.3.3.tgz
-f {{ kubesphere_dir }}/elasticsearch-curator/custom-values-elasticsearch-curator.yaml
--namespace kubesphere-logging-system
# when:
when:
- common.es.curator is defined and common.es.curator.enabled is defined and common.es.curator.enabled
# - (curator_check.stdout.find("DEPLOYED") == -1) or (curator_check.stdout.find("5.5.4-0217") == -1)
3 changes: 2 additions & 1 deletion roles/common/tasks/opensearch-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@
{{ kubesphere_dir }}/opensearch/opensearch-curator-1.3.3.tgz
-f {{ kubesphere_dir }}/opensearch/custom-values-opensearch-curator.yaml
--namespace kubesphere-logging-system
# when:
when:
- common.opensearch.curator is defined and common.opensearch.curator.enabled is defined and common.opensearch.curator.enabled
# - (curator_check.stdout.find("DEPLOYED") == -1) or (curator_check.stdout.find("5.5.4-0217") == -1)

- name: KubeSphere | Deploying opensearch-dashboard
Expand Down

0 comments on commit 989abbd

Please sign in to comment.