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
83 lines
2.4 KiB
Puppet
83 lines
2.4 KiB
Puppet
# Copyright 2013 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# Class to install elasticsearch.
|
|
#
|
|
class logstash::elasticsearch (
|
|
discover_nodes = ['localhost']
|
|
) {
|
|
# install java runtime
|
|
package { 'java7-runtime-headless':
|
|
ensure => present,
|
|
}
|
|
|
|
exec { 'get_elasticsearch_deb':
|
|
command => 'wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.20.5.deb -O /tmp/elasticsearch-0.20.5.deb',
|
|
path => '/bin:/usr/bin',
|
|
creates => '/tmp/elasticsearch-0.20.5.deb',
|
|
}
|
|
|
|
# install elastic search
|
|
package { 'elasticsearch':
|
|
ensure => latest,
|
|
source => '/tmp/elasticsearch-0.20.5.deb',
|
|
provider => 'dpkg',
|
|
subscribe => Exec['get_elasticsearch_deb'],
|
|
require => [
|
|
Package['java7-runtime-headless'],
|
|
Exec['get_elasticsearch_deb'],
|
|
]
|
|
}
|
|
|
|
file { '/etc/elasticsearch/elasticsearch.yml':
|
|
ensure => present,
|
|
content => template('logstash/elasticsearch.yml.erb'),
|
|
replace => true,
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
require => Package['elasticsearch'],
|
|
}
|
|
|
|
file { '/etc/elasticsearch/default-mapping.json':
|
|
ensure => present,
|
|
source => 'puppet:///modules/logstash/elasticsearch.mapping.json',
|
|
replace => true,
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
require => Package['elasticsearch'],
|
|
}
|
|
|
|
file { '/etc/default/elasticsearch':
|
|
ensure => present,
|
|
source => 'puppet:///modules/logstash/elasticsearch.default',
|
|
replace => true,
|
|
owner => 'root',
|
|
group => 'root',
|
|
mode => '0644',
|
|
require => Package['elasticsearch'],
|
|
}
|
|
|
|
service { 'elasticsearch':
|
|
ensure => running,
|
|
require => [
|
|
Package['elasticsearch'],
|
|
File['/etc/elasticsearch/elasticsearch.yml'],
|
|
File['/etc/elasticsearch/default-mapping.json'],
|
|
File['/etc/default/elasticsearch'],
|
|
],
|
|
}
|
|
}
|