diff options
Diffstat (limited to 'deployment_scripts/puppet/manifests/collectd.pp')
-rw-r--r-- | deployment_scripts/puppet/manifests/collectd.pp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/deployment_scripts/puppet/manifests/collectd.pp b/deployment_scripts/puppet/manifests/collectd.pp index 7e6ab37..2edd29f 100644 --- a/deployment_scripts/puppet/manifests/collectd.pp +++ b/deployment_scripts/puppet/manifests/collectd.pp | |||
@@ -162,16 +162,36 @@ if hiera('lma::collector::influxdb::server', false) { | |||
162 | require => Class['lma_collector::collectd::base'], | 162 | require => Class['lma_collector::collectd::base'], |
163 | } | 163 | } |
164 | $openstack_services = { | 164 | $openstack_services = { |
165 | 'nova' => $openstack_service_config, | ||
166 | 'nova_services' => $openstack_service_config, | 165 | 'nova_services' => $openstack_service_config, |
167 | 'cinder' => $openstack_service_config, | ||
168 | 'cinder_services' => $openstack_service_config, | 166 | 'cinder_services' => $openstack_service_config, |
169 | 'glance' => $openstack_service_config, | ||
170 | 'keystone' => $openstack_service_config, | 167 | 'keystone' => $openstack_service_config, |
171 | 'neutron' => $openstack_service_config, | ||
172 | 'neutron_agents' => $openstack_service_config, | 168 | 'neutron_agents' => $openstack_service_config, |
173 | } | 169 | } |
170 | |||
171 | $nova_polling = { | ||
172 | 'polling_interval' => 60, | ||
173 | 'pagination_limit' => 500, | ||
174 | } | ||
175 | $cinder_polling = { | ||
176 | 'polling_interval' => 60, | ||
177 | 'pagination_limit' => 500, | ||
178 | } | ||
179 | $glance_polling = { | ||
180 | 'polling_interval' => 60, | ||
181 | 'pagination_limit' => 25, | ||
182 | } | ||
183 | $neutron_polling = { | ||
184 | 'polling_interval' => 60, | ||
185 | 'pagination_limit' => 100, | ||
186 | } | ||
187 | $openstack_resources = { | ||
188 | 'nova' => merge($openstack_service_config, $nova_polling), | ||
189 | 'cinder' => merge($openstack_service_config, $cinder_polling), | ||
190 | 'glance' => merge($openstack_service_config, $glance_polling), | ||
191 | 'neutron' => merge($openstack_service_config, $neutron_polling), | ||
192 | } | ||
174 | create_resources(lma_collector::collectd::openstack, $openstack_services) | 193 | create_resources(lma_collector::collectd::openstack, $openstack_services) |
194 | create_resources(lma_collector::collectd::openstack, $openstack_resources) | ||
175 | 195 | ||
176 | # FIXME(elemoine) use the special attribute * when Fuel uses a Puppet version | 196 | # FIXME(elemoine) use the special attribute * when Fuel uses a Puppet version |
177 | # that supports it. | 197 | # that supports it. |