Merge pull request #216 from TMGMedia/master

use service name for redis_exporter to prevent multiple downloads of redis_exporter

manifests/redis_exporter.pp

@@ -126,7 +126,8 @@
     # redis_exporter lacks.
     # TODO: patch prometheus::daemon to support custom extract directories
     $exporter_install_method = 'none'
-    file { "/opt/${service_name}-${version}.${os}-${arch}":
+    $install_dir = "/opt/${service_name}-${version}.${os}-${arch}"
+    file { $install_dir:
       ensure => 'directory',
       owner  => 'root',
       group  => 0, # 0 instead of root because OS X uses "wheel".
@@ -135,16 +136,16 @@
     -> archive { "/tmp/${service_name}-${version}.${download_extension}":
       ensure          => present,
       extract         => true,
-      extract_path    => "/opt/${service_name}-${version}.${os}-${arch}",
+      extract_path    => $install_dir,
       source          => $real_download_url,
       checksum_verify => false,
-      creates         => "/opt/${name}-${version}.${os}-${arch}/${name}",
+      creates         => "${install_dir}/${service_name}",
       cleanup         => true,
     }
     -> file { "${bin_dir}/${service_name}":
       ensure => link,
       notify => $notify_service,
-      target => "/opt/${service_name}-${version}.${os}-${arch}/${service_name}",
+      target => "${install_dir}/${service_name}",
       before => Prometheus::Daemon[$service_name],
     }
   } else {

spec/acceptance/redis_exporter_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper_acceptance'
+
+describe 'prometheus redis exporter' do
+  it 'redis_exporter works idempotently with no errors' do
+    pp = 'include prometheus::redis_exporter'
+    # Run it twice and test for idempotency
+    apply_manifest(pp, catch_failures: true)
+    apply_manifest(pp, catch_changes: true)
+  end
+
+  describe service('redis_exporter') do
+    it { is_expected.to be_running }
+    it { is_expected.to be_enabled }
+  end
+  # the class installs an the redis_exporter that listens on port 9121
+  describe port(9121) do
+    it { is_expected.to be_listening.with('tcp6') }
+  end
+end