Merge branch 'apache:master' into master

pwallk · Aug 20, 2024 · 6bb7326 · 6bb7326
2 parents 7f4bad5 + 98b03b6
commit 6bb7326
Show file tree

Hide file tree

Showing 105 changed files with 2,958 additions and 393 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2009,6 +2009,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "loong95",
+      "name": "Loong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16333958?v=4",
+      "profile": "https://github.com/loong95",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ceekay47",
+      "name": "Chandrakant Vankayalapati",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104664857?v=4",
+      "profile": "https://github.com/ceekay47",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MRgenial",
+      "name": "b_mountain",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49973336?v=4",
+      "profile": "https://github.com/MRgenial",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -20,6 +20,3 @@ contact_links:
   - name: Community Support
     url: https://github.com/apache/hertzbeat/discussions
     about: Please ask and answer questions here.
-  - name: Security Bug Bounty
-    url: https://github.com/apache/hertzbeat/issues
-    about: Please report security vulnerabilities here.
diff --git a/.github/workflows/backend-build-test.yml b/.github/workflows/backend-build-test.yml
@@ -22,7 +22,7 @@ name: Backend CI
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ master, dev, action* ]
     paths-ignore:
       - '**.md'
       - 'home/**'
@@ -42,7 +42,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
@@ -55,15 +55,12 @@ jobs:
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Build Image
-      env:
-        IMAGE_PUSH: false
-        IMAGE_LOAD: true
-        IMAGE_PLATFORM: linux/amd64
-      run: |
-        docker buildx create --use --name myBuilder --driver docker-container
-        docker buildx use myBuilder
-        
-        ./script/docker/server/build.sh
+      uses: docker/build-push-action@v3
+      with:
+        context: ./dist
+        file: ./script/docker/server/Dockerfile
+        push: false
+        tags: apache/hertzbeat:test
 
     - name: Run E2E
       run: |

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/doc-build-test.yml b/.github/workflows/doc-build-test.yml
@@ -31,7 +31,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Check filename in home/blog

diff --git a/.github/workflows/doc-pdf-builder.yml b/.github/workflows/doc-pdf-builder.yml
@@ -53,4 +53,3 @@ jobs:
           path: docs-en.pdf
           if-no-files-found: error
           retention-days: 1
-
diff --git a/.github/workflows/frontend-build-test.yml b/.github/workflows/frontend-build-test.yml
@@ -34,7 +34,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Yarn Install
       working-directory: web-app
       run: yarn

diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Check license header

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -21,40 +21,55 @@ on:
   schedule:
     # trigger at 00:00 everyday
     - cron: '0 0 * * *'
+  push:
+    branches: [ action* ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.repository == 'apache/hertzbeat' }}
     steps:
     - uses: actions/checkout@v4
-    - uses: docker/setup-qemu-action@v3
     - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
         java-version: 17
-    - name: Build with Maven
-      run: mvn clean -B package -Prelease --file pom.xml
-
-    - name: Build Image
-      env:
-        IMAGE_PUSH: false
-        IMAGE_LOAD: true
-        IMAGE_VERSION: nightly
+
+    - name: Build the Frontend
       run: |
-        docker buildx create --use --name myBuilder --driver docker-container
-        docker buildx use myBuilder
+        cd web-app
+        yarn install
+        yarn package
         
-        ./script/docker/server/build.sh
+    - name: Build the Backend
+      run: |
+        mvn clean install
+        mvn clean package -Prelease -DskipTests
+        cd collector
+        mvn clean package -Pcluster -DskipTests
 
-    - name: Login to Docker Hub
+    - uses: docker/setup-qemu-action@v3
+    - uses: docker/setup-buildx-action@v3
+    - name: Log in to Docker Hub
       uses: docker/login-action@v3
-      with: 
+      with:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-    - name: Build and Push
+    - name: Build and Push Server
       uses: docker/build-push-action@v6
       with:
-        context: .
+        context: ./dist
+        file: ./script/docker/server/Dockerfile
+        platforms: linux/amd64,linux/arm64
         push: true
         tags: apache/hertzbeat:nightly
+
+    - name: Build and Push Collector
+      uses: docker/build-push-action@v6
+      with:
+        context: ./dist
+        file: ./script/docker/collector/Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: apache/hertzbeat-collector:nightly
diff --git a/README.md b/README.md
@@ -469,6 +469,9 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -521,6 +524,15 @@ CNCF Observability And Analysis - Monitoring Landscape.</a>
 
 [![Star History Chart](https://api.star-history.com/svg?repos=apache/hertzbeat&type=Date)](https://star-history.com/#apache/hertzbeat&Date)
 
+## Contributors
+
+### Monthly Active Contributors
+
+[![Monthly Active Contributors](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorMonthlyActivity&repo=apache/hertzbeat)](https://git-contributor.com?chart=contributorMonthlyActivity&repo=apache/hertzbeat)
+
+### GitHub Contributor Over Time
+
+[![GitHub Contributor Over Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=apache/hertzbeat)](https://git-contributor.com?chart=contributorOverTime&repo=apache/hertzbeat)
 
 ## 🛡️ License
 [`Apache License, Version 2.0`](https://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/README_CN.md b/README_CN.md
@@ -468,6 +468,9 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -522,6 +525,15 @@ CNCF Observability And Analysis - Monitoring Landscape.</a>
 
 [![Star History Chart](https://api.star-history.com/svg?repos=apache/hertzbeat&type=Date)](https://star-history.com/#apache/hertzbeat&Date)
 
+## Contributors
+
+### Monthly Active Contributors
+
+[![Monthly Active Contributors](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorMonthlyActivity&repo=apache/hertzbeat)](https://git-contributor.com?chart=contributorMonthlyActivity&repo=apache/hertzbeat)
+
+### GitHub Contributor Over Time
+
+[![GitHub Contributor Over Time](https://contributor-overtime-api.git-contributor.com/contributors-svg?chart=contributorOverTime&repo=apache/hertzbeat)](https://git-contributor.com?chart=contributorOverTime&repo=apache/hertzbeat)
 
 ## 🛡️ License
 [`Apache License, Version 2.0`](https://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertConvergeController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.Objects;
 import org.apache.hertzbeat.alert.service.AlertConvergeService;
 import org.apache.hertzbeat.common.entity.alerter.AlertConverge;
 import org.apache.hertzbeat.common.entity.dto.Message;
@@ -69,11 +70,10 @@ public ResponseEntity<Message<Void>> modifyAlertConverge(@Valid @RequestBody Ale
     public ResponseEntity<Message<AlertConverge>> getAlertConverge(
             @Parameter(description = "Alarm Converge ID", example = "6565463543") @PathVariable("id") long id) {
         AlertConverge alertConverge = alertConvergeService.getAlertConverge(id);
-        if (alertConverge == null) {
-            return ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertConverge not exist."));
-        } else {
-            return ResponseEntity.ok(Message.success(alertConverge));
-        }
+
+        return Objects.isNull(alertConverge)
+                ? ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertConverge not exist."))
+                : ResponseEntity.ok(Message.success(alertConverge));
     }
 
 }
diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java
@@ -24,6 +24,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
@@ -76,11 +77,10 @@ public ResponseEntity<Message<AlertDefine>> getAlertDefine(
             @Parameter(description = "Alarm Definition ID", example = "6565463543") @PathVariable("id") long id) {
         // Obtaining Monitoring Information
         AlertDefine alertDefine = alertDefineService.getAlertDefine(id);
-        if (alertDefine == null) {
-            return ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertDefine not exist."));
-        } else {
-            return ResponseEntity.ok(Message.success(alertDefine));
-        }
+
+        return Objects.isNull(alertDefine)
+                ? ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertDefine not exist."))
+                : ResponseEntity.ok(Message.success(alertDefine));
     }
 
     @DeleteMapping(path = "/{id}")

diff --git a/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java b/alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertSilenceController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.Objects;
 import org.apache.hertzbeat.alert.service.AlertSilenceService;
 import org.apache.hertzbeat.common.entity.alerter.AlertSilence;
 import org.apache.hertzbeat.common.entity.dto.Message;
@@ -69,11 +70,10 @@ public ResponseEntity<Message<Void>> modifyAlertSilence(@Valid @RequestBody Aler
     public ResponseEntity<Message<AlertSilence>> getAlertSilence(
             @Parameter(description = "Alarm Silence ID", example = "6565463543") @PathVariable("id") long id) {
         AlertSilence alertSilence = alertSilenceService.getAlertSilence(id);
-        if (alertSilence == null) {
-            return ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertSilence not exist."));
-        } else {
-            return ResponseEntity.ok(Message.success(alertSilence));
-        }
+
+        return Objects.isNull(alertSilence)
+                ? ResponseEntity.ok(Message.fail(MONITOR_NOT_EXIST_CODE, "AlertSilence not exist."))
+                : ResponseEntity.ok(Message.success(alertSilence));
     }
 
 }
diff --git a/...ain/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java b/...ain/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java
@@ -98,17 +98,6 @@ public List<ExportAlertDefineDTO> parseImport(InputStream is) {
         }
     }
 
-    private TagItem extractTagDataFromRow(Row row) {
-        String name = getCellValueAsString(row.getCell(7));
-        if (StringUtils.hasText(name)) {
-            TagItem tagItem = new TagItem();
-            tagItem.setName(name);
-            tagItem.setValue(getCellValueAsString(row.getCell(8)));
-            return tagItem;
-        }
-        return null;
-    }
-
     private List<TagItem> extractTagDataFromRow(Cell cell) {
         String jsonStr = getCellValueAsString(cell);
         if (StringUtils.hasText(jsonStr)) {

diff --git a/...or/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java b/...or/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/TimeLengthConvert.java
@@ -29,7 +29,6 @@
 @Component
 public final class TimeLengthConvert implements UnitConvert {
 
-
     @Override
     public String convert(String value, String originUnit, String newUnit) {
         if (value == null || value.isEmpty()) {

diff --git a/common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java b/common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java
@@ -17,6 +17,8 @@
 
 package org.apache.hertzbeat.common.constants;
 
+import java.util.Arrays;
+
 /**
  * Ai type Enum
  */
@@ -48,13 +50,10 @@ public enum AiTypeEnum {
      * get type
      */
     public static AiTypeEnum getTypeByName(String type) {
-        for (AiTypeEnum aiTypeEnum : values()) {
-            if (aiTypeEnum.name().equals(type)) {
-                return aiTypeEnum;
-            }
-
-        }
-        return null;
+        return Arrays.stream(values())
+                .filter(ai -> ai.name().equals(type))
+                .findFirst()
+                .orElse(null);
     }
 
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,4 +53,3 @@ jobs:
		path: docs-en.pdf
		if-no-files-found: error
		retention-days: 1