76d3e632d4
* manifests/site.pp: List the two new elasticsearch nodes in the appropriate lists. * modules/logstash/manifests/elasticsearch.pp: Do not restart elasticsearch when config files change. Service restarts are costly and should be manually performed when necessary. Otherwise puppet should simply update the config files. * modules/logstash/templates/elasticsearch.yml.erb: Update elasticsearch config with new cluster topology. Increase memory available for indexing. * modules/openstack_project/manifests/cacti.pp: Add new nodes to cacti monitoring list. Adding two more elasticsearch nodes to relieve memory pressure (more nodes means fewer indexes per nodes which requires less memory to manage). And two more nodes gives us more disk to retain older indexes in. These new nodes should allow us to retain at least 3 weeks of indexed logs. Change-Id: I3a5a02311e939c8147e401110c7b96d085eb8274 Reviewed-on: https://review.openstack.org/36305 Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Approved: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins
91 lines
2.6 KiB
Puppet
91 lines
2.6 KiB
Puppet
# Class to configure cacti on a node.
|
|
# Takes a list of sysadmin email addresses as a parameter. Exim will be
|
|
# configured to email cron spam and other alerts to this list of admins.
|
|
class openstack_project::cacti (
|
|
$sysadmins = []
|
|
) {
|
|
class { 'openstack_project::server':
|
|
iptables_public_tcp_ports => [80, 443],
|
|
sysadmins => $sysadmins,
|
|
}
|
|
|
|
include apache
|
|
|
|
package { 'cacti':
|
|
ensure => present,
|
|
}
|
|
|
|
file { '/usr/local/share/cacti/resource/snmp_queries':
|
|
ensure => directory,
|
|
owner => 'root',
|
|
}
|
|
|
|
file { '/usr/local/share/cacti/resource/snmp_queries/net-snmp_devio.xml':
|
|
ensure => present,
|
|
source => 'puppet:///modules/openstack_project/cacti/net-snmp_devio.xml',
|
|
mode => '0644',
|
|
owner => 'root',
|
|
group => 'root',
|
|
require => File['/usr/local/share/cacti/resource/snmp_queries'],
|
|
}
|
|
|
|
file { '/var/lib/cacti/linux_host.xml':
|
|
ensure => present,
|
|
source => 'puppet:///modules/openstack_project/cacti/linux_host.xml',
|
|
mode => '0644',
|
|
owner => 'root',
|
|
group => 'root',
|
|
require => File[
|
|
'/usr/local/share/cacti/resource/snmp_queries/net-snmp_devio.xml'
|
|
],
|
|
}
|
|
|
|
file { '/usr/local/bin/create_graphs.sh':
|
|
ensure => present,
|
|
source => 'puppet:///modules/openstack_project/cacti/create_graphs.sh',
|
|
mode => '0744',
|
|
owner => 'root',
|
|
group => 'root',
|
|
}
|
|
|
|
exec { 'cacti_import_xml':
|
|
command => '/usr/bin/php -q /usr/share/cacti/cli/import_template.php --filename=/var/lib/cacti/linux_host.xml --with-template-rras',
|
|
cwd => '/usr/share/cacti/cli',
|
|
require => File['/var/lib/cacti/linux_host.xml'],
|
|
}
|
|
|
|
$cacti_hosts = [
|
|
# community is currently not running puppet.
|
|
#'community.openstack.org',
|
|
'ci-puppetmaster.openstack.org',
|
|
'eavesdrop.openstack.org',
|
|
'elasticsearch.openstack.org',
|
|
'elasticsearch2.openstack.org',
|
|
'elasticsearch3.openstack.org',
|
|
'elasticsearch4.openstack.org',
|
|
'elasticsearch5.openstack.org',
|
|
'etherpad.openstack.org',
|
|
'graphite.openstack.org',
|
|
'jenkins.openstack.org',
|
|
'jenkins-dev.openstack.org',
|
|
'lists.openstack.org',
|
|
'logstash.openstack.org',
|
|
'logstash-worker1.openstack.org',
|
|
'logstash-worker2.openstack.org',
|
|
'logstash-worker3.openstack.org',
|
|
'logstash-worker4.openstack.org',
|
|
'logstash-worker5.openstack.org',
|
|
'paste.openstack.org',
|
|
'planet.openstack.org',
|
|
'puppet-dashboard.openstack.org',
|
|
'pypi.openstack.org',
|
|
'review.openstack.org',
|
|
'review-dev.openstack.org',
|
|
'static.openstack.org',
|
|
'wiki.openstack.org',
|
|
'zuul.openstack.org',
|
|
]
|
|
|
|
openstack_project::cacti_device { $cacti_hosts: }
|
|
}
|