From 85cba51261465af71bdbcc5b2fb019144ddf56b4 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:06 +0200 Subject: [PATCH] fix lint for docmorris --- customer/docmorris/common.yaml | 2 +- .../dev-app01-fact-01-dm.pixelpark.net.yaml | 8 ++++---- .../dev-app02-fact-01-dm.pixelpark.net.yaml | 8 ++++---- customer/docmorris/meto.pixelpark.net.yaml | 2 +- customer/docmorris/nafti.pixelpark.net.yaml | 2 +- .../docmorris/prd-app01-dm-tmp.pixelpark.net.yaml | 2 +- customer/docmorris/prd-app01-fact.pixelpark.net.yaml | 8 ++++---- .../docmorris/prd-app02-dm-tmp.pixelpark.net.yaml | 2 +- customer/docmorris/prd-app02-fact.pixelpark.net.yaml | 10 +++++----- .../docmorris/prd-app03-dm-tmp.pixelpark.net.yaml | 2 +- customer/docmorris/prd-app03-fact.pixelpark.net.yaml | 12 ++++++------ customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml | 2 +- .../docmorris/prd-web01-dm-tmp.pixelpark.net.yaml | 2 +- .../docmorris/prd-web02-dm-tmp.pixelpark.net.yaml | 2 +- .../docmorris/prd-web03-dm-tmp.pixelpark.net.yaml | 2 +- .../docmorris/prd-web04-dm-tmp.pixelpark.net.yaml | 2 +- .../docmorris/prd-web05-dm-tmp.pixelpark.net.yaml | 2 +- .../docmorris/prd-web06-dm-tmp.pixelpark.net.yaml | 2 +- customer/docmorris/qas-app01-fact.pixelpark.net.yaml | 6 +++--- customer/docmorris/qas-app02-fact.pixelpark.net.yaml | 10 +++++----- customer/docmorris/qas-app03-fact.pixelpark.net.yaml | 10 +++++----- .../uat-app01-fact-01-dm.pixelpark.net.yaml | 8 ++++---- .../uat-app02-fact-01-dm.pixelpark.net.yaml | 9 ++++----- 23 files changed, 57 insertions(+), 58 deletions(-) diff --git a/customer/docmorris/common.yaml b/customer/docmorris/common.yaml index b18ce0aa..7662f246 100644 --- a/customer/docmorris/common.yaml +++ b/customer/docmorris/common.yaml @@ -10,4 +10,4 @@ accounts::users: tarik.lahmoumi: apply: true shell: bash - group: tomcat \ No newline at end of file + group: tomcat diff --git a/customer/docmorris/dev-app01-fact-01-dm.pixelpark.net.yaml b/customer/docmorris/dev-app01-fact-01-dm.pixelpark.net.yaml index 8bc53174..4fe8c308 100644 --- a/customer/docmorris/dev-app01-fact-01-dm.pixelpark.net.yaml +++ b/customer/docmorris/dev-app01-fact-01-dm.pixelpark.net.yaml @@ -6,11 +6,11 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/dev-app01-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -20,5 +20,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' diff --git a/customer/docmorris/dev-app02-fact-01-dm.pixelpark.net.yaml b/customer/docmorris/dev-app02-fact-01-dm.pixelpark.net.yaml index 70e9230e..e61412fe 100644 --- a/customer/docmorris/dev-app02-fact-01-dm.pixelpark.net.yaml +++ b/customer/docmorris/dev-app02-fact-01-dm.pixelpark.net.yaml @@ -6,11 +6,11 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/dev-app02-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -20,5 +20,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' diff --git a/customer/docmorris/meto.pixelpark.net.yaml b/customer/docmorris/meto.pixelpark.net.yaml index 00add23f..90582f70 100644 --- a/customer/docmorris/meto.pixelpark.net.yaml +++ b/customer/docmorris/meto.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/nafti.pixelpark.net.yaml b/customer/docmorris/nafti.pixelpark.net.yaml index 00add23f..90582f70 100644 --- a/customer/docmorris/nafti.pixelpark.net.yaml +++ b/customer/docmorris/nafti.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-app01-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-app01-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-app01-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-app01-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-app01-fact.pixelpark.net.yaml b/customer/docmorris/prd-app01-fact.pixelpark.net.yaml index 254bf810..475f4cab 100644 --- a/customer/docmorris/prd-app01-fact.pixelpark.net.yaml +++ b/customer/docmorris/prd-app01-fact.pixelpark.net.yaml @@ -6,11 +6,11 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/prd-app01-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -20,5 +20,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' diff --git a/customer/docmorris/prd-app02-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-app02-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-app02-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-app02-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-app02-fact.pixelpark.net.yaml b/customer/docmorris/prd-app02-fact.pixelpark.net.yaml index 5531b044..82be5e97 100644 --- a/customer/docmorris/prd-app02-fact.pixelpark.net.yaml +++ b/customer/docmorris/prd-app02-fact.pixelpark.net.yaml @@ -6,7 +6,7 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder01: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/prd-app02-fact-01-dm/*.*' type: tomcat @@ -16,7 +16,7 @@ logstash::generic_resource: - "%{environment}" docmorris_factfinder02: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/prd-app02-fact-02-dm/*.*' type: tomcat @@ -30,12 +30,12 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' sudo::configs: cmd_alias: priority: "05" content: | Cmnd_Alias TOMCAT = /sbin/service tomcat@* *,/bin/systemctl * tomcat@* - tomcat ALL=(ALL) NOPASSWD: TOMCAT \ No newline at end of file + tomcat ALL=(ALL) NOPASSWD: TOMCAT diff --git a/customer/docmorris/prd-app03-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-app03-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-app03-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-app03-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-app03-fact.pixelpark.net.yaml b/customer/docmorris/prd-app03-fact.pixelpark.net.yaml index d78c832c..ba09704a 100644 --- a/customer/docmorris/prd-app03-fact.pixelpark.net.yaml +++ b/customer/docmorris/prd-app03-fact.pixelpark.net.yaml @@ -6,21 +6,21 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder01: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/prd-app03-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" docmorris_factfinder02: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/prd-app03-fact-02-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -30,5 +30,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' diff --git a/customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml b/customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml index 938591ea..ed97906c 100644 --- a/customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml +++ b/customer/docmorris/prd-dyna-dm-01.pixelpark.net.yaml @@ -5,4 +5,4 @@ infra::role: base xymon::disks: '/var': warnlevel: 95 - paniclevel: 98 \ No newline at end of file + paniclevel: 98 diff --git a/customer/docmorris/prd-web01-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web01-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web01-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web01-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-web02-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web02-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web02-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web02-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-web03-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web03-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web03-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web03-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-web04-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web04-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web04-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web04-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-web05-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web05-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web05-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web05-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/prd-web06-dm-tmp.pixelpark.net.yaml b/customer/docmorris/prd-web06-dm-tmp.pixelpark.net.yaml index 4fa9a57a..3c002ac1 100644 --- a/customer/docmorris/prd-web06-dm-tmp.pixelpark.net.yaml +++ b/customer/docmorris/prd-web06-dm-tmp.pixelpark.net.yaml @@ -1,5 +1,5 @@ --- -infra::role: base_for_old_systems # because we don't need xymon +infra::role: base_for_old_systems # because we don't need xymon infra::additional_classes: - accounts # facter override diff --git a/customer/docmorris/qas-app01-fact.pixelpark.net.yaml b/customer/docmorris/qas-app01-fact.pixelpark.net.yaml index 32629eab..90ca8534 100644 --- a/customer/docmorris/qas-app01-fact.pixelpark.net.yaml +++ b/customer/docmorris/qas-app01-fact.pixelpark.net.yaml @@ -6,7 +6,7 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/qas-app01-fact-01-dm/*.*' type: tomcat @@ -20,8 +20,8 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' sudo::configs: cmd_alias: diff --git a/customer/docmorris/qas-app02-fact.pixelpark.net.yaml b/customer/docmorris/qas-app02-fact.pixelpark.net.yaml index a2a5c6b2..0f7a88ad 100644 --- a/customer/docmorris/qas-app02-fact.pixelpark.net.yaml +++ b/customer/docmorris/qas-app02-fact.pixelpark.net.yaml @@ -6,7 +6,7 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder01: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/qas-app02-fact-01-dm/*.*' type: tomcat @@ -16,7 +16,7 @@ logstash::generic_resource: - "%{environment}" docmorris_factfinder02: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/qas-app02-fact-02-dm/*.*' type: tomcat @@ -30,8 +30,8 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' sudo::configs: cmd_alias: @@ -41,4 +41,4 @@ sudo::configs: tomcat: priority: "10" content: | - tomcat ALL=(root) NOPASSWD: CMDTOMCAT \ No newline at end of file + tomcat ALL=(root) NOPASSWD: CMDTOMCAT diff --git a/customer/docmorris/qas-app03-fact.pixelpark.net.yaml b/customer/docmorris/qas-app03-fact.pixelpark.net.yaml index 89137cc8..51ae9452 100644 --- a/customer/docmorris/qas-app03-fact.pixelpark.net.yaml +++ b/customer/docmorris/qas-app03-fact.pixelpark.net.yaml @@ -6,7 +6,7 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder01: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/qas-app03-fact-01-dm/*.*' type: tomcat @@ -16,7 +16,7 @@ logstash::generic_resource: - "%{environment}" docmorris_factfinder02: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/qas-app03-fact-02-dm/*.*' type: tomcat @@ -30,8 +30,8 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' sudo::configs: cmd_alias: @@ -41,4 +41,4 @@ sudo::configs: tomcat: priority: "10" content: | - tomcat ALL=(root) NOPASSWD: CMDTOMCAT \ No newline at end of file + tomcat ALL=(root) NOPASSWD: CMDTOMCAT diff --git a/customer/docmorris/uat-app01-fact-01-dm.pixelpark.net.yaml b/customer/docmorris/uat-app01-fact-01-dm.pixelpark.net.yaml index db26ec80..0c7e8840 100644 --- a/customer/docmorris/uat-app01-fact-01-dm.pixelpark.net.yaml +++ b/customer/docmorris/uat-app01-fact-01-dm.pixelpark.net.yaml @@ -6,11 +6,11 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/uat-app01-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -20,5 +20,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' diff --git a/customer/docmorris/uat-app02-fact-01-dm.pixelpark.net.yaml b/customer/docmorris/uat-app02-fact-01-dm.pixelpark.net.yaml index a4694f00..b7b7cd0a 100644 --- a/customer/docmorris/uat-app02-fact-01-dm.pixelpark.net.yaml +++ b/customer/docmorris/uat-app02-fact-01-dm.pixelpark.net.yaml @@ -6,11 +6,11 @@ logstash::drop_grokparsefailure: false logstash::generic_resource: docmorris_factfinder: resource: file - order: 10 # Input + order: 10 # Input parameters: path: '/www/logs/tomcat/uat-app02-fact-01-dm/*.*' type: tomcat - tags: + tags: - "docmorris-ff7" - "%{customer}" - "%{environment}" @@ -20,6 +20,5 @@ logstash::generic_resource: condition: "if [type] == 'tomcat'" parameters: match: - - "message" - - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' - + - "message" + - '%%{ich-trickse}{IP:ip}%%{ich-trickse}{SPACE}\[%%{ich-trickse}{HTTPDATE:logdate}%%{ich-trickse}{DATA}%%{ich-trickse}{QS:request}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:status}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:size}%%{ich-trickse}{DATA}%%{ich-trickse}{NUMBER:time}' -- 2.39.5