Removed default integtest.sh (1.1).

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

@@ -5,8 +5,8 @@ on: [pull_request, push]
 env:
   PLUGIN_NAME: reportsDashboards
   ARTIFACT_NAME: reports-dashboards
-  OPENSEARCH_VERSION: '1.0'
-  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
+  OPENSEARCH_VERSION: '1.x'
+  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
 
 jobs:
   build:

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

@@ -3,9 +3,10 @@ name: Test and Build Reports Scheduler
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.0'
-  COMMON_UTILS_VERSION: '1.0'
-  JOB_SCHEDULER_VERSION: '1.0'
+  OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
+  OPENSEARCH_BRANCH: '1.1'
+  COMMON_UTILS_BRANCH: 'main'
+  JOB_SCHEDULER_BRANCH: 'main'
 
 jobs:
   build:
@@ -23,32 +24,32 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: ${{ env.OPENSEARCH_VERSION }}
+          ref: ${{ env.OPENSEARCH_BRANCH }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
-        run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal
 
       # dependencies: common-utils
       - name: Checkout common-utils
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: ${{ env.COMMON_UTILS_VERSION }}
+          ref: ${{ env.COMMON_UTILS_BRANCH }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # dependencies: job-scheduler
       - name: Checkout job-scheduler
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/job-scheduler'
-          ref: ${{ env.JOB_SCHEDULER_VERSION }}
+          ref: ${{ env.JOB_SCHEDULER_BRANCH }}
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # reports-scheduler
       - name: Checkout Reports Scheduler
@@ -57,7 +58,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd reports-scheduler
-          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1
@@ -76,4 +77,4 @@ jobs:
         with:
           name: reports-scheduler
           path: reports-scheduler-builds
-          
+

README.md

@@ -26,10 +26,10 @@ We welcome you to get involved in development, documentation, testing the OpenSe
 
 ## Setup & Build
 
-Complete OpenSearch Dashboards Report feature is composed of 2 plugins. Refer to README in each plugin folder for more details.
+Complete OpenSearch Dashboards Report feature is composed of 2 plugins.
 
 - [OpenSearch Dashboards reports plugin](./dashboards-reports/README.md)
-- [OpenSearch Reports scheduler plugin](./reports-scheduler/README.md)（TODO）
+- OpenSearch Reports scheduler plugin
 
 ## Notifications Integration
 
@@ -54,7 +54,7 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## License
 
-See the [LICENSE](./LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](./LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 ## Copyright
 

dashboards-reports/.cypress/integration/01-create.spec.ts

@@ -24,6 +24,20 @@
  * permissions and limitations under the License.
  */
 
+describe('Adding sample data', () => {
+  it('Adds sample data', () => {
+    cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`);
+    cy.get('div[data-test-subj="sampleDataSetCardflights"]').contains(/(Add|View) data/).click();
+    cy.wait(3000);
+    cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`);
+    cy.get('div[data-test-subj="sampleDataSetCardecommerce"]').contains(/(Add|View) data/).click();
+    cy.wait(3000);
+    cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`);
+    cy.get('div[data-test-subj="sampleDataSetCardlogs"]').contains(/(Add|View) data/).click();
+    cy.wait(3000);
+  });
+});
+
 describe('Cypress', () => {
   it('Visits Reporting homepage', () => {
     cy.visit(`${Cypress.env('opensearchDashboards')}/app/reports-dashboards#/`);
@@ -59,10 +73,20 @@ describe('Cypress', () => {
     cy.get('#reportSettingsDescription').type('Description for cypress test');
 
     // select a report source
-    cy.get('.euiComboBox').click({ force: true });
+    cy.get('[data-test-subj="comboBoxInput"]').eq(0).click({ force: true });
+
+    // select drop-down option in report source list
+    cy.contains('[Logs] Web Traffic').click();
+
+    cy.wait(500);
 
     // create an on-demand report definition
     cy.get('#createNewReportDefinition').click({ force: true });
+
+    cy.wait(12500);
+
+    // check that re-direct to 
+    cy.get('#reportDefinitionDetailsLink').should('exist');
   });
 
   it('Create a new scheduled report definition', () => {
@@ -80,6 +104,14 @@ describe('Cypress', () => {
     // enter a report description
     cy.get('#reportSettingsDescription').type('Description for cypress test');
 
+    // select a report source
+    cy.get('[data-test-subj="comboBoxInput"]').eq(0).click({ force: true });
+
+    // select drop-down option in report source list
+    cy.contains('[Logs] Web Traffic').click();
+
+    cy.wait(500);
+
     // set report trigger to Schedule option
     cy.get('[type="radio"]').check({ force: true });
 
@@ -88,5 +120,10 @@ describe('Cypress', () => {
 
     // create scheduled report definition
     cy.get('#createNewReportDefinition').click({ force: true });
+
+    cy.wait(12500);
+
+    // check that re-direct to 
+    cy.get('#reportDefinitionDetailsLink').should('exist');
   });
 });

dashboards-reports/cypress.json

@@ -1,11 +1,14 @@
 {
-  "video": false,
+  "video": true,
   "fixturesFolder": ".cypress/fixtures",
   "integrationFolder": ".cypress/integration",
   "pluginsFile": ".cypress/plugins/index.js",
   "screenshotsFolder": ".cypress/screenshots",
   "supportFile": ".cypress/support/index.js",
   "videosFolder": ".cypress/videos",
+  "requestTimeout": 60000,
+  "responseTimeout": 60000,
+  "defaultCommandTimeout": 60000,
   "env": {
     "opensearch": "localhost:9200",
     "opensearchDashboards": "localhost:5601",

dashboards-reports/opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "reportsDashboards",
-  "version": "1.0.0.0",
-  "opensearchDashboardsVersion": "1.0.0",
+  "version": "1.1.0.0",
+  "opensearchDashboardsVersion": "1.1.0",
   "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
   "optionalPlugins": ["share"],
   "server": true,

dashboards-reports/package.json

@@ -1,11 +1,11 @@
 {
   "name": "reports-dashboards",
-  "version": "1.0.0.0",
+  "version": "1.1.0.0",
   "description": "OpenSearch Dashboards Reports Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",
   "opensearchDashboards": {
-    "version": "1.0.0",
+    "version": "1.1.0",
     "templateVersion": "1.0.0"
   },
   "scripts": {

dashboards-reports/public/components/context_menu/context_menu.js

@@ -66,11 +66,11 @@ const generateInContextReport = async (
   }
 
   let reportSource = '';
-  if (baseUrl.includes('dashboard')) {
+  if (/\/app\/dashboards/.test(baseUrl)) {
     reportSource = 'Dashboard';
-  } else if (baseUrl.includes('visualize')) {
+  } else if (/\/app\/visualize/.test(baseUrl)) {
     reportSource = 'Visualization';
-  } else if (baseUrl.includes('discover')) {
+  } else if (/\/app\/discover/.test(baseUrl)) {
     reportSource = 'Saved search';
   }
 

dashboards-reports/public/components/context_menu/context_menu_helpers.js

@@ -71,11 +71,11 @@ export const contextMenuCreateReportDefinition = (baseURI) => {
   const timeRanges = getTimeFieldsFromUrl();
 
   // check report source
-  if (baseURI.includes('dashboard')) {
+  if (/\/app\/dashboards/.test(baseURI)) {
     reportSource = 'dashboard:';
-  } else if (baseURI.includes('visualize')) {
+  } else if (/\/app\/visualize/.test(baseURI)) {
     reportSource = 'visualize:';
-  } else if (baseURI.includes('discover')) {
+  } else if (/\/app\/discover/.test(baseURI)) {
     reportSource = 'discover:';
   }
   reportSource += reportSourceId.toString();

dashboards-reports/server/utils/validationHelper.ts

@@ -55,7 +55,7 @@ export const isValidRelativeUrl = (relativeUrl: string) => {
 export const regexDuration = /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/;
 export const regexEmailAddress = /\S+@\S+\.\S+/;
 export const regexReportName = /^[\w\-\s\(\)\[\]\,\_\-+]+$/;
-export const regexRelativeUrl = /^\/(_plugin\/kibana\/app|app)\/(dashboards|visualize|discover|notebooks-dashboards\?view=output_only)(\?security_tenant=.+|)#\/(view\/|edit\/)?[^\/]+$/;
+export const regexRelativeUrl = /^\/(_plugin\/kibana\/|_dashboards\/)?app\/(dashboards|visualize|discover|notebooks-dashboards\?view=output_only)([?&]security_tenant=.+|)#\/(view\/|edit\/)?[^\/]+$/;
 
 export const validateReport = async (
   client: ILegacyScopedClusterClient,

release-notes/opensearch-dashboards-reports.release-notes-1.0.1.0.md

@@ -0,0 +1,9 @@
+## Version 1.0.1.0 Release Notes
+
+Compatible with OpenSearch 1.0.1
+
+### Bug Fixes
+* Bump version and add notebooks context menu fix for 1.0.1.0 patch ([#142](https://github.com/opensearch-project/dashboards-reports/pull/142))
+
+### Documentation
+* Add release notes for 1.0.1 release ([#143](https://github.com/opensearch-project/dashboards-reports/pull/143))

release-notes/opensearch-dashboards-reports.release-notes-1.1.0.0.md

@@ -0,0 +1,14 @@
+## Version 1.1.0.0 Release Notes
+
+Compatible with OpenSearch 1.1.0
+
+### Bug Fixes
+* Fix url validation ([#132](https://github.com/opensearch-project/dashboards-reports/pull/132))
+* Fix url validation for context menu ([#134](https://github.com/opensearch-project/dashboards-reports/pull/134))
+
+### Infrastructure
+* Bump opensearch ref to 1.1 in CI ([#155](https://github.com/opensearch-project/dashboards-reports/pull/155))
+
+### Infrastructure
+* Fix snapshot build and upgrade to OpenSearch 1.1 ([#140](https://github.com/opensearch-project/dashboards-reports/pull/140))
+* Bump version for Opensearch 1.1.0 release ([#149](https://github.com/opensearch-project/dashboards-reports/pull/149))

reports-scheduler/build.gradle

@@ -30,10 +30,12 @@ import java.util.concurrent.Callable
 buildscript {
     ext {
         opensearch_group = "org.opensearch"
-        opensearch_version = System.getProperty("opensearch.version", "1.0.0")
+        opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
+        // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
+        opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
+        common_utils_version = System.getProperty("common_utils.version", opensearch_build)
+        job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build)   
         kotlin_version = System.getProperty("kotlin.version", "1.4.0")
-        common_utils_version = "1.0.0.0"
-        job_scheduler_version = "1.0.0.0"
     }
 
     repositories {
@@ -109,11 +111,6 @@ ext {
     licenseFile = rootProject.file('LICENSE.txt')
     noticeFile = rootProject.file('NOTICE.txt')
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    opensearchVersion = "${version}.0"
-}
-
-if (isSnapshot) {
-    version += "-SNAPSHOT"
 }
 
 plugins.withId('java') {
@@ -126,7 +123,10 @@ plugins.withId('org.jetbrains.kotlin.jvm') {
 
 allprojects {
     group = "org.opensearch"
-    version = "${opensearchVersion}"
+    version = "${opensearch_version}" - "-SNAPSHOT" + ".0"
+    if (isSnapshot) {
+        version += "-SNAPSHOT"
+    } 
     plugins.withId('java') {
         sourceCompatibility = targetCompatibility = "1.8"
     }
@@ -236,14 +236,18 @@ integTest {
     if (System.getProperty("test.debug") != null) {
         jvmArgs '-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=8000'
     }
+
+    if (System.getProperty("tests.clustername") != null) {
+         exclude 'org/opensearch/reportsscheduler/ReportsSchedulerPluginIT.class'
+    }
 }
 
 Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
 integTest.dependsOn(bundle)
 integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
 
 testClusters.integTest {
-    testDistribution = "INTEG_TEST"
+    testDistribution = "ARCHIVE"
     // need to install job-scheduler first, need to assemble job-scheduler first
     plugin(provider(new Callable<RegularFile>(){
         @Override