[collector] trust sqlserver server certificate default (#746)

* [collector] trust sqlserver server certificate default * [collector] revome log stack * [doc] update developer cert file
apache · Mar 18, 2023 · b51f5cf · b51f5cf
1 parent fea1d48
commit b51f5cf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
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
@@ -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
@@ -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
@@ -19,10 +19,15 @@ sidebar_label: Contributors
   </tbody>
 </table>
 
+<img alt="cert" src="/img/docs/cert-committer.png" width="400"/>  
+
+
 ## ✨ HertzBeat Contributors
 
 Thanks these wonderful people, welcome to join us:  [Contributor Guide](contributing)  
 
+<img alt="cert" src="/img/docs/cert-contributor.png" width="400"/>  
+
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
@@ -139,5 +144,4 @@ Thanks these wonderful people, welcome to join us:  [Contributor Guide](contribu
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
 
-<!-- ALL-CONTRIBUTORS-LIST:END -->  
-
+<!-- ALL-CONTRIBUTORS-LIST:END -->
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
@@ -19,10 +19,14 @@ sidebar_label: 开发者们
   </tbody>
 </table>
 
+<img alt="cert" src="/img/docs/cert-committer.png" width="400"/>  
+
 ## ✨ HertzBeat的开发者们
 
 Thanks these wonderful people, welcome to join us: [贡献者指南](contributing)   
 
+<img alt="cert" src="/img/docs/cert-contributor.png" width="400"/>
+
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

diff --git a/home/static/img/docs/cert-committer.png b/home/static/img/docs/cert-committer.png
diff --git a/home/static/img/docs/cert-contributor.png b/home/static/img/docs/cert-contributor.png