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

Change default token-prefix to proper one for the Alerta service. This closes #1165 #1753

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change default token-prefix to proper one for the Alerta service. This closes #1165 #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions etc/kapacitor/kapacitor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,7 @@ default-retention-policy = ""
# Default authentication token.
token = ""
# Default token prefix
# If you are on older versions of alerta you may need to change this to "Key"
token-prefix = "Bearer"
token-prefix = "Key"
# Default environment.
environment = ""
# Default origin.
Expand Down
4 changes: 2 additions & 2 deletions integrations/streamer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8864,7 +8864,7 @@ stream
exp := []interface{}{
alertatest.Request{
URL: "/alert",
Authorization: "Bearer testtoken1234567",
Authorization: "Key testtoken1234567",
PostData: alertatest.PostData{
Resource: "cpu",
Event: "serverA",
Expand All @@ -8878,7 +8878,7 @@ stream
},
alertatest.Request{
URL: "/alert",
Authorization: "Bearer anothertesttoken",
Authorization: "Key anothertesttoken",
PostData: alertatest.PostData{
Resource: "resource: serverA",
Event: "event: TestStream_Alert",
Expand Down
4 changes: 2 additions & 2 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9474,7 +9474,7 @@ func TestServer_AlertHandlers(t *testing.T) {
Kind: "alerta",
Options: map[string]interface{}{
"token": "testtoken1234567",
"token-prefix": "Bearer",
"token-prefix": "Key",
"origin": "kapacitor",
"group": "test",
"environment": "env",
Expand All @@ -9495,7 +9495,7 @@ func TestServer_AlertHandlers(t *testing.T) {
got := ts.Requests()
exp := []alertatest.Request{{
URL: "/alert",
Authorization: "Bearer testtoken1234567",
Authorization: "Key testtoken1234567",
PostData: alertatest.PostData{
Resource: "alert",
Event: "id",
Expand Down
2 changes: 1 addition & 1 deletion services/alerta/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Config struct {
// The authentication token for this notification, can be overridden per alert.
Token string `toml:"token" override:"token,redact"`
// The prefix for the Authentication field where the token is stored
// This defaults to Bearer but you may need to set this to "Key" for older versions of alerta
// This defaults to Key
TokenPrefix string `toml:"token-prefix" override:"token-prefix"`
// The environment in which to raise the alert.
Environment string `toml:"environment" override:"environment"`
Expand Down
2 changes: 1 addition & 1 deletion services/alerta/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
defaultEvent = "{{ .ID }}"
defaultGroup = "{{ .Group }}"
defaultTimeout = time.Duration(24 * time.Hour)
defaultTokenPrefix = "Bearer"
defaultTokenPrefix = "Key"
)

type Diagnostic interface {
Expand Down