Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit e48ac68

Browse files
qreshiqreshi
authored
Support Kibana 7.3.2 (#109)
* Upgraded to Kibana 7.3.2 and updated release notes * Updated WhereExpression test to use empty string for default field value * Updated test snapshots * Updated yarn.lock
1 parent 2ce4831 commit e48ac68

File tree

20 files changed

+323
-343
lines changed

20 files changed

+323
-343
lines changed

‎opendistro-elasticsearch-alerting-kibana.release-notes.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
## Version 1.2.0.0
1+
## Version 1.3.0.0
22

3-
## New Features
4-
* Adds support for Kibana 7.2.0
3+
### New Features
4+
* Adds support for Kibana 7.3.2 - [PR #109](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/109)
5+
6+
## 2019-09-20, Version 1.2.0.0
57

6-
## Bug fixes
8+
### New Features
9+
* Adds support for Kibana 7.2.0 - [PR #81](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/81)
10+
11+
### Bug fixes
712
* Fixes update monitor from monitor list - [PR #64](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/64)
813
* Added support for IPv4 and IPv6 on URL validation - [PR #67](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/67)
914
* Disables the query parameter box in Custom webhook - [PR #72](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/72)

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "opendistro-alerting",
3-
"version": "1.2.0.0",
3+
"version": "1.3.0.0",
44
"description": "Kibana Alerting Plugin",
55
"main": "index.js",
66
"license": "Apache-2.0",
77
"homepage": "https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin",
88
"kibana": {
9-
"version": "7.2.0",
9+
"version": "7.3.2",
1010
"templateVersion": "6.3.3"
1111
},
1212
"repository": {

‎public/components/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@ exports[`FormikFieldPassword renders 1`] = `
2020
>
2121
<svg
2222
aria-hidden="true"
23-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
23+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
2424
focusable="false"
2525
height="16"
2626
viewBox="0 0 16 16"
2727
width="16"
2828
xmlns="http://www.w3.org/2000/svg"
29-
>
30-
<path
31-
d="M4 5v-.8C4 1.88 5.79 0 8 0s4 1.88 4 4.2V5h1.143c.473 0 .857.448.857 1v9c0 .552-.384 1-.857 1H2.857C2.384 16 2 15.552 2 15V6c0-.552.384-1 .857-1H4zM3 15h10V6H3v9zm5.998-3.706L9.5 12.5h-3l.502-1.206A1.644 1.644 0 0 1 6.5 10.1c0-.883.672-1.6 1.5-1.6s1.5.717 1.5 1.6c0 .475-.194.901-.502 1.194zM11 4.36C11 2.504 9.657 1 8 1S5 2.504 5 4.36V5h6v-.64z"
32-
/>
33-
</svg>
29+
/>
3430
</span>
3531
</div>
3632
</div>

‎public/components/FormControls/FormikSelect/__snapshots__/FormikSelect.test.js.snap

+2-14
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,13 @@ exports[`FormikSelect renders 1`] = `
2626
>
2727
<svg
2828
aria-hidden="true"
29-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
29+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
3030
focusable="false"
3131
height="16"
3232
viewBox="0 0 16 16"
3333
width="16"
34-
xlink="http://www.w3.org/1999/xlink"
3534
xmlns="http://www.w3.org/2000/svg"
36-
>
37-
<defs>
38-
<path
39-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
40-
id="arrow_down-a"
41-
/>
42-
</defs>
43-
<use
44-
fill-rule="nonzero"
45-
href="#arrow_down-a"
46-
/>
47-
</svg>
35+
/>
4836
</span>
4937
</div>
5038
</div>

‎public/components/FormControls/FormikSwitch/__snapshots__/FormikSwitch.test.js.snap

+4-13
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,21 @@ exports[`FormikSwitch renders 1`] = `
2020
class="euiSwitch__track"
2121
>
2222
<svg
23-
class="euiIcon euiIcon--medium euiSwitch__icon"
23+
class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
2424
focusable="false"
2525
height="16"
2626
viewBox="0 0 16 16"
2727
width="16"
2828
xmlns="http://www.w3.org/2000/svg"
29-
>
30-
<path
31-
d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
32-
/>
33-
</svg>
29+
/>
3430
<svg
35-
class="euiIcon euiIcon--medium euiSwitch__icon euiSwitch__icon--checked"
31+
class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
3632
focusable="false"
3733
height="16"
3834
viewBox="0 0 16 16"
3935
width="16"
4036
xmlns="http://www.w3.org/2000/svg"
41-
>
42-
<path
43-
d="M6.5 12a.502.502 0 0 1-.354-.146l-4-4a.502.502 0 0 1 .708-.708L6.5 10.793l6.646-6.647a.502.502 0 0 1 .708.708l-7 7A.502.502 0 0 1 6.5 12"
44-
fill-rule="evenodd"
45-
/>
46-
</svg>
37+
/>
4738
</span>
4839
</span>
4940
</div>

‎public/pages/CreateMonitor/components/MonitorDefinition/__snapshots__/MonitorDefinition.test.js.snap

+2-14
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,13 @@ exports[`MonitorDefinition renders 1`] = `
4444
>
4545
<svg
4646
aria-hidden="true"
47-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
47+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
4848
focusable="false"
4949
height="16"
5050
viewBox="0 0 16 16"
5151
width="16"
52-
xlink="http://www.w3.org/1999/xlink"
5352
xmlns="http://www.w3.org/2000/svg"
54-
>
55-
<defs>
56-
<path
57-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
58-
id="arrow_down-a"
59-
/>
60-
</defs>
61-
<use
62-
fill-rule="nonzero"
63-
href="#arrow_down-a"
64-
/>
65-
</svg>
53+
/>
6654
</span>
6755
</div>
6856
</div>

‎public/pages/CreateMonitor/components/MonitorExpressions/expressions/WhereExpression.test.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('WhereExpression', () => {
6969
button.simulate('keyDown', { keyCode: 27 });
7070
expect(closeExpression).toHaveBeenCalled();
7171
});
72-
test('should render text input for the text data types', done => {
72+
test('should render text input for the text data types', () => {
7373
const wrapper = mount(getMountWrapper(true));
7474
wrapper
7575
.find('[data-test-subj="comboBoxSearchInput"]')
@@ -78,14 +78,12 @@ describe('WhereExpression', () => {
7878
.simulate('keyDown', { keyCode: 40 })
7979
.simulate('keyDown', { keyCode: 13 })
8080
.simulate('blur');
81-
setTimeout(() => {
82-
wrapper.update();
83-
const values = wrapper.find(WhereExpression).props().formik.values;
84-
expect(values.where.fieldName).toEqual([{ label: 'cityName', type: 'text' }]);
85-
expect(values.where.operator).toEqual(OPERATORS_MAP.IS);
86-
expect(wrapper.find(FormikFieldText).length).toBe(1);
87-
expect(wrapper.find(FormikFieldNumber).length).toBe(0);
88-
done();
89-
});
81+
82+
wrapper.update();
83+
const values = wrapper.find(WhereExpression).props().formik.values;
84+
expect(values.where.fieldName).toEqual([{ label: 'cityName', type: 'text' }]);
85+
expect(values.where.operator).toEqual(OPERATORS_MAP.IS);
86+
expect(wrapper.find(FormikFieldText).length).toBe(1);
87+
expect(wrapper.find(FormikFieldNumber).length).toBe(0);
9088
});
9189
});

‎public/pages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap

+12-70
Original file line numberDiff line numberDiff line change
@@ -111,25 +111,13 @@ exports[`Frequencies renders CustomCron 1`] = `
111111
>
112112
<svg
113113
aria-hidden="true"
114-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
114+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
115115
focusable="false"
116116
height="16"
117117
viewBox="0 0 16 16"
118118
width="16"
119-
xlink="http://www.w3.org/1999/xlink"
120119
xmlns="http://www.w3.org/2000/svg"
121-
>
122-
<defs>
123-
<path
124-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
125-
id="arrow_down-a"
126-
/>
127-
</defs>
128-
<use
129-
fill-rule="nonzero"
130-
href="#arrow_down-a"
131-
/>
132-
</svg>
120+
/>
133121
</button>
134122
</div>
135123
</div>
@@ -201,25 +189,13 @@ exports[`Frequencies renders Frequency 1`] = `
201189
>
202190
<svg
203191
aria-hidden="true"
204-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
192+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
205193
focusable="false"
206194
height="16"
207195
viewBox="0 0 16 16"
208196
width="16"
209-
xlink="http://www.w3.org/1999/xlink"
210197
xmlns="http://www.w3.org/2000/svg"
211-
>
212-
<defs>
213-
<path
214-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
215-
id="arrow_down-a"
216-
/>
217-
</defs>
218-
<use
219-
fill-rule="nonzero"
220-
href="#arrow_down-a"
221-
/>
222-
</svg>
198+
/>
223199
</span>
224200
</div>
225201
</div>
@@ -270,18 +246,13 @@ exports[`Frequencies renders FrequencyPicker 1`] = `
270246
>
271247
<svg
272248
aria-hidden="true"
273-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
249+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
274250
focusable="false"
275251
height="16"
276252
viewBox="0 0 16 16"
277253
width="16"
278254
xmlns="http://www.w3.org/2000/svg"
279-
>
280-
<path
281-
d="M7.5 13A5.506 5.506 0 0 1 2 7.5C2 4.467 4.467 2 7.5 2S13 4.467 13 7.5 10.533 13 7.5 13m0-12a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13m3 6H8V3.5a.5.5 0 0 0-1 0v4a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 0-1"
282-
fill-rule="evenodd"
283-
/>
284-
</svg>
255+
/>
285256
</span>
286257
</div>
287258
</div>
@@ -332,25 +303,13 @@ exports[`Frequencies renders FrequencyPicker 1`] = `
332303
>
333304
<svg
334305
aria-hidden="true"
335-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
306+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
336307
focusable="false"
337308
height="16"
338309
viewBox="0 0 16 16"
339310
width="16"
340-
xlink="http://www.w3.org/1999/xlink"
341311
xmlns="http://www.w3.org/2000/svg"
342-
>
343-
<defs>
344-
<path
345-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
346-
id="arrow_down-a"
347-
/>
348-
</defs>
349-
<use
350-
fill-rule="nonzero"
351-
href="#arrow_down-a"
352-
/>
353-
</svg>
312+
/>
354313
</span>
355314
</div>
356315
</div>
@@ -403,18 +362,13 @@ exports[`Frequencies renders Interval 1`] = `
403362
>
404363
<svg
405364
aria-hidden="true"
406-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
365+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
407366
focusable="false"
408367
height="16"
409368
viewBox="0 0 16 16"
410369
width="16"
411370
xmlns="http://www.w3.org/2000/svg"
412-
>
413-
<path
414-
d="M7.5 13A5.506 5.506 0 0 1 2 7.5C2 4.467 4.467 2 7.5 2S13 4.467 13 7.5 10.533 13 7.5 13m0-12a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13m3 6H8V3.5a.5.5 0 0 0-1 0v4a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 0-1"
415-
fill-rule="evenodd"
416-
/>
417-
</svg>
371+
/>
418372
</span>
419373
</div>
420374
</div>
@@ -465,25 +419,13 @@ exports[`Frequencies renders Interval 1`] = `
465419
>
466420
<svg
467421
aria-hidden="true"
468-
class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
422+
class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
469423
focusable="false"
470424
height="16"
471425
viewBox="0 0 16 16"
472426
width="16"
473-
xlink="http://www.w3.org/1999/xlink"
474427
xmlns="http://www.w3.org/2000/svg"
475-
>
476-
<defs>
477-
<path
478-
d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
479-
id="arrow_down-a"
480-
/>
481-
</defs>
482-
<use
483-
fill-rule="nonzero"
484-
href="#arrow_down-a"
485-
/>
486-
</svg>
428+
/>
487429
</span>
488430
</div>
489431
</div>

‎public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ exports[`CreateMonitor renders 1`] = `
5555
"fieldName": Array [],
5656
"fieldRangeEnd": 0,
5757
"fieldRangeStart": 0,
58-
"fieldValue": 0,
58+
"fieldValue": "",
5959
"operator": "is",
6060
},
6161
}

‎public/pages/CreateMonitor/containers/CreateMonitor/utils/__snapshots__/formikToMonitor.test.js.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Object {
208208
"fieldName": Array [],
209209
"fieldRangeEnd": 0,
210210
"fieldRangeStart": 0,
211-
"fieldValue": 0,
211+
"fieldValue": "",
212212
"operator": "is",
213213
},
214214
}

‎public/pages/CreateMonitor/containers/CreateMonitor/utils/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const FORMIK_INITIAL_VALUES = {
4646
where: {
4747
fieldName: [],
4848
operator: OPERATORS_MAP.IS,
49-
fieldValue: 0,
49+
fieldValue: "",
5050
fieldRangeStart: 0,
5151
fieldRangeEnd: 0,
5252
},

0 commit comments

Comments
 (0)