fbb-www logging improved

diff --git a/customer/fbb-ws/production.yaml b/customer/fbb-ws/production.yaml
index 11dfdaf5980edb573841c96a602428f3da51673c..638ca84a6acd09fcdae649878c50c73af2657bf9 100644 (file)
--- 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 6accab32d9c5587c22b83f11e905f5a8baf77a22..754a42cb4cb76b22493cd974236ed0c18533902f 100644 (file)
--- 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: '*'