Skip to content

Commit

Permalink
fix elasticsearch protocol default variable
Browse files Browse the repository at this point in the history
  • Loading branch information
daixijun committed Oct 28, 2021
1 parent 1e4751f commit a82f45f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions roles/ks-core/config/templates/kubesphere-config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ data:
{% if logging.enabled is defined and logging.enabled == true %}
logging:
{% if common.es.externalElasticsearchUrl is defined and common.es.externalElasticsearchPort is defined and common.es.externalElasticsearchUrl != "" and common.es.externalElasticsearchPort != "" %}
host: {{ common.es.externalElasticsearchProtocol | default(http) }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
host: {{ common.es.externalElasticsearchProtocol | default('http') }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
{% else %}
host: http://elasticsearch-logging-data.kubesphere-logging-system.svc:9200
{% endif %}
Expand All @@ -175,7 +175,7 @@ data:
{% if events.enabled is defined and events.enabled == true %}
events:
{% if common.es.externalElasticsearchUrl is defined and common.es.externalElasticsearchPort is defined and common.es.externalElasticsearchUrl != "" and common.es.externalElasticsearchPort != "" %}
host: {{ common.es.externalElasticsearchProtocol | default(http) }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
host: {{ common.es.externalElasticsearchProtocol | default('http') }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
{% else %}
host: http://elasticsearch-logging-data.kubesphere-logging-system.svc:9200
{% endif %}
Expand All @@ -191,7 +191,7 @@ data:
enable: true
webhookURL: https://kube-auditing-webhook-svc.kubesphere-logging-system.svc:6443/audit/webhook/event
{% if common.es.externalElasticsearchUrl is defined and common.es.externalElasticsearchPort is defined and common.es.externalElasticsearchUrl != "" and common.es.externalElasticsearchPort != "" %}
host: {{ common.es.externalElasticsearchProtocol | default(http) }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
host: {{ common.es.externalElasticsearchProtocol | default('http') }}://{{ common.es.externalElasticsearchUrl }}:{{ common.es.externalElasticsearchPort }}
{% else %}
host: http://elasticsearch-logging-data.kubesphere-logging-system.svc:9200
{% endif %}
Expand Down

0 comments on commit a82f45f

Please sign in to comment.