Upgrade logstash to the 6.x release stream

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4282ba107687b0d012c00e5032add03915700a51..15cf58f9af929304423fc1dbc7b759c460857d3e 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -119,9 +119,9 @@ apt_repository "elasticsearch5.x" do
   key "D27D666CD88E42B4"
 end
 
   key "D27D666CD88E42B4"
 end
 

-apt_repository "logstash" do
-  action repository_actions["logstash"]
-  uri "https://packages.elasticsearch.org/logstash/2.3/debian"
+apt_repository "elasticsearch6.x" do
+  action repository_actions["elasticsearch6.x"]
+  uri "https://artifacts.elastic.co/packages/6.x/apt"

   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"

diff --git a/roles/logstash.rb b/roles/logstash.rb
index 860e015ffab717d8291f81b6dc6158aa3dff1087..9e421fc8d2ad5ec7eb7ef53334684df6eec242e6 100644 (file)
--- a/roles/logstash.rb
+++ b/roles/logstash.rb
@@ -2,13 +2,11 @@ name "logstash"
 description "Role applied to all logstash servers"
 
 default_attributes(
 description "Role applied to all logstash servers"
 
 default_attributes(

-  :apt => {
-    :sources => ["logstash"]
-  },

   :elasticsearch => {
     :cluster => {
       :name => "logstash"
   :elasticsearch => {
     :cluster => {
       :name => "logstash"

-    }
+    },
+    :version => "6.x"

   },
   :kibana => {
     :sites => {
   },
   :kibana => {
     :sites => {