Switch to installing prometheus exporters from github

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index e5f30a410855aea3fb4f6e87f0ddb4b8435fd721..6a429a41f28432811a00a41152593535f0759b8d 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -97,7 +97,9 @@ munin_plugin "apache_processes"
 munin_plugin "apache_volume"
 
 prometheus_exporter "apache" do
 munin_plugin "apache_volume"
 
 prometheus_exporter "apache" do

+  github_owner "Lusitaniae"
+  version "0.8.0"

   port 9117
   listen_switch "telemetry.address"
   port 9117
   listen_switch "telemetry.address"

-  exporter_options "-scrape_uri http://localhost/server-status?auto"
+  options "-scrape_uri http://localhost/server-status?auto"

 end
 end

diff --git a/cookbooks/prometheus/recipes/default.rb b/cookbooks/prometheus/recipes/default.rb
index a9a1db6a28f8946cdc075e99ecede02e40b092fb..7cfd70b6a07c284030ce58e90d94f4471b53dd25 100644 (file)
--- a/cookbooks/prometheus/recipes/default.rb
+++ b/cookbooks/prometheus/recipes/default.rb
@@ -38,8 +38,14 @@ else
   node.default[:prometheus][:address] = node.external_ipaddress(:family => :inet)
 end
 
   node.default[:prometheus][:address] = node.external_ipaddress(:family => :inet)
 end
 

+directory "/opt/prometheus" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+

 prometheus_exporter "node" do
 prometheus_exporter "node" do

+  version "1.0.1"

   port 9100
   port 9100

-  package_options "--no-install-recommends"
-  exporter_options "--collector.ntp --collector.processes --collector.interrupts"
+  options "--collector.ntp --collector.processes --collector.interrupts"

 end
 end

diff --git a/cookbooks/prometheus/resources/exporter.rb b/cookbooks/prometheus/resources/exporter.rb
index 8dd9288464751f94ddc54e24cb7f970bcc4d0ae3..0c94fa0eb4310d8567a7874628d9ab423980c067 100644 (file)
--- a/cookbooks/prometheus/resources/exporter.rb
+++ b/cookbooks/prometheus/resources/exporter.rb
@@ -20,34 +20,53 @@
 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true
 default_action :create
 
 property :exporter, :kind_of => String, :name_property => true

+property :github_owner, :kind_of => String, :default => "prometheus"
+property :github_project, :kind_of => String
+property :version, :kind_of => String, :required => [:create]

 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"
 property :port, :kind_of => Integer, :required => [:create]
 property :listen_switch, :kind_of => String, :default => "web.listen-address"

-property :exporter_options, :kind_of => [String, Array]
-property :package, :kind_of => String
-property :package_options, :kind_of => String
-property :defaults, :kind_of => String
-property :service, :kind_of => String
+property :options, :kind_of => [String, Array]

 
 action :create do
 
 action :create do

-  package package_name do
-    options new_resource.package_options
+  package "prometheus-#{new_resource.exporter}-exporter" do
+    action :purge

   end
 
   end
 

-  template defaults_name do
-    cookbook "prometheus"
-    source "defaults.erb"
+  remote_file archive_file do
+    action :create_if_missing
+    source archive_url

     owner "root"
     group "root"
     mode "644"
     owner "root"
     group "root"
     mode "644"

-    variables new_resource.to_hash.merge(:listen_address => listen_address)
+    backup false
+  end
+
+  execute archive_file do
+    action :nothing
+    command "tar -xf #{archive_file}"
+    cwd "/opt/prometheus"
+    user "root"
+    group "root"
+    subscribes :run, "remote_file[#{archive_file}]"
+  end
+
+  systemd_service service_name do
+    description "Prometheus #{new_resource.exporter} exporter"
+    type "simple"
+    user "root"
+    exec_start "#{executable_path} #{executable_options}"
+    private_tmp true
+    protect_system "strict"
+    protect_home true
+    no_new_privileges true

   end
 
   service service_name do
     action [:enable, :start]
   end
 
   service service_name do
     action [:enable, :start]

-    subscribes :restart, "template[#{defaults_name}]"
+    subscribes :restart, "systemd_service[#{service_name}]"

   end
 
   end
 

-  firewall_rule "accept-prometheus-#{new_resource.name}" do
+  firewall_rule "accept-prometheus-#{new_resource.exporter}" do

     action :accept
     source "osm"
     dest "fw"
     action :accept
     source "osm"
     dest "fw"


@@ -70,12 +89,28 @@ action :delete do
 end
 
 action_class do
 end
 
 action_class do

-  def package_name
-    new_resource.package || "prometheus-#{new_resource.exporter}-exporter"
+  def github_project
+    new_resource.github_project || "#{new_resource.exporter}_exporter"

   end
 
   end
 

-  def defaults_name
-    new_resource.defaults || "/etc/default/prometheus-#{new_resource.exporter}-exporter"
+  def archive_url
+    "https://github.com/#{new_resource.github_owner}/#{github_project}/releases/download/v#{new_resource.version}/#{github_project}-#{new_resource.version}.linux-amd64.tar.gz"
+  end
+
+  def archive_file
+    "#{Chef::Config[:file_cache_path]}/prometheus-#{new_resource.exporter}-exporter-#{new_resource.version}.tar.gz"
+  end
+
+  def service_name
+    "prometheus-#{new_resource.exporter}-exporter"
+  end
+
+  def executable_path
+    "/opt/prometheus/#{github_project}-#{new_resource.version}.linux-amd64/#{github_project}"
+  end
+
+  def executable_options
+    "--#{new_resource.listen_switch}=#{listen_address} #{Array(new_resource.options).join(" ")}"

   end
 
   def listen_address
   end
 
   def listen_address


@@ -85,8 +120,4 @@ action_class do
       "#{node[:prometheus][:address]}:#{new_resource.port}"
     end
   end
       "#{node[:prometheus][:address]}:#{new_resource.port}"
     end
   end

-
-  def service_name
-    new_resource.service || "prometheus-#{new_resource.exporter}-exporter"
-  end

 end
 end

diff --git a/cookbooks/prometheus/templates/default/defaults.erb b/cookbooks/prometheus/templates/default/defaults.erb
deleted file mode 100644 (file)
index c73c52e..0000000
--- a/cookbooks/prometheus/templates/default/defaults.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-ARGS="--<%= @listen_switch %>=<%= @listen_address %> <%= Array(@exporter_options).join(" ") %>"

diff --git a/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb b/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
index bb178dd96a53bd19cb66380e6babe14f772cef21..7a035e8f67e575699dcae0bd8e84cfef28dca838 100644 (file)
--- a/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
+++ b/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
@@ -3,10 +3,6 @@ require "serverspec"
 # Required by serverspec
 set :backend, :exec
 
 # Required by serverspec
 set :backend, :exec
 

-describe package("prometheus-node-exporter") do
-  it { should be_installed }
-end
-

 describe service("prometheus-node-exporter") do
   it { should be_enabled }
   it { should be_running }
 describe service("prometheus-node-exporter") do
   it { should be_enabled }
   it { should be_running }