This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch feature#grafana
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/feature#grafana by this push:
new 1f7b2f654 ```refactor(grafana): organize imports and constants,
improve readabilityThe code imports have been organized, and constants have
been grouped together to improvethe readability in several classes within the
grafana module. Excessive whitespace has also been removed to ensure a cleaner
and more standardized code appearance. ```
1f7b2f654 is described below
commit 1f7b2f65427c6142053bd80747fe63f442cf778a
Author: zqr10159 <[email protected]>
AuthorDate: Thu Aug 29 01:03:16 2024 +0800
```refactor(grafana): organize imports and constants, improve
readabilityThe code imports have been organized, and constants have been
grouped together to improvethe readability in several classes within the
grafana module. Excessive whitespace has also
been removed to ensure a cleaner and more standardized code appearance.
```
---
.../hertzbeat/grafana/controller/DashboardController.java | 7 ++++++-
.../grafana/controller/ServiceAccountController.java | 5 ++++-
.../apache/hertzbeat/grafana/service/DashboardService.java | 11 +++++++++--
.../hertzbeat/grafana/service/DatasourceService.java | 14 +++++++++++---
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git
a/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
b/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
index 12fd9f892..ee56872e3 100644
---
a/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
+++
b/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
@@ -12,7 +12,12 @@ import
org.apache.hertzbeat.grafana.config.GrafanaConfiguration;
import org.apache.hertzbeat.grafana.service.DashboardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* Controller for managing Grafana dashboards via API.
diff --git
a/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
b/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
index d0320bdf5..17ad640c4 100644
---
a/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
+++
b/grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
@@ -9,7 +9,10 @@ import org.apache.hertzbeat.common.entity.dto.Message;
import org.apache.hertzbeat.grafana.service.ServiceAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* Controller for managing Grafana service accounts and tokens via API.
diff --git
a/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
b/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
index 983bba664..72b129af7 100644
---
a/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
+++
b/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
@@ -1,5 +1,9 @@
package org.apache.hertzbeat.grafana.service;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.CREATE_DASHBOARD_API;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.DELETE_DASHBOARD_API;
+import static org.apache.hertzbeat.grafana.common.CommonConstants.KIOSK;
+import static org.apache.hertzbeat.grafana.common.CommonConstants.REFRESH;
import java.util.HashMap;
import java.util.Map;
import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
@@ -7,13 +11,16 @@ import org.apache.hertzbeat.common.util.JsonUtil;
import org.apache.hertzbeat.grafana.config.GrafanaConfiguration;
import org.apache.hertzbeat.grafana.dao.DashboardDao;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import lombok.extern.slf4j.Slf4j;
-import static org.apache.hertzbeat.grafana.common.CommonConstants.*;
/**
* Service for managing Grafana dashboards.
diff --git
a/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
b/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
index b609c2032..b7d1f83c3 100644
---
a/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
+++
b/grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
@@ -1,14 +1,22 @@
package org.apache.hertzbeat.grafana.service;
-import static org.apache.hertzbeat.grafana.common.CommonConstants.*;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.CREATE_DATASOURCE_API;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.DATASOURCE_ACCESS;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.DATASOURCE_NAME;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.DATASOURCE_TYPE;
+import static
org.apache.hertzbeat.grafana.common.CommonConstants.DELETE_DATASOURCE_API;
import jakarta.annotation.PostConstruct;
import java.util.Base64;
import lombok.extern.slf4j.Slf4j;
import org.apache.hertzbeat.grafana.config.GrafanaConfiguration;
import
org.apache.hertzbeat.warehouse.store.history.vm.VictoriaMetricsProperties;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -53,7 +61,7 @@ public class DatasourceService {
* @return ResponseEntity containing the response from Grafana
*/
public ResponseEntity<String> createDatasource() {
- String url = String.format(CREATE_DATASOURCE_API,username, password,
grafanaUrl);
+ String url = String.format(CREATE_DATASOURCE_API, username, password,
grafanaUrl);
HttpHeaders headers = createHeaders();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
