Skip to content

Commit 0268d4d

Browse files
rupal-bqzhongnansudavidcui1225joshuali925CarlMeadows
authored
Update 1.x branch with latest 1.3 branch (#553)
* Fix release notes version (#28) Signed-off-by: Zhongnan Su <[email protected]> * Migrate Reporting Notebooks Integration (#21) Signed-off-by: David Cui <[email protected]> * Add Logic to Auto-populate Notebooks from Context Menu (#30) Signed-off-by: David Cui <[email protected]> * Change opendistro to opensearch in email template (#31) Signed-off-by: Joshua Li <[email protected]> * Fix case sensitive directory name for chromium zip (#35) Signed-off-by: David Cui <[email protected]> Co-authored-by: Carl Meadows <[email protected]> Co-authored-by: Zhongnan Su <[email protected]> Co-authored-by: Joshua Li <[email protected]> * Use output_only Parameter for notebook reports (#32) Signed-off-by: David Cui <[email protected]> * replace osd-version header to remove need for version number matching (#37) Signed-off-by: David Cui <[email protected]> * Remove visualization editor in visualization reports (#50) Signed-off-by: Joshua Li <[email protected]> * add condition to fix negative value display (#51) Signed-off-by: David Cui <[email protected]> * [Query Builder] Correctly handle match phrases when a single value is specified or when the match phrases is negated (#33) * [Build query] Correctly handle phrases filter that specify only one single value Contrary to the phrase filter type which always specify a meta.params.query, the phrases filter type never specify a meta.params.query even when a single value is selected. This anomaly trigger an error generated by the MonoFieldQueryBase included in the elastic-builder dependency and prevent the generation of the report. Signed-off-by: Kévin Masseix <[email protected]> * [Build query] Correctly handle negated phrases filter that specify only one single value Signed-off-by: Kévin Masseix <[email protected]> * [Build query] Correctlty handle negated phrases to exclude them from the report instead of including them Signed-off-by: Kévin Masseix <[email protected]> * Pass processing if doc[field] == null (#361) Pass processing if doc[field] == null Based on opendistro-for-elasticsearch/kibana-reports#327 (comment) * add test case for commit 368eb03e200b755870f1ad373e67561201ab6f31 (#370) Add missing test case for the fix "pass doc[field] == null" * Unhash page url in case store URLs in session storage is enabled from Kibana advanced setting (#371) * Update Namespaces/APIs/Documentation for OpenSearch (#55) Signed-off-by: David Cui <[email protected]> * bump path-parse version to 1.0.7 to address CVE (#59) Signed-off-by: David Cui <[email protected]> * increase chromium timeout to 100s (#58) Signed-off-by: Zhongnan Su <[email protected]> * Fix csv parsing function (#53) * Fix csv parsing function Signed-off-by: Joshua Li <[email protected]> * Flatten nested results for csv Signed-off-by: Joshua Li <[email protected]> * Add test case for nested fields Signed-off-by: Joshua Li <[email protected]> * Add release notes for rc1 (#60) Signed-off-by: David Cui <[email protected]> * configure index settings to have default 1 replica and auto-expand upperbound 2 (#62) Signed-off-by: Zhongnan Su <[email protected]> * Rc1 release note patch (#63) Signed-off-by: David Cui <[email protected]> * Bump OpenSearch Dashboards version to 1.0 (#64) Signed-off-by: David Cui <[email protected]> * Revert .opensearch_dashboards index references to .kibana (#67) Signed-off-by: David Cui <[email protected]> * Add diagrams for integration with Notifications plugin (#75) * add puml diagrams for integration with Notifications plugin Signed-off-by: David Cui <[email protected]> * amend Notifications plugin naming in diagram Signed-off-by: David Cui <[email protected]> * Add i18n translation support (#362) * PDF report is no more a screenshot, increasing the overall quality Also a issue with chrome font rendering was fixed * Add Notifications to docs (#87) * moved docs to root folder, update readme to include Notifications roadmap Signed-off-by: David Cui <[email protected]> * update readme to clarify current status of supported features Signed-off-by: David Cui <[email protected]> * Better support sorting for csv report based on saved search (#86) * Change Delivery Request Body for Notifications (#85) * adding opensearch changed api for report definition to save branch Signed-off-by: David Cui <[email protected]> * change delivery request body, update test cases Signed-off-by: David Cui <[email protected]> * remove console.log statement, fix DeliveryType type members to use snake case Signed-off-by: David Cui <[email protected]> * convert all snake case to camel case Signed-off-by: David Cui <[email protected]> * make configId required in schema Signed-off-by: David Cui <[email protected]> * Remove legacy notifications/delivery related code (#94) * remove legacy notifications/delivery related code Signed-off-by: David Cui <[email protected]> * remove commented out reference Signed-off-by: David Cui <[email protected]> * Remove dependency on demo.elastic and use local mock html for testing (#100) * Add code cov back (#98) Signed-off-by: Zhongnan Su <[email protected]> * update workflow to rename artifact in kebab case (#102) Signed-off-by: Zhongnan Su <[email protected]> * bump dependency version (#101) Signed-off-by: Zhongnan Su <[email protected]> * level up markdowns and readme (#97) Signed-off-by: Zhongnan Su <[email protected]> * Bump to version 1.0.0.0 (#103) Signed-off-by: Zhongnan Su <[email protected]> * Bump test resource(job-scheduler) to 1.0.0.0 (#105) Signed-off-by: Zhongnan Su <[email protected]> * fix failed cypress integ-testing (#106) Signed-off-by: Zhongnan Su <[email protected]> * Bump node version, fix workflow and gradle build (#108) * Bump nodejs version to keep up with upstream Signed-off-by: Zhongnan Su <[email protected]> * fix github workflow Signed-off-by: Zhongnan Su <[email protected]> * Add release notes for 1.0.0.0 (#104) Signed-off-by: Zhongnan Su <[email protected]> * Fix notebooks context menu (#109) Signed-off-by: Joshua Li <[email protected]> * Fix context menu download request body after schema change to add notifiaction (#115) Signed-off-by: Zhongnan Su <[email protected]> * Exclude time range from report details for Notebooks (#117) * exclude time range check for notebooks reports Signed-off-by: David Cui <[email protected]> * use report source identifier over url partial match Signed-off-by: David Cui <[email protected]> * add report details fix to release notes Signed-off-by: David Cui <[email protected]> * add more bug fixes to release notes Signed-off-by: David Cui <[email protected]> * Update regex for notebooks reports (#118) Signed-off-by: Joshua Li <[email protected]> * Add integtest script to the repo Signed-off-by: Peter Zhu <[email protected]> * Improve osd bootstrap on dub directory Signed-off-by: Peter Zhu <[email protected]> * Improve osd bootstrap on dub directory Signed-off-by: Peter Zhu <[email protected]> * Exclude Faulty Integration Test (#122) Exclude broken ITs from upstream OpenSearch * Fix cypress reporting (#123) * fix create test Signed-off-by: David Cui <[email protected]> * toggle video on for cypress testing (#124) Signed-off-by: David Cui <[email protected]> * Update Doc Links (#127) * update doc links in dashboards-reports Signed-off-by: David Cui <[email protected]> * Update template to reflect new branding (#128) Signed-off-by: kgcreative <[email protected]> * Update UI for Notifications Integration (#126) Update reporting front-end for Notifications integration Signed-off-by: David Cui <[email protected]> * Add themed logo to README (#130) Signed-off-by: Miki <[email protected]> * Fix url validation (#132) Signed-off-by: Joshua Li <[email protected]> * Fix url validation for context menu (#134) * Fix url validation for context menu Signed-off-by: Joshua Li <[email protected]> * Fix url validation Signed-off-by: Joshua Li <[email protected]> * Connect Notifications APIs to Reporting (#131) * call notifications APIs from reporting, saving progress Signed-off-by: David Cui <[email protected]> * enable notifications integration, update view in details pages, update tests Signed-off-by: David Cui <[email protected]> * address comments, add server APIs to call backend notifications APIs to reduce dependency Signed-off-by: David Cui <[email protected]> * add get_event API to confirm test messages are sent successfully and throw error if not Signed-off-by: David Cui <[email protected]> * add input validation for delivery subject and message, hide notifications section if opensearch notifications is not installed Signed-off-by: David Cui <[email protected]> * renamed constant for notifications to follow API_PREFIX convention Signed-off-by: David Cui <[email protected]> * rename notifications constant to reporting_notifications Signed-off-by: David Cui <[email protected]> * add list of failed channels on test message failure Signed-off-by: David Cui <[email protected]> * Fix snapshot build and upgrade to OpenSearch 1.1. (#140) Signed-off-by: dblock <[email protected]> * Add release notes for 1.0.1 release (#143) Signed-off-by: Joshua Li <[email protected]> * Bump to 1.1 in main (#150) * bump version to 1.1, hide delivery section Signed-off-by: David Cui <[email protected]> * Dont hide delivery by default Signed-off-by: David Cui <[email protected]> * bump version to 1.1 in dashboards reports workflow Signed-off-by: David Cui <[email protected]> * fix OSD branch to use main Signed-off-by: David Cui <[email protected]> * change from main to 1.x for dashboards version Signed-off-by: David Cui <[email protected]> * Bump opensearch ref to 1.1 in CI (#155) * Removed integtest.sh. (#157) Signed-off-by: dblock <[email protected]> * Taking RBAC settings from Alerting plugin default to false Other changes: 1. Legacy settings removed because all relavent settings are removed or taken from Alerting plugin 2. Poll API removed as it is not used [Tests] All existing tests passed Signed-off-by: @akbhatta * Bump tmpl from 1.0.4 to 1.0.5 in /dashboards-reports (#164) Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix quoting and url-encoding (#153) * Replace '%2F' with '/' in relative dates Signed-off-by: Konstantin Roussou <[email protected]> * Ensure proper quoting of converted dates in URL Signed-off-by: Konstantin Roussou <[email protected]> * Use generic URL decoding Co-authored-by: Zhongnan Su <[email protected]> * Use roundUp for toDate Co-authored-by: Zhongnan Su <[email protected]> * Make date transformation same as in context_menu_helpers.js Co-authored-by: Zhongnan Su <[email protected]> * Integrate notifications backend (#129) * Remove hard coded localhost when calling API (#172) * rename plugin helper config file name to consistent with OSD (#180) Signed-off-by: Tengda He <[email protected]> * Add metrics for sending notifications (#173) * Add logic to build report detail page link and send as part of message for non-email channels (#182) * forward origin plus basePath to backend * Add build report link function and forward link as part of message * Update validation for observability notebooks integration (#174) * Build email message from template with reports links (#184) * remove the email tempalte and helpers from dashboards plugin * build email message from template for reporting notifcation Signed-off-by: Zhongnan Su <[email protected]> * Support range filters for csv reports (#185) * Forward extra headers while using headless chromium (#194) * Use advanced settings for date format in csv reports (#186) * add check in ReportInstanceActions to fix on demand report creation after report definition creation (#196) Signed-off by: David Cui <[email protected]> * Catch Notifications Errors on Details Pages (#197) * add catch statements to notifications get_configs to avoid crashing details pages Signed-off by: David Cui <[email protected]> * remove console log statment Signed-off by: David Cui <[email protected]> * remove notifications integration from details pages and update snapshots (#210) Signed-off-by: David Cui <[email protected]> * fix csv missing metadata fields issue and empty report on all(_source) fields (#206) * remove notifications references from create and edit report definition pages (#212) Signed-off by: David Cui <[email protected]> * refactor logic for creating DSL from saved object using buildOpensearchQuery() (#213) * Remove calling notifications in reports scheduler (#211) * Use advanced settings for csv separator and visual report timezone (#209) * Bump to version 1.2 (#203) * Bump to version 1.2 Bump OpenSearch and OpenSearch Dashboards plugins to 1.2 Related issue: #167 Signed-off-by: Kawika Avilla <[email protected]> * Use maven for building reports scheduler Signed-off-by: Joshua Li <[email protected]> Co-authored-by: Joshua Li <[email protected]> * Add dco and release drafter workflows (#217) Signed-off-by: Joshua Li <[email protected]> * update readme notification section (#216) Signed-off-by: Zhongnan Su <[email protected]> * revert paths to opendistro to keep cluster permissions same with ODFE (#218) Signed-off-by: David Cui <[email protected]> * Create opensearch-dashboards-reports.release-notes-1.2.0.0.md Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> * Update the copyright notices to reflect OpenSearch Contributors (#220) * update the copyright notices to reflect OpenSearch Contributors Signed-off-by: David Cui <[email protected]> * add .txt to NOTICE to resolve linkchecker error Signed-off-by: David Cui <[email protected]> * changes Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> * changes Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> * Remove notifications actions in reports scheduler (#221) Signed-off-by: Joshua Li <[email protected]> * add reporting osd server configurations (#222) Signed-off-by: Zhongnan Su <[email protected]> * Add suggested font packages in troubleshooting tips (#189) * add suggested font packages in troubleshooting tips Signed-off-by: David Cui <[email protected]> * add links to package documentation in README for font packages Signed-off-by: David Cui <[email protected]> * add more descriptive title under Troubleshooting Signed-off-by: David Cui <[email protected]> * add link to headless-chrome installation and add ipa-gothic-fonts link to centos 7 Signed-off-by: David Cui <[email protected]> * Update Copyright Headers (#226) * update copyright header for all files Signed-off-by: David Cui <[email protected]> * fix ktlint errors with extra whitespace Signed-off-by: David Cui <[email protected]> * Add support for codeowners to repo (#227) Signed-off-by: Ryan Bogan <[email protected]> * Fix reporting validation for observability (#231) * Update reporting validation for observability Signed-off-by: Joshua Li <[email protected]> * update tests Signed-off-by: Joshua Li <[email protected]> * remove poller code from frontend plugin (#235) Signed-off-by: Zhongnan Su <[email protected]> * bump reports-scheduler to 1.3 (#241) Signed-off-by: Zhongnan Su <[email protected]> * Fix apt source and link checker for CI (#245) * Update apt source in CI Signed-off-by: Joshua Li <[email protected]> * Try fix link checker Signed-off-by: Joshua Li <[email protected]> * Add Case Coverage tests for Create Report Definition (#239) * add & refactor cypress tests, add css selectors in report settings & report trigger Signed-off-by: David Cui <[email protected]> * remove comment and update jest snapshot Signed-off-by: David Cui <[email protected]> * add bwc test for reports-scheduler (#244) Signed-off-by: Zhongnan Su <[email protected]> * added code summary table (#243) * added code summary table Signed-off-by: Shenoy Pratik <[email protected]> * modularized tables, fixed links Signed-off-by: Shenoy Pratik <[email protected]> * updated header, changed bwc link Signed-off-by: Shenoy Pratik <[email protected]> * Add Cypress Case Coverage on Details Pages (#250) * add and refactor cypress tests for details pages Signed-off-by: David Cui <[email protected]> * update jest snapshots Signed-off-by: David Cui <[email protected]> * add utils.js file to store functions used in multiple cypress tests Signed-off-by: David Cui <[email protected]> * add gradle task to run integtest against remote cluster (#247) Signed-off-by: Zhongnan Su <[email protected]> * added untriaged and nolabel badges Signed-off-by: Shenoy Pratik <[email protected]> * bump dashboards-reports version to 1.3 (#265) Signed-off-by: Zhongnan Su <[email protected]> * add UT for request/reseponse model (#264) Signed-off-by: Zhongnan Su <[email protected]> * Add .whitesource configuration file * Address Reporting CVEs (#267) * update vulnerable package versions Signed-off-by: David Cui <[email protected]> * change ansi-regex to 5.0.1 to pass bootstrap Signed-off-by: David Cui <[email protected]> * update yarn lock for cve fixes (#271) Signed-off-by: David Cui <[email protected]> * add release notes for 1.2.4 Signed-off-by: David Cui <[email protected]> * remove jcenter repo from gradle build Signed-off-by: Shenoy Pratik <[email protected]> * update guava to 31.0.1-jre Signed-off-by: Shenoy Pratik <[email protected]> * WS package update (#283) * updated ws version Signed-off-by: Shenoy Pratik <[email protected]> * moved ws package to resolutions Signed-off-by: Shenoy Pratik <[email protected]> * updated yarn lock Signed-off-by: Shenoy Pratik <[email protected]> * add auto-backport functionality for reporting (#286) Add auto-backport and auto-delete workflows for reporting Signed-off-by: David Cui <[email protected]> * Change Default CI version to JDK 11 (#290) * change default CI version to JDK 11, add JDK versions to CI matrix and document changes in developer guide Signed-off-by: David Cui <[email protected]> * remove incorrect tag form issue template (#294) Signed-off-by: Zhongnan Su <[email protected]> * Fix empty or multiple date values in csv (#293) Signed-off-by: Zhongnan Su <[email protected]> * Update the saved object id matcher regex to match custom id (#295) Signed-off-by: Zhongnan Su <[email protected]> * Replace Centos links to fix link checker CI (#297) exclude centos links from linkchecker Signed-off-by: David Cui <[email protected]> * update regex to match custom saved object id (#298) Signed-off-by: Zhongnan Su <[email protected]> * Fix reporting uuid parsing (#300) Signed-off-by: Joshua Li <[email protected]> * Add java 8 support in compile and test (#304) (#305) * add java 8 support in compile and test Signed-off-by: Zhongnan Su <[email protected]> (cherry picked from commit e753b07) Co-authored-by: Zhongnan Su <[email protected]> * Add 1.3 release notes (#307) (#308) * Add 1.3 release notes Signed-off-by: Zhongnan Su <[email protected]> (cherry picked from commit 2e904c5) Co-authored-by: Zhongnan Su <[email protected]> * Bump version to 1.3.1 (#324) Signed-off-by: Sayali Gaikawad <[email protected]> * Bump reports dashboards to 1.3.1 (#331) Signed-off-by: Joshua Li <[email protected]> * Incremented version to 1.3.2. (#352) Signed-off-by: Zelin Hao <[email protected]> * Version bump 1.3.3 Signed-off-by: pgodithi <[email protected]> * Version bump 1.3.3 Signed-off-by: pgodithi <[email protected]> * Version bump 1.3.3 Signed-off-by: pgodithi <[email protected]> * [1.3] Bump minimist to 1.2.6 (#367) Signed-off-by: Joshua Li <[email protected]> * Move HTML sanitization from client to server side (#382) (#386) Move HTML sanitization to server, store markdown over HTML, remove unused imports Signed-off-by: David Cui <[email protected]> Co-authored-by: David Cui <[email protected]> * Incremented version to 1.3.4. (#389) * Incremented version to 1.3.4. Signed-off-by: Zelin Hao <[email protected]> * Add JS snapshot Signed-off-by: Zelin Hao <[email protected]> * Add release notes for 1.3.4.0 (#393) (#394) Signed-off-by: Joshua Li <[email protected]> (cherry picked from commit 8e01eaa) Co-authored-by: Joshua Li <[email protected]> * Staging for version increment automation (#391) (#418) * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation Signed-off-by: pgodithi <[email protected]> * Version increment automation: task rename updateVersion Signed-off-by: pgodithi <[email protected]> (cherry picked from commit 6667bfb) Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: pgodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> Co-authored-by: Prudhvi Godithi <[email protected]> * [Release 1.3.5] Version increment (#420) * release 1.3.5 Signed-off-by: prudhvigodithi <[email protected]> * release 1.3.5 Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> * [1.3] Remove zips and download from remote at build time (#337) (#422) * Remove zips and download from remote at build time (#337) Signed-off-by: Joshua Li <[email protected]> * Remove odfe bwc test (#408) Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Shenoy Pratik <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]> * [1.3] restrict chromium requests (#424) Signed-off-by: Joshua Li <[email protected]> * [Release 1.3.5] Add `build.sh` (#426) * release 1.3.5 Signed-off-by: prudhvigodithi <[email protected]> * release 1.3.5 Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> * [1.3] Add Bwc Test for OS 1.1 (#417) (#423) * Add Bwc Test for OS 1.1 (#417) Signed-off-by: Shenoy Pratik <[email protected]> * Fix job-scheduler url Signed-off-by: Joshua Li <[email protected]> * Remove artifact zips Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: Joshua Li <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]> * Increment version to 1.3.6-SNAPSHOT (#456) Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> * Merge pull request #472 from sejli/CVE-fix-1.3.6 (#473) Updating Kotlin and Jsoup (cherry picked from commit 50eac17) * Merge pull request #474 from sejli/release-notes-1.3.6 Add release notes for 1.3.6 (cherry picked from commit fd8f9de) * Merge pull request #476 from sejli/1.3.6-release-notes Changing 1.3.6 release notes location (cherry picked from commit 2159036) * update jackson to 2.13.4 (#479) (#480) Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> (cherry picked from commit d0c86aa) Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]> * Update 1.3.6 release notes (#481) (#482) Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> (cherry picked from commit dea93af) Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]> * [1.3] Upgrade puppeteer (#488) * upgrade puppeteer & change report timeout Signed-off-by: Rupal Mahajan <[email protected]> * Change timeout Signed-off-by: Rupal Mahajan <[email protected]> Signed-off-by: Rupal Mahajan <[email protected]> * Added release notes for 1.3.5 (#451) Signed-off-by: vamsi-amazon <[email protected]> (cherry picked from commit e2e4366) Co-authored-by: vamsi-amazon <[email protected]> * Increment version to 1.3.7-SNAPSHOT (#502) Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> * Resolve conflicting dependencies Signed-off-by: Rupal Mahajan <[email protected]> * nit Signed-off-by: Rupal Mahajan <[email protected]> * Fix build failure Signed-off-by: Rupal Mahajan <[email protected]> Signed-off-by: Zhongnan Su <[email protected]> Signed-off-by: David Cui <[email protected]> Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Kévin Masseix <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: kgcreative <[email protected]> Signed-off-by: Miki <[email protected]> Signed-off-by: dblock <[email protected]> Signed-off-by: dblock <[email protected]> Signed-off-by: @akbhatta Signed-off-by: Tengda He <[email protected]> Signed-off-by: Kavitha Conjeevaram Mohan <[email protected]> Signed-off-by: Ryan Bogan <[email protected]> Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: Sayali Gaikawad <[email protected]> Signed-off-by: Zelin Hao <[email protected]> Signed-off-by: pgodithi <[email protected]> Signed-off-by: prudhvigodithi <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Rupal Mahajan <[email protected]> Co-authored-by: Zhongnan Su <[email protected]> Co-authored-by: David Cui <[email protected]> Co-authored-by: Joshua <[email protected]> Co-authored-by: Carl Meadows <[email protected]> Co-authored-by: Kevin Masseix <[email protected]> Co-authored-by: Uzhinskiy Boris <[email protected]> Co-authored-by: David Cui <[email protected]> Co-authored-by: starcatter <[email protected]> Co-authored-by: Elias Soares <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: Kevin Garcia <[email protected]> Co-authored-by: Miki <[email protected]> Co-authored-by: David Cui <[email protected]> Co-authored-by: Daniel Doubrovkine (dB.) <[email protected]> Co-authored-by: Anantha Krishna Bhatta <[email protected]> Co-authored-by: Anantha Krishna Bhatta <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kroussou <[email protected]> Co-authored-by: Tengda-He <[email protected]> Co-authored-by: Kawika Avilla <[email protected]> Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]> Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]> Co-authored-by: Ryan Bogan <[email protected]> Co-authored-by: Shenoy Pratik <[email protected]> Co-authored-by: whitesource-for-g.yxqyang.asia[bot] <50673670+whitesource-for-g.yxqyang.asia[bot]@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Sayali Gaikawad <[email protected]> Co-authored-by: Zelin Hao <[email protected]> Co-authored-by: pgodithi <[email protected]> Co-authored-by: Anirudha (Ani) Jadhav <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: Sean Li <[email protected]> Co-authored-by: vamsi-amazon <[email protected]>
1 parent 58ec535 commit 0268d4d

File tree

13 files changed

+140
-15
lines changed

13 files changed

+140
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
PLUGIN_NAME: reportsDashboards
77
ARTIFACT_NAME: reports-dashboards
88
OPENSEARCH_VERSION: '1.3'
9-
OPENSEARCH_PLUGIN_VERSION: 1.3.4.0
9+
OPENSEARCH_PLUGIN_VERSION: 1.3.7.0
1010

1111
jobs:
1212
build:

‎.github/workflows/draft-release-notes-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
with:
1717
config-name: draft-release-notes-config.yml
1818
tag: (None)
19-
version: 1.3.4.0
19+
version: 1.3.7.0
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test and Build Reports Scheduler
33
on: [push, pull_request]
44

55
env:
6-
OPENSEARCH_VERSION: '1.3.4-SNAPSHOT'
6+
OPENSEARCH_VERSION: '1.3.5-SNAPSHOT'
77

88
jobs:
99
build:
@@ -31,7 +31,6 @@ jobs:
3131
echo "Running backwards compatibility tests ..."
3232
./gradlew bwcTestSuite
3333
34-
3534
- name: Build with Gradle
3635
run: |
3736
cd reports-scheduler

‎dashboards-reports/opensearch_dashboards.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "reportsDashboards",
3-
"version": "1.3.4.0",
4-
"opensearchDashboardsVersion": "1.3.4",
3+
"version": "1.3.7.0",
4+
"opensearchDashboardsVersion": "1.3.7",
55
"requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
66
"optionalPlugins": ["share"],
77
"server": true,

‎dashboards-reports/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reports-dashboards",
3-
"version": "1.3.4.0",
3+
"version": "1.3.7.0",
44
"description": "OpenSearch Dashboards Reports Plugin",
55
"license": "Apache-2.0",
66
"main": "index.ts",
@@ -45,7 +45,6 @@
4545
"@types/enzyme-adapter-react-16": "^1.0.6",
4646
"@types/jsdom": "^16.2.3",
4747
"@types/puppeteer-core": "^5.4.0",
48-
"@types/react": "^16.9.36",
4948
"@types/react-addons-test-utils": "^0.14.25",
5049
"@types/react-dom": "^16.9.8",
5150
"@types/react-test-renderer": "^16.9.1",

‎dashboards-reports/yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@
696696
dependencies:
697697
"@types/react" "*"
698698

699-
"@types/react@*", "@types/react@^16.9.36":
699+
"@types/react@*":
700700
version "16.9.49"
701701
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
702702
integrity sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==

‎reports-scheduler/build.gradle

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
1010
buildscript {
1111
ext {
1212
opensearch_group = "org.opensearch"
13-
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
13+
opensearch_version = System.getProperty("opensearch.version", "1.3.7-SNAPSHOT")
1414
// 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT
1515
opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
1616
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
@@ -241,6 +241,8 @@ Zip bundle = (Zip) project.getTasks().getByName("bundlePlugin");
241241
integTest.dependsOn(bundle)
242242
integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
243243

244+
String jobSchedulerURL = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/" + opensearch_version.replace("-SNAPSHOT", "") + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-" + opensearch_build.replace("-SNAPSHOT", "") + ".zip"
245+
244246
testClusters.integTest {
245247
testDistribution = "INTEG_TEST"
246248
// need to install job-scheduler first, need to assemble job-scheduler first
@@ -250,6 +252,14 @@ testClusters.integTest {
250252
return new RegularFile() {
251253
@Override
252254
File getAsFile() {
255+
File dir = new File("src/test/resources/job-scheduler")
256+
if (!dir.exists()) {
257+
dir.mkdirs()
258+
}
259+
File file = new File(dir, "opensearch-job-scheduler-" + opensearch_build + ".zip")
260+
if (!file.exists()) {
261+
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
262+
}
253263
return fileTree("src/test/resources/job-scheduler").getSingleFile()
254264
}
255265
}
@@ -271,23 +281,33 @@ testClusters.integTest {
271281
setting 'path.repo', repo.absolutePath
272282
}
273283

274-
// For job-scheduler and reports-scheduler, the latest opendistro releases appear to be 1.13.0.0.
275-
String bwcVersion = "1.13.0.0"
284+
// For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0.
285+
String bwcVersion = "1.1.0.0"
276286
String baseName = "reportsSchedulerBwcCluster"
277287
String bwcFilePath = "src/test/resources/bwc"
288+
String bwcJobSchedulerURL = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-job-scheduler-1.1.0.0.zip"
289+
String bwcReportsSchedulerURL = "https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/20210930/linux/x64/builds/opensearch/plugins/opensearch-reports-scheduler-1.1.0.0.zip"
278290

279291
2.times {i ->
280292
testClusters {
281293
"${baseName}$i" {
282294
testDistribution = "ARCHIVE"
283-
versions = ["7.10.2","1.3.4-SNAPSHOT"]
295+
versions = ["1.1.0", opensearch_version]
284296
numberOfNodes = 3
285297
plugin(provider(new Callable<RegularFile>(){
286298
@Override
287299
RegularFile call() throws Exception {
288300
return new RegularFile() {
289301
@Override
290302
File getAsFile() {
303+
File dir = new File(bwcFilePath + "/job-scheduler/" + bwcVersion)
304+
if (!dir.exists()) {
305+
dir.mkdirs()
306+
}
307+
File file = new File(dir, "opensearch-job-scheduler-" + bwcVersion + ".zip")
308+
if (!file.exists()) {
309+
new URL(bwcJobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
310+
}
291311
return fileTree(bwcFilePath + "/job-scheduler/" + bwcVersion).getSingleFile()
292312
}
293313
}
@@ -299,6 +319,14 @@ String bwcFilePath = "src/test/resources/bwc"
299319
return new RegularFile() {
300320
@Override
301321
File getAsFile() {
322+
File dir = new File(bwcFilePath + "/reports-scheduler/" + bwcVersion)
323+
if (!dir.exists()) {
324+
dir.mkdirs()
325+
}
326+
File file = new File(dir, "opensearch-reports-scheduler-" + bwcVersion + ".zip")
327+
if (!file.exists()) {
328+
new URL(bwcReportsSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
329+
}
302330
return fileTree(bwcFilePath + "/reports-scheduler/" + bwcVersion).getSingleFile()
303331
}
304332
}
@@ -323,6 +351,14 @@ task prepareBwcTests {
323351
return new RegularFile() {
324352
@Override
325353
File getAsFile() {
354+
File dir = new File(bwcFilePath + "/job-scheduler/" + project.version)
355+
if (!dir.exists()) {
356+
dir.mkdirs()
357+
}
358+
File file = new File(dir, "opensearch-reports-scheduler-" + project.version + ".zip")
359+
if (!file.exists()) {
360+
new URL(jobSchedulerURL).withInputStream{ ins -> file.withOutputStream{ it << ins }}
361+
}
326362
return fileTree(bwcFilePath + "/job-scheduler/" + project.version).getSingleFile()
327363
}
328364
}

‎reports-scheduler/scripts/build.sh

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#!/bin/bash
2+
3+
# SPDX-License-Identifier: Apache-2.0
4+
#
5+
# The OpenSearch Contributors require contributions made to
6+
# this file be licensed under the Apache-2.0 license or a
7+
# compatible open source license.
8+
9+
set -ex
10+
11+
function usage() {
12+
echo "Usage: $0 [args]"
13+
echo ""
14+
echo "Arguments:"
15+
echo -e "-v VERSION\t[Required] OpenSearch version."
16+
echo -e "-q QUALIFIER\t[Optional] Version qualifier."
17+
echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'."
18+
echo -e "-p PLATFORM\t[Optional] Platform, ignored."
19+
echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored."
20+
echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'."
21+
echo -e "-h help"
22+
}
23+
24+
while getopts ":h:v:q:s:o:p:a:" arg; do
25+
case $arg in
26+
h)
27+
usage
28+
exit 1
29+
;;
30+
v)
31+
VERSION=$OPTARG
32+
;;
33+
q)
34+
QUALIFIER=$OPTARG
35+
;;
36+
s)
37+
SNAPSHOT=$OPTARG
38+
;;
39+
o)
40+
OUTPUT=$OPTARG
41+
;;
42+
p)
43+
PLATFORM=$OPTARG
44+
;;
45+
a)
46+
ARCHITECTURE=$OPTARG
47+
;;
48+
:)
49+
echo "Error: -${OPTARG} requires an argument"
50+
usage
51+
exit 1
52+
;;
53+
?)
54+
echo "Invalid option: -${arg}"
55+
exit 1
56+
;;
57+
esac
58+
done
59+
60+
if [ -z "$VERSION" ]; then
61+
echo "Error: You must specify the OpenSearch version"
62+
usage
63+
exit 1
64+
fi
65+
66+
[[ ! -z "$QUALIFIER" ]] && VERSION=$VERSION-$QUALIFIER
67+
[[ "$SNAPSHOT" == "true" ]] && VERSION=$VERSION-SNAPSHOT
68+
[ -z "$OUTPUT" ] && OUTPUT=artifacts
69+
70+
mkdir -p $OUTPUT
71+
72+
./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER
73+
74+
zipPath=$(find . -path \*build/distributions/*.zip)
75+
distributions="$(dirname "${zipPath}")"
76+
77+
echo "COPY ${distributions}/*.zip"
78+
mkdir -p $OUTPUT/plugins
79+
cp ${distributions}/*.zip ./$OUTPUT/plugins

‎reports-scheduler/src/test/kotlin/org/opensearch/integTest/bwc/ReportsSchedulerBackwardsCompatibilityIT.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class ReportsSchedulerBackwardsCompatibilityIT : PluginRestTestCase() {
5050
val pluginNames = plugins.map { plugin -> plugin["name"] }.toSet()
5151
when (CLUSTER_TYPE) {
5252
ClusterType.OLD -> {
53-
assertTrue(pluginNames.contains("opendistro-reports-scheduler"))
54-
assertTrue(pluginNames.contains("opendistro-job-scheduler"))
53+
assertTrue(pluginNames.contains("opensearch-reports-scheduler"))
54+
assertTrue(pluginNames.contains("opensearch-job-scheduler"))
5555
createBasicReportDefinition()
5656
}
5757
ClusterType.MIXED -> {

‎reports-scheduler/src/test/resources/bwc/job-scheduler/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# ignore artifacts in this directory
2+
*
3+
*/
4+
!.gitignore

0 commit comments

Comments
 (0)