diff --git a/data/defaults.yaml b/data/defaults.yaml --- a/data/defaults.yaml +++ b/data/defaults.yaml @@ -3190,6 +3190,7 @@ qPDlGRlOgVTd9xUfHFkzB52c70E= =92oX -----END PGP PUBLIC KEY BLOCK----- +elastic::elk_version: '6.4.2' hwraid_levert::apt_config::keyid: 0073C11919A641464163F7116005210E23B3D3B4 hwraid_levert::apt_config::key: | diff --git a/site-modules/profile/manifests/elasticsearch.pp b/site-modules/profile/manifests/elasticsearch.pp --- a/site-modules/profile/manifests/elasticsearch.pp +++ b/site-modules/profile/manifests/elasticsearch.pp @@ -22,8 +22,9 @@ # Elasticsearch official package installation instructions: # https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html - $keyid = lookup('elastic::apt_config::keyid') - $key = lookup('elastic::apt_config::key') + $keyid = lookup('elastic::apt_config::keyid') + $key = lookup('elastic::apt_config::key') + $version = lookup('elastic::elk_version') apt::source { 'elastic-6.x': location => 'https://artifacts.elastic.co/packages/6.x/apt', @@ -36,12 +37,12 @@ } package { 'elasticsearch': - ensure => '6.3.2', + ensure => $version, } apt::pin { 'elasticsearch': packages => 'elasticsearch elasticsearch-oss', - version => '6.3.2', + version => $version, priority => 1001, } 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 @@ -6,6 +6,7 @@ $keyid = lookup('elastic::apt_config::keyid') $key = lookup('elastic::apt_config::key') + $version = lookup('elastic::elk_version') apt::source { 'elastic-6.x': location => 'https://artifacts.elastic.co/packages/6.x/apt', @@ -18,12 +19,12 @@ } package { 'kibana': - ensure => '6.3.2', + ensure => $version, } apt::pin { 'kibana': packages => 'kibana', - version => '6.3.2', + version => $version, priority => 1001, } diff --git a/site-modules/profile/manifests/logstash.pp b/site-modules/profile/manifests/logstash.pp --- a/site-modules/profile/manifests/logstash.pp +++ b/site-modules/profile/manifests/logstash.pp @@ -4,8 +4,9 @@ ensure => 'present', } - $keyid = lookup('elastic::apt_config::keyid') - $key = lookup('elastic::apt_config::key') + $keyid = lookup('elastic::apt_config::keyid') + $key = lookup('elastic::apt_config::key') + $version = sprintf("1:%s-1", lookup('elastic::elk_version')) apt::source { 'elastic-6.x': location => 'https://artifacts.elastic.co/packages/6.x/apt', @@ -18,12 +19,12 @@ } package { 'logstash': - ensure => '1:6.4.2-1', + ensure => $version, } apt::pin { 'logstash': packages => 'logstash', - version => '1:6.4.2-1', + version => $version, priority => 1001, }