From e268b96223c37f9c55a5d0009ef3b6b37ddf4551 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Wed, 5 Jul 2017 13:43:25 +0200 Subject: [PATCH] MHK - refine logstash --- .../mhk/red-mhk-kueche-de.pixelpark.net.yaml | 2 ++ ...stage-red-mhk-kueche-de.pixelpark.net.yaml | 34 +++++++++++++++++++ ...age-www01-mhk-kueche-de.pixelpark.net.yaml | 17 ++++++++++ ...age-www02-mhk-kueche-de.pixelpark.net.yaml | 17 ++++++++++ ...age-www03-mhk-kueche-de.pixelpark.net.yaml | 17 ++++++++++ .../www01-mhk-kueche-de.pixelpark.net.yaml | 1 + .../www02-mhk-kueche-de.pixelpark.net.yaml | 1 + .../www03-mhk-kueche-de.pixelpark.net.yaml | 1 + 8 files changed, 90 insertions(+) diff --git a/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/red-mhk-kueche-de.pixelpark.net.yaml index 43a58c44..945c2d3d 100644 --- 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 181b3143..45e0987a 100644 --- 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 e0b07a11..bdbdffdb 100644 --- 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 01530303..f7818937 100644 --- 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 f9204d7e..d215b436 100644 --- 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 b709f3f7..bfffe825 100644 --- 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 fffc1772..ea75d620 100644 --- 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 c429fecc..518588c9 100644 --- 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 -- 2.39.5