From 302fd461eab5f3c88bea0f771b676f7b8f786af3 Mon Sep 17 00:00:00 2001 From: Roman Babyuk Date: Tue, 27 Sep 2016 14:23:17 +0300 Subject: [PATCH] Clean up Change-Id: I2b6d3f02bd963304bb70587074701f2960bfdfdb --- deployment_scripts/puppet/manifests/configure.pp | 13 ------------- deployment_scripts/puppet/manifests/heka.pp | 4 +--- deployment_scripts/puppet/manifests/hiera.pp | 5 +---- deployment_scripts/puppet/manifests/hindsight.pp | 10 ---------- .../puppet/modules/telemetry/manifests/init.pp | 4 +--- deployment_tasks.yaml | 2 -- metadata.yaml | 2 +- 7 files changed, 4 insertions(+), 36 deletions(-) diff --git a/deployment_scripts/puppet/manifests/configure.pp b/deployment_scripts/puppet/manifests/configure.pp index 059c8d6..09393d5 100644 --- a/deployment_scripts/puppet/manifests/configure.pp +++ b/deployment_scripts/puppet/manifests/configure.pp @@ -9,17 +9,11 @@ $event_api = $plugin_data['event_api'] $network_metadata = hiera_hash('network_metadata') $elasticsearch_server = hiera('telemetry::elasticsearch::server') $elasticsearch_port = hiera('telemetry::elasticsearch::rest_port') -# TODO_0 'set' default values when looking for via hiera -# TODO_1 add if statments in case of 'advanced settings' passed through Fuel UI -# TODO_2 checks if we can reach ES, influxdb before actioning? -# Still needed $aodh_nodes ? $aodh_nodes = hiera('aodh_nodes') $ceilometer_service_name = $::ceilometer::params::api_service_name -# TODO move to hiera $event_pipeline_file = '/etc/ceilometer/event_pipeline.yaml' -# TODO move to hiera $ceilometer_publishers = 'direct' $influxdb_address = hiera('telemetry::influxdb::address') @@ -73,11 +67,6 @@ $packages = { }, } -# TODO FOR V3: stop collector only when qeue is empty* -# *wait utill all the events went from collector -# before stop collector service -# maybe service'collector' ensure stopped; require exec 'wait for qeue is empty' - create_resources(package, $packages) # Stop not needed any more service @@ -119,8 +108,6 @@ if hiera('telemetry::kafka::enabled') { } -# TODO validate values before proceed - ceilometer_config { 'database/metering_connection': value => $metering_connection } if $resource_api { ceilometer_config { 'database/resource_connection': value => $resource_connection } diff --git a/deployment_scripts/puppet/manifests/heka.pp b/deployment_scripts/puppet/manifests/heka.pp index f50b3fe..1d8d2b4 100644 --- a/deployment_scripts/puppet/manifests/heka.pp +++ b/deployment_scripts/puppet/manifests/heka.pp @@ -44,7 +44,6 @@ if !hiera('telemetry::kafka::enabled') { "${config_dir}/file-output-resource.toml": content => template( 'telemetry/heka/file-output-resource.toml.erb' ); "${config_dir}/file-output.toml": content => template( 'telemetry/heka/file-output.toml.erb' ); "${config_dir}/filter-influxdb_accumulator_sample.toml": content => template( 'telemetry/heka/filter-influxdb_accumulator_sample.toml.erb' ); - # TODO disable config when Elasticsearch not in use "${config_dir}/output-elasticsearch-resource.toml": content => template( 'telemetry/heka/output-elasticsearch-resource.toml.erb' ); "${config_dir}/output-influxdb-samples.toml": content => template( 'telemetry/heka/output-influxdb-samples.toml.erb' ); } @@ -57,7 +56,7 @@ if !hiera('telemetry::kafka::enabled') { $max_timer_inject = hiera('telemetry::heka::max_timer_inject') $poolsize = hiera('telemetry::heka::poolsize') - # TODO we dont't need them on controller + # We dont't use init on controller, we use pacemaker $install_init_script = false # Workaround for heka module @@ -68,7 +67,6 @@ if !hiera('telemetry::kafka::enabled') { ::heka { 'telemetry-collector-heka': config_dir => $config_dir, user => $user, - #additional_groups => $additional_groups, hostname => $::hostname, max_message_size => $max_message_size, max_process_inject => $max_process_inject, diff --git a/deployment_scripts/puppet/manifests/hiera.pp b/deployment_scripts/puppet/manifests/hiera.pp index 1c7f1f9..d0aeb0f 100644 --- a/deployment_scripts/puppet/manifests/hiera.pp +++ b/deployment_scripts/puppet/manifests/hiera.pp @@ -33,12 +33,10 @@ case $elasticsearch_mode { 'local': { if $network_metadata['vips'][$es_vip_name] { $es_server = $network_metadata['vips'][$es_vip_name]['ipaddr'] - # TODO: use data from hiera for $es_port. Can't do it rigt now. - $es_port = '9200' } else { $es_server = '' - $es_port = '9200' } + $es_port = '9200' } default: { fail("'${elasticsearch_mode}' mode not supported for Elasticsearch") @@ -59,7 +57,6 @@ if $telemetry['influxdb_address'] { $influxdb_user = $telemetry['influxdb_user'] $influxdb_password = $telemetry['influxdb_password'] - # TODO hardcode or move to params? $retention_period = '30' } else { diff --git a/deployment_scripts/puppet/manifests/hindsight.pp b/deployment_scripts/puppet/manifests/hindsight.pp index 632202a..ce335b3 100644 --- a/deployment_scripts/puppet/manifests/hindsight.pp +++ b/deployment_scripts/puppet/manifests/hindsight.pp @@ -115,7 +115,6 @@ $configs = { "${run_dir}/input/kafka_input.cfg" => { content => template( "${templates}/input/kafka_input.cfg.erb"), }, - # TODO: avoid such a ugly thigs like below "${run_dir}/input/kafka_input_1.cfg" => { content => template( "${templates}/input/kafka_input.cfg.erb"), }, @@ -129,15 +128,6 @@ $configs = { create_resources(file, $configs, $files_defaults) -## Let's multiply kafka_input.cfg files -#define telemetry::kafka_input_cfg_creator ($i = $title, $run_dir = $run_dir, $templates = $templates) { -# file {"${run_dir}/input/kafka_input_${i}.cfg": -# content => template( "${templates}/input/kafka_input.cfg.erb"), -# } -#} -#$sufix = ['1','2','3'] -#kafka_input_cfg_creator { $sufix: } - # Files $scripts = { diff --git a/deployment_scripts/puppet/modules/telemetry/manifests/init.pp b/deployment_scripts/puppet/modules/telemetry/manifests/init.pp index c2c0a7d..5f5e0ac 100644 --- a/deployment_scripts/puppet/modules/telemetry/manifests/init.pp +++ b/deployment_scripts/puppet/modules/telemetry/manifests/init.pp @@ -19,13 +19,11 @@ # === Parameters # # [*event_pipeline_file*] -# TODO # # [*publishers*] -# TODO # # -# === Examples (TODO) +# === Example # # class { 'telemetry': # event_pipeline_file => $event_pipeline_file, diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index d248ec2..3f589e7 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -267,8 +267,6 @@ puppet_modules: puppet/modules:/etc/puppet/modules timeout: 300 - - - id: telemetry-notifications type: puppet version: 2.1.0 diff --git a/metadata.yaml b/metadata.yaml index 0e28082..aa3d8c3 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,6 +1,6 @@ # Plugin name name: telemetry -# Human-readable name for your plugin (TODO) +# Human-readable name title: The OpenStack Telemetry Plugin # Plugin version version: '1.0.0'