Remove fluentd manifests
We don't need these implementations anymore because fluentd support was already removed from tripleo-heat-templates. Depends-on: https://review.opendev.org/#/c/668851/ Change-Id: If8bca34b9893fc49f598e8c86cd45bc55848363f
This commit is contained in:
Takashi Kajinami
parent
b8ed26353e
commit
2527249caf
|
|
@ -33,12 +33,6 @@ mod 'fdio',
|
|||
:git => 'https://git.fd.io/puppet-fdio',
|
||||
:ref => 'master'
|
||||
|
||||
# NOTE(aschultz): Include a fixed version for alternate source until
|
||||
# https://github.com/soylent/konstantin-fluentd/pull/40 is merged
|
||||
mod 'fluentd',
|
||||
:git => 'https://github.com/mwhahaha/konstantin-fluentd',
|
||||
:ref => 'fix-tdagent-provider'
|
||||
|
||||
mod 'certmonger',
|
||||
:git => 'https://github.com/saltedsignal/puppet-certmonger',
|
||||
:ref => 'v1.1.1'
|
||||
|
|
|
|||
|
|
@ -1,306 +0,0 @@
|
|||
# Copyright 2016 Red Hat, Inc.
|
||||
#
|
||||
# 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: tripleo::profile::base::logging::fluentd
|
||||
#
|
||||
# FluentD configuration for TripleO
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) String. The current step of the deployment
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
# [*fluentd_sources*]
|
||||
# (Optional) List of dictionaries. A list of sources for fluentd.
|
||||
#
|
||||
# [*fluentd_filters*]
|
||||
# (Optional) List of dictionaries. A list of filters for fluentd.
|
||||
#
|
||||
# [*fluentd_servers*]
|
||||
# (Optional) List of dictionaries. A list of destination hosts for
|
||||
# fluentd. Each should be of the form {host=>'my.host.name',
|
||||
# 'port'=>24224}
|
||||
#
|
||||
# [*fluentd_groups*]
|
||||
# (Optional) List of strings. Add the 'fluentd' user to these groups.
|
||||
#
|
||||
# [*fluentd_manage_groups*]
|
||||
# (Optional) Boolean. If true, modify the group membership of the
|
||||
# fluentd_config_user using information provided by fluentd_groups
|
||||
# and the per-service configurations.
|
||||
#
|
||||
# [*fluentd_use_ssl*]
|
||||
# (Optional) Boolean. If true, use the secure_forward plugin.
|
||||
#
|
||||
# [*fluentd_ssl_certificate*]
|
||||
# (Required if fluentd_use_ssl is true) PEM encoded certificate data from
|
||||
# for example "secure-forward-ca-generate".
|
||||
#
|
||||
# [*fluentd_shared_key*]
|
||||
# (Required if fluentd_use_ssl is true) Shared secret key for fluentd
|
||||
# secure-foward plugin.
|
||||
#
|
||||
# [*fluentd_monitoring*]
|
||||
# (Optional, default true) When true, fluentd will have REST API interface
|
||||
# for monitoring purposes.
|
||||
#
|
||||
# [*fluentd_monitoring_bind*]
|
||||
# (Optional, default '127.0.0.1') Interface on which fluentd monitoring
|
||||
# interface should listen if $fluentd_monitoring is true.
|
||||
#
|
||||
# [*fluentd_monitoring_port*]
|
||||
# (Optional, default 24220) Port on which fluentd monitoring interface
|
||||
# should listen if $fluentd_monitoring is true.
|
||||
#
|
||||
# [*fluentd_listen_syslog*]
|
||||
# (Optional, default true) When true, fluentd will listen for syslog
|
||||
# messages on a local UDP port.
|
||||
#
|
||||
# [*fluentd_syslog_port*]
|
||||
# (Optional, default 42185) Port on which fluentd should listen if
|
||||
# $fluentd_listen_syslog is true.
|
||||
#
|
||||
# [*fluentd_path_transform*]
|
||||
# (Optional) List. Specifies [find, replace] arguments that will be
|
||||
# used to transform the 'path' value for logging sources using puppet's
|
||||
# regsubst function.
|
||||
#
|
||||
# [*fluentd_pos_file_path*]
|
||||
# (Optional) String. Path to a directory that will be created
|
||||
# if it does not exist and made writable by the fluentd user.
|
||||
#
|
||||
# [*fluentd_default_format*]
|
||||
# (Optional) String. Default log format if not otherwise specified
|
||||
# in a log source definition.
|
||||
#
|
||||
# [*fluentd_service_user*]
|
||||
# (Optional) String. Username that will run the fluentd service.
|
||||
# This will be used to create a systemd drop-in for the fluentd
|
||||
# service that sets User explicitly.
|
||||
#
|
||||
# [*service_names*]
|
||||
# (Optional) List of services enabled on the current role. This is used
|
||||
# to obtain per-service configuration information.
|
||||
#
|
||||
# [*fluentd_managed_rsyslog*]
|
||||
# (Optional, default false) Let fluentd configure and restart rsyslog
|
||||
# service
|
||||
class tripleo::profile::base::logging::fluentd (
|
||||
$step = Integer(hiera('step')),
|
||||
$fluentd_sources = undef,
|
||||
$fluentd_filters = undef,
|
||||
$fluentd_servers = undef,
|
||||
$fluentd_groups = undef,
|
||||
$fluentd_manage_groups = true,
|
||||
$fluentd_use_ssl = undef,
|
||||
$fluentd_ssl_certificate = undef,
|
||||
$fluentd_shared_key = undef,
|
||||
$fluentd_listen_syslog = true,
|
||||
$fluentd_syslog_port = 42185,
|
||||
$fluentd_path_transform = undef,
|
||||
$fluentd_pos_file_path = undef,
|
||||
$fluentd_default_format = undef,
|
||||
$fluentd_service_user = undef,
|
||||
$fluentd_monitoring = true,
|
||||
$fluentd_monitoring_bind = '127.0.0.1',
|
||||
$fluentd_monitoring_port = 24220,
|
||||
$service_names = hiera('service_names', []),
|
||||
$fluentd_managed_rsyslog = false
|
||||
) {
|
||||
if $step >= 4 {
|
||||
warning('Service fluentd is deprecated. Please take in mind, that it going to be removed in T release.')
|
||||
|
||||
include fluentd
|
||||
include systemd::systemctl::daemon_reload
|
||||
|
||||
$_fluentd_service_user = pick($fluentd_service_user,
|
||||
$::fluentd::config_owner,
|
||||
'fluentd')
|
||||
|
||||
# don't manage groups for 'root'
|
||||
$_fluentd_manage_groups = $_fluentd_service_user ? {
|
||||
'root' => false,
|
||||
default => $fluentd_manage_groups,
|
||||
}
|
||||
|
||||
::systemd::dropin_file { 'fluentd_user.conf':
|
||||
unit => "${::fluentd::service_name}.service",
|
||||
content => template('tripleo/fluentd/fluentd_user.conf.erb'),
|
||||
}
|
||||
~> Service['fluentd']
|
||||
|
||||
# Load per-service plugin configuration
|
||||
::tripleo::profile::base::logging::fluentd::fluentd_service {
|
||||
$service_names:
|
||||
pos_file_path => $fluentd_pos_file_path,
|
||||
default_format => $fluentd_default_format,
|
||||
fluentd_transform => $fluentd_path_transform
|
||||
}
|
||||
|
||||
if $_fluentd_manage_groups {
|
||||
# compute a list of all the groups of which the fluentd user
|
||||
# should be a member.
|
||||
$_tmpgroups1 = $service_names.map |$srv| {
|
||||
hiera("tripleo_fluentd_groups_${srv}", undef)
|
||||
}.filter |$new_srv| { ! empty($new_srv) }.flatten()
|
||||
|
||||
$_tmpgroups2 = any2array($fluentd_groups)
|
||||
$groups = concat($_tmpgroups2,
|
||||
$_tmpgroups1)
|
||||
|
||||
if !empty($groups) {
|
||||
Package<| tag == 'openstack' |>
|
||||
-> user { $_fluentd_service_user:
|
||||
ensure => present,
|
||||
groups => $groups,
|
||||
membership => 'minimum',
|
||||
}
|
||||
~> Service[$::fluentd::service_name]
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_pos_file_path {
|
||||
file { $fluentd_pos_file_path:
|
||||
ensure => 'directory',
|
||||
owner => $_fluentd_service_user,
|
||||
group => $::fluentd::config_group,
|
||||
mode => '0750',
|
||||
recurse => true,
|
||||
}
|
||||
~> Service[$::fluentd::service_name]
|
||||
}
|
||||
|
||||
::fluentd::plugin { 'rubygem-fluent-plugin-add':
|
||||
plugin_provider => 'yum',
|
||||
}
|
||||
|
||||
if $fluentd_sources {
|
||||
|
||||
if $fluentd_path_transform {
|
||||
$_fluentd_sources = map($fluentd_sources) |$source| {
|
||||
if $source['path'] {
|
||||
$newpath = {
|
||||
'path' => regsubst($source['path'],
|
||||
$fluentd_path_transform[0],
|
||||
$fluentd_path_transform[1])
|
||||
}
|
||||
|
||||
$source + $newpath
|
||||
} else {
|
||||
$source
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$_fluentd_sources = $fluentd_sources
|
||||
}
|
||||
|
||||
::fluentd::config { '100-openstack-sources.conf':
|
||||
config => {
|
||||
'source' => $_fluentd_sources,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_monitoring {
|
||||
# fluentd will open port for monitoring REST API interface
|
||||
::fluentd::config { '110-monitoring-agent.conf':
|
||||
config => {
|
||||
'source' => {
|
||||
'type' => 'monitor_agent',
|
||||
'bind' => $fluentd_monitoring_bind,
|
||||
'port' => $fluentd_monitoring_port,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_listen_syslog {
|
||||
# fluentd will receive syslog messages by listening on a local udp
|
||||
# socket.
|
||||
::fluentd::config { '110-system-sources.conf':
|
||||
config => {
|
||||
'source' => {
|
||||
'type' => 'syslog',
|
||||
'tag' => 'system.messages',
|
||||
'port' => $fluentd_syslog_port,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_managed_rsyslog {
|
||||
file { '/etc/rsyslog.d/fluentd.conf':
|
||||
content => "*.* @127.0.0.1:${fluentd_syslog_port}",
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
} ~> exec { 'reload rsyslog':
|
||||
command => '/bin/systemctl restart rsyslog',
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_filters {
|
||||
::fluentd::config { '200-openstack-filters.conf':
|
||||
config => {
|
||||
'filter' => $fluentd_filters,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if $fluentd_servers and !empty($fluentd_servers) {
|
||||
if $fluentd_use_ssl {
|
||||
::fluentd::plugin { 'rubygem-fluent-plugin-secure-forward':
|
||||
plugin_provider => 'yum',
|
||||
}
|
||||
|
||||
file {'/etc/fluentd/ca_cert.pem':
|
||||
content => $fluentd_ssl_certificate,
|
||||
owner => $_fluentd_service_user,
|
||||
group => $::fluentd::config_group,
|
||||
mode => '0444',
|
||||
}
|
||||
|
||||
::fluentd::config { '300-openstack-matches.conf':
|
||||
config => {
|
||||
'match' => {
|
||||
# lint:ignore:single_quote_string_with_variables
|
||||
# lint:ignore:quoted_booleans
|
||||
'type' => 'secure_forward',
|
||||
'tag_pattern' => '**',
|
||||
'self_hostname' => '${hostname}',
|
||||
'secure' => 'true',
|
||||
'ca_cert_path' => '/etc/fluentd/ca_cert.pem',
|
||||
'shared_key' => $fluentd_shared_key,
|
||||
'server' => $fluentd_servers,
|
||||
# lint:endignore
|
||||
# lint:endignore
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
::fluentd::config { '300-openstack-matches.conf':
|
||||
config => {
|
||||
'match' => {
|
||||
'type' => 'forward',
|
||||
'tag_pattern' => '**',
|
||||
'server' => $fluentd_servers,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# This is used to look up a list of service-specific fluentd configurations
|
||||
# in the hiera data provided by THT.
|
||||
#
|
||||
# [*pos_file_path*]
|
||||
# Default location for fluentd pos files (used to track file
|
||||
# position for the 'tail' input type).
|
||||
#
|
||||
# [*default_format*]
|
||||
# Default regular expression against which to match log messages.
|
||||
#
|
||||
# [*fluentd_transform*]
|
||||
# Two value array where the first value is a regular expresion to
|
||||
# be replaced and the second one is the replacement.
|
||||
#
|
||||
define tripleo::profile::base::logging::fluentd::fluentd_service (
|
||||
$pos_file_path = undef,
|
||||
$default_format = undef,
|
||||
$fluentd_transform = undef
|
||||
) {
|
||||
$sources = hiera("tripleo_fluentd_sources_${title}", [])
|
||||
$filters = hiera("tripleo_fluentd_filters_${title}", [])
|
||||
$matches = hiera("tripleo_fluentd_matches_${title}", [])
|
||||
|
||||
$default_source = {
|
||||
format => $default_format,
|
||||
type => 'tail',
|
||||
}
|
||||
|
||||
if !empty($sources) or !empty($filters) or !empty($matches) {
|
||||
if !empty($sources) {
|
||||
$all = map($sources) |$values| {
|
||||
{ 'pos_file' => "${pos_file_path}/${values['tag']}.pos" }
|
||||
+ $default_source
|
||||
+ $values
|
||||
}
|
||||
if $fluentd_transform {
|
||||
$new_source = map($all) |$values| { $values.filter|$index,$value| {$index != 'path'} +
|
||||
$values.filter|$index,$value|
|
||||
{$index == 'path'}.reduce({})|$memo,$x| {$memo + {'path' => regsubst($x[1], $fluentd_transform[0], $fluentd_transform[1]) } } }
|
||||
} else{
|
||||
$new_source = any2array($all)
|
||||
}
|
||||
} else {
|
||||
$new_source = any2array($sources)
|
||||
}
|
||||
|
||||
::fluentd::config { "100-openstack-${title}.conf":
|
||||
config => {
|
||||
'source' => $new_source,
|
||||
'filter' => $filters,
|
||||
'match' => $matches,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,329 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2017 Red Hat, Inc.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'tripleo::profile::base::logging::fluentd' do
|
||||
shared_examples_for 'tripleo::profile::base::logging::fluentd' do
|
||||
|
||||
before :each do
|
||||
facts.merge!({ :step => params[:step] })
|
||||
end
|
||||
|
||||
context 'with step less than 4' do
|
||||
let(:params) { { :step => 3 } }
|
||||
|
||||
it 'should do nothing' do
|
||||
is_expected.to_not contain_class('fluentd')
|
||||
is_expected.to_not contain_class('systemd::systemctl::daemon_reload')
|
||||
is_expected.to_not contain_fluentd__plugin('rubygem-fluent-plugin-add')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with defaults and step greater than 3' do
|
||||
let(:params) { { :step => 4 } }
|
||||
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_class('systemd::systemctl::daemon_reload') }
|
||||
|
||||
it { is_expected.to contain_fluentd__plugin('rubygem-fluent-plugin-add').with(
|
||||
:plugin_provider => 'yum',
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_fluentd__config('110-monitoring-agent.conf') }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/110-monitoring-agent.conf').with_content(
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
bind 127.0.0.1
|
||||
port 24220
|
||||
@type monitor_agent
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
|
||||
it { is_expected.to contain_fluentd__config('110-system-sources.conf') }
|
||||
it { is_expected.to_not contain_file('/etc/rsyslog.d/fluentd.conf') }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/110-system-sources.conf').with_content(
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
port 42185
|
||||
tag system.messages
|
||||
@type syslog
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
end
|
||||
|
||||
context 'step greater than 3 and a fluentd source' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_managed_rsyslog => true,
|
||||
:fluentd_sources => [ {
|
||||
'format' => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
'path' => '/var/log/keystone/keystone.log',
|
||||
'pos_file' => '/var/cache/fluentd/openstack.keystone.pos',
|
||||
'tag' => 'openstack.keystone',
|
||||
'type' => 'tail'
|
||||
} ],
|
||||
} }
|
||||
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_class('systemd::systemctl::daemon_reload') }
|
||||
it { is_expected.to contain_fluentd__plugin('rubygem-fluent-plugin-add').with(
|
||||
:plugin_provider => 'yum',
|
||||
) }
|
||||
it { is_expected.to contain_fluentd__config('100-openstack-sources.conf').with(
|
||||
:config => {
|
||||
'source' => params[:fluentd_sources]
|
||||
}
|
||||
) }
|
||||
it { is_expected.to contain_fluentd__config('110-system-sources.conf') }
|
||||
it { is_expected.to contain_file('/etc/rsyslog.d/fluentd.conf').with_content(
|
||||
"*.* @127.0.0.1:42185"
|
||||
) }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/100-openstack-sources.conf').with_content(
|
||||
/^\s*path \/var\/log\/keystone\/keystone\.log$/
|
||||
) }
|
||||
end
|
||||
|
||||
context 'step greater than 3 and a fluentd source with transformation' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_sources => [ {
|
||||
'format' => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
'path' => '/var/log/keystone/keystone.log',
|
||||
'pos_file' => '/var/cache/fluentd/openstack.keystone.pos',
|
||||
'tag' => 'openstack.keystone',
|
||||
'type' => 'tail'
|
||||
} ],
|
||||
:fluentd_path_transform => [
|
||||
'/var/log/',
|
||||
'/var/log/containers/',
|
||||
]
|
||||
} }
|
||||
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_fluentd__plugin('rubygem-fluent-plugin-add').with(
|
||||
:plugin_provider => 'yum',
|
||||
) }
|
||||
it { is_expected.to contain_fluentd__config('100-openstack-sources.conf').with(
|
||||
:config => {
|
||||
'source' => [ {
|
||||
'format' => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
'path' => '/var/log/containers/keystone/keystone.log',
|
||||
'pos_file' => '/var/cache/fluentd/openstack.keystone.pos',
|
||||
'tag' => 'openstack.keystone',
|
||||
'type' => 'tail'
|
||||
} ]
|
||||
}
|
||||
) }
|
||||
end
|
||||
|
||||
context 'Config by service -- ceilometer_agent_central' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
:fluentd_manage_groups => false,
|
||||
:fluentd_pos_file_path => '/var/cache/fluentd/',
|
||||
:service_names => [ 'ceilometer_agent_central' ]
|
||||
} }
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_file('/var/cache/fluentd/') }
|
||||
it { is_expected.to contain_tripleo__profile__base__logging__fluentd__fluentd_service('ceilometer_agent_central').with(
|
||||
:pos_file_path => '/var/cache/fluentd/',
|
||||
:default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/'
|
||||
) }
|
||||
it { is_expected.to contain_fluentd__config('100-openstack-ceilometer_agent_central.conf') }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/100-openstack-ceilometer_agent_central.conf').with_content(
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/ceilometer/central.log
|
||||
pos_file /var/cache/fluentd//openstack.ceilometer.agent.central.pos
|
||||
tag openstack.ceilometer.agent.central
|
||||
@type tail
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
|
||||
end
|
||||
|
||||
context 'Config by service -- ceilometer_agent_central with path trasnformation' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
:fluentd_manage_groups => false,
|
||||
:fluentd_pos_file_path => '/var/cache/fluentd/',
|
||||
:service_names => [ 'ceilometer_agent_central' ],
|
||||
:fluentd_path_transform => [
|
||||
'/var/log/',
|
||||
'/var/log/containers/',
|
||||
]
|
||||
} }
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_file('/var/cache/fluentd/') }
|
||||
it { is_expected.to contain_tripleo__profile__base__logging__fluentd__fluentd_service('ceilometer_agent_central').with(
|
||||
:pos_file_path => '/var/cache/fluentd/',
|
||||
:default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/'
|
||||
) }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/100-openstack-ceilometer_agent_central.conf').with_content (
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/containers/ceilometer/central.log
|
||||
pos_file /var/cache/fluentd//openstack.ceilometer.agent.central.pos
|
||||
tag openstack.ceilometer.agent.central
|
||||
@type tail
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
|
||||
end
|
||||
|
||||
context 'Multifiles -- horizon' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
:fluentd_manage_groups => false,
|
||||
:fluentd_pos_file_path => '/var/cache/fluentd/',
|
||||
:service_names => [ 'horizon' ],
|
||||
:fluentd_path_transform => [
|
||||
'/var/log/',
|
||||
'/var/log/containers/'
|
||||
]
|
||||
} }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/100-openstack-horizon.conf').with_content (
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/containers/horizon/test.log
|
||||
pos_file /var/cache/fluentd/horizon-test.pos
|
||||
tag openstack.horizon.test
|
||||
@type tail
|
||||
</source>
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/containers/horizon/access.log
|
||||
pos_file /var/cache/fluentd//openstack.horizon.access.pos
|
||||
tag openstack.horizon.access
|
||||
@type tail
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
|
||||
end
|
||||
|
||||
context 'Multifiles -- horizon no transformation' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_default_format => '/(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/',
|
||||
:fluentd_manage_groups => false,
|
||||
:fluentd_pos_file_path => '/var/cache/fluentd/',
|
||||
:service_names => [ 'horizon' ],
|
||||
} }
|
||||
it { is_expected.to contain_file('/etc/fluentd/config.d/100-openstack-horizon.conf').with_content (
|
||||
"# This file is managed by Puppet, do not edit manually.
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/horizon/test.log
|
||||
pos_file /var/cache/fluentd/horizon-test.pos
|
||||
tag openstack.horizon.test
|
||||
@type tail
|
||||
</source>
|
||||
<source>
|
||||
format /(?<time>\\d{4}-\\d{2}-\\d{2} \\d{2} =>\\d{2}:\\d{2}.\\d+) (?<pid>\\d+) (?<priority>\\S+) (?<message>.*)$/
|
||||
path /var/log/horizon/access.log
|
||||
pos_file /var/cache/fluentd//openstack.horizon.access.pos
|
||||
tag openstack.horizon.access
|
||||
@type tail
|
||||
</source>
|
||||
"
|
||||
) }
|
||||
|
||||
end
|
||||
|
||||
context 'Groups by service -- ceilometer_agent_central added ceilometer' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_manage_groups => true,
|
||||
:fluentd_groups => [ 'fluentd' ]
|
||||
} }
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_user('fluentd').with(
|
||||
:ensure =>'present',
|
||||
:groups => [ 'fluentd', 'ceilometer', 'horizon' ],
|
||||
:membership => 'minimum'
|
||||
) }
|
||||
end
|
||||
|
||||
context 'fluentd user and managed groups' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_service_user => 'fluentd',
|
||||
:fluentd_manage_groups => true,
|
||||
:fluentd_groups => [ 'fluentd' ]
|
||||
} }
|
||||
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_class('systemd::systemctl::daemon_reload') }
|
||||
it { is_expected.to contain_service('fluentd') }
|
||||
|
||||
it { is_expected.to contain_file('/etc/systemd/system/fluentd.service.d/fluentd_user.conf')
|
||||
.with( {
|
||||
:ensure => 'file',
|
||||
:content => [ "# This file is maintained by puppet.\n[Service]\nUser=fluentd\n" ]
|
||||
} ) }
|
||||
|
||||
it { is_expected.to contain_user('fluentd').with(
|
||||
:ensure =>'present',
|
||||
:groups => [ 'fluentd','ceilometer','horizon' ],
|
||||
:membership => 'minimum'
|
||||
) }
|
||||
end
|
||||
|
||||
context 'root user, no matter about groups' do
|
||||
let(:params) { {
|
||||
:step => 4,
|
||||
:fluentd_service_user => 'root',
|
||||
:fluentd_manage_groups => true,
|
||||
:fluentd_groups => [ 'fluentd' ]
|
||||
} }
|
||||
|
||||
it { is_expected.to contain_class('fluentd') }
|
||||
it { is_expected.to contain_class('systemd::systemctl::daemon_reload') }
|
||||
it { is_expected.to contain_service('fluentd') }
|
||||
|
||||
it { is_expected.to contain_file('/etc/systemd/system/fluentd.service.d/fluentd_user.conf')
|
||||
.with( {
|
||||
:ensure => 'file',
|
||||
:content => [ "# This file is maintained by puppet.\n[Service]\nUser=root\n" ]
|
||||
} ) }
|
||||
|
||||
it { is_expected.to_not contain_user('fluentd') }
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
on_supported_os.each do |os, facts|
|
||||
context "on #{os}" do
|
||||
let (:facts) {
|
||||
facts
|
||||
}
|
||||
it_behaves_like 'tripleo::profile::base::logging::fluentd'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -12,25 +12,3 @@ cinder::backend::emc_vnx::storage_vnx_pool_names: 'emc-storage-pool'
|
|||
service_names:
|
||||
- 'ceilometer_agent_central'
|
||||
- 'horizon'
|
||||
tripleo_fluentd_groups_ceilometer_agent_central:
|
||||
- 'ceilometer'
|
||||
tripleo_fluentd_sources_ceilometer_agent_central:
|
||||
- 'path': '/var/log/ceilometer/central.log'
|
||||
'tag': 'openstack.ceilometer.agent.central'
|
||||
tripleo_fluentd_groups_horizon:
|
||||
- 'horizon'
|
||||
tripleo_fluentd_sources_horizon:
|
||||
- 'path': '/var/log/horizon/test.log'
|
||||
'tag': 'openstack.horizon.test'
|
||||
'pos_file' : '/var/cache/fluentd/horizon-test.pos'
|
||||
- 'path': '/var/log/horizon/access.log'
|
||||
'tag': 'openstack.horizon.access'
|
||||
fluentd::config_file: "/etc/fluentd/fluent.conf"
|
||||
fluentd::config_group: "fluentd"
|
||||
fluentd::config_owner: "fluentd"
|
||||
fluentd::config_path: "/etc/fluentd/config.d"
|
||||
fluentd::package_name: "fluentd"
|
||||
fluentd::plugin_provider: "yum"
|
||||
fluentd::repo_install: false
|
||||
fluentd::service_name: "fluentd"
|
||||
fluentd::service_provider: "systemd"
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
# This file is maintained by puppet.
|
||||
[Service]
|
||||
User=<%= @_fluentd_service_user %>
|
||||
Loading…
Reference in New Issue