diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e52738..1d1da15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ openstack-telemetry Cookbook CHANGELG ============================== This file is used to list changes made in each version of the openstack-metering cookbook. +## 9.1.2 +* Add attribute sample_source + ## 9.1.1 * Remove policy.json file, it's just a dup of what's in the package diff --git a/README.md b/README.md index 5b4d796..4d2fb90 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Attributes * `openstack['telemetry']['api']['auth']['version']` - Select v2.0 or v3.0. Default v2.0. The auth API version used to interact with identity service. TODO: Add DB2 support on other platforms * `openstack['telemetry']['platform']['db2_python_packages']` - Array of DB2 python packages, only available on redhat platform +* `openstack['telemetry']['sample_source'] - The source name of emitted samples, default value is openstack. The following attributes are defined in attributes/default.rb of the common cookbook, but are documented here due to their relevance: diff --git a/attributes/default.rb b/attributes/default.rb index 3ad37ed..81c9cdd 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -42,6 +42,8 @@ default['openstack']['telemetry']['service_user'] = 'ceilometer' default['openstack']['telemetry']['service_tenant_name'] = 'service' default['openstack']['telemetry']['service_role'] = 'admin' +default['openstack']['telemetry']['sample_source'] = 'openstack' + case node['openstack']['compute']['driver'] when 'libvirt.LibvirtDriver' default['openstack']['telemetry']['hypervisor_inspector'] = 'libvirt' diff --git a/metadata.rb b/metadata.rb index 4cae68c..61389e9 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com' license 'Apache 2.0' description 'The OpenStack Metering service Ceilometer.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '9.1.1' +version '9.1.2' recipe 'openstack-telemetry::agent-central', 'Installs agent central service.' recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.' diff --git a/spec/common_spec.rb b/spec/common_spec.rb index ab4efaa..1f20641 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -56,6 +56,17 @@ describe 'openstack-telemetry::common' do ) end + it 'has default sample_source set' do + expect(chef_run).to render_file(file.name).with_content( + /^sample_source = openstack$/) + end + + it 'has sample_source set' do + node.set['openstack']['telemetry']['sample_source'] = 'RegionOne' + expect(chef_run).to render_file(file.name).with_content( + /^sample_source = RegionOne$/) + end + it 'has default RPC/AMQP options set' do [/^amqp_durable_queues=false$/, /^amqp_auto_delete=false$/].each do |line| diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb index 9276751..3f42230 100644 --- a/templates/default/ceilometer.conf.erb +++ b/templates/default/ceilometer.conf.erb @@ -12,6 +12,7 @@ hypervisor_inspector = <%= node["openstack"]["telemetry"]["hypervisor_inspector" <% if node["openstack"]["telemetry"]["syslog"]["use"] %> log_config = /etc/openstack/logging.conf <% end %> +sample_source = <%= node["openstack"]["telemetry"]["sample_source"] %> ##### AMQP ##### notification_topics = notifications,glance_notifications