added searchguard config

diff --git a/customer/elk/common.yaml b/customer/elk/common.yaml
index 493e6583e7174d43f5fba69c8599b3164187754c..0c4d00684ff694189cb1374526a110d7ef2551c8 100644 (file)
--- a/customer/elk/common.yaml
+++ b/customer/elk/common.yaml
@@ -27,6 +27,35 @@ elasticsearch::plugins:
   'com.floragunn/search-guard-2/2.3.5.5':
     instances: 'es-01'
 
+elasticsearch::config:
+  cluster.name: "elk-logstash"
+  node.name: "%{fqdn}"
+  node.master: true
+  node.data: true
+  index.number_of_shards: 2
+  bootstrap.mlockall: true
+  indices.memory.index_buffer_size: "50%"
+  path.data: /opt/database/data/elastisearch/data
+  index.translog.flush_threshold_ops: 50000
+  threadpool.search.type: fixed
+  threadpool.search.size: 20
+  threadpool.search.queue_size: 100
+  threadpool.index.type: fixed
+  threadpool.index.size: 60
+  threadpool.index.queue_size: 200
+  http.port: '9200'
+  http.enabled: "true"
+  http.host: 0.0.0.0
+  transport.host: 0.0.0.0
+  discovery.zen.ping.unicast.hosts: ["93.188.104.53","93.188.104.52"]
+  searchguard.ssl.transport.keystore_type: PKCS12
+  searchguard.ssl.transport.keystore_filepath: wildcard.pixelpark.net-cert2016.p12
+  searchguard.ssl.transport.keystore_password: pixel
+  searchguard.ssl.transport.truststore_type: PKCS12
+  searchguard.ssl.transport.truststore_filepath: wildcard.pixelpark.net-cert2016.p12
+  searchguard.ssl.transport.truststore_password: pixel
+
+
 logstash::manage_repo: true
 logstash::repo_version: "2.3"
 logstash::java_install: true

diff --git a/customer/elk/vm-elk-01.pixelpark.net.yaml b/customer/elk/vm-elk-01.pixelpark.net.yaml
deleted file mode 100644 (file)
index 13be104..0000000
--- a/customer/elk/vm-elk-01.pixelpark.net.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-elasticsearch::config:
-  cluster.name: "elk-logstash"
-  node.name: "%{fqdn}"
-  node.master: true
-  node.data: true
-  index.number_of_shards: 2
-  bootstrap.mlockall: true
-  indices.memory.index_buffer_size: "50%"
-  path.data: /opt/database/data/elastisearch/data
-  index.translog.flush_threshold_ops: 50000
-  threadpool.search.type: fixed
-  threadpool.search.size: 20
-  threadpool.search.queue_size: 100
-  threadpool.index.type: fixed
-  threadpool.index.size: 60
-  threadpool.index.queue_size: 200
-  http.port: '9200'
-  http.enabled: "true"
-  http.host: 0.0.0.0
-  transport.host: 0.0.0.0
-  discovery.zen.ping.unicast.hosts: ["93.188.104.53"]

diff --git a/customer/elk/vm-elk-02.pixelpark.net.yaml b/customer/elk/vm-elk-02.pixelpark.net.yaml
deleted file mode 100644 (file)
index ab0e95b..0000000
--- a/customer/elk/vm-elk-02.pixelpark.net.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-elasticsearch::config:
-  cluster.name: "elk-logstash"
-  node.name: "%{fqdn}"
-  node.master: true
-  node.data: true
-  index.number_of_shards: 2
-  bootstrap.mlockall: true
-  indices.memory.index_buffer_size: "50%"
-  path.data: /opt/database/data/elastisearch/data
-  index.translog.flush_threshold_ops: 50000
-  threadpool.search.type: fixed
-  threadpool.search.size: 20
-  threadpool.search.queue_size: 100
-  threadpool.index.type: fixed
-  threadpool.index.size: 60
-  threadpool.index.queue_size: 200
-  http.port: '9200'
-  http.enabled: "true"
-  http.host: 0.0.0.0
-  transport.host: 0.0.0.0
-  discovery.zen.ping.unicast.hosts: ["93.188.104.52"]