diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -3273,6 +3273,8 @@ path.logs: "%{alias('elasticsearch::config::path::logs')}" http.port: "%{alias('elasticsearch::config::http::port')}" prometheus.indices: "%{alias('elasticsearch::config::prometheus::indices')}" + indices.memory.index_buffer_size: 50% + index.store.type: hybridfs logstash::listen_network: "%{lookup('internal_network')}" logstash::elasticsearch::hosts: "%{alias('elasticsearch::hosts')}" diff --git a/data/deployments/production/common.yaml b/data/deployments/production/common.yaml --- a/data/deployments/production/common.yaml +++ b/data/deployments/production/common.yaml @@ -11,10 +11,6 @@ - esnode2 - esnode3 -elasticsearch::config::extras: - indices.memory.index_buffer_size: 50% - index.store.type: hybridfs - elasticsearch::jvm_options::heap_size: 16g swh::postgresql::shared_buffers: 4GB diff --git a/data/hostname/esnode1.internal.softwareheritage.org.yaml b/data/hostname/esnode1.internal.softwareheritage.org.yaml --- a/data/hostname/esnode1.internal.softwareheritage.org.yaml +++ b/data/hostname/esnode1.internal.softwareheritage.org.yaml @@ -10,3 +10,7 @@ - zfs-dkms - zfsutils-linux - zfs-zed + +elastic::elk_version: '7.15.1' +elasticsearch::config::extras: + xpack.security.enabled: false diff --git a/data/hostname/esnode2.internal.softwareheritage.org.yaml b/data/hostname/esnode2.internal.softwareheritage.org.yaml --- a/data/hostname/esnode2.internal.softwareheritage.org.yaml +++ b/data/hostname/esnode2.internal.softwareheritage.org.yaml @@ -10,3 +10,7 @@ - zfs-dkms - zfsutils-linux - zfs-zed + +elastic::elk_version: '7.15.1' +elasticsearch::config::extras: + xpack.security.enabled: false diff --git a/data/hostname/esnode3.internal.softwareheritage.org.yaml b/data/hostname/esnode3.internal.softwareheritage.org.yaml --- a/data/hostname/esnode3.internal.softwareheritage.org.yaml +++ b/data/hostname/esnode3.internal.softwareheritage.org.yaml @@ -10,3 +10,7 @@ - zfs-dkms - zfsutils-linux - zfs-zed + +elastic::elk_version: '7.15.1' +elasticsearch::config::extras: + xpack.security.enabled: false diff --git a/data/hostname/kibana0.internal.softwareheritage.org.yaml b/data/hostname/kibana0.internal.softwareheritage.org.yaml new file mode 100644 --- /dev/null +++ b/data/hostname/kibana0.internal.softwareheritage.org.yaml @@ -0,0 +1 @@ +elastic::elk_version: '7.15.1' diff --git a/site-modules/profile/manifests/kibana.pp b/site-modules/profile/manifests/kibana.pp --- a/site-modules/profile/manifests/kibana.pp +++ b/site-modules/profile/manifests/kibana.pp @@ -9,7 +9,7 @@ apt::pin { 'kibana': packages => 'kibana', - version => $version, + version => $version, priority => 1001, }