Skip to content

Commit 5926c17

Browse files
authored
Merge branch 'master' into logr
2 parents 5d7a948 + e537758 commit 5926c17

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ endpoints:
501501

502502
> 📝 Note that Gatus will use the [gcloud default credentials](https://cloud.google.com/docs/authentication/application-default-credentials) within its environment to generate the token.
503503

504-
This example shows you how you cna use the `client.tls` configuration to perform an mTLS query to a backend API:
504+
This example shows you how you can use the `client.tls` configuration to perform an mTLS query to a backend API:
505505

506506
```yaml
507507
endpoints:

alerting/alert/type.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ const (
6262
// TypeTeams is the Type for the teams alerting provider
6363
TypeTeams Type = "teams"
6464

65+
// TypeTeamsWorkflows is the Type for the teams-workflows alerting provider
66+
TypeTeamsWorkflows Type = "teams-workflows"
67+
6568
// TypeTelegram is the Type for the telegram alerting provider
6669
TypeTelegram Type = "telegram"
6770

config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
417417
alert.TypePushover,
418418
alert.TypeSlack,
419419
alert.TypeTeams,
420+
alert.TypeTeamsWorkflows,
420421
alert.TypeTelegram,
421422
alert.TypeTwilio,
422423
alert.TypeZulip,

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/TwiN/logr v0.2.1
1212
github.com/TwiN/whois v1.1.9
1313
github.com/aws/aws-sdk-go v1.54.10
14-
github.com/coreos/go-oidc/v3 v3.10.0
14+
github.com/coreos/go-oidc/v3 v3.11.0
1515
github.com/gofiber/fiber/v2 v2.52.4
1616
github.com/google/go-github/v48 v48.2.0
1717
github.com/google/uuid v1.6.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
3131
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3232
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
3333
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
34-
github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU=
35-
github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac=
34+
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
35+
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
3636
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3737
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3838
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

0 commit comments

Comments
 (0)