opendistro-for-elasticsearch · ftianli-amzn · May 29, 2020 · May 19, 2020 · May 19, 2020 · May 20, 2020
diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: opendistro-for-elasticsearch/kibana-oss
-          ref: 7.6.1
+          ref: 7.7.0
           token: ${{ secrets.GITHUB_KIBANA_OSS }}
           path: kibana
       - name: Get node and yarn versions

diff --git a/opendistro-elasticsearch-alerting-kibana.release-notes.md b/opendistro-elasticsearch-alerting-kibana.release-notes.md
@@ -1,3 +1,8 @@
+## Version 1.8.0.0, 2020-05-19
+
+### Bug fixes
+   * Fixes wrong time interval unit for monitor on top of anomaly detector. - [PR #145](https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin/pull/145)
+
 ## Version 1.7.0.0, 2020-05-04
 
 ### New Features

diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "opendistro-alerting",
-  "version": "1.7.0.0",
+  "version": "1.8.0.0",
   "description": "Kibana Alerting Plugin",
   "main": "index.js",
   "license": "Apache-2.0",
   "homepage": "https://github.com/opendistro-for-elasticsearch/alerting-kibana-plugin",
   "kibana": {
-    "version": "7.6.1",
+    "version": "7.7.0",
     "templateVersion": "6.3.3"
   },
   "repository": {

diff --git a/public/pages/CreateMonitor/components/AnomalyDetectors/AnomaliesChart/AnomaliesChart.js b/public/pages/CreateMonitor/components/AnomalyDetectors/AnomaliesChart/AnomaliesChart.js
@@ -18,14 +18,11 @@ import PropTypes from 'prop-types';
 import { EuiText, EuiSpacer } from '@elastic/eui';
 import {
   Chart,
-  getAxisId,
   Axis,
-  getSpecId,
   LineSeries,
   niceTimeFormatter,
   Settings,
   Position,
-  getAnnotationId,
   LineAnnotation,
 } from '@elastic/charts';
 import { ChartContainer } from '../../../../../components/ChartContainer/ChartContainer';
@@ -62,16 +59,16 @@ const AnomaliesChart = props => {
                     showLegendDisplayValue={false}
                   />
                 ) : null}
-                <Axis id={getAxisId('bottom')} position="bottom" tickFormat={timeFormatter} />
+                <Axis id="bottom" position="bottom" tickFormat={timeFormatter} />
                 <Axis
-                  id={getAxisId('left')}
+                  id="left"
                   title={getAxisTitle(props.displayGrade, props.displayConfidence)}
                   position="left"
                   domain={{ min: 0, max: 1 }}
                 />
                 {props.annotationData ? (
                   <LineAnnotation
-                    annotationId={getAnnotationId('anomalyAnnotation')}
+                    annotationId="anomalyAnnotation"
                     domainType="yDomain"
                     dataValues={props.annotationData}
                     style={{
@@ -84,7 +81,7 @@ const AnomaliesChart = props => {
                 ) : null}
                 {props.displayGrade ? (
                   <LineSeries
-                    id={getSpecId('Anomaly grade')}
+                    id="Anomaly grade"
                     xScaleType="time"
                     yScaleType="linear"
                     xAccessor={'plotTime'}
@@ -94,7 +91,7 @@ const AnomaliesChart = props => {
                 ) : null}
                 {props.displayConfidence ? (
                   <LineSeries
-                    id={getSpecId('Confidence')}
+                    id="Confidence"
                     xScaleType="time"
                     yScaleType="linear"
                     xAccessor={'plotTime'}

diff --git a/public/pages/CreateMonitor/components/AnomalyDetectors/FeatureChart/FeatureChart.js b/public/pages/CreateMonitor/components/AnomalyDetectors/FeatureChart/FeatureChart.js
@@ -22,7 +22,6 @@ import {
   getSpecId,
   getAxisId,
   RectAnnotation,
-  getAnnotationId,
   niceTimeFormatter,
 } from '@elastic/charts';
 import { EuiPagination, EuiText, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
@@ -70,7 +69,7 @@ class FeatureChart extends React.Component {
                 <Chart>
                   <RectAnnotation
                     dataValues={annotations || []}
-                    annotationId={getAnnotationId('react')}
+                    annotationId="react"
                     style={{
                       stroke: '#FCAAAA',
                       strokeWidth: 1.5,

diff --git a/...ages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap b/...ages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap
@@ -98,6 +98,7 @@ exports[`Frequencies renders CustomCron 1`] = `
                   style="font-size:14px;display:inline-block"
                 >
                   <input
+                    aria-controls=""
                     data-test-subj="comboBoxSearchInput"
                     id="timezone"
                     role="textbox"

diff --git a/...eMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap b/...eMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap
@@ -639,6 +639,7 @@ exports[`AnomalyDetectors renders 1`] = `
                         onFocus={[Function]}
                       >
                         <EuiComboBox
+                          async={false}
                           compressed={false}
                           fullWidth={false}
                           id="detectorId"
@@ -666,7 +667,6 @@ exports[`AnomalyDetectors renders 1`] = `
                             <EuiComboBoxInput
                               autoSizeInputRef={[Function]}
                               compressed={false}
-                              focusedOptionId={null}
                               fullWidth={false}
                               hasSelectedOptions={false}
                               id="detectorId"
@@ -717,16 +717,15 @@ exports[`AnomalyDetectors renders 1`] = `
                                       className="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
                                       data-test-subj="comboBoxInput"
                                       onClick={[Function]}
-                                      tabIndex="-1"
+                                      tabIndex={-1}
                                     >
                                       <p
                                         className="euiComboBoxPlaceholder"
                                       >
                                         Select a detector
                                       </p>
                                       <AutosizeInput
-                                        aria-activedescendant={null}
-                                        aria-controls={null}
+                                        aria-controls=""
                                         className="euiComboBox__input"
                                         data-test-subj="comboBoxSearchInput"
                                         id="detectorId"
@@ -754,8 +753,7 @@ exports[`AnomalyDetectors renders 1`] = `
                                           }
                                         >
                                           <input
-                                            aria-activedescendant={null}
-                                            aria-controls={null}
+                                            aria-controls=""
                                             data-test-subj="comboBoxSearchInput"
                                             id="detectorId"
                                             onBlur={[Function]}

diff --git a/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap b/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap
@@ -664,7 +664,6 @@ exports[`MonitorIndex renders 1`] = `
                           <EuiComboBoxInput
                             autoSizeInputRef={[Function]}
                             compressed={false}
-                            focusedOptionId={null}
                             fullWidth={false}
                             hasSelectedOptions={false}
                             id="index"
@@ -712,16 +711,15 @@ exports[`MonitorIndex renders 1`] = `
                                     className="euiComboBox__inputWrap euiComboBox__inputWrap-isClearable"
                                     data-test-subj="comboBoxInput"
                                     onClick={[Function]}
-                                    tabIndex="-1"
+                                    tabIndex={-1}
                                   >
                                     <p
                                       className="euiComboBoxPlaceholder"
                                     >
                                       Select indices
                                     </p>
                                     <AutosizeInput
-                                      aria-activedescendant={null}
-                                      aria-controls={null}
+                                      aria-controls=""
                                       className="euiComboBox__input"
                                       data-test-subj="comboBoxSearchInput"
                                       id="index"
@@ -749,8 +747,7 @@ exports[`MonitorIndex renders 1`] = `
                                         }
                                       >
                                         <input
-                                          aria-activedescendant={null}
-                                          aria-controls={null}
+                                          aria-controls=""
                                           data-test-subj="comboBoxSearchInput"
                                           id="index"
                                           onBlur={[Function]}

diff --git a/...ic/pages/Monitors/components/AcknowledgeModal/__snapshots__/AcknowledgeModal.test.js.snap b/...ic/pages/Monitors/components/AcknowledgeModal/__snapshots__/AcknowledgeModal.test.js.snap
@@ -3,7 +3,6 @@
 exports[`AcknowledgeModal renders 1`] = `
 <EuiOverlayMask>
   <EuiConfirmModal
-    buttonColor="primary"
     cancelButtonText="cancel"
     confirmButtonText="Acknowledge"
     maxWidth={650}

diff --git a/yarn.lock b/yarn.lock
@@ -16,7 +16,7 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/core@^7.9.0":
+"@babel/core@^7.5.5":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
   integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
@@ -1151,16 +1151,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0:
+commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
-  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"