github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Watcher] Support scheme field when creating a Threshold alert with a Webhook action (#53757) (#54459)

Browse source 
Co-authored-by: Jimmy Kuang <jimmy@elastic.co>
This commit is contained in:
Alison Goryachev 2020-01-10 11:06:54 -05:00 • committed by GitHub
parent 5d5e5b8575
commit 4560a79787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/legacy/plugins/watcher/__jest__/client_integration/helpers/watch_create_threshold.helpers.ts
View file

@ -104,4 +104,5 @@ export type TestSubjects =
| 'webhookPathInput'
| 'webhookPortInput'
| 'webhookMethodSelect'
| 'webhookSchemeSelect'
| 'webhookUsernameInput';

3
x-pack/legacy/plugins/watcher/__jest__/client_integration/watch_create_threshold.test.tsx
View file

@ -487,6 +487,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
const METHOD = 'put';
const HOST = 'localhost';
const PORT = '9200';
const SCHEME = 'http';
const PATH = '/test';
const USERNAME = 'test_user';
const PASSWORD = 'test_password';
@ -510,6 +511,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
form.setInputValue('webhookMethodSelect', METHOD);
form.setInputValue('webhookHostInput', HOST);
form.setInputValue('webhookPortInput', PORT);
form.setInputValue('webhookSchemeSelect', SCHEME);
form.setInputValue('webhookPathInput', PATH);
form.setInputValue('webhookUsernameInput', USERNAME);
form.setInputValue('webhookPasswordInput', PASSWORD);
@ -534,6 +536,7 @@ describe('<ThresholdWatchEdit /> create route', () => {
method: METHOD,
host: HOST,
port: Number(PORT),
scheme: SCHEME,
path: PATH,
body:
'{\n "message": "Watch [{{ctx.metadata.name}}] has exceeded the threshold"\n}', // Default

13
x-pack/legacy/plugins/watcher/common/models/action/webhook_action.js
View file

@ -16,6 +16,7 @@ export class WebhookAction extends BaseAction {
this.method = props.method;
this.host = props.host;
this.port = props.port;
this.scheme = props.scheme;
this.path = props.path;
this.body = props.body;
this.contentType = props.contentType;
@ -30,6 +31,7 @@ export class WebhookAction extends BaseAction {
method: this.method,
host: this.host,
port: this.port,
scheme: this.scheme,
path: this.path,
body: this.body,
contentType: this.contentType,
@ -47,6 +49,7 @@ export class WebhookAction extends BaseAction {
method: json.method,
host: json.host,
port: json.port,
scheme: json.scheme,
path: json.path,
body: json.body,
contentType: json.contentType,
@ -72,6 +75,10 @@ export class WebhookAction extends BaseAction {
optionalFields.method = this.method;
}
if (this.scheme) {
optionalFields.scheme = this.scheme;
}
if (this.body) {
optionalFields.body = this.body;
}
@ -108,7 +115,7 @@ export class WebhookAction extends BaseAction {
const webhookJson = json && json.actionJson && json.actionJson.webhook;
const { errors } = this.validateJson(json.actionJson);
const { path, method, body, auth, headers } = webhookJson;
const { path, method, scheme, body, auth, headers } = webhookJson;
const optionalFields = {};
@ -120,6 +127,10 @@ export class WebhookAction extends BaseAction {
optionalFields.method = method;
}
if (scheme) {
optionalFields.scheme = scheme;
}
if (body) {
optionalFields.body = body;
}

1
x-pack/legacy/plugins/watcher/common/types/action_types.ts
View file

@ -56,6 +56,7 @@ export interface WebhookAction extends BaseAction {
method?: 'head' | 'get' | 'post' | 'put' | 'delete';
host: string;
port: number;
scheme?: 'http' | 'https';
path?: string;
body?: string;
username?: string;

7
x-pack/legacy/plugins/watcher/public/np_ready/application/models/action/webhook_action.js
View file

@ -11,23 +11,21 @@ import { i18n } from '@kbn/i18n';
export class WebhookAction extends BaseAction {
constructor(props = {}) {
super(props);
const defaultJson = JSON.stringify(
{ message: 'Watch [{{ctx.metadata.name}}] has exceeded the threshold' },
null,
2
);
this.body = get(props, 'body', props.ignoreDefaults ? null : defaultJson);
this.method = get(props, 'method');
this.host = get(props, 'host');
this.port = get(props, 'port');
this.scheme = get(props, 'scheme', 'http');
this.path = get(props, 'path');
this.username = get(props, 'username');
this.password = get(props, 'password');
this.contentType = get(props, 'contentType');
this.fullPath = `${this.host}:${this.port}${this.path}`;
this.fullPath = `${this.host}:${this.port}${this.path ? '/' + this.path : ''}`;
}
validate() {
@ -112,6 +110,7 @@ export class WebhookAction extends BaseAction {
method: this.method,
host: this.host,
port: this.port,
scheme: this.scheme,
path: this.path,
body: this.body,
username: this.username,

25
x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/threshold_watch_edit/action_fields/webhook_action_fields.tsx
View file

@ -29,13 +29,15 @@ interface Props {
const HTTP_VERBS = ['head', 'get', 'post', 'put', 'delete'];
const SCHEME = ['http', 'https'];
export const WebhookActionFields: React.FunctionComponent<Props> = ({
action,
editAction,
errors,
hasErrors,
}) => {
const { method, host, port, path, body, username, password } = action;
const { method, host, port, scheme, path, body, username, password } = action;
useEffect(() => {
editAction({ key: 'contentType', value: 'application/json' }); // set content-type for threshold watch to json by default
@ -65,6 +67,27 @@ export const WebhookActionFields: React.FunctionComponent<Props> = ({
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
<EuiFormRow
label={i18n.translate(
'xpack.watcher.sections.watchEdit.threshold.webhookAction.schemeFieldLabel',
{
defaultMessage: 'Scheme',
}
)}
>
<EuiSelect
name="scheme"
value={scheme}
data-test-subj="webhookSchemeSelect"
options={SCHEME.map(verb => ({ text: verb, value: verb }))}
onChange={e => {
editAction({ key: 'scheme', value: e.target.value });
}}
/>
</EuiFormRow>
</EuiFlexItem>
<EuiFlexItem>
<ErrableFormRow
id="webhookHost"