From 459451a1008ebc1be872f1f96f8d263aedb54962 Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Wed, 27 Aug 2014 21:58:43 -0600 Subject: [PATCH] Change to use monasca instead of mon Renamed data_bag from mon_persister to monasca_persister Also, renamed attributes to appropriate names from the refactor of removing the persister. Removed attributes no longer used as well Use the monasca group instead of the persister group so /var/log/monasca can be reused between components Change the credential databag from mon_credentials to just credentials Change-Id: I5bc564ae3763ff05a44cbdc05a4550d627b4b7d2 --- README.md | 8 ++--- attributes/default.rb | 5 +-- metadata.rb | 4 +-- recipes/default.rb | 36 ++++++++++++++-------- templates/default/persister-config.yml.erb | 18 +++++------ 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 5e65686..fa2046c 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,12 @@ Additionally when using as part of a chef server it requires the hp_common_funct Using Vertica ------------ -If Vertica is used as the database for Monasca, the Vertica JDBC jar that matches the Vertica version must be placed in /opt/mon/vertica. The jar from Vertica will be named like vertica-jdbc-7.0.1-0.jar and must be renamed to vertica_jdbc.jar when placed in /opt/mon/vertica. You can find the Vertica JDBC jar in /opt/vertica/java on a system with the Vertica database installed. This cookbook will copy the Vertica JDBC Jar from /vagrant and place it in /opt/mon/vertica if run using Chef Solo. +If Vertica is used as the database for Monasca, the Vertica JDBC jar that matches the Vertica version must be placed in /opt/monasca/vertica. The jar from Vertica will be named like vertica-jdbc-7.0.1-0.jar and must be renamed to vertica_jdbc.jar when placed in /opt/monasca/vertica. You can find the Vertica JDBC jar in /opt/vertica/java on a system with the Vertica database installed. This cookbook will copy the Vertica JDBC Jar from /vagrant and place it in /opt/monasca/vertica if run using Chef Solo. Data Bags --------- -The node[:mon_persister][:data_bag] data bag is used for all items. When used in standard chef all data bag items can have a location as the suffix and the get_data_bag_item +The node[:monasca_persister][:data_bag] data bag is used for all items. When used in standard chef all data bag items can have a location as the suffix and the get_data_bag_item function will pull the most specific. Item details: - - mon_persister is needed for configuration, see the @settings usages in templates/default/persister-config.yml.erb for details - - `mon_credentials` is an encrytped data bag for user/password, see the @credentials usages in templates/default/persister-config.yml.erb for details + - monasca_persister is needed for configuration, see the @settings usages in templates/default/persister-config.yml.erb for details + - `credentials` is an encrytped data bag for user/password, see the @credentials usages in templates/default/persister-config.yml.erb for details diff --git a/attributes/default.rb b/attributes/default.rb index 1015fda..a669a3f 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,7 +1,8 @@ # encoding: UTF-8# # -node.default[:mon_persister][:group] = 'persister' -node.default[:mon_persister][:data_bag] = 'mon_persister' +node.default[:monasca_persister][:user] = 'persister' +node.default[:monasca_persister][:group] = 'monasca' +node.default[:monasca_persister][:data_bag] = 'monasca_persister' # Sysctl settings # This style is picked up by the sysctl cookbook in HP Cloud basenode diff --git a/metadata.rb b/metadata.rb index 8b95721..d1c453e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,9 +1,9 @@ # encoding: UTF-8# # -name 'mon_persister' +name 'monasca_persister' maintainer 'Monasca Team' maintainer_email 'monasca@lists.launchpad.net' license 'All rights reserved' description 'Installs/Configures som_persister' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.18' +version '0.1.19' diff --git a/recipes/default.rb b/recipes/default.rb index ec19337..bc6c240 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,44 +1,54 @@ # encoding: UTF-8# # -package 'mon-persister' do # The package depends on openjdk-7-jre + +group node[:monasca_persister][:group] do + action :create +end +user node[:monasca_persister][:user] do + action :create + system true + gid node[:monasca_persister][:group] +end + +package 'monasca-persister' do # The package depends on openjdk-7-jre action :upgrade end -service 'mon-persister' do +service 'monasca-persister' do action :enable provider Chef::Provider::Service::Upstart end # Create the log file directory -directory '/var/log/mon' do +directory '/var/log/monasca' do recursive true - owner 'persister' - group node[:mon_persister][:group] - mode 0755 + owner node[:monasca_persister][:user] + group node[:monasca_persister][:group] + mode 0775 action :create end # TODO: encrypt the credentials data bag item -credentials = data_bag_item(node[:mon_persister][:data_bag], 'mon_credentials') -settings = data_bag_item(node[:mon_persister][:data_bag], 'mon_persister') +credentials = data_bag_item(node[:monasca_persister][:data_bag], 'credentials') +settings = data_bag_item(node[:monasca_persister][:data_bag], 'monasca_persister') -template '/etc/mon/persister-config.yml' do +template '/etc/monasca/persister-config.yml' do action :create owner 'root' - group node[:mon_persister][:group] + group node[:monasca_persister][:group] mode '640' source 'persister-config.yml.erb' variables( credentials: credentials, settings: settings ) - notifies :restart, 'service[mon-persister]' + notifies :restart, 'service[monasca-persister]' end if settings['database_configuration']['database_type'] == 'vertica' # Create the directory for the vertica JDBC jar - directory '/opt/mon/vertica' do + directory '/opt/monasca/vertica' do recursive true owner 'root' group 'root' @@ -50,7 +60,7 @@ if settings['database_configuration']['database_type'] == 'vertica' bash 'vertica_jdbc.jar' do action :run code <<-EOL - DEST=/opt/mon/vertica/vertica_jdbc.jar + DEST=/opt/monasca/vertica/vertica_jdbc.jar if [ ! -s ${DEST} ]; then SRC=`ls /vagrant/vertica-jdbc-*.jar` if [ $? != 0 ]; then diff --git a/templates/default/persister-config.yml.erb b/templates/default/persister-config.yml.erb index 4799955..1735b0a 100644 --- a/templates/default/persister-config.yml.erb +++ b/templates/default/persister-config.yml.erb @@ -1,9 +1,9 @@ -name: mon-persister +name: monasca-persister alarmHistoryConfiguration: - batchSize: <%= @settings['output_processor']['batch_size'] %> - numThreads: <%= @settings['kafka']['num_threads'] %> - maxBatchTime: <%= @settings['deduper_config']['dedupe_run_frequencey_seconds'] %> + batchSize: <%= @settings['alarm_history']['batch_size'] %> + numThreads: <%= @settings['alarm_history']['num_threads'] %> + maxBatchTime: <%= @settings['alarm_history']['maxBatchTime'] %> # See http://kafka.apache.org/documentation.html#api for semantics and defaults. topic: <%= @settings['alarm_history']['topic'] %> groupId: <%= @settings['kafka']['group_id'] %>_<%= @settings['alarm_history']['topic'] %> @@ -17,9 +17,9 @@ alarmHistoryConfiguration: clientId : 1 metricConfiguration: - batchSize: <%= @settings['output_processor']['batch_size'] %> - numThreads: <%= @settings['kafka']['num_threads'] %> - maxBatchTime: <%= @settings['deduper_config']['dedupe_run_frequencey_seconds'] %> + batchSize: <%= @settings['metrics']['batch_size'] %> + numThreads: <%= @settings['metrics']['num_threads'] %> + maxBatchTime: <%= @settings['metrics']['maxBatchTime'] %> # See http://kafka.apache.org/documentation.html#api for semantics and defaults. topic: <%= @settings['metrics']['topic'] %> groupId: <%= @settings['kafka']['group_id'] %>_<%= @settings['metrics']['topic'] %> @@ -147,8 +147,8 @@ logging: - type: file threshold: INFO archive: true - currentLogFilename: /var/log/mon/mon-persister.log - archivedLogFilenamePattern: /var/log/mon/mon-persister.log-%d.log.gz + currentLogFilename: /var/log/monasca/monasca-persister.log + archivedLogFilenamePattern: /var/log/monasca/monasca-persister.log-%d.log.gz archivedFileCount: 5 # The timezone used to format dates. HINT: USE THE DEFAULT, UTC. timeZone: UTC