From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Oct 2018 17:37:56 +0000 (+0100)
Subject: Upgrade logstash to the 6.x release stream
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9fc754d0dd005efc40234f2877045c3aa17fc4f9?hp=f4ad66e6f3aa6643701112f0c955c6b1b81daf1a;ds=sidebyside

Upgrade logstash to the 6.x release stream
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 4282ba107..15cf58f9a 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -119,9 +119,9 @@ apt_repository "elasticsearch5.x" do
   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"
diff --git a/roles/logstash.rb b/roles/logstash.rb
index 860e015ff..9e421fc8d 100644
--- a/roles/logstash.rb
+++ b/roles/logstash.rb
@@ -2,13 +2,11 @@ name "logstash"
 description "Role applied to all logstash servers"
 
 default_attributes(
-  :apt => {
-    :sources => ["logstash"]
-  },
   :elasticsearch => {
     :cluster => {
       :name => "logstash"
-    }
+    },
+    :version => "6.x"
   },
   :kibana => {
     :sites => {