From bf9a91cbe3ad1c92c6eb3591d9120689b09d10bd Mon Sep 17 00:00:00 2001
From: Tianli Feng <62041081+ftianli-amzn@users.noreply.github.com>
Date: Wed, 24 Jun 2020 20:09:56 -0700
Subject: [PATCH] Adds support for Kibana 7.8.0 (#163)
* Bump version number of ES, ODFE, and node
* update Jest snapshots
* update release notes with Kibana 7.8.0 support
* Move plugin entry into Kibana app category in sidebar
---
index.js | 5 +-
package.json | 6 +-
.../Flyout/__snapshots__/Flyout.test.js.snap | 8 -
.../AnomalyDetector.test.js.snap | 1 +
.../__snapshots__/MonitorIndex.test.js.snap | 1 +
...h.alerting-kibana.release-notes-1.9.0.0.md | 4 +
yarn.lock | 262 +++++++++---------
7 files changed, 143 insertions(+), 144 deletions(-)
create mode 100644 release-notes/opendistro-for-elasticsearch.alerting-kibana.release-notes-1.9.0.0.md
diff --git a/index.js b/index.js
index 98a5ae1a..d9625806 100644
--- a/index.js
+++ b/index.js
@@ -13,7 +13,6 @@
* permissions and limitations under the License.
*/
-import { resolve } from 'path';
import { alerts, destinations, elasticsearch, monitors, detectors } from './server/routes';
import {
AlertService,
@@ -24,8 +23,9 @@ import {
} from './server/services';
import { createAlertingCluster, createAlertingADCluster } from './server/clusters';
import { PLUGIN_NAME } from './utils/constants';
+import { DEFAULT_APP_CATEGORIES } from '../../src/core/utils';
-export default function(kibana) {
+export default function (kibana) {
return new kibana.Plugin({
require: ['elasticsearch'],
name: PLUGIN_NAME,
@@ -35,6 +35,7 @@ export default function(kibana) {
description: 'Kibana Alerting Plugin',
main: `plugins/${PLUGIN_NAME}/app`,
icon: `plugins/${PLUGIN_NAME}/images/alerting_icon.svg`,
+ category: DEFAULT_APP_CATEGORIES.kibana,
},
hacks: [`plugins/${PLUGIN_NAME}/hack`],
diff --git a/package.json b/package.json
index a984c581..63700158 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
{
"name": "opendistro-alerting",
- "version": "1.8.0.0",
+ "version": "1.9.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.7.0",
+ "version": "7.8.0",
"templateVersion": "6.3.3"
},
"repository": {
@@ -47,7 +47,7 @@
"fstream": "1.0.12"
},
"engines": {
- "node": "10.19.0",
+ "node": "10.21.0",
"yarn": "^1.21.1"
}
}
diff --git a/public/components/Flyout/__snapshots__/Flyout.test.js.snap b/public/components/Flyout/__snapshots__/Flyout.test.js.snap
index db6c8a4f..9c9f5c7f 100644
--- a/public/components/Flyout/__snapshots__/Flyout.test.js.snap
+++ b/public/components/Flyout/__snapshots__/Flyout.test.js.snap
@@ -2,23 +2,15 @@
exports[`Flyout defaults if bad flyout data 1`] = `
`;
exports[`Flyout renders 1`] = `