diff options
Diffstat (limited to 'src')
3 files changed, 44 insertions, 3 deletions
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh index 5491f340..08efca81 100755 --- a/src/fuel-plugin/deployment_scripts/install.sh +++ b/src/fuel-plugin/deployment_scripts/install.sh @@ -7,6 +7,10 @@ HOST=$1 OS_AUTH_URL=$2 OS_USERNAME=$3 OS_PASSWORD=$4 +enable_mcelog=$5 +enable_intel_rdt=$6 +enable_hugepages=$7 +enable_ovs_events=$8 CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL} CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000} @@ -66,7 +70,9 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf </Plugin> EOF -cat << EOF > /etc/collectd/collectd.conf.d/intel-rdt.conf +if [ $enable_intel_rdt = 'true' ] +then + cat << EOF > /etc/collectd/collectd.conf.d/intel-rdt.conf <LoadPlugin intel_rdt> Interval 1 </LoadPlugin> @@ -75,8 +81,11 @@ cat << EOF > /etc/collectd/collectd.conf.d/intel-rdt.conf Cores "" </Plugin> EOF +fi -cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf +if [ $enable_hugepages = 'true' ] +then + cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf LoadPlugin hugepages <Plugin hugepages> @@ -87,7 +96,10 @@ LoadPlugin hugepages ValuesPercentage false </Plugin> EOF +fi +if [ $enable_mcelog = 'true' ] +then cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf <LoadPlugin mcelog> Interval 1 @@ -96,5 +108,6 @@ cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf McelogClientSocket "/var/run/mcelog-client" </Plugin> EOF +fi service collectd restart diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp index cd77016b..cbbfcad2 100644 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp +++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp @@ -12,12 +12,19 @@ $ceilometer_hash = hiera_hash('ceilometer', {'user'=>'ceilometer'}) $auth_user = 'ceilometer' $auth_password = $ceilometer_hash['user_password'] + +$collectd_settings = hiera('fuel-plugin-collectd-ceilometer') +$enable_mcelog = $collectd_settings['enable_mcelog'] +$enable_intel_rdt = $collectd_settings['enable_intel_rdt'] +$enable_hugepages = $collectd_settings['enable_hugepages'] +$enable_ovs_events = $collectd_settings['enable_ovs_events'] + $exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/deployment_scripts/install.sh" if ($use_ceilometer) { exec { "install collectd-ceilometer": - command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password}", + command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password} ${enable_mcelog} ${enable_intel_rdt} ${enable_hugepages} ${enable_ovs_events}", path => "/usr/bin:/usr/sbin:/bin:/sbin"; } } diff --git a/src/fuel-plugin/environment_config.yaml b/src/fuel-plugin/environment_config.yaml index e69de29b..125dfa53 100644 --- a/src/fuel-plugin/environment_config.yaml +++ b/src/fuel-plugin/environment_config.yaml @@ -0,0 +1,21 @@ +attributes: + enable_mcelog: + type: "checkbox" + weight: 20 + value: false + label: "Enable collectd for mcelog" + enable_intel_rdt: + type: "checkbox" + weight: 20 + value: false + label: "Enable collectd for Intel RDT" + enable_hugepages: + type: "checkbox" + weight: 20 + value: false + label: "Enable collectd for hugepages" + enable_ovs_events: + type: "checkbox" + weight: 20 + value: false + label: "Enable collectd for Open vSwitch events" |