public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify that Threema Gateway Alerts support only Basic IDs (#34828)

Browse Source 
Threema Gateway supports two types of IDs: Basic IDs (where the
encryption is managed by the API server) and End-to-End IDs (where the
keys are managed by the user).

This plugin currently does not support End-to-End IDs (since it's much
more complex to implement, because the encryption needs to happen
locally). Add a few clarifications to the UI.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Danilo Bargen
2021-05-28 08:54:55 +02:00
committed by GitHub
parent 35a4b2c651
commit 83a83de10a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/notifiers/threema.go
+2 -2
View File
@@ -19,7 +19,7 @@ func init() {
alerting.RegisterNotifier(&alerting.NotifierPlugin{
Type: "threema",
Name: "Threema Gateway",
Description: "Sends notifications to Threema using the Threema Gateway",
Description: "Sends notifications to Threema using Threema Gateway (Basic IDs)",
Heading: "Threema Gateway settings",
Info: "Notifications can be configured for any Threema Gateway ID of type \"Basic\". End-to-End IDs are not currently supported." +
"The Threema Gateway ID can be set up at https://gateway.threema.ch/.",
@@ -30,7 +30,7 @@ func init() {
Element: alerting.ElementTypeInput,
InputType: alerting.InputTypeText,
Placeholder: "*3MAGWID",
Description: "Your 8 character Threema Gateway ID (starting with a *).",
Description: "Your 8 character Threema Gateway Basic ID (starting with a *).",
PropertyName: "gateway_id",
Required: true,
ValidationRule: "\\*[0-9A-Z]{7}",
pkg/services/ngalert/notifier/available_channels.go
+2 -2
View File
@@ -725,7 +725,7 @@ func GetAvailableNotifiers() []*alerting.NotifierPlugin {
{
Type: "threema",
Name: "Threema Gateway",
Description: "Sends notifications to Threema using the Threema Gateway",
Description: "Sends notifications to Threema using Threema Gateway (Basic IDs)",
Heading: "Threema Gateway settings",
Info: "Notifications can be configured for any Threema Gateway ID of type \"Basic\". End-to-End IDs are not currently supported." +
"The Threema Gateway ID can be set up at https://gateway.threema.ch/.",
@@ -735,7 +735,7 @@ func GetAvailableNotifiers() []*alerting.NotifierPlugin {
Element: alerting.ElementTypeInput,
InputType: alerting.InputTypeText,
Placeholder: "*3MAGWID",
Description: "Your 8 character Threema Gateway ID (starting with a *).",
Description: "Your 8 character Threema Gateway Basic ID (starting with a *).",
PropertyName: "gateway_id",
Required: true,
ValidationRule: "\\*[0-9A-Z]{7}",
pkg/tests/api/alerting/api_available_channel_test.go
+2 -2
View File
@@ -1442,14 +1442,14 @@ var expAvailableChannelJsonOutput = `
"type": "threema",
"name": "Threema Gateway",
"heading": "Threema Gateway settings",
"description": "Sends notifications to Threema using the Threema Gateway",
"description": "Sends notifications to Threema using Threema Gateway (Basic IDs)",
"info": "Notifications can be configured for any Threema Gateway ID of type \"Basic\". End-to-End IDs are not currently supported.The Threema Gateway ID can be set up at https://gateway.threema.ch/.",
"options": [
{
"element": "input",
"inputType": "text",
"label": "Gateway ID",
"description": "Your 8 character Threema Gateway ID (starting with a *).",
"description": "Your 8 character Threema Gateway Basic ID (starting with a *).",
"placeholder": "*3MAGWID",
"propertyName": "gateway_id",
"selectOptions": null,
public/app/features/alerting/unified/mocks/grafana-notifiers.ts
+2 -2
View File
@@ -308,7 +308,7 @@ export const grafanaNotifiersMock: NotifierDTO[] = [
type: 'threema',
name: 'Threema Gateway',
heading: 'Threema Gateway settings',
description: 'Sends notifications to Threema using the Threema Gateway',
description: 'Sends notifications to Threema using Threema Gateway (Basic IDs)',
info:
'Notifications can be configured for any Threema Gateway ID of type "Basic". End-to-End IDs are not currently supported.The Threema Gateway ID can be set up at https://gateway.threema.ch/.',
options: [
@@ -316,7 +316,7 @@ export const grafanaNotifiersMock: NotifierDTO[] = [
element: 'input',
inputType: 'text',
label: 'Gateway ID',
description: 'Your 8 character Threema Gateway ID (starting with a *).',
description: 'Your 8 character Threema Gateway Basic ID (starting with a *).',
placeholder: '*3MAGWID',
propertyName: 'gateway_id',
selectOptions: null,