-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.x' into backport/backport-736-to-2.x
- Loading branch information
Showing
151 changed files
with
45,638 additions
and
1,203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
* -text |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
* @tianleh @kavilla @ohltyler @CCongWang @ashwin-pc @peterzhuamazon @ananzh @prudhvigodithi | ||
* @xluo-aws @Hailong-am @SuZhou-Joe @ruanyl @wanglam @raintygao | ||
* @tianleh @kavilla @ohltyler @CCongWang @ashwin-pc @peterzhuamazon @ananzh @prudhvigodithi @xluo-aws @Hailong-am @SuZhou-Joe @ruanyl @wanglam @raintygao |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
name: Cypress test for core Dashboards | ||
on: | ||
pull_request: | ||
branches: ['**'] | ||
paths: | ||
- '.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml' | ||
- 'cypress/**/core-opensearch-dashboards/**' | ||
- 'cypress/utils/dashboards/**' | ||
- 'package.json' | ||
push: | ||
branches: ['**'] | ||
paths: | ||
- '.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml' | ||
- 'cypress/**/core-opensearch-dashboards/**' | ||
- 'cypress/utils/dashboards/**' | ||
- 'package.json' | ||
|
||
env: | ||
CI_GROUPS: "1,2,3,4,5,6,7,8,9" | ||
|
||
jobs: | ||
get_spec: | ||
runs-on: 'ubuntu-latest' | ||
outputs: | ||
MATRIX_INCLUDES: ${{ steps.get_spec.outputs.MATRIX_INCLUDES }} | ||
steps: | ||
- name: Checkout Branch | ||
uses: actions/checkout@v3 | ||
- name: Checkout cypress-test | ||
uses: actions/checkout@v2 | ||
with: | ||
repository: ${{github.repository}} | ||
path: spec-detect | ||
- id: get_spec | ||
name: Get specs array | ||
run: | | ||
cd spec-detect | ||
source ./test_finder.sh | ||
result="[" | ||
## split CI_Groups into array | ||
IFS="," read -a groups <<< "${{ env.CI_GROUPS }}" | ||
for group in "${groups[@]}"; do | ||
item="{\"ciGroup\": \"${group}\", \"specs\": " | ||
specs_of_ci_group=`ci_grouped_specs_finder ${group}` | ||
FORMATTED_SPEC="\"${specs_of_ci_group}\" }" | ||
if [[ "${result}" != "[" ]]; | ||
then | ||
result+="," | ||
fi | ||
item+="${FORMATTED_SPEC}" | ||
result+="${item}" | ||
done | ||
result+=']'; | ||
echo ${result} | ||
echo "MATRIX_INCLUDES=${result}" >> "$GITHUB_OUTPUT" | ||
tests-with-security: | ||
needs: ["get_spec"] | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
include: ${{ fromJSON(needs.get_spec.outputs.MATRIX_INCLUDES) }} | ||
name: (security)osd:ciGroup${{ matrix.ciGroup }} | ||
uses: ./.github/workflows/release-e2e-workflow-template.yml | ||
with: | ||
test-name: "osd:ciGroup${{ matrix.ciGroup }}" | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec '${{ matrix.specs }}' | ||
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true | ||
|
||
tests-without-security: | ||
needs: ["get_spec"] | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
include: ${{ fromJSON(needs.get_spec.outputs.MATRIX_INCLUDES) }} | ||
name: (non-security)osd:ciGroup${{ matrix.ciGroup }} | ||
uses: ./.github/workflows/release-e2e-workflow-template.yml | ||
with: | ||
test-name: "osd:ciGroup${{ matrix.ciGroup }}" | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec '${{ matrix.specs }}' | ||
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true | ||
security-enabled: false | ||
|
||
# Hold on windows test cases | ||
# https://github.com/opensearch-project/opensearch-dashboards-functional-test/actions/runs/9377445544/job/25819022121?pr=1352 | ||
# tests-with-security-windows: | ||
# needs: ["get_spec"] | ||
# strategy: | ||
# fail-fast: false | ||
# matrix: | ||
# include: ${{ fromJSON(needs.get_spec.outputs.MATRIX_INCLUDES) }} | ||
# name: (security)osd:ciGroup${{ matrix.ciGroup }} | ||
# uses: ./.github/workflows/release-e2e-workflow-template-windows.yml | ||
# with: | ||
# test-name: "osd:ciGroup${{ matrix.ciGroup }}" | ||
# test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chrome --spec '${{ matrix.specs }}' | ||
|
||
# tests-without-security-windows: | ||
# needs: ["get_spec"] | ||
# strategy: | ||
# fail-fast: false | ||
# matrix: | ||
# include: ${{ fromJSON(needs.get_spec.outputs.MATRIX_INCLUDES) }} | ||
# name: (non-security)osd:ciGroup${{ matrix.ciGroup }} | ||
# uses: ./.github/workflows/release-e2e-workflow-template-windows.yml | ||
# with: | ||
# test-name: "osd:ciGroup${{ matrix.ciGroup }}" | ||
# test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chrome --spec '${{ matrix.specs }}' | ||
# security-enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 8 additions & 6 deletions
14
.github/workflows/cypress-workflow-bundle-snapshot-based.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,30 @@ | ||
name: Bundle Snapshot based E2E Cypress tests workflow for core Dashboards | ||
on: | ||
pull_request: | ||
branches: [ '**' ] | ||
branches: ['**'] | ||
paths: | ||
- 'cypress/**/core-opensearch-dashboards/**' | ||
- 'cypress/utils/dashboards/**' | ||
- '.github/workflows/cypress-workflow-bundle-snapshot-based.yml' | ||
push: | ||
branches: [ '**' ] | ||
branches: ['**'] | ||
paths: | ||
- 'cypress/**/core-opensearch-dashboards/**' | ||
- 'cypress/utils/dashboards/**' | ||
- '.github/workflows/cypress-workflow-bundle-snapshot-based.yml' | ||
|
||
jobs: | ||
tests-with-security: | ||
uses: ./.github/workflows/release-e2e-workflow-template.yml | ||
with: | ||
test-name: Core Dashboards using Bundle Snapshot | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js' | ||
osd-serve-args: --data_source.enabled=true --vis_builder.enabled=true --ml_commons_dashboards.enabled=true | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_UIMETRIC_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js' | ||
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true --usageCollection.uiMetric.enabled=true | ||
|
||
tests-without-security: | ||
uses: ./.github/workflows/release-e2e-workflow-template.yml | ||
with: | ||
test-name: Core Dashboards using Bundle Snapshot | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js' | ||
osd-serve-args: --data_source.enabled=true --vis_builder.enabled=true --ml_commons_dashboards.enabled=true | ||
test-command: env CYPRESS_NO_COMMAND_LOG=1 CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_UIMETRIC_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js' | ||
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --vis_builder.enabled=true --ml_commons_dashboards.enabled=true --usageCollection.uiMetric.enabled=true | ||
security-enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
name: E2E Cypress tests workflow for MDS | ||
on: | ||
pull_request: | ||
branches: ['**'] | ||
paths: | ||
- 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/mds*.js' | ||
push: | ||
branches: ['**'] | ||
paths: | ||
- 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/mds*.js' | ||
|
||
jobs: | ||
tests-with-multiple-data-source-and-disabled-local-cluster: | ||
uses: ./.github/workflows/release-e2e-workflow-template.yml | ||
with: | ||
test-name: MDS enabled and local cluster disabled | ||
test-command: env CYPRESS_DISABLE_LOCAL_CLUSTER=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/mds*.js' | ||
osd-serve-args: --data_source.enabled=true --data_source.ssl.verificationMode=none --data_source.hideLocalCluster=true | ||
security-enabled: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
## Reporting a Vulnerability | ||
|
||
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to aws-security@amazon.com. Please do **not** create a public GitHub issue. | ||
If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do not create a public GitHub issue. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...tures/dashboard/opensearch_dashboards/data_explorer/index_with_nested_field/data.json.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
{ | ||
"type": "doc", | ||
"value": { | ||
"id": "0", | ||
"index": "nestedindex", | ||
"source": { | ||
"products": [{ | ||
"base_price": 31.14, | ||
"discount_percentage": 5, | ||
"quantity": 1, | ||
"manufacturer": "Virora" | ||
}, { | ||
"base_price": 35.69, | ||
"discount_percentage": 10, | ||
"quantity": 3, | ||
"manufacturer": "Oceanavigations" | ||
}], | ||
"timestamp": "2015-09-21T06:09:20.045Z" | ||
} | ||
} | ||
} | ||
|
||
{ | ||
"type": "doc", | ||
"value": { | ||
"id": "1", | ||
"index": "nestedindex", | ||
"source": { | ||
"products": [{ | ||
"base_price": 28.99, | ||
"discount_percentage": 0, | ||
"quantity": 1, | ||
"manufacturer": "Tigress Enterprises" | ||
}, { | ||
"base_price": 32.99, | ||
"discount_percentage": 0, | ||
"quantity": 1, | ||
"manufacturer": "Oceanavigations" | ||
}], | ||
"timestamp": "2015-09-21T21:13:02.070Z" | ||
} | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
...s/dashboard/opensearch_dashboards/data_explorer/index_with_nested_field/mappings.json.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
{ | ||
"type": "index", | ||
"value": { | ||
"index": "nestedindex", | ||
"mappings": { | ||
"properties": { | ||
"products": { | ||
"type": "nested", | ||
"properties": { | ||
"base_price": { | ||
"type": "float" | ||
}, | ||
"discount_percentage": { | ||
"type": "long" | ||
}, | ||
"manufacturer": { | ||
"type": "text", | ||
"fields": { | ||
"keyword": { | ||
"type": "keyword", | ||
"ignore_above": 256 | ||
} | ||
} | ||
}, | ||
"quantity": { | ||
"type": "long" | ||
} | ||
} | ||
}, | ||
"timestamp": { | ||
"type": "date" | ||
} | ||
} | ||
}, | ||
"settings": { | ||
"index": { | ||
"replication": { | ||
"type": "DOCUMENT" | ||
}, | ||
"number_of_shards": "1", | ||
"number_of_replicas": "1" | ||
} | ||
} | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
cypress/fixtures/dashboard/opensearch_dashboards/telemetry/uiReport.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"report":{"reportVersion":1,"uiStatsMetrics":{"console-count-GET_cat.indices":{"key":"console-count-GET_cat.indices","appName":"console","eventName":"GET_cat.indices","type":"count","stats":{"min":0,"max":1,"avg":0.5,"sum":21}}}}} |
Oops, something went wrong.