Skip to content

Commit

Permalink
Merge pull request #427 from Zhang21/fix/es-https
Browse files Browse the repository at this point in the history
【Fix】es https
  • Loading branch information
feiyu563 authored Oct 16, 2024
2 parents 2e326e0 + 1bf5488 commit 6d8f4c1
Show file tree
Hide file tree
Showing 4 changed files with 362 additions and 3 deletions.
3 changes: 3 additions & 0 deletions doc/readme/conf-es.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- 支持 ES 7.x 和 8.x 版本。(ES 从 v7 到 v8 有一些变化,但主要的 API 设计上是保持兼容的。)
- 索引根据年月动态创建 `prometheusalert-YYMM`(如prometheusalert-202112)
- 支持 ES HTTPS。

<br/>
<br/>
Expand All @@ -19,6 +20,8 @@ alert_to_es=0
to_es_url=http://localhost:9200
# 多个地址
# to_es_url=http://es1:9200;http://es2:9200;http://es3:9200
# 多个 https 地址,程序里会跳过 https 证书检查
# to_es_url=https://es1:9200;https://es2:9200;https://es3:9200
# 是否有认证,es用户和密码, 无认证则不需要填写。
# to_es_user=username
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ require (
github.com/aliyun/alibaba-cloud-sdk-go v1.62.771
github.com/astaxie/beego v1.12.3
github.com/baidubce/bce-sdk-go v0.9.183
github.com/elastic/go-elasticsearch/v7 v7.17.10
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
github.com/go-sql-driver/mysql v1.8.1
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
github.com/lib/pq v1.10.9
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/olivere/elastic/v7 v7.0.32
github.com/prometheus/client_golang v1.19.1
github.com/robfig/cron/v3 v3.0.1
github.com/smartystreets/goconvey v1.8.1
Expand Down Expand Up @@ -40,11 +40,9 @@ require (
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
Expand Down
Loading

0 comments on commit 6d8f4c1

Please sign in to comment.