Merge branch 'master' into feat-collector-alarm

home/docs/download.md

@@ -20,9 +20,9 @@ sidebar_label: Download
 Previous releases of HertzBeat may be affected by security issues, please use the latest one.
 :::
 
-| Version |    Date    | Download                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                              Release Notes                              |
-|---------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------|
-| v1.6.0  | 2024.06.10 | [apache-hertzbeat-1.6.0-incubating-bin.tar.gz](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-bin.tar.gz) (HertzBeat) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-bin.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-bin.tar.gz.sha512) ) <br/> [apache-hertzbeat-collector-1.6.0-incubating-bin.tar.gz](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-collector-1.6.0-incubating-bin.tar.gz) (HertzBeat Collector) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-collector-1.6.0-incubating-bin.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-collector-1.6.0-incubating-bin.tar.gz.sha512) ) <br/> [apache-hertzbeat-1.6.0-incubating-src.tar.gz](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-src.tar.gz) (HertzBeat Source) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-src.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.0/apache-hertzbeat-1.6.0-incubating-src.tar.gz.sha512) ) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.6.0) |
+| Version | Date       | Download                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Release Notes                                                                                   |
+|---------|------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+| v1.6.1  | 2024.10.29 | [apache-hertzbeat-1.6.1-incubating-bin.tar.gz](https://dist.apache.org/repos/dist/release/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-bin.tar.gz) (HertzBeat) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-bin.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-bin.tar.gz.sha512) ) <br/> [apache-hertzbeat-collector-1.6.1-incubating-bin.tar.gz](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-collector-1.6.1-incubating-bin.tar.gz) (HertzBeat Collector) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-collector-1.6.1-incubating-bin.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-collector-1.6.1-incubating-bin.tar.gz.sha512) ) <br/> [apache-hertzbeat-1.6.1-incubating-src.tar.gz](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-src.tar.gz) (HertzBeat Source) ( [signature](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-src.tar.gz.asc) , [sha512](https://downloads.apache.org/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-src.tar.gz.sha512) )  <br/> [apache-hertzbeat-1.6.1-incubating-docker-compose.tar.gz](https://dist.apache.org/repos/dist/release/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-docker-compose.tar.gz) (docker-compose) ( [signature](https://dist.apache.org/repos/dist/release/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-docker-compose.tar.gz.asc) , [sha512](https://dist.apache.org/repos/dist/release/incubator/hertzbeat/1.6.1/apache-hertzbeat-1.6.1-incubating-docker-compose.tar.gz.sha512) ) | [release note](https://github.com/apache/hertzbeat/releases/tag/v1.6.1)|
 
 ## Release Docker Image
 

home/docs/help/hadoop.md

@@ -1,7 +1,7 @@
 ---
 id: hadoop
 title: Monitoring Hadoop
-sidebar_label: Hadoop 
+sidebar_label: Apache Hadoop 
 keywords: [Open Source Monitoring System, Open Source Java Monitoring, Hadoop JVM Monitoring]
 ---
 

home/docs/help/spark.md

@@ -1,7 +1,7 @@
 ---
 id: spark  
 title: Monitoring Spark      
-sidebar_label: Spark Monitor
+sidebar_label: Spark 监控
 keywords: [open source monitoring tool, open source java spark monitoring tool, monitoring spark metrics]
 ---
 

home/docs/help/template_marketplace.md

@@ -0,0 +1,152 @@
+---
+id: template_marketplace
+title: Template Marketplace
+sidebar_label: Template Marketplace
+---
+
+> Hertzbeat official template marketplace: users can freely upload, download, view, search and share monitoring template files.
+
+## Basic Functions
+
+### Search
+
+💡 Guest availability
+
+> Display template name, brief description, favorites, downloads, views and other information
+
+1. **No filter: displayed in order of upload**
+
+   ![search.png](template-marketplace-img/search.png)
+
+2. **Filtering by category: currently divided into six categories**
+
+   > **📋Todo:** develop tag function, subdivided within the category, such as database monitoring template can be divided into MySQL, Oracle, etc.
+
+   ![search-category.png](template-marketplace-img/search-category.png)
+
+3. **Fuzzy search by Title**
+
+   ![search-name.png](template-marketplace-img/search-name.png)
+
+4. **Hover window function: download the latest version, view details, favorite/un-favorite**
+
+   > Show if the user has favorites after logging in
+
+   ![img.png](template-marketplace-img/hover-window-guest.png)![img_1.png](template-marketplace-img/hover-window-user.png)
+
+5. **Sort: Eight Sorting Methods**
+
+   > **📋Todo:** Waiting for the actual installation
+
+### Template Detail
+
+💡 Guest availability
+
+   > Display basic information about the template, such as name, author, update time, version information, etc.
+
+1. **Info: Summary information, detailed information and other information**
+
+   > **📋Todo:** Upgrade to MarkDown format
+
+   ![img.png](template-marketplace-img/detail-info.png)
+
+2. **Version: Historical version download, sharing and basic information display**
+
+   > **📋Todo:** Set up a view function for each historical version to display information such as the version description.
+
+   ![img.png](template-marketplace-img/detail-version.png)
+
+3. **FAQ**
+
+   > **📋Todo:** Discussion or issue Q&A section
+
+   ![img.png](template-marketplace-img/detail-faq.png)
+
+4. **Download**
+
+   > The latest version can be downloaded directly from the list hover window.  
+   > The latest version can also be downloaded directly from the template detail page.  
+   > The historical version can be downloaded from the version page.  
+
+   ![img.png](template-marketplace-img/download.png)
+
+5. **Share**
+
+   > Template details page to share the latest version.  
+   > Version page to share historical versions.  
+   > Sharing will automatically copy the sharing URL to the clipboard, and the person being shared can download the file via that URL  
+   >
+   > **📋Todo:** Shared template detail page is accessed through the URL of the shared template, and the shared person is free to choose whether to download or not.
+
+   ![img.png](template-marketplace-img/share.png)
+
+### User Center
+
+💡 User availability
+
+   > Provide asset management, collection management and upload function  
+>
+   > **📋Todo:** Overview page, notification page, user settings page
+
+1. **Asset: Manage all templates uploaded by user themselves**
+
+   > Provides the ability to download the latest version and view details  
+   >
+   > **📋Todo:** Function to update template information
+
+   ![img_1.png](template-marketplace-img/user-center-asset.png)
+
+   ![img.png](template-marketplace-img/asset-detail.png)
+
+2. **Version Upgrade**
+
+   > The user defines the new version number under this template family, updates the version information, and uploads the latest version of the file
+
+   ![img.png](template-marketplace-img/asset-upgrade.png)
+
+3. **Star**
+
+   ![img.png](template-marketplace-img/user-center-star.png)
+
+   ![img.png](template-marketplace-img/user-center-star-detail.png)
+
+4. **Upload**
+
+   > Create a new template series and upload the first version of the file  
+   >
+   > Fill in the template name, select the template category, fill in the description information and version information, and upload files
+
+   ![img.png](template-marketplace-img/user-center-upload.png)
+
+### Sign Up & Login
+
+💡 Guest availability
+
+1. **Sign up**
+
+   > Usernames can be duplicated, but email addresses are unique  
+   >
+   > **📋Todo:** Captcha function, email verification function
+
+   ![img.png](template-marketplace-img/sign-up.png)
+
+2. **Login**
+
+   > **📋Todo:** Captcha function and forgot password function
+
+   ![img.png](template-marketplace-img/email-login.png)
+
+## Development Steps
+
+   > Download `template-marketplace/hertzbeat-template-hub` and `template-marketplace/hertzbeat-template-hub-web-app` projects respectively
+
+   The front-end project in accordance with README.md directly start
+
+   The back-end project steps:
+
+   1. Run the `sql` script in the `template-marketplace/hertzbeat-template-hub/sql` to create database tables
+   2. Install MinIO
+   3. Config `MySQL` and `MinIO` in the `application.yml`
+   4. Start the back-end project
+
+Other issues can be fed back through the communication group ISSUE!

home/docs/start/baota-deploy.md

@@ -1,42 +1,42 @@
 ---
 id: baota-deploy  
-title: Use BaoTa Panel Deploy HertzBeat  
-sidebar_label: Install via BaoTa
+title: Use aaPanel Deploy HertzBeat  
+sidebar_label: Install via aaPanel
 ---
 
-Apache HertzBeat (incubating) supports one-click deployment in the `Docker` application store of the BaoTa panel.
+Apache HertzBeat (incubating) supports one-click deployment in the `Docker` application store of the aaPanel.
 
 ## Prerequisites
 
-Install Baota Panel, go to the [BaoTa Panel Website](https://www.bt.cn/new/index.html), switch the script and install.
+Install aaPanel, go to the [aaPanel](https://www.aapanel.com/new/download.html#install), switch the script and install.
 
 ## Install
 
-1. Log in to the Baota Panel, click `Docker` menu and install the `Docker` `Docker Compose` according the prompts.  
+1. Log in, click `Docker` menu and install the `Docker` `Docker Compose` according the prompts.  
 
     > Install the Docker service, skip if it already exists.  
 
-    ![HertzBeat](/img/docs/start/install-to-baota-1.png)
+    ![HertzBeat](/img/docs/start/install-to-aapanel-1.png)
 
-2. Find `HertzBeat` in `Docker App Store` and click `Install`
+2. Find `HertzBeat` in `One-Click Install` and click `Install`
 
-    ![HertzBeat](/img/docs/start/install-to-baota-2.png)  
+   ![HertzBeat](/img/docs/start/install-to-aapanel-2.png)
 
-3. Config the domain, name and other info, click `OK`
+3. Config the domain, name and others, click `OK`
 
-    ![HertzBeat](/img/docs/start/install-to-baota-3.png)
+    ![HertzBeat](/img/docs/start/install-to-aapanel-3.png)
     - Name: App name, default the `HertzBeat-random`
     - Version：Default `latest`
     - Domain：Config if you need domain access, please configure the domain name here and resolve the domain name to the server
     - Allow External Access：If you need to access directly through `IP+Port`, please check it. If you have already set the domain name, please do not check here
     - Port：Default `1157`
 
-4. After submission, the panel will automatically initialize the application, which takes about `1-3` minutes. After the initialization is completed, you can access it.
+4. After submission, the panel will automatically initialize the application, which takes about `1-3` minutes. It can be accessed after the initialization is completed.
 
 ## Access HertzBeat
 
 - If you have set a domain name, please enter the domain name directly in the browser address bar to access, such as `http://demo.hertzbeat.apache.org`, you can access the `HertzBeat` console.
-- If you choose to access via `IP+Port`, please enter the domain name in the browser address bar to access `http://<Baota Panel IP>:1157`, you can access the `HertzBeat` console.
+- If you choose to access via `IP+Port`, please enter the domain name in the browser address bar to access `http://<aaPanelIP>:1157`, you can access the `HertzBeat` console.
 
 ![HertzBeat](/img/home/0.png)
 

home/docs/start/docker-compose-deploy.md

@@ -15,7 +15,7 @@ Run the `docker compose version` command to check if you have a Docker Compose e
 
 1. Download the startup script package
 
-   Download the installation script package `apache-hertzbeat-xxx-incubating-docker-compose.tar.gz` from the [download](https://github.com/apache/hertzbeat/releases/download/v1.6.0/apache-hertzbeat-1.6.0-incubating-docker-compose.tar.gz)
+   Download the installation script package `apache-hertzbeat-xxx-incubating-docker-compose.tar.gz` from the [download](/docs/download)
 
 2. Choose to use the HertzBeat + PostgreSQL + VictoriaMetrics solution