Skip to content

Commit 7dcf45b

Browse files
vikhy-awsvikhy-aws
authored
Merge branch 'opensearch-project:main' into main
2 parents 29d2a51 + 2852125 commit 7dcf45b

File tree

164 files changed

+17987
-8340
lines changed

Some content is hidden

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

164 files changed

+17987
-8340
lines changed

‎.cypress/integration/alerts_dashboard_flyout.spec.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ describe('Alerts by trigger flyout', () => {
4747
beforeEach(() => {
4848
// Reloading the page to close any flyouts that were not closed by other tests that had failures.
4949
cy.visit(`${Cypress.env('opensearch_dashboards')}/app/${PLUGIN_NAME}#/dashboard`);
50-
cy.contains('Alerts by triggers', { timeout: TWENTY_SECONDS });
50+
cy.get('[data-test-subj="alertsDashboard_table"]', {
51+
timeout: TWENTY_SECONDS,
52+
}).should('exist');
5153

5254
// Waiting 5 seconds for alerts to finish loading.
5355
// This short wait period alleviates flakiness observed during these tests.

‎.cypress/integration/bucket_level_monitor.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ describe('Bucket-Level Monitors', () => {
192192
cy.contains(SAMPLE_TRIGGER);
193193

194194
// Go back to the Monitors list
195-
cy.get('a').contains('Monitors').click({ force: true });
195+
cy.contains('Monitors').click({ force: true });
196196

197197
// Confirm we can see the created monitor in the list
198198
cy.contains(SAMPLE_EXTRACTION_QUERY_MONITOR);
@@ -298,7 +298,7 @@ describe('Bucket-Level Monitors', () => {
298298
cy.contains(SAMPLE_TRIGGER);
299299

300300
// Go back to the Monitors list
301-
cy.get('a').contains('Monitors').click({ force: true });
301+
cy.contains('Monitors').click({ force: true });
302302

303303
// Confirm we can see the created monitor in the list
304304
cy.contains(SAMPLE_VISUAL_EDITOR_MONITOR);

‎.cypress/integration/cluster_metrics_monitor.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ describe('ClusterMetricsMonitor', () => {
133133
cy.contains(SAMPLE_TRIGGER);
134134

135135
// Go back to the Monitors list
136-
cy.get('a').contains('Monitors').click({ force: true });
136+
cy.contains('Monitors').click({ force: true });
137137

138138
// Confirm we can see the created monitor in the list
139139
cy.contains(SAMPLE_CLUSTER_METRICS_HEALTH_MONITOR);
@@ -187,7 +187,7 @@ describe('ClusterMetricsMonitor', () => {
187187
cy.contains(SAMPLE_TRIGGER);
188188

189189
// Go back to the Monitors list
190-
cy.get('a').contains('Monitors').click({ force: true });
190+
cy.contains('Monitors').click({ force: true });
191191

192192
// Confirm we can see the created monitor in the list
193193
cy.contains(SAMPLE_CLUSTER_METRICS_NODES_STATS_MONITOR);

‎.cypress/integration/composite_level_monitor.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe('CompositeLevelMonitor', () => {
8585
cy.contains(SAMPLE_VISUAL_EDITOR_MONITOR);
8686

8787
// Go back to the Monitors list
88-
cy.get('a').contains('Monitors').click({ force: true });
88+
cy.contains('Monitors').click({ force: true });
8989

9090
cy.contains(SAMPLE_VISUAL_EDITOR_MONITOR);
9191
});

‎.cypress/integration/document_level_monitor.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ describe('DocumentLevelMonitor', () => {
180180
cy.contains(sampleDocumentLevelMonitor.triggers[0].document_level_trigger.name);
181181

182182
// Go back to the Monitors list
183-
cy.get('a').contains('Monitors').click({ force: true });
183+
cy.contains('Monitors').click({ force: true });
184184

185185
// Confirm we can see the created monitor in the list
186186
cy.contains(SAMPLE_EXTRACTION_QUERY_MONITOR);
@@ -314,7 +314,7 @@ describe('DocumentLevelMonitor', () => {
314314
).contains(sampleDocumentLevelMonitor.inputs[0].doc_level_input.queries[0].name);
315315

316316
// Go back to the Monitors list
317-
cy.get('a').contains('Monitors').click({ force: true });
317+
cy.contains('Monitors').click({ force: true });
318318

319319
// Confirm we can see the created monitor in the list
320320
cy.contains(SAMPLE_VISUAL_EDITOR_MONITOR);

‎.cypress/integration/query_level_monitor.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ describe('Query-Level Monitors', () => {
148148
cy.contains(SAMPLE_TRIGGER);
149149

150150
// Go back to the Monitors list
151-
cy.get('a').contains('Monitors').click({ force: true });
151+
cy.contains('Monitors').click({ force: true });
152152

153153
// Confirm we can see the created monitor in the list
154154
cy.contains(SAMPLE_MONITOR);
@@ -185,7 +185,7 @@ describe('Query-Level Monitors', () => {
185185
cy.contains('Edit monitor');
186186

187187
// Go back to the Monitors list
188-
cy.get('a').contains('Monitors').click({ force: true });
188+
cy.contains('Monitors').click({ force: true });
189189

190190
// Confirm we can see the updated monitor in the list
191191
cy.contains(UPDATED_MONITOR);

‎.github/workflows/verify-binary-installation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Install Dashboards with Plugin via Binary'
22

33
on: [push, pull_request]
44
env:
5-
OPENSEARCH_VERSION: '3.0.0-alpha1'
5+
OPENSEARCH_VERSION: '3.5.0'
66
CI: 1
77
# avoid warnings like "tput: No value for $TERM and no -T specified"
88
TERM: xterm

‎cypress/integration/alerts_dashboard_flyout.spec.js‎

Whitespace-only changes.

‎opensearch_dashboards.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"id": "alertingDashboards",
3-
"version": "3.5.0.0",
4-
"opensearchDashboardsVersion": "3.5.0",
3+
"version": "3.6.0.0",
4+
"opensearchDashboardsVersion": "3.6.0",
55
"configPath": ["opensearch_alerting"],
6-
"optionalPlugins": ["dataSource", "dataSourceManagement", "assistantDashboards"],
6+
"optionalPlugins": ["dataSource", "dataSourceManagement", "assistantDashboards", "explore"],
77
"requiredPlugins": [
88
"uiActions",
99
"dashboard",

‎package.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "opensearch-alerting-dashboards",
3-
"version": "3.5.0.0",
3+
"version": "3.6.0.0",
44
"description": "OpenSearch Dashboards Alerting Plugin",
55
"main": "index.js",
66
"license": "Apache-2.0",
@@ -28,20 +28,23 @@
2828
},
2929
"devDependencies": {
3030
"@babel/plugin-transform-modules-commonjs": "^7.22.9",
31+
"@cfaester/enzyme-adapter-react-18": "^0.8.0",
3132
"@elastic/elastic-eslint-config-kibana": "link:../../packages/opensearch-eslint-config-opensearch-dashboards",
3233
"@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
34+
"@types/react": "^18.2.0",
3335
"cypress": "^13.6.0",
3436
"husky": "^8.0.0",
35-
"lint-staged": "^10.2.0",
36-
"@types/react": "^16.14.23"
37+
"lint-staged": "^10.2.0"
3738
},
3839
"dependencies": {
40+
"@reduxjs/toolkit": "^1.6.1",
3941
"brace": "0.11.1",
4042
"formik": "^2.2.6",
4143
"lodash": "^4.17.21",
44+
"prettier": "^2.1.1",
4245
"query-string": "^6.13.2",
43-
"react-vis": "^1.8.1",
44-
"prettier": "^2.1.1"
46+
"react-redux": "^8.1.0",
47+
"react-vis": "^1.8.1"
4548
},
4649
"resolutions": {
4750
"ansi-regex": "^5.0.1",

0 commit comments

Comments
 (0)
⚡