MHK - refine logstash

diff --git a/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
index 43a58c44dd324447598a197b00f071a4848a0b97..945c2d3d54edb2578044023c989b7d5380c127a2 100644 (file)
--- a/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml
@@ -171,6 +171,7 @@ logstash::generic_resource:
       tags:
         - 'preview'
         - 'blueprint'
+        - 'prod'
         - "%{customer}"
       codec:
         type: multiline
@@ -186,6 +187,7 @@ logstash::generic_resource:
       tags:
         - 'preview'
         - 'studio'
+        - 'prod'
         - "%{customer}"
       codec:
         type: multiline

diff --git a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
index 181b31437b1405683a0eda31c606a44965083a47..45e0987a386f81c37f932642da1b321425d184cc 100644 (file)
--- a/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-red-mhk-kueche-de.pixelpark.net.yaml
@@ -154,3 +154,37 @@ infra::profile::apache::pp_vhosts:
     proxy_preserve_host: true
     proxy_pass:
       - { path: /blueprint, url: 'ajp://localhost:40009/blueprint' }
+
+logstash::generic_resource:
+  preview:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/coremedia/cm7-studio-tomcat/blueprint.log'
+      type: webapp
+      tags:
+        - 'preview'
+        - 'blueprint'
+        - 'stage'
+        - "%{customer}"
+      codec:
+        type: multiline
+        what: previous
+        pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}"
+        negate: true
+  studio:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/coremedia/cm7-studio-tomcat/CoreMedia-Studio.log'
+      type: webapp
+      tags:
+        - 'preview'
+        - 'studio'
+        - 'stage'
+        - "%{customer}"
+      codec:
+        type: multiline
+        what: previous
+        pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}"
+        negate: true

diff --git a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
index e0b07a1126d7f87db3e85d4edba56bdc00146e7c..bdbdffdb8cf9a9731967ddae58e41537de92702d 100644 (file)
--- a/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www01-mhk-kueche-de.pixelpark.net.yaml
@@ -96,3 +96,20 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: sameorigin'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Content-Type-Options: nosniff'
+
+logstash::generic_resource:
+  webapp:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
+      type: webapp
+      tags:
+        - 'blueprint'
+        - 'stage'
+        - "%{customer}"
+      codec:
+        type: multiline
+        what: previous
+        pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}"
+        negate: true

diff --git a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
index 015303032c012876c8426107db12da5191ac2901..f7818937a7775f14b0dced54132bc017bed3974c 100644 (file)
--- a/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www02-mhk-kueche-de.pixelpark.net.yaml
@@ -96,3 +96,20 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: sameorigin'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Content-Type-Options: nosniff'
+
+logstash::generic_resource:
+  webapp:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
+      type: webapp
+      tags:
+        - 'blueprint'
+        - 'stage'
+        - "%{customer}"
+      codec:
+        type: multiline
+        what: previous
+        pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}"
+        negate: true

diff --git a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
index f9204d7ec845b79565a23e21e775402d5f0675ff..d215b436cdc367d287f3e5eb418d0c0e18efaaa7 100644 (file)
--- a/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/stage-www03-mhk-kueche-de.pixelpark.net.yaml
@@ -96,3 +96,20 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Frame-Options: sameorigin'
       - 'set X-XSS-Protection: "1; mode=block"'
       - 'set X-Content-Type-Options: nosniff'
+
+logstash::generic_resource:
+  webapp:
+    resource: file
+    order: 10 # Input
+    parameters:
+      path: '/var/log/coremedia/cm7-delivery-tomcat/blueprint.log'
+      type: webapp
+      tags:
+        - 'blueprint'
+        - 'stage'
+        - "%{customer}"
+      codec:
+        type: multiline
+        what: previous
+        pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}"
+        negate: true

diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
index b709f3f769b9e3cc9f571da18c5bed0da708f430..bfffe825e45ae6b2e8fbfdd943afaef272671566 100644 (file)
--- a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
@@ -183,6 +183,7 @@ logstash::generic_resource:
       type: webapp
       tags:
         - 'blueprint'
+        - 'prod'
         - "%{customer}"
       codec:
         type: multiline

diff --git a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
index fffc177245c936df3a0e3de75fc418e3562e6fab..ea75d620ae3febc12f4d868b12bbc21035cb162e 100644 (file)
--- a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
@@ -183,6 +183,7 @@ logstash::generic_resource:
       type: webapp
       tags:
         - 'blueprint'
+        - 'prod'
         - "%{customer}"
       codec:
         type: multiline

diff --git a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
index c429fecc484e0b94f8c80d329621e73f89dd9eda..518588c91dd9b61cde5f7a25c0d7741adb09d565 100644 (file)
--- a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
@@ -183,6 +183,7 @@ logstash::generic_resource:
       type: webapp
       tags:
         - 'blueprint'
+        - 'prod'
         - "%{customer}"
       codec:
         type: multiline