From 09e8cf9463f110f0aacab0c3a33c13d802828bb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Tue, 10 Oct 2017 10:12:24 +0200 Subject: [PATCH] ODT - refinements --- .../db-odt-daimler-com.pixelpark.net.yaml | 1 - .../int-db-odt-daimler-com.pixelpark.net.yaml | 3 +- .../int-odt-daimler-com.pixelpark.net.yaml | 30 +++++++++++++++++++ .../odt-daimler-com.pixelpark.net.yaml | 4 +-- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml index 143545a6..214e0d2d 100644 --- a/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/db-odt-daimler-com.pixelpark.net.yaml @@ -50,7 +50,6 @@ infra::profile::pg_server::backup::day_of_week_to_keep: 0 infra::profile::pg_server::backup::enable_plain_backups: false mongodb::globals::manage_package_repo: true -mongodb::globals::version: 3.4.6-1.el7 mongodb::globals::bind_ip: 0.0.0.0 mongodb::globals::repo_location: 'https://repo.pixelpark.com/Linux/yum/mongodb/7/mongodb-org-3.4/' mongodb::server::auth: true diff --git a/customer/mbvd-odt/int-db-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-db-odt-daimler-com.pixelpark.net.yaml index 57410418..b1a8c860 100644 --- a/customer/mbvd-odt/int-db-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/int-db-odt-daimler-com.pixelpark.net.yaml @@ -3,6 +3,8 @@ infra::role: base infra::additional_classes: - infra::profile::pg_server - infra::profile::mongodb_server + - mongodb::globals + infra::profile::pg_server::version: '9.6' infra::profile::pg_server::install_contrib: true @@ -43,7 +45,6 @@ infra::profile::pg_server::backup::days_to_keep: 2 infra::profile::pg_server::backup::enable_plain_backups: false mongodb::globals::manage_package_repo: true -mongodb::globals::version: 3.4.6-1.el7 mongodb::globals::bind_ip: 0.0.0.0 mongodb::globals::repo_location: 'https://repo.pixelpark.com/Linux/yum/mongodb/7/mongodb-org-3.4/' mongodb::server::auth: true diff --git a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml index 6229b9ad..d960a94d 100644 --- a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml @@ -127,3 +127,33 @@ logstash::generic_resource: what: previous pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}" negate: true + openemm-core: + resource: file + order: 10 + parameters: + path: '/home/openemm/logs/openemm/openemm_core.log' + type: 'EMM-Core' + tags: + - 'prod' + - "%{customer}" + - 'odt-core' + codec: + type: multiline + what: previous + pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}" + negate: true + openemm-data: + resource: file + order: 10 + parameters: + path: '/home/openemm/logs/openemm/openemm_data.log' + type: 'EMM-Webservice' + tags: + - 'prod' + - "%{customer}" + - 'odt-data' + codec: + type: multiline + what: previous + pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}" + negate: true diff --git a/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml index 02f646a4..5709f265 100644 --- a/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/odt-daimler-com.pixelpark.net.yaml @@ -158,7 +158,7 @@ logstash::generic_resource: codec: type: multiline what: previous - pattern: "^[%%{ich-trickse}{TIMESTAMP_ISO8601}" + pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}" negate: true openemm-data: resource: file @@ -173,5 +173,5 @@ logstash::generic_resource: codec: type: multiline what: previous - pattern: "^[%%{ich-trickse}{TIMESTAMP_ISO8601}" + pattern: "^%%{ich-trickse}{TIMESTAMP_ISO8601}" negate: true -- 2.39.5