Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[collector] trust sqlserver server certificate default #746

Merged
merged 3 commits into from
Mar 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 6 additions & 2 deletions home/docs/others/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
Binary file added home/static/img/docs/cert-committer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added home/static/img/docs/cert-contributor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.