diff --git a/salt/kibana/etc/kibana.yml b/salt/kibana/etc/kibana.yml index 89e568df9..4bcc22016 100644 --- a/salt/kibana/etc/kibana.yml +++ b/salt/kibana/etc/kibana.yml @@ -1,15 +1,11 @@ --- # Default Kibana configuration from kibana-docker. {%- set ES = salt['pillar.get']('manager:mainip', '') -%} -{% set FEATURES = salt['pillar.get']('elastic:features', False) %} +{%- set FEATURES = salt['pillar.get']('elastic:features', False) %} server.name: kibana server.host: "0" server.basePath: /kibana -{% if FEATURES %} -elasticsearch.hosts: [ "https://{{ ES }}:9200" ] -{%- else %} elasticsearch.hosts: [ "http://{{ ES }}:9200" ] -{%- endif %} #kibana.index: ".kibana" #elasticsearch.username: elastic #elasticsearch.password: changeme diff --git a/salt/soc/files/soc/soc.json b/salt/soc/files/soc/soc.json index 86bad6cf4..b44733cb1 100644 --- a/salt/soc/files/soc/soc.json +++ b/salt/soc/files/soc/soc.json @@ -16,11 +16,7 @@ "hostUrl": "http://{{ MANAGERIP }}:4434/" }, "elastic": { - {%- if FEATURES %} - "hostUrl": "https://{{ MANAGERIP }}:9200", - {%- else %} "hostUrl": "http://{{ MANAGERIP }}:9200", - {%- endif %} "username": "", "password": "", "verifyCert": false