Merge branch 'test-server' into 'main'

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "$ES_PORT1:9200"
       - "$ES_PORT2:9300"
     environment:
-      ES_JAVA_OPTS: "-Xmx512m -Xms512m"
+      ES_JAVA_OPTS: "-Xmx1024m -Xms1024m"
       ELASTIC_PASSWORD: changeme
       # Use single node discovery in order to disable production mode and avoid bootstrap checks.
       # see: https://www.elastic.co/guide/en/elasticsearch/reference/current/bootstrap-checks.html

logstash/pipeline/logstash.conf

@@ -31,49 +31,62 @@ filter {
 	}else {
 		mutate { add_field => { "[service][version]" => "v" } }
 	}
+##	if env == "" {
+##		mutate { add_field => { "[env][name]" => "test" } }
+##	}
+
+
+	mutate { add_field => { "[service][program]" => "backend" } }
 
 	if "gateway" in [log][file][path]{
-                mutate { add_field => { "[service][name]" => "gateway-service" } }
+                mutate { add_field => { "[service][name]" => "gateway" } }
         }else if "swagger" in [log][file][path]{
-                mutate { add_field => { "[service][name]" => "swagger-service" } }
+                mutate { add_field => { "[service][name]" => "swagger" } }
         }else if "auth-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "auth-service" } }
+		mutate { add_field => { "[service][name]" => "auth" } }
         }else if "file-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "file-service" } }
+		mutate { add_field => { "[service][name]" => "file" } }
 	}else if "notify-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "notify-service" } }
+		mutate { add_field => { "[service][name]" => "notify" } }
         }else if "pay-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "pay-service" } }
+		mutate { add_field => { "[service][name]" => "pay" } }
         }else if "proof-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "proof-service" } }
+		mutate { add_field => { "[service][name]" => "proof" } }
         }else if "tx-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "tx-service" } }
+		mutate { add_field => { "[service][name]" => "tx" } }
         }else if "role-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "role-service" } }
+                mutate { add_field => { "[service][name]" => "role" } }
         }else if "user-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "user-service" } }
+		mutate { add_field => { "[service][name]" => "user" } }
 	}else if "department-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "department-service" } }
+                mutate { add_field => { "[service][name]" => "department" } }
         }else if "process-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "process-service" } }
+                mutate { add_field => { "[service][name]" => "process" } }
         }else if "template-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "template-service" } }
+                mutate { add_field => { "[service][name]" => "template" } }
         }else if "trace-service" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "trace-service" } }
-        }else if "sync" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "trace" } }
+	}else if "external" in [log][file][path] {
+		mutate { update => { "[service][program]" => "exdb" } }
+		if "sync" in [log][file][path] {
 	                mutate { add_field => { "[service][name]" => "sync" } } 
 		}else if "convert" in [log][file][path] {
         	        mutate { add_field => { "[service][name]" => "convert" } }
-        }else if "exrpc" in [log][file][path] {
-                mutate { add_field => { "[service][name]" => "exrpc" } }
+		}else if "rpc" in [log][file][path] {
+                	mutate { add_field => { "[service][name]" => "rpc" } }
+		}
+	}else if "chain" in [log][file][path] {
+		mutate { update => { "[service][program]" => "chain" } }
+        	mutate { add_field => { "[service][name]" => "chain33" } }
         }else {
-                mutate { add_field => { "[service][name]" => "others" } }
+		mutate { update => { "[service][program]" => "others" } }
+		mutate { add_field => { "[service][name]" => "other" } }
 	}
 }
 
 output {
 	elasticsearch{
-                index => "%{[service][name]}-%{[service][version]}-%{+YYYY.MM}"
+		index => "%{[env]}-%{[service][program]}-%{[service][version]}-%{[service][name]}-%{+YYYY.MM}"
 	        hosts => ["elasticsearch:9200"]
         }
 }