diff --git a/manifests/site.pp b/manifests/site.pp index 34ac0f39..8d3434e8 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,99 +1,100 @@ node 'louvre.softwareheritage.org' { include role::swh_hypervisor_master } node 'beaubourg.softwareheritage.org', 'orsay.softwareheritage.org' { include role::swh_hypervisor } node 'pergamon.softwareheritage.org' { include role::swh_sysadmin } node 'tate.softwareheritage.org' { include role::swh_forge } node 'moma.softwareheritage.org' { include role::swh_api + include role::swh_apache_log_archiver } node 'webapp0.softwareheritage.org' { include role::swh_api_azure } node 'saatchi.internal.softwareheritage.org' { include role::swh_scheduler } node /^(prado|somerset).(internal.)?softwareheritage.org$/ { include role::swh_database } node 'banco.softwareheritage.org' { include role::swh_backup } node 'esnode1.internal.softwareheritage.org', 'esnode2.internal.softwareheritage.org', 'esnode3.internal.softwareheritage.org' { include role::swh_elasticsearch } node /^(unibo-test|orangeriedev).(internal.)?softwareheritage.org$/ { include role::swh_vault_test } node /^(unibo-prod|orangerie).(internal.)?softwareheritage.org$/ { include role::swh_vault } node /^(uffizi|storage\d+\.[^.]+\.azure).(internal.)?softwareheritage.org$/ { include role::swh_storage } node /^getty.(internal.)?softwareheritage.org$/ { include role::swh_eventlog } node 'worker08.softwareheritage.org' { include role::swh_worker_inria_miracle } node /^worker\d+\.(internal\.)?softwareheritage\.org$/ { include role::swh_worker_inria } node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ { include role::swh_worker_azure } node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ { include role::swh_database } node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_osd } node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ { include role::swh_ceph_mon } node 'thyssen.internal.softwareheritage.org' { include role::swh_ci_server } node 'giverny.softwareheritage.org', 'petit-palais.softwareheritage.org', 'grand-palais.softwareheritage.org'{ include role::swh_desktop } node default { include role::swh_server include profile::puppet::agent } diff --git a/site-modules/profile/manifests/filebeat.pp b/site-modules/profile/manifests/filebeat.pp new file mode 100644 index 00000000..1ae21fdf --- /dev/null +++ b/site-modules/profile/manifests/filebeat.pp @@ -0,0 +1,24 @@ +# Filebeat apache log shipper profile + +class profile::filebeat { + + # Filebeat official package installation instructions: + # https://www.elastic.co/guide/en/beats/filebeat/current/setup-repositories.html + $keyid = lookup('elastic::apt_config::keyid') + $key = lookup('elastic::apt_config::key') + + apt::source { 'elastic-6.x': + location => 'https://artifacts.elastic.co/packages/6.x/apt', + release => 'stable', + repos => 'main', + key => { + id => $keyid, + content => $key, + }, + } + + package { 'filebeat': + ensure => '6.3.1', + } + +} diff --git a/site-modules/role/manifests/swh_apache_log_archiver.pp b/site-modules/role/manifests/swh_apache_log_archiver.pp new file mode 100644 index 00000000..79369ec0 --- /dev/null +++ b/site-modules/role/manifests/swh_apache_log_archiver.pp @@ -0,0 +1,4 @@ +class role::swh_apache_log_archiver inherits role::swh_base { + include profile::puppet::agent + include profile::filebeat +}