Merge pull request #20 from Lswith/master

Fix AlertManager Class
voxpupuli · Nov 11, 2016 · 94d4095 · 94d4095
2 parents 23d6df2 + 43782bc
commit 94d4095
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/manifests/alert_manager.pp b/manifests/alert_manager.pp
@@ -93,6 +93,7 @@
   $package_name         = $::prometheus::params::alert_manager_package_name,
   $package_ensure       = $::prometheus::params::alert_manager_package_ensure,
   $storage_path         = $::prometheus::params::alert_manager_storage_path,
+  $config_dir           = $::prometheus::params::alert_manager_config_dir,
   $config_file          = $::prometheus::params::alert_manager_config_file,
   $global               = $::prometheus::params::alert_manager_global,
   $route                = $::prometheus::params::alert_manager_route,

diff --git a/manifests/alert_manager/config.pp b/manifests/alert_manager/config.pp
@@ -72,14 +72,22 @@
       }
     }
   }
-
+
+  file { $prometheus::alert_manager::config_dir:
+    ensure  => 'directory',
+    owner   => $prometheus::alert_manager::user,
+    group   => $prometheus::alert_manager::group,
+    purge   => $purge,
+    recurse => $purge,
+  }
+
   file { $prometheus::alert_manager::config_file:
     ensure  => present,
-    owner   => $prometheus::user,
-    group   => $prometheus::group,
-    mode    => $prometheus::config_mode,
+    owner   => $prometheus::alert_manager::user,
+    group   => $prometheus::alert_manager::group,
+    mode    => $prometheus::alert_manager::config_mode,
     content => template('prometheus/alert_manager.yaml.erb'),
-    require => File[$prometheus::config_dir],
+    require => File[$prometheus::alert_manager::config_dir],
   }
 
 }
diff --git a/manifests/alert_manager/install.pp b/manifests/alert_manager/install.pp
@@ -9,8 +9,8 @@
   {
     file { $::prometheus::alert_manager::storage_path:
       ensure => 'directory',
-      owner  => $::prometheus::user,
-      group  =>  $::prometheus::group,
+      owner  => $::prometheus::alert_manager::user,
+      group  =>  $::prometheus::alert_manager::group,
       mode   => '0755',
     }
   }
@@ -19,9 +19,9 @@
       include staging
       $staging_file = "alert_manager-${prometheus::alert_manager::version}.${prometheus::alert_manager::download_extension}"
       if( versioncmp($::prometheus::alert_manager::version, '0.1.0') == -1 ){
-        $binary = "${::staging::path}/alertmanager-${::prometheus::alert_manager::version}.${::prometheus::os}-${::prometheus::arch}"
+        $binary = "${::staging::path}/alertmanager-${::prometheus::alert_manager::version}.${::prometheus::alert_manager::os}-${::prometheus::alert_manager::arch}"
       } else {
-        $binary = "${::staging::path}/alertmanager-${::prometheus::alert_manager::version}.${::prometheus::os}-${::prometheus::arch}/alertmanager"
+        $binary = "${::staging::path}/alertmanager-${::prometheus::alert_manager::version}.${::prometheus::alert_manager::os}-${::prometheus::alert_manager::arch}/alertmanager"
       }
       staging::file { $staging_file:
         source => $prometheus::alert_manager::real_download_url,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -22,9 +22,10 @@
   $node_exporter_package_name = 'node_exporter'
   $node_exporter_extra_groups = []
   $alert_manager_download_url_base = 'https://github.com/prometheus/alertmanager/releases'
-  $alert_manager_config_file = "${config_dir}/alertmanager.yaml"
+  $alert_manager_config_dir = '/etc/alert_manager'
+  $alert_manager_config_file = "${alert_manager_config_dir}/alertmanager.yaml"
   $alert_manager_global = { 'smtp_smarthost' =>'localhost:25', 'smtp_from'=>'alertmanager@localhost' }
-  $alert_manager_templates = [ "${config_dir}/*.tmpl" ]
+  $alert_manager_templates = [ "${alert_manager_config_dir}/*.tmpl" ]
   $alert_manager_route = { 'group_by'               =>  [ 'alertname', 'cluster', 'service' ], 'group_wait'=> '30s', 'group_interval'=> '5m', 'repeat_interval'=> '3h', 'receiver'=> 'Admin' }
   $alert_manager_receivers = [ { 'name'             => 'Admin', 'email_configs'=> [ { 'to'=> 'root@localhost' }] }]
   $alert_manager_inhibit_rules = [ { 'source_match' => { 'severity'=> 'critical' },'target_match'=> { 'severity'=>'warning'},'equal'=>['alertname','cluster','service']}]