prd/tst fbb-www flugplan import unitb to logstash

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index d04ad0ddf9837d761466b607ed244a6f0965ed0b..3aa994e31b045198fee92116153e1ce165142945 100644 (file)
--- 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 447af011841d1645ddb9fc90da9d7ac2de559c23..8df11cac0a20f2be4aaa5b9e499a79c9adbb177d 100644 (file)
--- 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 9f87b4627eddb9996a26cefe3c733fddb49f5ad3..38c32676834d6ede24d43f4a82baf451189f8b11 100644 (file)
--- 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}"