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.

Sign up for GitHub

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

Jump to bottom

feat: support user_key_file and token_file to the pushover #5886

Merged
merged 21 commits into from
Oct 6, 2023
Merged

feat: support user_key_file and token_file to the pushover #5886

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5720840
dongjiang, add the user_key_file and token_file keys to the pushover …
dongjiang1989 Sep 4, 2023
133e828
add PushoverConfig Sanitize
dongjiang1989 Sep 4, 2023
4344770
add PushoverConfig Sanitize
dongjiang1989 Sep 4, 2023
3755399
dongjiang, update by code review
dongjiang1989 Sep 4, 2023
3dbd810
fix unittest case
dongjiang1989 Sep 4, 2023
4e102d1
Merge branch 'main' into add-key-files
dongjiang1989 Sep 12, 2023
20b1cda
update unittest case
dongjiang1989 Sep 12, 2023
20a0506
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Sep 18, 2023
2af73eb
Update pkg/alertmanager/validation/v1beta1/validation_test.go
dongjiang1989 Sep 18, 2023
885b726
update code review case
dongjiang1989 Sep 18, 2023
f695d68
add tabale unittest
dongjiang1989 Sep 18, 2023
decbd77
Merge branch 'main' into add-key-files
dongjiang1989 Oct 6, 2023
3dd477b
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
6e0db6e
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
f20eac8
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
c21388f
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
3aec801
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
390494e
add unittest case by code review
dongjiang1989 Oct 6, 2023
edd0cc6
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
0d25c3c
Update pkg/alertmanager/amcfg_test.go
dongjiang1989 Oct 6, 2023
8714125
fix golint
dongjiang1989 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 68 additions & 4 deletions Documentation/api.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 14 additions & 2 deletions bundle.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 28 additions & 4 deletions example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 14 additions & 2 deletions example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,7 @@
"type": "string"
},
"token": {
"description": "The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.",
"description": "The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `token` or `tokenFile` is required.",
"properties": {
"key": {
"description": "The key of the secret to select from. Must be a valid secret key.",
Expand All @@ -2299,6 +2299,10 @@
],
"type": "object"
},
"tokenFile": {
"description": "The token file that contains the registered application's API token, see https://pushover.net/apps. Either `token` or `tokenFile` is required. It requires Alertmanager >= v0.26.0.",
"type": "string"
},
"url": {
"description": "A supplementary URL shown alongside the message.",
"type": "string"
Expand All @@ -2308,7 +2312,7 @@
"type": "string"
},
"userKey": {
"description": "The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.",
"description": "The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `userKey` or `userKeyFile` is required.",
"properties": {
"key": {
"description": "The key of the secret to select from. Must be a valid secret key.",
Expand All @@ -2327,6 +2331,10 @@
"key"
],
"type": "object"
},
"userKeyFile": {
"description": "The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is required. It requires Alertmanager >= v0.26.0.",
"type": "string"
}
},
"type": "object"
Expand Down
12 changes: 10 additions & 2 deletions jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2139,7 +2139,7 @@
type: 'string',
},
token: {
description: "The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.",
description: "The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `token` or `tokenFile` is required.",
properties: {
key: {
description: 'The key of the secret to select from. Must be a valid secret key.',
Expand All @@ -2158,6 +2158,10 @@
],
type: 'object',
},
tokenFile: {
description: "The token file that contains the registered application's API token, see https://pushover.net/apps. Either `token` or `tokenFile` is required. It requires Alertmanager >= v0.26.0.",
type: 'string',
},
url: {
description: 'A supplementary URL shown alongside the message.',
type: 'string',
Expand All @@ -2167,7 +2171,7 @@
type: 'string',
},
userKey: {
description: "The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.",
description: "The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `userKey` or `userKeyFile` is required.",
properties: {
key: {
description: 'The key of the secret to select from. Must be a valid secret key.',
Expand All @@ -2186,6 +2190,10 @@
],
type: 'object',
},
userKeyFile: {
description: "The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is required. It requires Alertmanager >= v0.26.0.",
type: 'string',
},
},
type: 'object',
},
Expand Down