Merge pull request #20 from redBorder/development

Release 0.1.5

CHANGELOG.md

@@ -1,4 +1,10 @@
-# rb-proxy CHANGELOG
+cookbook-rb-proxy CHANGELOG
+===============
+
+## 0.1.5
+
+  - David Vanhoucke
+    - [b5de2fb] add rb_exporter service in redborder proxy
 
 ## 0.0.1
 - [Miguel Negrón] - Initial release of proxy

resources/attributes/default.rb

@@ -60,6 +60,7 @@
 default["redborder"]["services"]["n2klocd"]                   = true
 default["redborder"]["services"]["radiusd"]                   = true
 default["redborder"]["services"]["k2http"]                    = true
+default["redborder"]["services"]["redborder-exporter"]        = true
 
 default["redborder"]["systemdservices"]["chef-client"]            = ["chef-client"]
 default["redborder"]["systemdservices"]["kafka"]                  = ["kafka"]
@@ -77,4 +78,5 @@
 default["redborder"]["systemdservices"]["n2klocd"]                = ["n2klocd"]
 default["redborder"]["systemdservices"]["radiusd"]                = ["radiusd"]
 default["redborder"]["systemdservices"]["k2http"]                 = ["k2http"]
+default["redborder"]["systemdservices"]["redborder-exporter"]     = ["redborder-exporter"]
 

resources/metadata.rb

@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures redborder proxy'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.4'
+version          '0.1.5'
 
 depends 'rb-selinux'
 depends 'zookeeper'
@@ -20,6 +20,7 @@
 depends 'rbnmsp'
 depends 'rbale'
 depends 'n2klocd'
+depends 'rb-exporter'
 #depends 'freeradius'
 depends 'k2http'
 #depends 'ohai'

resources/recipes/configure.rb

@@ -95,6 +95,10 @@
     action (proxy_services["n2klocd"] ? [:add] : [:remove])
 end
 
+rb_exporter_config "Configure rb-exporter" do
+    action (proxy_services["redborder-exporter"] ? [:add] : [:remove])
+end
+
 # TODO: replace node["redborder"]["services"] in action with "proxy_services".. 
 rbale_config "Configure redborder-ale" do
     ale_nodes node["redborder"]["sensors_info_all"]["ale-sensor"]