Merge pull request #19 from jlambert121/config_json_gone

move each service config to conf.d - no munging config.json
sensu · Feb 27, 2013 · 239969a · 239969a
2 parents 63a649b + e8eeb8b
commit 239969a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 59 deletions.
diff --git a/lib/puppet/provider/sensu_api_config/json.rb b/lib/puppet/provider/sensu_api_config/json.rb
@@ -10,7 +10,7 @@
   # /etc/sensu/config.json or an empty Hash if the file can not be read.
   def conf
     begin
-      @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))
+      @conf ||= JSON.parse(File.read('/etc/sensu/conf.d/api.json'))
     rescue
       @conf ||= {}
     end
@@ -20,7 +20,7 @@ def conf
   #
   # Returns nothing.
   def flush
-    File.open('/etc/sensu/config.json', 'w') do |f|
+    File.open('/etc/sensu/conf.d/api.json', 'w') do |f|
       f.puts JSON.pretty_generate(@conf)
     end
   end

diff --git a/lib/puppet/provider/sensu_clean_config/json.rb b/lib/puppet/provider/sensu_clean_config/json.rb
diff --git a/lib/puppet/provider/sensu_dashboard_config/json.rb b/lib/puppet/provider/sensu_dashboard_config/json.rb
@@ -6,14 +6,14 @@
 
   def conf
     begin
-      @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))
+      @conf ||= JSON.parse(File.read('/etc/sensu/conf.d/dashboard.json'))
     rescue
       @conf ||= {}
     end
   end
 
   def flush
-    File.open('/etc/sensu/config.json', 'w') do |f|
+    File.open('/etc/sensu/conf.d/dashboard.json', 'w') do |f|
       f.puts JSON.pretty_generate(conf)
     end
   end

diff --git a/lib/puppet/provider/sensu_rabbitmq_config/json.rb b/lib/puppet/provider/sensu_rabbitmq_config/json.rb
@@ -6,14 +6,14 @@
 
   def conf
     begin
-      @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))
+      @conf ||= JSON.parse(File.read('/etc/sensu/conf.d/rabbitmq.json'))
     rescue
       @conf ||= {}
     end
   end
 
   def flush
-    File.open('/etc/sensu/config.json', 'w') do |f|
+    File.open('/etc/sensu/conf.d/rabbitmq.json', 'w') do |f|
       f.puts JSON.pretty_generate(conf)
     end
   end

diff --git a/lib/puppet/provider/sensu_redis_config/json.rb b/lib/puppet/provider/sensu_redis_config/json.rb
@@ -6,14 +6,14 @@
 
   def conf
     begin
-      @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))
+      @conf ||= JSON.parse(File.read('/etc/sensu/conf.d/redis.json'))
     rescue
       @conf ||= {}
     end
   end
 
   def flush
-    File.open('/etc/sensu/config.json', 'w') do |f|
+    File.open('/etc/sensu/conf.d/redis.json', 'w') do |f|
       f.puts JSON.pretty_generate(conf)
     end
   end

diff --git a/lib/puppet/type/sensu_clean_config.rb b/lib/puppet/type/sensu_clean_config.rb
diff --git a/manifests/package.pp b/manifests/package.pp
@@ -20,5 +20,5 @@
     notify  => $notify_services
   }
 
-  sensu_clean_config { $::fqdn: }
+  file { '/etc/sensu/config.json': ensure => absent }
 }
diff --git a/spec/classes/sensu_package_spec.rb b/spec/classes/sensu_package_spec.rb
@@ -7,7 +7,7 @@
     it { should create_class('sensu::package') }
     it { should include_class('sensu::repo') }
     it { should contain_package('sensu').with_ensure('latest') }
-    it { should contain_sensu_clean_config('testhost.domain.com') }
+    it { should contain_file('/etc/sensu/config.json').with_ensure('absent') }
   end
 
   context 'setting parameters' do