Elastic Stack: Update to 6.3

fixes #157
Icinga · Jul 16, 2018 · e3e5245 · e3e5245
1 parent 0c6afec
commit e3e5245
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/.puppet/hieradata/common.yaml b/.puppet/hieradata/common.yaml
@@ -38,13 +38,13 @@ grafana::version:                       "5.1.0"
 graphite::version:                      "1.1.2"
 icinga::director::version:              "v1.4.3"
 
-elastic::repo::version:                 "6.x"
-elastic::elasticsearch::version:        "6.2.3"
-elastic::kibana::version:               "6.2.3-1" # revision is important
+elastic::repo::version:                 6
+elastic::elasticsearch::version:        "6.3.1"
+elastic::kibana::version:               "6.3.1-1" # revision is important
 elastic::icingabeat::version:           "6.1.1"
 # keep this in sync with the icingabeat dashboard ids!
 elastic::kibana::default_app_id:        "dashboard/34e97340-e4ce-11e7-b4d1-8383451ae5a4"
 
 graylog::repo::version:                 "2.4"
-graylog::elasticsearch::repo_version:   "5.x"
+graylog::elasticsearch::repo_version:   5
 
diff --git a/.puppet/modules/profiles/manifests/elastic/elasticsearch.pp b/.puppet/modules/profiles/manifests/elastic/elasticsearch.pp
@@ -1,9 +1,14 @@
 class profiles::elastic::elasticsearch (
-  $repo_version = '5.x',
-  $elasticsearch_revision = '5.6.1',
+  $repo_version = 6,
+  $elasticsearch_revision = '6.3.1',
   $elasticsearch_host = '127.0.0.1',
   $elasticsearch_port = 9200
 ) {
+  class { 'elastic_stack::repo':
+    version => $repo_version,
+    oss     => true,
+  }
+
   file { '/etc/security/limits.d/99-elasticsearch.conf':
     ensure  => present,
     owner   => 'root',
@@ -13,9 +18,8 @@
   }
   ->
   class { 'elasticsearch':
-    manage_repo  => true,
-    repo_version => $repo_version,
-    version      => $elasticsearch_revision,
+    oss         => true,
+    version     => $elasticsearch_revision,
     jvm_options => [
       '-Xms256m',
       '-Xmx256m'

diff --git a/.puppet/modules/profiles/manifests/elastic/kibana.pp b/.puppet/modules/profiles/manifests/elastic/kibana.pp
@@ -1,14 +1,14 @@
 class profiles::elastic::kibana (
-  $repo_version = '6.x',
-  $kibana_revision = '6.0.0-1',
+  $kibana_revision = '6.3.1-1',
   $kibana_port = 5601,
   $kibana_host = '127.0.0.1',
   $kibana_default_app_id = 'dashboard/720f2f20-0979-11e7-a4dd-e96fa284b426'
 ) {
+  # requires profiles::elastic::elasticsearch to setup the repository
   class { 'kibana':
-    repo_version => $repo_version,
-    ensure => $kibana_revision,
-    config => {
+    oss     => true,
+    ensure  => $kibana_revision,
+    config  => {
       'server.port'                  => $kibana_port,
       'server.host'                  => $kibana_host,
       'kibana.index'                 => '.kibana',

diff --git a/elastic/environments/vagrant/manifests/default.pp b/elastic/environments/vagrant/manifests/default.pp
@@ -43,7 +43,6 @@
   }
   ->
   class { '::profiles::elastic::kibana':
-    repo_version => lookup('elastic::repo::version'),
     kibana_revision => lookup('elastic::kibana::version'),
     kibana_host => lookup('elastic::kibana::listen_ip'),
     kibana_port => lookup('elastic::kibana::listen_port'),