Skip to content

Commit 8f8357b

Browse files
davidcui1225zhongnansujoshuali925CarlMeadowsMKCG
authored
Merge dev into main (#66)
Signed-off-by: David Cui <[email protected]> Co-authored-by: Zhongnan Su <[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]>
1 parent 4ba7ff4 commit 8f8357b

File tree

132 files changed

+3394
-1558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+3394
-1558
lines changed

.github/workflows/dashboards-reports-release-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77

88
env:
99
PLUGIN_NAME: reportsDashboards
10-
OPENSEARCH_VERSION: 1.0.0-beta1
11-
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1
10+
OPENSEARCH_VERSION: '1.0'
11+
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1
1212

1313
jobs:
1414
build:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on: [pull_request, push]
44

55
env:
66
PLUGIN_NAME: reportsDashboards
7-
OPENSEARCH_VERSION: 1.0.0-beta1
8-
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1
7+
OPENSEARCH_VERSION: '1.0'
8+
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1
99

1010
jobs:
1111
build:

.github/workflows/reports-scheduler-release-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Release Reports Scheduler Artifacts
2-
# This workflow is triggered on creating tags to master or an opendistro release branch
2+
# This workflow is triggered on creating tags to master or an opensearch release branch
33
on:
44
push:
55
tags:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,32 @@ jobs:
1818
with:
1919
repository: 'opensearch-project/OpenSearch'
2020
path: OpenSearch
21-
ref: '1.0.0-beta1'
21+
ref: '1.0'
2222
- name: Build OpenSearch
2323
working-directory: ./OpenSearch
24-
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=beta1 -Dbuild.snapshot=false
24+
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false
2525

2626
# dependencies: common-utils
2727
- name: Checkout common-utils
2828
uses: actions/checkout@v2
2929
with:
3030
repository: 'opensearch-project/common-utils'
31-
ref: '1.0.0-beta1'
31+
ref: 'main'
3232
path: common-utils
3333
- name: Build common-utils
3434
working-directory: ./common-utils
35-
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-beta1
35+
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1
3636

3737
# dependencies: job-scheduler
3838
- name: Checkout job-scheduler
3939
uses: actions/checkout@v2
4040
with:
4141
repository: 'opensearch-project/job-scheduler'
42-
ref: '1.0.0-beta1'
42+
ref: 'main'
4343
path: job-scheduler
4444
- name: Build job-scheduler
4545
working-directory: ./job-scheduler
46-
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-beta1 -Dbuild.snapshot=false
46+
run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-rc1 -Dbuild.snapshot=false
4747

4848
# reports-scheduler
4949
- name: Checkout Reports Scheduler
@@ -52,7 +52,7 @@ jobs:
5252
- name: Build with Gradle
5353
run: |
5454
cd reports-scheduler
55-
./gradlew build -Dopensearch.version=1.0.0-beta1
55+
./gradlew build -Dopensearch.version=1.0.0-rc1
5656
5757
- name: Create Artifact Path
5858
run: |

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[![OpenSearch Dashboards Reports CI](https://github.com/opensearch-project/dashboards-reports/workflows/Test%20and%20Build%20OpenSearch%20Dashboards%20Reports/badge.svg)](https://github.com/opensearch-project/dashboards-reports/actions?query=workflow%3A%22Test+and+Build+OpenSearch+Dashboards+Reports%22)
22
[![Reports Scheduler CI](https://github.com/opensearch-project/dashboards-reports/workflows/Test%20and%20Build%20Reports%20Scheduler/badge.svg)](https://github.com/opensearch-project/dashboards-reports/actions?query=workflow%3A%22Test+and+Build+Reports+Scheduler%22)
33
[![codecov](https://codecov.io/gh/opensearch-project/dashboards-reports/branch/dev/graph/badge.svg?token=FBVYQSZD3B)](https://codecov.io/gh/opensearch-project/dashboards-reports)
4-
[![Documentation](https://img.shields.io/badge/documentation-blue.svg)](https://opendistro.github.io/for-elasticsearch-docs/docs/kibana/reporting/)
4+
[![Documentation](https://img.shields.io/badge/documentation-blue.svg)](https://docs-beta.opensearch.org/docs/opensearch-dashboards/reporting/)
55
![PRs welcome!](https://img.shields.io/badge/PRs-welcome!-success)
66

7-
# OpenSearch Dashboards Reports for Open Distro
7+
# OpenSearch Dashboards Reports
88

9-
OpenSearch Dashboards Reports for Open Distro allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
9+
OpenSearch Dashboards Reports allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
1010

1111
# Request for Comments ( RFC )
1212

@@ -29,7 +29,7 @@ There could be two reasons for this problem
2929

3030
2. Missing additional dependencies. Please refer to [additional dependencies section](./dashboards-reports/rendering-engine/headless-chrome/README.md#additional-libaries) to install required dependencies according to your operating system.
3131

32-
## Contributing to OpenSearch Dashboards reports for Open Distro
32+
## Contributing to OpenSearch Dashboards reports
3333

3434
We welcome you to get involved in development, documentation, testing the OpenSearch Dashboards reports plugin. See our [CONTRIBUTING.md](./CONTRIBUTING.md) and join in.
3535

dashboards-reports/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenSearch Dashboards Reports
22

3-
OpenSearch Dashboards Reports for Open Distro allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
3+
OpenSearch Dashboards Reports allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
44

55
# Request for Comments ( RFC )
66

@@ -49,7 +49,7 @@ Example output: `./build/reports-dashboards-0.0.1.zip`
4949

5050
Runs the plugin tests.
5151

52-
## Contributing to OpenSearch Dashboards reports for Open Distro
52+
## Contributing to OpenSearch Dashboards reports
5353

5454
We welcome you to get involved in development, documentation, testing the OpenSearch Dashboards reports plugin. See our [CONTRIBUTING.md](./CONTRIBUTING.md) and join in.
5555

dashboards-reports/common/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ export const PLUGIN_NAME = 'reports-dashboards';
3030
export const API_PREFIX = '/api/reporting';
3131

3232
export const NOTIFICATION_API = {
33-
SEND: '/_opendistro/_notifications/send',
33+
SEND: '/_plugins/_notifications/send',
3434
};
3535

36-
const BASE_REPORTS_URI = '/_opendistro/_reports';
36+
const BASE_REPORTS_URI = '/_plugins/_reports';
3737

3838
export const OPENSEARCH_REPORTS_API = {
3939
ON_DEMAND_REPORT: `${BASE_REPORTS_URI}/on_demand`,

dashboards-reports/docs/dev/OpenSearch-Dashboards-Reporting-Design-Proposal.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This plugin will introduce the ability to generate reports, as well as enable th
1515

1616
### 1.2 Introduction
1717

18-
OpenSearch Dashboards Reports for Open Distro allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
18+
OpenSearch Dashboards Reports allows ‘Report Owner’ (engineers, including but not limited to developers, DevOps, IT Engineer, and IT admin) export and share reports from OpenSearch Dashboards dashboards, saved search, alerts and visualizations. It helps automate the process of scheduling reports on an on-demand or a periodical basis (on cron schedules as well). Further, it also automates the process of exporting and sharing reports triggered for various alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email, slack, Amazon Chime. However, in order to export, schedule and share reports, report owners should have the necessary permissions as defined under Roles and Privileges.
1919

2020

2121
## 2. Requirements
@@ -192,10 +192,10 @@ List of curated headless browsers https://github.com/dhamaniasad/HeadlessBrowser
192192
|Java |[Selenium](https://www.selenium.dev/) |No support for PDF generation |
193193
| |[jBrowserDriver](https://github.com/MachinePublishers/jBrowserDriver) |No support for PDF generation |
194194

195-
**(II)** To generate CSV reports based on SQL queries, we will be leveraging OpenDistro SQL plugin with **`format=csv`**
195+
**(II)** To generate CSV reports based on SQL queries, we will be leveraging OpenSearch SQL plugin with **`format=csv`**
196196

197197
```
198-
POST _opendistro/_sql?format=csv
198+
POST _plugins/_sql?format=csv
199199
{
200200
"query" : "SELECT ... FROM ... WHERE ... ORDER BY ..."
201201
}
@@ -423,7 +423,7 @@ listReportEvents()
423423

424424
### 4.3 Job Scheduler APIs
425425

426-
https://github.com/opendistro-for-elasticsearch/job-scheduler
426+
https://github.com/opensearch-project/job-scheduler
427427

428428
**(A) createSchedule**
429429

@@ -439,12 +439,12 @@ Scheduled Report Creation workflow
439439

440440
### 4.4 Alerting Integration
441441

442-
https://opendistro.github.io/for-elasticsearch-docs/docs/alerting/
442+
https://docs-beta.opensearch.org/docs/alerting/
443443

444444
ODFE Alerting can be used as an external trigger. To generate the report the `generateReport()` API can be utilized as `custom_webhook` destination.
445445

446446
```
447-
POST _opendistro/_alerting/destinations
447+
POST _plugins/_alerting/destinations
448448
449449
{
450450
"type": "custom_webhook",
@@ -486,7 +486,7 @@ TODO
486486

487487
### (II) Security reference
488488

489-
* https://opendistro.github.io/for-elasticsearch-docs/docs/security-configuration/concepts/
490-
* https://opendistro.github.io/for-elasticsearch-docs/docs/security-access-control/
491-
* https://opendistro.github.io/for-elasticsearch-docs/docs/security-access-control/api/
489+
* https://docs-beta.opensearch.org/docs/security/configuration/
490+
* https://docs-beta.opensearch.org/docs/security/access-control/
491+
* https://docs-beta.opensearch.org/docs/security/access-control/api/
492492

dashboards-reports/docs/ux/OpenSearch-Dashboards-Reporting-UX-documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenSearch Dashboards Reporting
22
## Overview
3-
OpenSearch Dashboards Reports for Open Distro allows `report owners` (including but not limited to Developers, DevOps, IT Engineers, and IT admins) to export and share reports from OpenSearch Dashboards dashboards, saved queries, alerts and visualizations. It helps automate the process of scheduling reports via on-demand or periodic basis (including cron schedules). It also automates exporting and sharing reports from triggers, such as alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email or the OpenSearch Dashboards reporting plugin.
3+
OpenSearch Dashboards Reports allows `report owners` (including but not limited to Developers, DevOps, IT Engineers, and IT admins) to export and share reports from OpenSearch Dashboards dashboards, saved queries, alerts and visualizations. It helps automate the process of scheduling reports via on-demand or periodic basis (including cron schedules). It also automates exporting and sharing reports from triggers, such as alerts. The feature is present in the Dashboard, Discover, and Visualization tabs. Scheduled reports can be sent to (shared with) self or various stakeholders within the organization such as, including but not limited to, executives, managers, engineers (developers, DevOps, IT Engineer) in the form of pdf, hyperlinks, csv, excel via various channels such as email or the OpenSearch Dashboards reporting plugin.
44

55
## Key user flows
66
### From source

dashboards-reports/opensearch_dashboards.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "reportsDashboards",
3-
"version": "1.0.0.0-beta1",
4-
"opensearchDashboardsVersion": "1.0.0-beta1",
5-
"requiredPlugins": ["navigation", "data"],
3+
"version": "1.0.0.0-rc1",
4+
"opensearchDashboardsVersion": "1.0.0-rc1",
5+
"requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
66
"optionalPlugins": ["share"],
77
"server": true,
88
"ui": true

0 commit comments

Comments
 (0)