-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Shards alert draft * Added index pattern validation * Fixed ui/ux * Optimizing the response * CR feedback * import fix * Increased size limit # Conflicts: # packages/kbn-optimizer/limits.yml # x-pack/plugins/monitoring/public/components/elasticsearch/index/advanced.js
- Loading branch information
Showing
32 changed files
with
931 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| export interface RegExPatterns { | ||
| contains?: string | RegExp; | ||
| negate?: string | RegExp; | ||
| } | ||
|
|
||
| const valid = /.*/; | ||
|
|
||
| export class ESGlobPatterns { | ||
| public static createRegExPatterns(globPattern: string) { | ||
| if (globPattern === '*') { | ||
| return { contains: valid, negate: valid }; | ||
| } | ||
|
|
||
| globPattern = globPattern.toLowerCase(); | ||
| globPattern = globPattern.replace(/[ \\\/?"<>|#]/g, ''); | ||
| const patternsArr = globPattern.split(','); | ||
| const containPatterns: string[] = []; | ||
| const negatePatterns: string[] = []; | ||
| patternsArr.forEach((pattern) => { | ||
| if (pattern.charAt(0) === '-') { | ||
| negatePatterns.push(ESGlobPatterns.createESGlobRegExStr(pattern.slice(1))); | ||
| } else { | ||
| containPatterns.push(ESGlobPatterns.createESGlobRegExStr(pattern)); | ||
| } | ||
| }); | ||
| const contains = containPatterns.length ? new RegExp(containPatterns.join('|'), 'gi') : valid; | ||
| const negate = negatePatterns.length | ||
| ? new RegExp(`^((?!(${negatePatterns.join('|')})).)*$`, 'gi') | ||
| : valid; | ||
| return { contains, negate }; | ||
| } | ||
|
|
||
| public static isValid(value: string, patterns: RegExPatterns) { | ||
| const { contains = valid, negate = valid } = patterns; | ||
| return new RegExp(contains).test(value) && new RegExp(negate).test(value); | ||
| } | ||
|
|
||
| private static createESGlobRegExStr(pattern: string) { | ||
| const patternsArr = pattern.split('*'); | ||
| const firstItem = patternsArr.shift(); | ||
| const lastItem = patternsArr.pop(); | ||
| const start = firstItem?.length ? `(^${ESGlobPatterns.escapeStr(firstItem)})` : ''; | ||
| const mid = patternsArr.map((group) => `(.*${ESGlobPatterns.escapeStr(group)})`); | ||
| const end = lastItem?.length ? `(.*${ESGlobPatterns.escapeStr(lastItem)}$)` : ''; | ||
| const regExArr = ['(^', start, ...mid, end, ')']; | ||
| return regExArr.join(''); | ||
| } | ||
|
|
||
| private static escapeStr(str: string) { | ||
| return str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
x-pack/plugins/monitoring/public/alerts/flyout_expressions/alert_param_textfield.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import React, { useState } from 'react'; | ||
| import { EuiFormRow, EuiFieldText } from '@elastic/eui'; | ||
|
|
||
| interface Props { | ||
| name: string; | ||
| value: string; | ||
| placeholder?: string; | ||
| label: string; | ||
| errors: string[]; | ||
| setAlertParams: (property: string, value: string) => void; | ||
| } | ||
| export const AlertParamTextField: React.FC<Props> = (props: Props) => { | ||
| const { name, label, setAlertParams, errors, placeholder } = props; | ||
| const [value, setValue] = useState(props.value); | ||
| return ( | ||
| <EuiFormRow label={label} error={errors} isInvalid={errors?.length > 0}> | ||
| <EuiFieldText | ||
| compressed | ||
| placeholder={placeholder} | ||
| value={value} | ||
| onChange={(e) => { | ||
| const newValue = e.target.value; | ||
| setValue(newValue); | ||
| setAlertParams(name, newValue); | ||
| }} | ||
| /> | ||
| </EuiFormRow> | ||
| ); | ||
| }; |
Oops, something went wrong.