Merge branch 'master' into 0722-yuluo/optimize-collector

Author: Aias00

common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java

@@ -28,9 +28,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
-
-
 /**
  * Grafana dashboard entity
  */
@@ -42,23 +39,32 @@
 @NoArgsConstructor
 @Schema(description = "Grafana dashboard entity")
 public class GrafanaDashboard implements Serializable {
+
+    @Id
+    @Schema(description = "Monitor id")
+    private Long monitorId;
+    
     @Schema(description = "Dashboard folderUid")
     private String folderUid;
+    
     @Schema(description = "Dashboard slug")
     private String slug;
+    
     @Schema(description = "Dashboard status")
     private String status;
+    
     @Schema(description = "Dashboard uid")
     private String uid;
+    
     @Schema(description = "Dashboard url")
     private String url;
+    
     @Schema(description = "Dashboard version")
     private Long version;
-    @Id
-    @Schema(description = "Monitor id")
-    private Long monitorId;
+    
     @Schema(description = "is enabled")
     private boolean enabled;
+    
     @Schema(description = "template")
     @Transient
     private String template;

common/src/main/java/org/apache/hertzbeat/common/entity/grafana/ServiceAccount.java

@@ -32,7 +32,6 @@
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.Size;
@@ -42,7 +41,6 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
 import org.apache.hertzbeat.common.support.valid.HostValid;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
@@ -168,11 +166,4 @@ public class Monitor {
         joinColumns = {@JoinColumn(name = "monitor_id", referencedColumnName = "id")},
         inverseJoinColumns = {@JoinColumn(name = "tag_id", referencedColumnName = "id")})
     private List<Tag> tags;
-
-    /**
-     * grafana dashboard
-     */
-    @Schema(title = "grafana dashboard")
-    @Transient
-    private GrafanaDashboard grafanaDashboard;
 }

common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
@@ -223,4 +224,40 @@ public static void validDefineI18n(Map<String, String> i18nMap, String field) {
         }
     }
 
+    /**
+     * generate random word
+     * @param length length
+     * @return words
+     */
+    public static String generateRandomWord(int length) {
+        StringBuilder word = new StringBuilder();
+        Random random = new Random();
+        // 'a' ASCII
+        int minVowel = 97;
+        // 'z' ASCII
+        int maxVowel = 122;
+        // 'A' ASCII
+        int minConsonant = 65;
+        // 'Z' ASCII
+        int maxConsonant = 90;
+        // '0' ASCII
+        int minDigit = 48;
+        // '9' ASCII
+        int maxDigit = 57;
+        word.append((char) (minVowel + random.nextInt(5)));
+        for (int i = 1; i < length; i++) {
+            switch (random.nextInt(3)) {
+                case 0:
+                    word.append((char) (minVowel + random.nextInt(5)));
+                    break;
+                case 1:
+                    word.append((char) (minDigit + random.nextInt(10)));
+                    break;
+                default:
+                    word.append((char) (minConsonant + random.nextInt(26)));
+                    break;
+            }
+        }
+        return word.toString();
+    }
 }

common/src/main/java/org/apache/hertzbeat/common/util/CommonUtil.java

@@ -20,7 +20,8 @@
 /**
  * Grafana Common Constants
  */
-public interface CommonConstants {
+public interface GrafanaConstants {
+    
     String HTTP = "http://";
 
     String HTTPS = "https://";
@@ -30,48 +31,36 @@ public interface CommonConstants {
     String REFRESH = "&refresh=15s";
 
     String INSTANCE = "&var-instance=";
-
-    String AUTHORIZATION = "Authorization";
-    
-    String BEARER = "Bearer ";
 
     String CREATE_DASHBOARD_API = "/api/dashboards/db";
 
     String DELETE_DASHBOARD_API = "/api/dashboards/uid/%s";
 
     String DATASOURCE_NAME = "hertzbeat-victoria-metrics";
 
+    String USE_DATASOURCE = "&var-ds=" + DATASOURCE_NAME;
+    
     String DATASOURCE_TYPE = "prometheus";
 
     String DATASOURCE_ACCESS = "proxy";
 
-    String CREATE_DATASOURCE_API = "%s:%s@%s/api/datasources";
+    String CREATE_DATASOURCE_API = "/api/datasources";
 
-    String DELETE_DATASOURCE_API = "%s:%s@%s/api/datasources/name/%s";  
+    String QUERY_DATASOURCE_API = "/api/datasources/name/" + DATASOURCE_NAME;
 
+    String GET_SERVICE_ACCOUNTS_API = "%s:%s@%s/api/serviceaccounts/search";
+
     String ACCOUNT_NAME = "hertzbeat";
 
     String ACCOUNT_ROLE = "Admin";
 
-    String ACCOUNT_TOKEN_NAME = "hertzbeat-token";
-    
     String CREATE_SERVICE_ACCOUNT_API = "%s:%s@%s/api/serviceaccounts";
 
-    String GET_SERVICE_ACCOUNTS_API = "%s:%s@%s/api/serviceaccounts/search";
-    
-    String DELETE_SERVICE_ACCOUNT_API = "%s:%s@%s/api/serviceaccounts/%d";
-    
     String CREATE_SERVICE_TOKEN_API = "%s:%s@%s/api/serviceaccounts/%d/tokens";
-    
-    String GET_SERVICE_TOKENS_API = "%s:%s@%s/api/serviceaccounts/%d/tokens";
-
-    String NAME = "name";
 
     String APPLICATION_JSON = "application/json";
-    
-    String HERTZBEAT_TOKEN = "hertzbeat-token";
-
-    String TYPE = "type";
 
     String URL = "url";
+
+    String GRAFANA_CONFIG = "grafanaConfig";
 }

grafana/src/main/java/org/apache/hertzbeat/grafana/common/CommonConstants.java renamed to grafana/src/main/java/org/apache/hertzbeat/grafana/common/GrafanaConstants.java

@@ -42,22 +42,17 @@ public class GrafanaInit implements CommandLineRunner {
     //3. Determine whether there is a token, if not, create and ensure that the account is unique.
     @Override
     public void run(String... args) throws Exception {
-        if (grafanaProperties.enabled() && grafanaProperties.url() != null && grafanaProperties.username() != null && grafanaProperties.password() != null) {
-            serviceAccountService.reload();
+        if (grafanaProperties.enabled()) {
+            log.info("grafana init start");
             try {
-                serviceAccountService.getAccount();
-            } catch (RuntimeException e) {
-                log.error("service account is not exist, create service account");
-                serviceAccountService.createServiceAccount();
+                String token = serviceAccountService.getToken();
+                if (token == null) {
+                    token = serviceAccountService.applyForToken();
+                }
+                datasourceService.existOrCreateDatasource(token);   
+            } catch (Exception e) {
+                log.error("grafana init error", e);
             }
-            try {
-                serviceAccountService.getToken();
-            } catch (RuntimeException e) {
-                log.error("service token is not exist, create service token");
-                serviceAccountService.createToken();
-            }
-            datasourceService.deleteDatasource();
-            datasourceService.createDatasource();
         }
     }
 

grafana/src/main/java/org/apache/hertzbeat/grafana/config/GrafanaInit.java

@@ -17,8 +17,8 @@
 
 package org.apache.hertzbeat.grafana.config;
 
-import static org.apache.hertzbeat.grafana.common.CommonConstants.HTTP;
-import static org.apache.hertzbeat.grafana.common.CommonConstants.HTTPS;
+import static org.apache.hertzbeat.grafana.common.GrafanaConstants.HTTP;
+import static org.apache.hertzbeat.grafana.common.GrafanaConstants.HTTPS;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.bind.DefaultValue;

grafana/src/main/java/org/apache/hertzbeat/grafana/config/GrafanaProperties.java

@@ -25,7 +25,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.common.entity.dto.Message;
 import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
-import org.apache.hertzbeat.grafana.config.GrafanaProperties;
 import org.apache.hertzbeat.grafana.service.DashboardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -48,9 +47,6 @@ public class DashboardController {
     @Autowired
     private DashboardService dashboardService;
 
-    @Autowired
-    private GrafanaProperties grafanaProperties;
-
     /**
      * Creates a new Grafana dashboard.
      *
@@ -62,7 +58,7 @@ public class DashboardController {
     @PostMapping
     public ResponseEntity<Message<?>> createDashboard(@RequestParam String dashboardJson, @RequestParam Long monitorId) {
         try {
-            ResponseEntity<?> response = dashboardService.createDashboard(dashboardJson, monitorId);
+            ResponseEntity<?> response = dashboardService.createOrUpdateDashboard(dashboardJson, monitorId);
             if (response.getStatusCode().is2xxSuccessful()) {
                 return ResponseEntity.ok(Message.success("create dashboard success"));
             }