ODT - refinements

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 143545a65f8ed9435a8bbec9f395cba639889432..214e0d2de6eb2afd1e18ed48e14d5458e9cc11c4 100644 (file)
--- 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 57410418af0c529122546143ad62f37d1eb14618..b1a8c860fdf8ea90b2a999eb4d914870ece07c66 100644 (file)
--- 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 6229b9ad24f0cf10148070276d338bb77834b671..d960a94d5ced02d6038a3aa497fffde4764498e1 100644 (file)
--- 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 02f646a47b4560c30f0ed6b7a5b6837902625bfc..5709f26525fb990da839dd03da42321aefd8cab5 100644 (file)
--- 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