[collector]fix 由于链接复用不佳造成创建过多链接监控异常

* [collector,manager]支持Linux操作系统监控类型

* [collector,manager]linux监控类型新增内存，磁盘，网络监控指标

* [web-app]前端放开操作系统

* [home]适配支持Linux操作系统监控帮助文档

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: ['https://hertzbeat.com/docs/others/sponsor']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Used Version**  
+the version , tag or branch used  
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Community Support
+    url: https://github.com/dromara/hertzbeat/discussions
+    about: Please ask and answer questions here.
+  - name: Security Bug Bounty
+    url: https://github.com/dromara/hertzbeat/issues
+    about: Please report security vulnerabilities here.

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 13 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/issues-translator.yml

@@ -0,0 +1,12 @@
+name: 'issues-translator'
+on:
+  issue_comment:
+    types: [created]
+  issues:
+    types: [opened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: tomsun28/issues-translate-action@v2.6

.github/workflows/maven-build.yml

@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

CONTRIBUTING.md

@@ -0,0 +1,62 @@
+参与贡献  
+=======================================
+
+非常欢迎参与项目贡献，我们致力于维护一个互相帮助的快乐社区。
+
+### 模块
+
+- **[manager](https://github.com/dromara/hertzbeat/tree/master/manager)** 提供监控管理,系统管理基础服务
+> 提供对监控的管理，监控应用配置的管理，系统用户租户后台管理等。
+- **[collector](https://github.com/dromara/hertzbeat/tree/master/collector)** 提供监控数据采集服务
+> 使用通用协议远程采集获取对端指标数据。
+- **[scheduler](https://github.com/dromara/hertzbeat/tree/master/scheduler)** 提供监控任务调度服务
+> 采集任务管理，一次性任务和周期性任务的调度分发。
+- **[warehouse](https://github.com/dromara/hertzbeat/tree/master/warehouse)** 提供监控数据仓储服务
+> 采集指标结果数据管理，数据落盘，查询，计算统计。
+- **[alerter](https://github.com/dromara/hertzbeat/tree/master/alerter)** 提供告警服务
+> 告警计算触发，监控状态联动，告警配置，告警通知。
+- **[web-app](https://github.com/dromara/hertzbeat/tree/master/web-app)** 提供可视化控制台页面
+> 监控告警系统可视化控制台前端
+
+![hertzBeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/docs/hertzbeat-stru.svg)
+
+## 如何贡献?
+
+我们不仅仅接收代码的贡献提交，您也可以通过提交文档的更新或者BUG的报告来参与社区贡献。
+
+如果是新的贡献者，请首先了解参考仓库提交Issues,提交Pull Requests如何工作。
+
+https://github.com/dromara/hertzbeat/issues     
+https://github.com/dromara/hertzbeat/pulls   
+https://gitee.com/dromara/hertzbeat/issues   
+https://gitee.com/dromara/hertzbeat/pulls  
+
+## 本地代码工程启动   
+
+此为前后端分离项目，本地代码启动需将后端[manager](manager)和前端[web-app](web-app)分别启动生效。  
+
+### 后端启动  
+
+1. 部署启动依赖服务`MYSQL`和`TDengine`数据库    
+2. 需要`maven3+`和`java8+`环境    
+3. 修改配置文件的依赖服务地址等信息-`manager/src/main/resources/application.yml`   
+4. 启动`manager`服务 `manager/src/main/java/com/usthe/manager/Manager.java`   
+
+### 前端启动   
+
+1. 需要nodejs npm环境   
+   下载地址：https://nodejs.org/en/download   
+2. 安装yarn `npm install -g yarn`    
+3. 在前端工程目录web-app下执行 `yarn install`   
+4. 全局安装angular-cli `npm install -g @angular/cli@12 --registry=https://registry.npm.taobao.org`   
+5. 待本地后端启动后，在web-app目录下启动本地前端 `ng serve --open`    
+6. 浏览器访问 localhost:4200 即可开始   
+
+## 加入交流      
+ 
+[Github Discussion](https://github.com/dromara/hertzbeat/discussions)               
+加微信号 tan-cloud 拉您进微信交流群      
+加QQ群号 718618151 进QQ交流群, 验证信息: tancloud      
+微信公众号：tancloudtech        
+[Dromara社区网站](https://dromara.org/)      
+[HertzBeat用户网站](https://support.qq.com/products/379369)  

README.md

@@ -95,6 +95,14 @@
 
 详细步骤参考 [通过安装包安装HertzBeat](https://hertzbeat.com/docs/start/package-deploy)   
 
+##### 本地代码启动   
+1. 此为前后端分离项目，本地代码调试需要分别启动后端工程manager和前端工程web-app  
+2. 后端：需要`maven3+`和`java8+`环境，修改YML配置信息并启动manager服务   
+3. 前端：需要`nodejs npm angular-cli`环境，待本地后端启动后，在web-app目录下启动 `ng serve --open`    
+4. 浏览器访问 localhost:4200 即可开始
+
+详细步骤参考 [参与贡献之本地代码启动](CONTRIBUTING.md)      
+
 **HAVE FUN**
 
 ## 💬 社区交流

collector/pom.xml

@@ -97,6 +97,12 @@
             <artifactId>postgresql</artifactId>
             <version>42.3.3</version>
         </dependency>
+        <!-- linux ssh -->
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-core</artifactId>
+            <version>2.8.0</version>
+        </dependency>
     </dependencies>
 
 </project>

collector/src/main/java/com/usthe/collector/collect/common/cache/CacheIdentifier.java

@@ -2,6 +2,7 @@ package com.usthe.collector.collect.common.cache;
 
 import lombok.Builder;
 import lombok.Data;
+import lombok.ToString;
 
 /**
  * 缓存key唯一标识符
@@ -10,6 +11,7 @@ import lombok.Data;
  */
 @Data
 @Builder
+@ToString
 public class CacheIdentifier {
 
     private String ip;

collector/src/main/java/com/usthe/collector/collect/common/cache/CommonCache.java

@@ -21,9 +21,9 @@ import java.util.concurrent.TimeUnit;
 public class CommonCache {
 
     /**
-     * 默认缓存时间 30minute
+     * 默认缓存时间 800s
      */
-    private static final long DEFAULT_CACHE_TIMEOUT = 30 * 60 * 1000L;
+    private static final long DEFAULT_CACHE_TIMEOUT = 800 * 1000L;
 
     /**
      * 默认最大缓存数量
@@ -155,6 +155,15 @@ public class CommonCache {
         });
     }
 
+    /**
+     * 新增或更新cache
+     * @param key 存储对象key
+     * @param value 存储对象
+     */
+    public void addCache(Object key, Object value) {
+        addCache(key, value, DEFAULT_CACHE_TIMEOUT);
+    }
+
     /**
      * 根据缓存key获取缓存对象
      * @param key key
@@ -164,9 +173,11 @@ public class CommonCache {
     public Optional<Object> getCache(Object key, boolean refreshCache) {
         Long[] cacheTime = timeoutMap.get(key);
         if (cacheTime == null || cacheTime.length != CACHE_TIME_LENGTH) {
+            log.warn("[cache] not hit the cache, key {}.", key);
             return Optional.empty();
         }
         if (cacheTime[0] + cacheTime[1] < System.currentTimeMillis()) {
+            log.warn("[cache] is timeout, key {}.", key);
             timeoutMap.remove(key);
             cacheMap.remove(key);
             return Optional.empty();

collector/src/main/java/com/usthe/collector/collect/common/ssh/CommonSshClient.java

@@ -0,0 +1,25 @@
+package com.usthe.collector.collect.common.ssh;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.sshd.client.SshClient;
+
+/**
+ * ssh公共client
+ * @author tom
+ * @date 2022/3/11 15:58
+ */
+@Slf4j
+public class CommonSshClient {
+
+    private static SshClient sshClient;
+
+
+    static {
+        sshClient = SshClient.setUpDefaultClient();
+        sshClient.start();
+    }
+
+    public static SshClient getSshClient() {
+        return sshClient;
+    }
+}

collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java

@@ -134,7 +134,7 @@ public class JdbcCommonCollect extends AbstractCollect {
         // 设置查询最大行数1000行
         statement.setMaxRows(1000);
         JdbcConnect jdbcConnect = new JdbcConnect(connection);
-        CommonCache.getInstance().addCache(identifier, jdbcConnect, 10000L);
+        CommonCache.getInstance().addCache(identifier, jdbcConnect);
         return statement;
     }
 

collector/src/main/java/com/usthe/collector/collect/ssh/SshCollectImpl.java

@@ -0,0 +1,202 @@
+package com.usthe.collector.collect.ssh;
+
+import com.usthe.collector.collect.AbstractCollect;
+import com.usthe.collector.collect.common.cache.CacheIdentifier;
+import com.usthe.collector.collect.common.cache.CommonCache;
+import com.usthe.collector.collect.common.ssh.CommonSshClient;
+import com.usthe.collector.util.CollectorConstants;
+import com.usthe.common.entity.job.Metrics;
+import com.usthe.common.entity.job.protocol.SshProtocol;
+import com.usthe.common.entity.message.CollectRep;
+import com.usthe.common.util.CommonConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.channel.ClientChannel;
+import org.apache.sshd.client.channel.ClientChannelEvent;
+import org.apache.sshd.client.session.ClientSession;
+import org.springframework.util.StringUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * ssh协议采集实现
+ * @author tom
+ * @date 2022/03/11 15:10
+ */
+@Slf4j
+public class SshCollectImpl extends AbstractCollect {
+
+    private static final String PARSE_TYPE_ONE_ROW = "oneRow";
+    private static final String PARSE_TYPE_MULTI_ROW = "multiRow";
+
+    private SshCollectImpl(){}
+
+    public static SshCollectImpl getInstance() {
+        return SshCollectImpl.Singleton.INSTANCE;
+    }
+
+
+    @Override
+    public void collect(CollectRep.MetricsData.Builder builder, long appId, String app, Metrics metrics) {
+        long startTime = System.currentTimeMillis();
+        // 校验参数
+        try {
+            validateParams(metrics);
+        } catch (Exception e) {
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(e.getMessage());
+            return;
+        }
+        SshProtocol sshProtocol = metrics.getSsh();
+        // 超时时间默认300毫秒
+        int timeout = 3000;
+        try {
+            timeout = Integer.parseInt(sshProtocol.getTimeout());
+        } catch (Exception e) {
+            log.warn(e.getMessage());
+        }
+        try {
+            ClientSession clientSession = getConnectSession(sshProtocol, timeout);
+            ClientChannel channel = clientSession.createExecChannel(sshProtocol.getScript());
+            ByteArrayOutputStream response = new ByteArrayOutputStream();
+            channel.setOut(response);
+            if (!channel.open().verify(timeout).isOpened()) {
+                throw new Exception("open failed");
+            }
+            List<ClientChannelEvent> list = new ArrayList<>();
+            list.add(ClientChannelEvent.CLOSED);
+            channel.waitFor(list, timeout);
+            Long responseTime  = System.currentTimeMillis() - startTime;
+            channel.close();
+            String result = response.toString();
+            if (!StringUtils.hasText(result)) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg("采集数据失败");
+            }
+            switch (sshProtocol.getParseType()) {
+                case PARSE_TYPE_ONE_ROW:
+                    parseResponseDataByOne(result, metrics.getAliasFields(), builder, responseTime);
+                    break;
+                default: parseResponseDataByMulti(result, metrics.getAliasFields(), builder, responseTime);
+                break;
+            }
+        } catch (ConnectException connectException) {
+            log.debug(connectException.getMessage());
+            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
+            builder.setMsg("对端拒绝连接：服务未启动端口监听或防火墙");
+        } catch (IOException ioException) {
+            log.debug(ioException.getMessage());
+            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
+            builder.setMsg("对端连接失败 " + ioException.getMessage());
+        } catch (Exception exception) {
+            log.debug(exception.getMessage());
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(exception.getMessage());
+        }
+    }
+
+    private void parseResponseDataByOne(String result, List<String> aliasFields, CollectRep.MetricsData.Builder builder, Long responseTime) {
+        String[] lines = result.split("\n");
+        if (lines.length + 1 < aliasFields.size()) {
+            log.error("ssh response data not enough: {}",  result);
+        }
+        CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+        int aliasIndex = 0;
+        int lineIndex = 0;
+        while (aliasIndex < aliasFields.size()) {
+            if (CollectorConstants.RESPONSE_TIME.equalsIgnoreCase(aliasFields.get(aliasIndex))) {
+                valueRowBuilder.addColumns(responseTime.toString());
+            } else {
+                valueRowBuilder.addColumns(lines[lineIndex].trim());
+                lineIndex++;
+            }
+            aliasIndex++;
+        }
+        builder.addValues(valueRowBuilder.build());
+    }
+
+    private void parseResponseDataByMulti(String result, List<String> aliasFields,
+                                          CollectRep.MetricsData.Builder builder, Long responseTime) {
+        String[] lines = result.split("\n");
+        if (lines.length <= 1) {
+            log.error("ssh response data only has header: {}",  result);
+        }
+        String[] fields = lines[0].split(" ");
+        Map<String, Integer> fieldMapping = new HashMap<>(fields.length);
+        for (int i = 0; i < fields.length; i++) {
+            fieldMapping.put(fields[i].trim().toLowerCase(), i);
+        }
+        for (int i = 1; i < lines.length; i++) {
+            String[] values = lines[i].split(" ");
+            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+            for (String alias : aliasFields) {
+                if (CollectorConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                    valueRowBuilder.addColumns(responseTime.toString());
+                } else {
+                    Integer index = fieldMapping.get(alias.toLowerCase());
+                    if (index != null && index < values.length) {
+                        valueRowBuilder.addColumns(values[index]);
+                    } else {
+                        valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
+                    }
+                }
+            }
+            builder.addValues(valueRowBuilder.build());
+        }
+    }
+
+    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout) throws IOException {
+        CacheIdentifier identifier = CacheIdentifier.builder()
+                .ip(sshProtocol.getHost()).port(sshProtocol.getPort())
+                .username(sshProtocol.getUsername()).password(sshProtocol.getPassword())
+                .build();
+        Optional<Object> cacheOption = CommonCache.getInstance().getCache(identifier, true);
+        ClientSession clientSession = null;
+        if (cacheOption.isPresent()) {
+            clientSession = (ClientSession) cacheOption.get();
+            try {
+                if (clientSession.isClosed() || clientSession.isClosing()) {
+                    clientSession = null;
+                    CommonCache.getInstance().removeCache(identifier);
+                }
+            } catch (Exception e) {
+                log.warn(e.getMessage());
+                clientSession = null;
+                CommonCache.getInstance().removeCache(identifier);
+            }
+        }
+        if (clientSession != null) {
+            return clientSession;
+        }
+        SshClient sshClient = CommonSshClient.getSshClient();
+        clientSession = sshClient.connect(sshProtocol.getUsername(), sshProtocol.getHost(), Integer.parseInt(sshProtocol.getPort()))
+                .verify(timeout, TimeUnit.MILLISECONDS).getSession();
+        if (StringUtils.hasText(sshProtocol.getPassword())) {
+            clientSession.addPasswordIdentity(sshProtocol.getPassword());
+        }
+        // 进行认证
+        if (!clientSession.auth().verify(timeout, TimeUnit.MILLISECONDS).isSuccess()) {
+            throw new IllegalArgumentException("认证失败");
+        }
+        CommonCache.getInstance().addCache(identifier, clientSession);
+        return clientSession;
+    }
+
+    private void validateParams(Metrics metrics) throws Exception {
+        if (metrics == null || metrics.getSsh() == null) {
+            throw new Exception("Ssh collect must has ssh params");
+        }
+    }
+
+    private static class Singleton {
+        private static final SshCollectImpl INSTANCE = new SshCollectImpl();
+    }
+}

collector/src/main/java/com/usthe/collector/collect/telnet/TelnetCollectImpl.java

@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.net.ConnectException;
 
 /**
- * icmp协议采集实现 - ping
+ * telnet协议采集实现
  * @author tom
  * @date 2021/12/4 12:32
  */

collector/src/main/java/com/usthe/collector/dispatch/DispatchConstants.java

@@ -24,6 +24,10 @@ public interface DispatchConstants {
      * 协议 jdbc
      */
     String PROTOCOL_JDBC = "jdbc";
+    /**
+     * 协议 ssh
+     */
+    String PROTOCOL_SSH = "ssh";
     // 协议类型相关 - end //
 
     // http协议相关 - start 需尽可能先复用 HttpHeaders //

collector/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java

@@ -6,6 +6,7 @@ import com.usthe.collector.collect.AbstractCollect;
 import com.usthe.collector.collect.database.JdbcCommonCollect;
 import com.usthe.collector.collect.http.HttpCollectImpl;
 import com.usthe.collector.collect.icmp.IcmpCollectImpl;
+import com.usthe.collector.collect.ssh.SshCollectImpl;
 import com.usthe.collector.collect.telnet.TelnetCollectImpl;
 import com.usthe.collector.dispatch.timer.Timeout;
 import com.usthe.collector.dispatch.timer.WheelTimerTask;
@@ -111,6 +112,9 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
             case DispatchConstants.PROTOCOL_JDBC:
                 abstractCollect = JdbcCommonCollect.getInstance();
                 break;
+            case DispatchConstants.PROTOCOL_SSH:
+                abstractCollect = SshCollectImpl.getInstance();
+                break;
                 // todo
             default: break;
         }

common/src/main/java/com/usthe/common/entity/job/Metrics.java

@@ -3,6 +3,7 @@ package com.usthe.common.entity.job;
 import com.usthe.common.entity.job.protocol.HttpProtocol;
 import com.usthe.common.entity.job.protocol.IcmpProtocol;
 import com.usthe.common.entity.job.protocol.JdbcProtocol;
+import com.usthe.common.entity.job.protocol.SshProtocol;
 import com.usthe.common.entity.job.protocol.TcpUdpProtocol;
 import com.usthe.common.entity.job.protocol.TelnetProtocol;
 import lombok.AllArgsConstructor;
@@ -73,6 +74,10 @@ public class Metrics {
      * 使用公共的jdbc规范实现的数据库配置信息
      */
     private JdbcProtocol jdbc;
+    /**
+     * 使用公共的ssh协议的监控配置信息
+     */
+    private SshProtocol ssh;
 
     @Override
     public boolean equals(Object o) {

common/src/main/java/com/usthe/common/entity/job/protocol/SshProtocol.java

@@ -0,0 +1,58 @@
+package com.usthe.common.entity.job.protocol;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ssh 协议参数配置
+ * @author tom
+ * @date 2022/3/11 15:20
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SshProtocol {
+
+    /**
+     * 对端主机ip或域名
+     */
+    private String host;
+
+    /**
+     * 对端主机端口
+     */
+    private String port;
+
+    /**
+     * 超时时间
+     */
+    private String timeout = "3000";
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 密码(可选)
+     */
+    private String password;
+
+    /**
+     * 公钥(可选)
+     */
+    private String publicKey;
+
+    /**
+     * SSH执行脚本
+     */
+    private String script;
+
+    /**
+     * 响应数据解析方式：oneRow, multiRow
+     */
+    private String parseType;
+}

home/docs/help/guide.md

@@ -20,6 +20,10 @@ sidebar_label: 帮助入门
 
 [MYSQL数据库监控](mysql)      [MariaDB数据库监控](mariadb)       [PostgreSQL数据库监控](postgresql)        
 
+### 操作系统监控     
+
+[Linux操作系统监控](linux)     
+
 ## 💡 告警服务  
 
 > 更自由化的阈值告警配置，支持邮箱，短信，webhook，钉钉，企业微信，飞书机器人等告警通知。     

home/docs/help/issue.md

@@ -10,7 +10,7 @@ sidebar_label: 常见问题
 > 如信息所示，输入的监控Host须是ipv4,ipv6或域名，不能携带协议头，例如协议头http   
 
 2. ** 网站API等监控反馈statusCode:403或401，但对端服务本身无需认证，浏览器直接访问是OK **       
-> 请排查是否是被防火墙拦截，如宝塔等默认设置了对请求header中`User-Agent=Apache-HttpClient`的拦截，若被拦截请删除此拦截规则。         
+> 请排查是否是被防火墙拦截，如宝塔等默认设置了对请求header中`User-Agent=Apache-HttpClient`的拦截，若被拦截请删除此拦截规则。(v1.0.beat5版本已将user-agent模拟成浏览器此问题不存在)         
 
 ### Docker部署常见问题   
 

home/docs/help/linux.md

@@ -0,0 +1,70 @@
+---
+id: linux  
+title: 监控：Linux操作系统监控      
+sidebar_label: Linux操作系统       
+---
+
+> 对Linux操作系统的通用性能指标进行采集监控。
+
+### 配置参数
+
+| 参数名称      | 参数帮助描述 |
+| ----------- | ----------- |
+| 监控Host     | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
+| 监控名称     | 标识此监控的名称，名称需要保证唯一性。  |
+| 端口        | Linux SSH对外提供的端口，默认为22。  |
+| 用户名      | SSH连接用户名，可选 |
+| 密码        | SSH连接密码，可选 |
+| 采集间隔    | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为10秒  |
+| 是否探测    | 新增监控前是否先探测检查监控可用性，探测成功才会继续新增修改操作  |
+| 描述备注    | 更多标识和描述此监控的备注信息，用户可以在这里备注信息  |
+
+### 采集指标
+
+#### 指标集合：basic
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+| ----------- | ----------- | ----------- |
+| hostname        | 无 | 主机名称 |
+| version         | 无 | 操作系统版本 |
+| uptime          | 无 | 系统运行时间 |
+
+#### 指标集合：cpu
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+| ----------- | ----------- | ----------- |
+| info           | 无 | CPU型号 |
+| cores          | 核数 | CPU内核数量 |
+| interrupt      | 个数 | CPU中断数量 |
+| load           | 无 | CPU最近1/5/15分钟的平均负载 |
+| context_switch | 个数 | 当前上下文切换数量 |
+
+
+#### 指标集合：memory
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+| ----------- | ----------- | ----------- |
+| total         | Mb | 总内存容量 |
+| used          | Mb | 用户程序内存量 |
+| free          | Mb | 空闲内存容量 |
+| buff_cache    | Mb | 缓存占用内存 |  
+| available     | Mb | 剩余可用内存容 |   
+
+#### 指标集合：disk
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+| ----------- | ----------- | ----------- |
+| disk_num       | 块数 | 磁盘总数 |
+| partition_num  | 分区数 | 分区总数 |
+| block_write    | 块数 | 写入磁盘的总块数 |
+| block_read     | 块数 | 从磁盘读出的块数 |  
+| write_rate     | iops | 每秒写磁盘块的速率 |   
+
+#### 指标集合：interface
+
+| 指标名称      | 指标单位 | 指标帮助描述 |
+| ----------- | ----------- | ----------- |
+| interface_name         | 无 | 网卡名称 |
+| receive_bytes          | byte | 入站数据流量(bytes)  |
+| transmit_bytes         | byte | 出站数据流量(bytes)  |
+

home/sidebars.json

@@ -60,6 +60,13 @@
             "help/postgresql"
           ]
         },
+        {
+          "type": "category",
+          "label": "操作系统",
+          "items": [
+            "help/linux"
+          ]
+        },
         {
           "type": "category",
           "label": "阈值告警配置",

manager/src/main/resources/define/app/linux.yml

@@ -0,0 +1,168 @@
+# 此监控类型所属类别：service-应用服务监控 db-数据库监控 custom-自定义监控 os-操作系统监控
+category: os
+# 监控应用类型(与文件名保持一致) eg: linux windows tomcat mysql aws...
+app: linux
+name:
+  zh-CN: Linux操作系统
+  en-US: OS Linux
+# 参数映射map. type是参数类型: 0-number数字, 1-string明文字符串, 2-secret加密字符串
+# 强制固定必须参数 - host
+configmap:
+  - key: host
+    type: 1
+  - key: port
+    type: 0
+  - key: username
+    type: 1
+  - key: password
+    type: 2
+# 指标组列表
+metrics:
+# 第一个监控指标组 basic
+# 注意：内置监控指标有 (responseTime - 响应时间)
+  - name: basic
+    # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集
+    # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度
+    priority: 0
+    # 指标组中的具体监控指标
+    fields:
+      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
+      - field: hostname
+        type: 1
+        instance: true
+      - field: version
+        type: 1
+      - field: uptime
+        type: 1
+# 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+# 当protocol为http协议时具体的采集配置
+    ssh:
+      # 主机host: ipv4 ipv6 域名
+      host: ^_^host^_^
+      # 端口
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      script: (uname -r ; hostname ; uptime | awk -F "," '{print $1}' | sed  "s/ //g") | sed ":a;N;s/\n/^/g;ta" | awk -F '^' 'BEGIN{print "version hostname uptime"} {print $1, $2, $3}'
+      # 响应数据解析方式：oneRow, multiRow
+      parseType: multiRow
+
+  - name: cpu
+    priority: 1
+    fields:
+      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
+      - field: info
+        type: 1
+      - field: cores
+        type: 0
+        unit: 核数
+      - field: interrupt
+        type: 0
+        unit: 个数
+      - field: load
+        type: 1
+      - field: context_switch
+        type: 0
+        unit: 个数
+    # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # 当protocol为http协议时具体的采集配置
+    ssh:
+      # 主机host: ipv4 ipv6 域名
+      host: ^_^host^_^
+      # 端口
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      script: "LANG=C lscpu | awk -F: '/Model name/ {print $2}';awk '/processor/{core++} END{print core}' /proc/cpuinfo;uptime | sed 's/,/ /g' | awk '{for(i=NF-2;i<=NF;i++)print $i }' | xargs;vmstat 1 1 | awk 'NR==3{print $11}';vmstat 1 1 | awk 'NR==3{print $12}'"
+      parseType: oneRow
+
+  - name: memory
+    priority: 2
+    fields:
+      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
+      - field: total
+        type: 0
+        unit: Mb
+      - field: used
+        type: 0
+        unit: Mb
+      - field: free
+        type: 0
+        unit: Mb
+      - field: buff_cache
+        type: 0
+        unit: Mb
+      - field: available
+        type: 0
+        unit: Mb
+    # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # 当protocol为http协议时具体的采集配置
+    ssh:
+      # 主机host: ipv4 ipv6 域名
+      host: ^_^host^_^
+      # 端口
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      script: free -m | grep Mem | awk 'BEGIN{print "total used free buff_cache available"} {print $2,$3,$4,$6,$7}'
+      parseType: multiRow
+
+  - name: disk
+    priority: 3
+    fields:
+      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
+      - field: disk_num
+        type: 0
+        unit: 块数
+      - field: partition_num
+        type: 0
+        unit: 分区数
+      - field: block_write
+        type: 0
+        unit: 块数
+      - field: block_read
+        type: 0
+        unit: 块数
+      - field: write_rate
+        type: 0
+        unit: iops
+    # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # 当protocol为http协议时具体的采集配置
+    ssh:
+      # 主机host: ipv4 ipv6 域名
+      host: ^_^host^_^
+      # 端口
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      script: vmstat -D | awk 'NR==1{print $1}';vmstat -D | awk 'NR==2{print $1}';vmstat 1 1 | awk 'NR==3{print $10}';vmstat 1 1 | awk 'NR==3{print $9}';vmstat 1 1 | awk 'NR==3{print $16}'
+      parseType: oneRow
+
+  - name: interface
+    priority: 4
+    fields:
+      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
+      - field: interface_name
+        type: 1
+      - field: receive_bytes
+        type: 0
+        unit: byte
+      - field: transmit_bytes
+        type: 0
+        unit: byte
+    # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # 当protocol为http协议时具体的采集配置
+    ssh:
+      # 主机host: ipv4 ipv6 域名
+      host: ^_^host^_^
+      # 端口
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      script: cat /proc/net/dev | tail -n +3 | awk 'BEGIN{ print "interface_name receive_bytes transmit_bytes"} {print $1,$2,$10}'
+      parseType: multiRow

manager/src/main/resources/define/param/linux.yml

@@ -0,0 +1,22 @@
+app: linux
+param:
+  - field: host
+    name: 主机Host
+    type: host
+    required: true
+  - field: port
+    name: 端口
+    type: number
+    range: '[0,65535]'
+    required: true
+    defaultValue: 22
+    placeholder: '请输入端口'
+  - field: username
+    name: 用户名
+    type: text
+    limit: 20
+    required: true
+  - field: password
+    name: 密码
+    type: password
+    required: true

web-app/README.md

@@ -1,10 +1,8 @@
-<h1 align="center">HertzBeat</h1>   
-
 > 前端工程    
 
-**面向开发者，易用友好的高性能监控云服务**
+**面向开发者，易用友好的监控告警系统**
 
-## 本地启动
+## 前端本地启动
 
 ### npm 方式
 1. 需要nodejs npm环境   
@@ -21,13 +19,13 @@
 4. 全局安装angular-cli `npm install -g @angular/cli@12 --registry=https://registry.npm.taobao.org`
 5. 待本地后端启动后，在web-app目录下启动本地前端 `ng serve --open`
 
-## 编译打包  
+## hertzbeat 编译打包  
 
-web-app目录下执行
+1. web-app目录下执行
 
 ```ng build --prod --base-href /console/```
 
-manager目录下执行
+2. manager目录下执行
 
 ```mvn package```
 

web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html

@@ -28,11 +28,11 @@
 </button>
 <button nz-button nzType="primary" (click)="onEnableManageMonitors()">
   <i nz-icon nzType="up-circle" nzTheme="outline"></i>
-  启用纳管
+  启用监控
 </button>
 <button nz-button nzType="primary" (click)="onCancelManageMonitors()">
   <i nz-icon nzType="down-circle" nzTheme="outline"></i>
-  取消纳管
+  取消监控
 </button>
 <button nz-button nzType="primary" (click)="sync()" nz-tooltip nzTooltipTitle="刷新">
   <i nz-icon nzType="sync" nzTheme="outline"></i>
@@ -109,10 +109,10 @@
         <button nz-button nzType="primary" (click)="onDeleteOneMonitor(data.id)" nz-tooltip nzTooltipTitle="删除监控">
           <i nz-icon nzType="delete" nzTheme="outline"></i>
         </button>
-        <button nz-button nzType="primary" (click)="onEnableManageOneMonitor(data.id)" nz-tooltip nzTooltipTitle="启用纳管">
+        <button nz-button nzType="primary" (click)="onEnableManageOneMonitor(data.id)" nz-tooltip nzTooltipTitle="启用监控">
           <i nz-icon nzType="up-circle" nzTheme="outline"></i>
         </button>
-        <button nz-button nzType="primary" (click)="onCancelManageOneMonitor(data.id)" nz-tooltip nzTooltipTitle="取消纳管">
+        <button nz-button nzType="primary" (click)="onCancelManageOneMonitor(data.id)" nz-tooltip nzTooltipTitle="取消监控">
           <i nz-icon nzType="down-circle" nzTheme="outline"></i>
         </button>
       </td>

web-app/src/app/routes/monitor/monitor-list/monitor-list.component.ts

@@ -154,7 +154,7 @@ export class MonitorListComponent implements OnInit {
       return;
     }
     this.modal.confirm({
-      nzTitle: '请确认是否批量取消纳管！',
+      nzTitle: '请确认是否批量取消监控！',
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOkDanger: true,
@@ -167,7 +167,7 @@ export class MonitorListComponent implements OnInit {
     let monitors = new Set<number>();
     monitors.add(monitorId);
     this.modal.confirm({
-      nzTitle: '请确认是否取消纳管！',
+      nzTitle: '请确认是否取消监控！',
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOkDanger: true,
@@ -182,28 +182,28 @@ export class MonitorListComponent implements OnInit {
       message => {
         cancelManage$.unsubscribe();
         if (message.code === 0) {
-          this.notifySvc.success('取消纳管成功！', '');
+          this.notifySvc.success('取消监控成功！', '');
           this.loadMonitorTable();
         } else {
           this.tableLoading = false;
-          this.notifySvc.error('取消纳管失败！', message.msg);
+          this.notifySvc.error('取消监控失败！', message.msg);
         }
       },
       error => {
         this.tableLoading = false;
         cancelManage$.unsubscribe();
-        this.notifySvc.error('取消纳管失败！', error.msg);
+        this.notifySvc.error('取消监控失败！', error.msg);
       }
     );
   }
 
   onEnableManageMonitors() {
     if (this.checkedMonitorIds == null || this.checkedMonitorIds.size === 0) {
-      this.notifySvc.warning('未选中任何待启用纳管项！', '');
+      this.notifySvc.warning('未选中任何待启用监控项！', '');
       return;
     }
     this.modal.confirm({
-      nzTitle: '请确认是否批量启用纳管！',
+      nzTitle: '请确认是否批量启用监控！',
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOkDanger: true,
@@ -216,7 +216,7 @@ export class MonitorListComponent implements OnInit {
     let monitors = new Set<number>();
     monitors.add(monitorId);
     this.modal.confirm({
-      nzTitle: '请确认是否启用纳管！',
+      nzTitle: '请确认是否启用监控！',
       nzOkText: '确定',
       nzCancelText: '取消',
       nzOkDanger: true,
@@ -231,17 +231,17 @@ export class MonitorListComponent implements OnInit {
       message => {
         enableManage$.unsubscribe();
         if (message.code === 0) {
-          this.notifySvc.success('启用纳管成功！', '');
+          this.notifySvc.success('启用监控成功！', '');
           this.loadMonitorTable();
         } else {
           this.tableLoading = false;
-          this.notifySvc.error('启用纳管失败！', message.msg);
+          this.notifySvc.error('启用监控失败！', message.msg);
         }
       },
       error => {
         this.tableLoading = false;
         enableManage$.unsubscribe();
-        this.notifySvc.error('启用纳管失败！', error.msg);
+        this.notifySvc.error('启用监控失败！', error.msg);
       }
     );
   }

web-app/src/assets/app-data.json

@@ -44,7 +44,7 @@
         {
           "key": "os",
           "text": "操作系统",
-          "hide": true,
+          "hide": false,
           "i18n": "menu.monitor.os",
           "icon": "anticon-windows"
         },