added kibana and ssl settings

diff --git a/customer/elk/common.yaml b/customer/elk/common.yaml
index 181c58bca48c555fe194cf2c3e99b1d5b8b17837..b85cd15ee2183ed1c262fcbcd640251c7b5ca872 100644 (file)
--- a/customer/elk/common.yaml
+++ b/customer/elk/common.yaml
@@ -51,7 +51,7 @@ elasticsearch::config:
   discovery.zen.ping.unicast.hosts: ["93.188.104.53","93.188.104.52"]
   searchguard.ssl.transport.keystore_filepath: node-keystore.jks
   searchguard.ssl.transport.keystore_password: changeit
-  searchguard.ssl.transport.truststore_filepath: truststore.jkstruststore.jks
+  searchguard.ssl.transport.truststore_filepath: truststore.jks
   searchguard.ssl.transport.truststore_password: changeit
   searchguard.ssl.http.enabled: true
   searchguard.ssl.http.keystore_type: PKCS12
@@ -59,6 +59,8 @@ elasticsearch::config:
   searchguard.ssl.http.keystore_password: pixel
   searchguard.ssl.http.truststore_filepath: GeoTrustCA.jks
   searchguard.ssl.http.truststore_password: pixelpark
+  searchguard.authcz.admin_dn:
+    - cn=kirk,ou=client,o=client,l=Test,c=DE
 
 
 logstash::manage_repo: true
@@ -89,5 +91,15 @@ logstash::generic_resource:
     resource: elasticsearch
     order: 71
     parameters:
+      password: logstash
+      user: logstash
       hosts: "%{fqdn}"
       ssl: "true"
+      ssl_certificate_verification: "true"
+      truststore: "/etc/elasticsearch/es-01/GeoTrustCA.jks"
+      truststore_password: pixelpark
+
+kibana4::config:
+  elasticsearch.url: "https://vm-elk-01.pixelpark.net:9200"
+  elasticsearch.password: kibana
+  elasticsearch.username: kibana