Merge remote-tracking branch 'remotes/origin/2.4/dev' into dockerips

salt/kibana/config.map.jinja

@@ -7,6 +7,8 @@
 
 {% 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')}) %}
 
+{% do KIBANACONFIG.kibana.config.xpack.fleet.update({'registryUrl': 'http://' ~ GLOBALS.manager_ip ~ ':8080'}) %}
+
 {% if salt['pillar.get']('kibana:secrets') %}
   {% do KIBANACONFIG.kibana.config.xpack.update({'encryptedSavedObjects': {'encryptionKey': pillar['kibana']['secrets']['encryptedSavedObjects']['encryptionKey']}}) %}
   {% do KIBANACONFIG.kibana.config.xpack.security.update({'encryptionKey': pillar['kibana']['secrets']['security']['encryptionKey']}) %}

salt/kibana/defaults.yaml

@@ -31,6 +31,7 @@ kibana:
         kibanaServer:
           hostname: localhost
       fleet:
+        registryUrl: ""
         packages:
          - name: fleet_server
            version: latest