Merge dev to master branch for ODFE 1.12 release (#57)

Merge dev to master branch for ODFE 1.12 release

.github/workflows/release-workflow.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: opendistro-for-elasticsearch/kibana-oss
-          ref: 7.9.1
+          ref: 7.10.0
           token: ${{secrets.OD_ACCESS}}
           path: kibana
 
@@ -37,7 +37,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.22.0'
+          node-version: '10.22.1'
 
       - name: Kibana Pluign Bootstrap
         run: |
@@ -46,6 +46,7 @@ jobs:
       - name: Build Artifact
         run: |
           yarn build
+          mv ./build/*.zip ./build/opendistroNotebooksKibana-1.12.0.0.zip
           artifact=`ls ./build/*.zip`
 
           aws s3 cp $artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-notebooks/

.github/workflows/test-and-build-workflow.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v1
         with:
           repository: elastic/kibana
-          ref: v7.9.1
+          ref: v7.10.0
           path: kibana
       - name: Checkout Plugin
         uses: actions/checkout@v1
@@ -23,13 +23,14 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.22.0'
+          node-version: '10.22.1'
       - name: Kibana Pluign Bootstrap
         run: |
           yarn kbn bootstrap
       - name: Build Artifact
         run: |
           yarn build
+          mv ./build/*.zip ./build/opendistroNotebooksKibana-1.12.0.0.zip
       - name: Upload Artifact
         uses: actions/upload-artifact@v1
         with:

.gitignore

@@ -1,5 +1,6 @@
 npm-debug.log*
 node_modules
+/target/
 /build/
 /public/app.css
 **/.DS_Store

.kibana-plugin-helpers.json

@@ -1,9 +1,12 @@
 {
-  "buildSourcePatterns": [
+  "serverSourcePatterns": [
     "package.json",
     "yarn.lock",
     "tsconfig.json",
-    "{public,server,common,target}/**/*",
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+    "target/**/*",
     "kibana.json"
   ]
 }

README.md

@@ -1,6 +1,6 @@
 # Open Distro for Elasticsearch Kibana Notebooks
 
-Dashboards offer a solution for a few selected use cases, and are a great tool if you’re focused on monitoring a known set of metrics over time. Notebooks enables contextual use of data with detailed explanations by allowing a user to combine saved visualizations, text, graphs and decorate data in elastic with other reference data sources.
+Dashboards offer a solution for a few selected use cases, and are great tools if you’re focused on monitoring a known set of metrics over time. Notebooks enables contextual use of data with detailed explanations by allowing a user to combine saved visualizations, text, graphs and decorate data in elastic with other reference data sources.
 
 ## Documentation
 
@@ -31,7 +31,7 @@ Ultimately, your directory structure should look like this:
 
 To build the plugin's distributable zip simply run `yarn build`.
 
-Example output: `./build/kibana_notebooks-*.zip`
+Example output: `./build/opendistro-notebooks-kibana-*.zip`
 
 
 ## Run
@@ -40,7 +40,7 @@ Example output: `./build/kibana_notebooks-*.zip`
 
   Starts Kibana and includes this plugin. Kibana will be available on `localhost:5601`.
 
-- `yarn test`
+- `yarn test:cypress`
 
   Runs the plugin cypress tests.
 

cypress.json

@@ -7,6 +7,8 @@
   "screenshotsFolder": ".cypress/screenshots",
   "supportFile": ".cypress/support/index.js",
   "videosFolder": ".cypress/videos",
+  "viewportWidth": 1000,
+  "viewportHeight": 1600,
   "requestTimeout": 60000,
   "responseTimeout": 60000,
   "defaultCommandTimeout": 60000

kibana.json

@@ -1,7 +1,7 @@
 {
-  "id": "opendistro-notebooks-kibana",
-  "version": "1.11.0.0",
-  "kibanaVersion": "7.9.1",
+  "id": "opendistroNotebooksKibana",
+  "version": "1.12.0.0",
+  "kibanaVersion": "7.10.0",
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "embeddable", "dashboard"],

package.json

@@ -1,48 +1,33 @@
 {
   "name": "opendistro-notebooks-kibana",
-  "version": "1.11.0.0",
+  "version": "1.12.0.0",
   "description": "Kibana Notebooks",
   "main": "index.ts",
+  "license": "Apache-2.0",
   "kibana": {
-    "version": "7.9.1",
+    "version": "7.10.0",
     "templateVersion": "1.0.0"
   },
   "scripts": {
-    "preinstall": "node ../../preinstall_check",
     "kbn": "node ../../scripts/kbn",
     "es": "node ../../scripts/es",
     "lint": "eslint .",
-    "start": "plugin-helpers start",
-    "test:server": "plugin-helpers test:server",
-    "test:browser": "plugin-helpers test:browser",
-    "build": "plugin-helpers build",
+    "start": "yarn plugin-helpers start",
+    "build": "yarn plugin-helpers build",
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
     "test:jest": "../../node_modules/.bin/jest --config ./test/jest.config.js",
-    "test": "cypress run",
+    "test:server": "yarn plugin-helpers test:server",
+    "test:browser": "yarn plugin-helpers test:browser",
+    "test:cypress": "cypress run",
     "postinstall": "yarn run babel node_modules/@nteract/markdown/lib -d node_modules/@nteract/markdown/lib; yarn run babel node_modules/@nteract/mathjax/lib -d node_modules/@nteract/mathjax/lib; yarn run babel node_modules/@nteract/outputs/lib -d node_modules/@nteract/outputs/lib; yarn run babel node_modules/@nteract/presentational-components/lib -d node_modules/@nteract/presentational-components/lib; yarn run babel node_modules/ansi-to-react/lib -d node_modules/ansi-to-react/lib;"
   },
   "devDependencies": {
-    "@babel/cli": "^7.11.6",
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "@elastic/eslint-config-kibana": "link:../../packages/eslint-config-kibana",
-    "@elastic/eslint-import-resolver-kibana": "link:../../packages/kbn-eslint-import-resolver-kibana",
-    "@kbn/expect": "link:../../packages/kbn-expect",
-    "@kbn/plugin-helpers": "link:../../packages/kbn-plugin-helpers",
-    "babel-eslint": "^10.0.1",
-    "cypress": "^5.3.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-jest": "^22.4.1",
-    "eslint-plugin-jsx-a11y": "^6.2.1",
-    "eslint-plugin-mocha": "^5.3.0",
-    "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-react": "^7.12.4",
-    "jest": "^26.4.1"
+    "cypress": "^5.0.0",
+    "eslint": "^6.8.0"
   },
   "dependencies": {
-    "@hapi/wreck": "^17.0.0",
+    "lodash": "^4.17.20",
+    "@babel/cli": "^7.10.5",
     "@nteract/outputs": "^3.0.11",
     "@nteract/presentational-components": "^3.4.3"
   },
@@ -63,7 +48,7 @@
     ]
   },
   "engines": {
-    "node": "10.22.0",
+    "node": "10.22.1",
     "yarn": "^1.21.1"
   }
 }

release-notes/opendistro-for-elasticsearch-kibana-notebooks.release-notes-1.12.0.0.md

@@ -0,0 +1,12 @@
+## 2020-11-18 Version 1.12.0.0
+
+### Bug fixes
+* Correct URL link ([#55](https://github.com/opendistro-for-elasticsearch/kibana-notebooks/pull/55))
+
+
+### Infrastructure
+* Update plugin id to use camelcase ([#51](https://github.com/opendistro-for-elasticsearch/kibana-notebooks/pull/51))
+
+
+### Maintenance
+* Upgrade to ODFE 1.12.0 ([#56](https://github.com/opendistro-for-elasticsearch/kibana-notebooks/pull/56))