Restore elasticsearch6.x and get rid of elasticsearch5.x

[chef.git] / cookbooks / prometheus / resources / collector.rb

diff --git a/cookbooks/prometheus/resources/collector.rb b/cookbooks/prometheus/resources/collector.rb
index c9c28fc6e8046d5c9ce74b3915e48da1a7ab882e..e82984b143354b45326bb12d47eb71c51d1fed8b 100644 (file)
--- a/cookbooks/prometheus/resources/collector.rb
+++ b/cookbooks/prometheus/resources/collector.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :collector, :kind_of => String, :name_property => true
@@ -36,7 +38,7 @@ action :create do
     private_tmp true
     protect_system "strict"
     protect_home true
-    read_write_paths "/var/lib/prometheus/node-exporter"
+    read_write_paths ["/var/lib/prometheus/node-exporter", "/var/lock", "/var/log"]
     no_new_privileges true
   end
 
@@ -76,7 +78,7 @@ action_class do
   end
 
   def executable_path
-    "/opt/prometheus/collectors/#{new_resource.collector}/#{new_resource.collector}_collector"
+    "/opt/prometheus-exporters/collectors/#{new_resource.collector}/#{new_resource.collector}_collector"
   end
 
   def executable_options