From 61c4e81c263b298041074233dd7019b14346d2bc Mon Sep 17 00:00:00 2001
From: sambufe <samuel.bufe@publicispixelpark.de>
Date: Wed, 13 Sep 2017 11:51:55 +0200
Subject: [PATCH] fbb-www logging improved

---
 customer/fbb-ws/production.yaml | 24 +++++++++++++++++++++++-
 customer/fbb-ws/test.yaml       |  2 +-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/customer/fbb-ws/production.yaml b/customer/fbb-ws/production.yaml
index 11dfdaf5..638ca84a 100644
--- a/customer/fbb-ws/production.yaml
+++ b/customer/fbb-ws/production.yaml
@@ -6,6 +6,28 @@ infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
 
+logstash::generic_resource:
+  webservice:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/fbb_webservice/*.*'
+      type: webservice
+      tags:
+        - "webservice"
+        - "%{customer}"
+        - "%{environment}"
+  cdm_webservice:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/fbb_cdm_webservice/*.*'
+      type: cdm_webservice
+      tags:
+        - "cdm_webservice"
+        - "%{customer}"
+        - "%{environment}"
+
 infra::profile::cron::cronjobs:
   vbb-import:
     command: '/bin/php -f /var/www/webservice/web/webservices/jobs/vbb.php >> /var/log/fbb_webservice/vbb-import.log 2>> /var/log/fbb_webservice/vbb-import-error.log'
@@ -44,7 +66,7 @@ infra::profile::cron::cronjobs:
       - 'PATH="/usr/bin:/bin"'
     description: 'Braintree Zahlungsverifikation'
   cdm-webservice-push:
-    command: '/bin/php -f /var/www/cdm-webservice/web/webservices/jobs/push.php >> /var/log/fbb_webservice/cdm-webservice-push.log 2>> /var/log/fbb_webservice/cdm-webservice-push-error.log'
+    command: '/bin/php -f /var/www/cdm-webservice/web/webservices/jobs/push.php >> /var/log/fbb_cdm_webservice/cdm-webservice-push.log 2>> /var/log/fbb_cdm_webservice/cdm-webservice-push-error.log'
     minute: '*'
     hour: '*'
     date: '*'
diff --git a/customer/fbb-ws/test.yaml b/customer/fbb-ws/test.yaml
index 6accab32..754a42cb 100644
--- a/customer/fbb-ws/test.yaml
+++ b/customer/fbb-ws/test.yaml
@@ -90,7 +90,7 @@ infra::profile::cron::cronjobs:
       - 'PATH="/usr/bin:/bin"'
     description: 'Braintree Zahlungsverifikation'
   cdm-webservice-push:
-    command: '/bin/php -f /var/www/cdm-webservice/web/webservices/jobs/push.php >> /var/log/fbb_webservice/cdm-webservice-push.log 2>> /var/log/fbb_webservice/cdm-webservice-push-error.log'
+    command: '/bin/php -f /var/www/cdm-webservice/web/webservices/jobs/push.php >> /var/log/fbb_cdm_webservice/cdm-webservice-push.log 2>> /var/log/fbb_cdm_webservice/cdm-webservice-push-error.log'
     minute: '*'
     hour: '*'
     date: '*'
-- 
2.39.5