diff --git a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java index 6de31aca860..fd706731d3d 100644 --- a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java +++ b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java @@ -310,7 +310,8 @@ private String constructDatabaseUrl(JdbcProtocol jdbcProtocol) { break; case "sqlserver": url = "jdbc:sqlserver://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort() - + ";" + (jdbcProtocol.getDatabase() == null ? "" : "DatabaseName=" + jdbcProtocol.getDatabase()); + + ";" + (jdbcProtocol.getDatabase() == null ? "" : "DatabaseName=" + jdbcProtocol.getDatabase()) + + ";trustServerCertificate=true;"; break; case "oracle": url = "jdbc:oracle:thin:@" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort() diff --git a/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java b/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java index 4ce8c959862..69b103ac403 100644 --- a/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java +++ b/collector/src/main/java/com/usthe/collector/collect/snmp/SnmpCollectImpl.java @@ -187,7 +187,7 @@ public void collect(CollectRep.MetricsData.Builder builder, long appId, String a } } catch (ExecutionException | InterruptedException ex) { String errorMsg = CommonUtil.getMessageFromThrowable(ex); - log.warn("[snmp collect] error: {}", errorMsg, ex); + log.warn("[snmp collect] error: {}", errorMsg); builder.setCode(CollectRep.Code.UN_CONNECTABLE); builder.setMsg(errorMsg); } catch (Exception e) { diff --git a/home/docs/others/developer.md b/home/docs/others/developer.md index 85897b4103c..2d30b5eba18 100644 --- a/home/docs/others/developer.md +++ b/home/docs/others/developer.md @@ -19,10 +19,15 @@ sidebar_label: Contributors +cert + + ## ✨ HertzBeat Contributors Thanks these wonderful people, welcome to join us: [Contributor Guide](contributing) +cert + @@ -139,5 +144,4 @@ Thanks these wonderful people, welcome to join us: [Contributor Guide](contribu - - + diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/developer.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/developer.md index 17d83888979..50fa99e2ac6 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/developer.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/developer.md @@ -19,10 +19,14 @@ sidebar_label: 开发者们 +cert + ## ✨ HertzBeat的开发者们 Thanks these wonderful people, welcome to join us: [贡献者指南](contributing) +cert + diff --git a/home/static/img/docs/cert-committer.png b/home/static/img/docs/cert-committer.png new file mode 100644 index 00000000000..78783c7440a Binary files /dev/null and b/home/static/img/docs/cert-committer.png differ diff --git a/home/static/img/docs/cert-contributor.png b/home/static/img/docs/cert-contributor.png new file mode 100644 index 00000000000..9630d735cdd Binary files /dev/null and b/home/static/img/docs/cert-contributor.png differ