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

Upgrade to Kibana 7.10.0 #329

Merged

Conversation

yizheliu-amazon
Copy link
Contributor

@yizheliu-amazon yizheliu-amazon commented Nov 23, 2020

Issue #, if available:

Description of changes:
Upgrade to Kibana 7.10.0

E2E test passed:


  (Run Finished)


       Spec                                              Tests  Passing  Failing  Pending  Skipped
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  ad/dashboard/ad_dashboard.spec.ts        00:13        6        6        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  ad/detectorList/detector_list.spec.      00:17       10       10        -        -        - │
  │    ts                                                                                          │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  ad/workflow/create_detector.spec.ts      00:05        1        1        -        -        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        00:35       17       17        -        -        -

server    log   [19:22:48.484] [info][plugins-system] Stopping all plugins.
✨  Done in 101.88s.

Unit test passed:

Test Suites: 1 skipped, 51 passed, 51 of 52 total
Tests:       5 skipped, 230 passed, 235 total
Snapshots:   46 passed, 46 total
Time:        39.91 s
Ran all test suites.
✨  Done in 41.88s.

yarn build

➜  anomaly-detection-kibana-plugin git:(7-10-0-up) ✗ yarn build
yarn run v1.22.10
$ yarn plugin-helpers build && echo Renaming artifact to $npm_package_config_odfe_name-$npm_package_config_odfe_version.zip && mv ./build/$npm_package_config_odfe_name*.zip ./build/$npm_package_config_odfe_name-$npm_package_config_odfe_version.zip
$ node ../../scripts/plugin_helpers build
 info Loaded config file from [/Users/yizheliu/workspace/kibana-7100/kibana/plugins/anomaly-detection-kibana-plugin/.kibana-plugin-helpers.json]
 info deleting the build and target directories
 info running @kbn/optimizer
 │ info initialized, 0 bundles cached
 │ info starting worker [1 bundle]
 │ succ 1 bundles compiled successfully after 41.4 sec
 info copying source into the build and converting with babel

  `@babel/polyfill` is deprecated. Please, use required parts of `core-js`
  and `regenerator-runtime/runtime` separately
 info running yarn to install dependencies
 info compressing plugin into [opendistroAnomalyDetectionKibana-7.10.0.zip]
Renaming artifact to opendistroAnomalyDetectionKibana-1.12.0.0.zip

Have also installed artifact to binary kibana and done some sanity tests.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

package.json Outdated Show resolved Hide resolved
@ohltyler
Copy link
Contributor

Another thing - can you bump the versions for the test workflows? Regarding the e2e test workflow, I've outlined what I think all needs to be changed based on the new naming conventions here. Let me know and I can put out a follow up PR to handle this as well.

@yizheliu-amazon
Copy link
Contributor Author

Another thing - can you bump the versions for the test workflows? Regarding the e2e test workflow, I've outlined what I think all needs to be changed based on the new naming conventions here. Let me know and I can put out a follow up PR to handle this as well.

Sure. will bump the kibana and ODFE version there.

@yizheliu-amazon yizheliu-amazon added the version upgrade Upgrading Kibana compatibility or dependencies label Nov 24, 2020
## Uninstall existing AD artifact and install new one
echo "RUN if [ -d /usr/share/kibana/plugins/opendistro-anomaly-detection-kibana ]; then /usr/share/kibana/bin/kibana-plugin remove opendistro-anomaly-detection-kibana; fi" >> Dockerfile-AD-Kibana
echo "RUN bin/kibana-plugin install file:///usr/share/kibana/opendistro-anomaly-detection-kibana-$plugin_version.zip;" >> Dockerfile-AD-Kibana
echo "RUN if [ -d /usr/share/kibana/plugins/opendistro-anomaly-detection-kibana ]; then /usr/share/kibana/bin/kibana-plugin remove $AD_KIBANA_PLUGIN_NAME; fi" >> Dockerfile-AD-Kibana
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need to change the first part of this line too - from opendistro-anomaly-detection-kibana to AD_KIBANA_PLUGIN_NAME

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch. done

Copy link
Contributor

@ohltyler ohltyler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the changes!

@@ -23,5 +23,6 @@ module.exports = {
require('@babel/plugin-proposal-class-properties'),
require('@babel/plugin-proposal-object-rest-spread'),
['@babel/plugin-transform-modules-commonjs', { allowTopLevelThis: true }],
[require('@babel/plugin-transform-runtime'), { regenerator: true }],
Copy link

@ftianli-amzn ftianli-amzn Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I will also do this line of change when fixing functional tests for Alerting Kibana plugin.
Just a reminder that true is the default value for the option regenerator, so I think { regenerator: true } can be omitted. (https://babeljs.io/docs/en/babel-plugin-transform-runtime#regenerator)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. good to know!

@yizheliu-amazon yizheliu-amazon merged commit 14168a7 into opendistro-for-elasticsearch:master Nov 24, 2020
@yizheliu-amazon yizheliu-amazon deleted the 7-10-0-up branch November 24, 2020 22:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
version upgrade Upgrading Kibana compatibility or dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants