Skip to content

Commit a48941f

Browse files
authored
Merge branch 'master' into pushover-p-on-resolved
2 parents 43b2ae4 + c6ff6ec commit a48941f

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ updates:
77
interval: "daily"
88
- package-ecosystem: "gomod"
99
directory: "/"
10-
open-pull-requests-limit: 1
10+
open-pull-requests-limit: 3
1111
labels: ["dependencies"]
1212
schedule:
1313
interval: "daily"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# was configured by the "Set up Go" step (otherwise, it'd use sudo's "go" executable)
2929
run: sudo env "PATH=$PATH" "GOROOT=$GOROOT" go test ./... -race -coverprofile=coverage.txt -covermode=atomic
3030
- name: Codecov
31-
uses: codecov/codecov-action@v4.5.0
31+
uses: codecov/codecov-action@v4.6.0
3232
with:
3333
files: ./coverage.txt
3434
token: ${{ secrets.CODECOV_TOKEN }}

README.md

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

501501
> 📝 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.
502502

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

505505
```yaml
506506
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
@@ -413,6 +413,7 @@ func validateAlertingConfig(alertingConfig *alerting.Config, endpoints []*endpoi
413413
alert.TypePushover,
414414
alert.TypeSlack,
415415
alert.TypeTeams,
416+
alert.TypeTeamsWorkflows,
416417
alert.TypeTelegram,
417418
alert.TypeTwilio,
418419
alert.TypeZulip,

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
github.com/TwiN/health v1.6.0
1111
github.com/TwiN/whois v1.1.9
1212
github.com/aws/aws-sdk-go v1.54.10
13-
github.com/coreos/go-oidc/v3 v3.10.0
14-
github.com/gofiber/fiber/v2 v2.52.4
13+
github.com/coreos/go-oidc/v3 v3.11.0
14+
github.com/gofiber/fiber/v2 v2.52.5
1515
github.com/google/go-github/v48 v48.2.0
1616
github.com/google/uuid v1.6.0
1717
github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
2929
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3030
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
3131
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
32-
github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU=
33-
github.com/coreos/go-oidc/v3 v3.10.0/go.mod h1:5j11xcw0D3+SGxn6Z/WFADsgcWVMyNAlSQupk0KK3ac=
32+
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
33+
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
3434
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3535
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3636
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -54,8 +54,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
5454
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
5555
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
5656
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
57-
github.com/gofiber/fiber/v2 v2.52.4 h1:P+T+4iK7VaqUsq2PALYEfBBo6bJZ4q3FP8cZ84EggTM=
58-
github.com/gofiber/fiber/v2 v2.52.4/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
57+
github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo=
58+
github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
5959
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
6060
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
6161
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

0 commit comments

Comments
 (0)