Browse Source

dsfsadfasdfsdfasdf

yangxg 4 years ago
parent
commit
d6dfa7daa3
2 changed files with 14 additions and 14 deletions
  1. 7 10
      deploy-tmp-logstash.yaml
  2. 7 4
      offline-process-charge.yml

+ 7 - 10
deploy-tmp-logstash.yaml

@@ -12,16 +12,13 @@ data:
           group_id => "es-test"
           topics => ["offline-process-topic"]
           codec => json
-     }
+      }
     }
     
     filter {
       grok{
           match => {"message" => "(?m)^\[%{DATA:logdate}\] \[%{WORD:thread_trace_id}*\] \[%{WORD:biz_id}*\] \[%{LOGLEVEL:level}%{SPACE}*\] \[%{DATA:threadName}\] \[%{DATA:loggerName}\] \[%{DATA:method_line}\] - %{GREEDYDATA:msg}"}
       }
-      mutate {
-        remove_field => ["@version","beat.name","input.type"]
-      }
       date {
           match => [ "timestamp" , "yyyy-MM-dd HH:mm:ss.SSS" ]
       }
@@ -29,42 +26,42 @@ data:
 
     output {
       stdout { codec => rubydebug }
-      if [fields][log_topic] == "offline-process-charge" {
+      if [log_topic] == "offline-process-charge" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-charge-%{+YYYY.MM}"
             template_overwrite => true
           }
       }
-      if [fields][log_topic] == "offline-process-charge-callback" {
+      if [log_topic] == "offline-process-charge-callback" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-charge-callback-%{+YYYY.MM}"
             template_overwrite => true
           }
       }
-      if [fields][log_topic] == "offline-process-promotion" {
+      if [log_topic] == "offline-process-promotion" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-promotion-%{+YYYY.MM}"
             template_overwrite => true
           }
       }
-      if [fields][log_topic] == "offline-process-newmedia" {
+      if [log_topic] == "offline-process-newmedia" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-newmedia-%{+YYYY.MM}"
             template_overwrite => true
           }
       }
-      if [fields][log_topic] == "offline-process-schedule" {
+      if [log_topic] == "offline-process-schedule" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-schedule-%{+YYYY.MM}"
             template_overwrite => true
           }
       }
-      if [fields][log_topic] == "offline-process-statistics" {
+      if [log_topic] == "offline-process-statistics" {
           elasticsearch {
             hosts => ["elasticsearch:9200"]
             index => "logstash-offline-process-statistics-%{+YYYY.MM}"

+ 7 - 4
offline-process-charge.yml

@@ -141,8 +141,11 @@ data:
       multiline.negate: true
       multiline.match: after
       multiline.timeout: 30
+      fields:
+          log_topic: offline-process-charge
+      fields_under_root: true
       paths:
-        - "/data/logs/app/all.log"
+        - "/data/logs/app/*.log"
         - "/data/logs/*.log"
     setup.template.enabled: true
     setup.template.name: offline-process-charge
@@ -154,12 +157,12 @@ data:
       # initial brokers for reading cluster metadata
       hosts: ["kafka-0.kafka-svc.qa.svc.cluster.local:9093", "kafka-1.kafka-svc.qa.svc.cluster.local:9093", "kafka-2.kafka-svc.qa.svc.cluster.local:9093"]
       # message topic selection + partitioning
-      topic: 'offline-process-charge-topic'
+      topic: 'offline-process-topic'
       partition.round_robin:
         reachable_only: false
       required_acks: 0
       compression: gzip
       max_message_bytes: 1000000
-    #setup.kibana:
-    #  host: 'qa-kibana.ieasou.cn:80'
+    setup.kibana:
+      host: 'qa-kibana.ieasou.cn:80'
     #   host: 'kibana-svc:80'