nominatim: add new dependency for updated osm2pgsql

[chef.git] / cookbooks / elasticsearch / recipes / default.rb

diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb
index 4c00b5e3cc3d944fed92fc6a886f4143ba98fffc..a48ee99879c4dd049afa5eab2eebcdb3e57ce265 100644 (file)
--- a/cookbooks/elasticsearch/recipes/default.rb
+++ b/cookbooks/elasticsearch/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: elasticsearch
+# Cookbook:: elasticsearch

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,14 +17,22 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "openjdk-7-jre-headless"
+include_recipe "prometheus"
+
+case node[:elasticsearch][:version]
+when "6.x" then include_recipe "apt::elasticsearch6"
+when "7.x" then include_recipe "apt::elasticsearch7"
+when "8.x" then include_recipe "apt::elasticsearch8"
+end
+
+package "default-jre-headless"

 package "elasticsearch"
 
 template "/etc/elasticsearch/elasticsearch.yml" do
   source "elasticsearch.yml.erb"
   user "root"
   group "root"
 package "elasticsearch"
 
 template "/etc/elasticsearch/elasticsearch.yml" do
   source "elasticsearch.yml.erb"
   user "root"
   group "root"

-  mode 0644
+  mode "644"

   notifies :restart, "service[elasticsearch]"
 end
 
   notifies :restart, "service[elasticsearch]"
 end
 


@@ -32,3 +40,7 @@ service "elasticsearch" do
   action [:enable, :start]
   supports :status => true, :restart => true
 end
   action [:enable, :start]
   supports :status => true, :restart => true
 end

+
+prometheus_exporter "elasticsearch" do
+  port 9114
+end