Fix yaml for idh,es,kib,esalert

salt/kibana/config.map.jinja

@@ -1,6 +1,9 @@
 {% import_yaml 'kibana/defaults.yaml' as KIBANACONFIG with context %}
 {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
 
+{% do KIBANACONFIG.kibana.config.server.update({'publicBaseUrl': 'https://' ~ pillar.global.url_base ~ '/kibana'}) %}
+{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': 'https://' ~ pillar.global.managerip ~ ':9200'}) %}
+
 {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %}
 
 {% if salt['pillar.get']('kibana:secrets') %}

salt/kibana/defaults.yaml

@@ -5,10 +5,7 @@ kibana:
       name: kibana
       host: "0.0.0.0"
       basePath: /kibana
-      publicBaseUrl: https://{{salt['pillar.get']('global:url_base')}}/kibana
     elasticsearch:
-      hosts:
-        - https://{{salt['pillar.get']('global:managerip')}}:9200
       ssl:
         verificationMode: none
       requestTimeout: 90000
@@ -70,7 +67,7 @@ kibana:
                   - type: system/metrics
                     enabled: false
           - name: Endpoints-Initial
-            id: endpoints-default
+            id: endpoints
             description: "Initial Endpoint Policy"
             namespace: default
             monitoring_enabled: ['logs']