feat(executor-manager): 优化task任务命名

service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/YarnApplicationVO.java

@@ -2,6 +2,7 @@ package com.lanyuanxiaoyao.service.web.entity;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
 import com.eshore.odcp.hudi.connector.utils.NameHelper;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication;
@@ -17,7 +18,7 @@ import java.util.regex.Pattern;
  * @date 2023-04-21
  */
 public class YarnApplicationVO {
-    private static final Pattern TASK_REGEX = Pattern.compile("^Service_Task_(.+)_(.{8})$");
+    private static final Pattern TASK_REGEX = Pattern.compile("^Service_Task(.*)#(.{8})$");
 
     @JsonIgnore
     private final YarnApplication yarnApplication;
@@ -48,8 +49,8 @@ public class YarnApplicationVO {
         Matcher matcher = TASK_REGEX.matcher(yarnApplication.getName());
         isTaskApplication = matcher.matches();
         if (isTaskApplication && matcher.groupCount() == 2) {
-            taskName = matcher.group(1);
-            taskId = matcher.group(2);
+            taskName = StrUtil.trim(matcher.group(1));
+            taskId = StrUtil.format(matcher.group(2));
         }
 
         long now = Instant.now().toEpochMilli();

service-web/src/main/resources/static/common/info.js

@@ -1,7 +1,7 @@
 function commonInfo() {
     return {
-        baseUrl: 'http://132.126.207.131:35690/hudi_services/service_web',
-        // baseUrl: '/hudi_services/service_web',
+        // baseUrl: 'http://132.126.207.131:35690/hudi_services/service_web',
+        baseUrl: '/hudi_services/service_web',
         loki: {
             grafanaUrl: 'http://132.126.207.125:35700',
             hudi: {

service-web/src/main/resources/static/components/task-tab.js

@@ -139,6 +139,21 @@ function taskTab() {
                 perPage: 10,
                 headerToolbar: [
                     "reload",
+                    {
+                        label: "任务管理器日志",
+                        type: "action",
+                        tooltip: '打开Grafana日志',
+                        onEvent: {
+                            click: {
+                                actions: [
+                                    {
+                                        actionType: 'custom',
+                                        script: () => window.open(serviceLogByAppName("service-executor-manager"), '_blank'),
+                                    }
+                                ]
+                            }
+                        }
+                    },
                     paginationCommonOptions(),
                 ],
                 footerToolbar: [],