From 8e1b8e11aeac7b35499cf09eb7009e9fd23acf3e Mon Sep 17 00:00:00 2001 From: Sascha Date: Mon, 30 Jul 2018 15:01:41 +0200 Subject: [PATCH] prd/tst fbb-www flugplan import unitb to logstash --- customer/fbb-www/production.yaml | 12 ++++++++++++ customer/fbb-www/test.yaml | 11 +++++++++++ customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml | 11 ----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml index d04ad0dd..3aa994e3 100644 --- a/customer/fbb-www/production.yaml +++ b/customer/fbb-www/production.yaml @@ -1011,3 +1011,15 @@ infra::profile::apache::pp_vhosts: - '%{literal("%")}{HTTP_HOST} !www01.berin-airport.de' rewrite_rule: - '^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]' + +logstash::generic_resource: + flugdaten: + resource: file + order: 10 # Input + parameters: + path: '/var/log/unitb/flugplan-import.log' + type: flugdaten + tags: + - 'flugdaten' + - 'unitb' + - "%{customer}" diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index 447af011..8df11cac 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -9,6 +9,7 @@ infra::additional_classes: - apache::mod::remoteip - apache::mod::ssl - apache::mod::proxy_http + - logstash accounts::users: #pixelpark @@ -759,3 +760,13 @@ infra::profile::apache::pp_vhosts: - '%{literal("%")}{HTTP_HOST} !tst02.berlin-airport.de' rewrite_rule: - '^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]' + +logstash::generic_resource: + flugdaten: + resource: file + order: 10 # Input + parameters: + path: '/var/log/unitb/flugplan-import.log' + tags: + - 'flugdaten' + - "%{customer}" diff --git a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml index 9f87b462..38c32676 100644 --- a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml +++ b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml @@ -22,14 +22,3 @@ infra::profile::cron::cronjobs: user: root environment: - 'PATH="/usr/bin:/bin"' - -logstash::generic_resource: - flugdaten: - resource: file - order: 10 # Input - parameters: - path: '/var/log/unitb/flugplan-import.log' - type: flugdaten - tags: - - 'slave' - - "%{customer}" -- 2.39.5