Merge branch 'test-server' into 'main'

.gitignore

+es.log
+kibana.log
+logstash-restart.sh
+logstash.log

kibana/config/kibana.yml

@@ -11,3 +11,5 @@ monitoring.ui.container.elasticsearch.enabled: true
 #
 elasticsearch.username: elastic
 elasticsearch.password: changeme
+
+# i18n.locale: "zh-CN"

logstash/pipeline/logstash.conf

@@ -24,40 +24,50 @@ filter {
                 skip_on_invalid_json => true
                 target => "json"
         }
-	if "gateway" in [log][file][path]{
-                mutate { add_field => { "[@metadata][target_index]" => "gateway-service-%{+YYYY.MM}" } }
-        }
-        else if "swagger" in [log][file][path]{
-		mutate { add_field => { "[@metadata][target_index]" => "swagger-service-%{+YYYY.MM}" } }
-        }
-        else if "auth-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "auth-service-%{+YYYY.MM}" } }
-        }
-        else if "file-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "file-service-%{+YYYY.MM}" } }
-	}
-        else if "notify-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "notify-service-%{+YYYY.MM}" } }
-        }
-        else if "pay-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "pay-service-%{+YYYY.MM}" } }
-        }       
-        else if "proof-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "proof-service-%{+YYYY.MM}" } }
-        }
-        else if "tx-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "tx-service-%{+YYYY.MM}" } }
+	if "v1" in [log][file][path]{
+		mutate { add_field => { "[service][version]" => "v1" } }
+	}else if "v2" in [log][file][path]{
+                mutate { add_field => { "[service][version]" => "v2" } }
+	}else {
+		mutate { add_field => { "[service][version]" => "v" } }
 	}
-        else if "user-service" in [log][file][path] {
-		mutate { add_field => { "[@metadata][target_index]" => "user-service-%{+YYYY.MM}" } }
+
+	if "gateway" in [log][file][path]{
+                mutate { add_field => { "[service][name]" => "gateway-service" } }
+        }else if "swagger" in [log][file][path]{
+                mutate { add_field => { "[service][name]" => "swagger-service" } }
+        }else if "auth-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "auth-service" } }
+        }else if "file-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "file-service" } }
+	}else if "notify-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "notify-service" } }
+        }else if "pay-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "pay-service" } }
+        }else if "proof-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "proof-service" } }
+        }else if "tx-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "tx-service" } }
+        }else if "role-service" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "role-service" } }
+        }else if "user-service" in [log][file][path] {
+		mutate { add_field => { "[service][name]" => "user-service" } }
+	}else if "department-service" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "department-service" } }
+        }else if "process-service" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "process-service" } }
+        }else if "template-service" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "template-service" } }
+        }else if "trace-service" in [log][file][path] {
+                mutate { add_field => { "[service][name]" => "trace-service" } }
         }else {
-		mutate { add_field => { "[@metadata][target_index]" => "others-%{+YYYY.MM}" } }
+		mutate { add_field => { "[service][name]" => "others" } }
 	}
 }
 
 output {
 	elasticsearch{
-		index => "%{[@metadata][target_index]}"
+		index => "%{[service][name]}-%{[service][version]}-%{+YYYY.MM}"
 	        hosts => ["elasticsearch:9200"]
         }
 }