Skip to content

Commit

Permalink
[Backport] app-analytics features and bug fixes for 2.0 release (#740)
Browse files Browse the repository at this point in the history
* Add availability entry points (#731)

Signed-off-by: Eugene Lee <[email protected]>

* Update availabilityVizId if visualization is removed from panel (#732)

Signed-off-by: Eugene Lee <[email protected]>

* Issue fix not a function error (#739)

* Bump prismjs from 1.25.0 to 1.27.0 in /dashboards-observability (#508) (#574)

Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.25.0...v1.27.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit b4f491a)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* change to support java 8 in compile and runtime (#575) (#576)

Signed-off-by: Zhongnan Su <[email protected]>
(cherry picked from commit 5c43e9d)

Co-authored-by: Zhongnan Su <[email protected]>

* Add 1.3.0 release notes (#580) (#582)

Signed-off-by: Eugene Lee <[email protected]>

* bug fixes

Signed-off-by: Eric Wei <[email protected]>

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zhongnan Su <[email protected]>

* resolved conflicts

Signed-off-by: Eric Wei <[email protected]>

Co-authored-by: Eugene Lee <[email protected]>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zhongnan Su <[email protected]>
  • Loading branch information
5 people authored May 17, 2022
1 parent b0ee26c commit afee280
Show file tree
Hide file tree
Showing 47 changed files with 1,745 additions and 464 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ describe('Testing service view', () => {
cy.wait(delay);

cy.get('.euiBadge__text').contains('spanId: ').should('exist');
cy.get('[data-test-subj="euiFlyoutCloseButton"]').click({ force: true });
cy.contains('Spans (1)').should('exist');
});
});

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions dashboards-observability/.cypress/utils/app_constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { supressResizeObserverIssue } from './constants';

export const delay = 1000;

export const timeoutDelay = 30000;
export const TYPING_DELAY = 500;

export const moveToHomePage = () => {
Expand Down Expand Up @@ -47,11 +47,11 @@ export const changeTimeTo24 = (timeUnit) => {
cy.get('[aria-label="Time unit"]').select(timeUnit);
cy.get('.euiButton').contains('Apply').click();
cy.wait(delay);
cy.get('.euiButton').contains('Refresh').click();
cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
};

export const expectMessageOnHover = (message) => {
cy.get('.euiToolTipAnchor').contains('Create').click({ force: true });
export const expectMessageOnHover = (button, message) => {
cy.get(`[data-test-subj="${button}"]`).click({ force: true });
cy.get('.euiToolTipPopover').contains(message).should('exist');
};

Expand All @@ -70,22 +70,21 @@ export const deleteAllSavedApplications = () => {
cy.get('.euiButton__text').contains('Delete').click();
};

export const uniqueId = Date.now();
export const baseQuery = 'source = opensearch_dashboards_sample_data_flights';
export const nameOne = 'Cypress';
export const nameTwo = 'Pine';
export const nameOne = `Cypress-${uniqueId}`;
export const nameTwo = `Pine-${uniqueId}`;
export const nameThree = `Cedar-${uniqueId}`;
export const description = 'This is my application for cypress testing.';
export const service_one = 'order';
export const service_two = 'payment';
export const trace_one = 'HTTP POST';
export const trace_two = 'HTTP GET';
export const trace_three = 'client_pay_order';
export const spanQueryOnePartOne = 'where DestCityName ';
export const spanQueryOnePartTwo = '= "Venice" | stats count() by span( timestamp ';
export const spanQueryOnePartThree = ', 6h )';
export const spanQueryTwoPartOne = 'where OriginCityName ';
export const spanQueryTwoPartTwo = '= "Seoul" | stats count() by span( timestamp ';
export const spanQueryTwoPartThree = ', 6h )';
export const query_one = 'where DestCityName = "Venice" | stats count() by span( timestamp , 6h )';
export const query_two = 'where OriginCityName = "Seoul" | stats count() by span( timestamp , 6h )';
export const availability_default = 'stats count() by span( timestamp, 1h )';
export const visOneName = 'Flights to Venice';
export const visTwoName = 'Flights from Seoul';
export const composition = 'order, payment, HTTP POST, HTTP GET, client_pay_order'
export const newName = 'Monterey Cypress';
export const newName = `Monterey Cypress-${uniqueId}`;
1 change: 1 addition & 0 deletions dashboards-observability/common/constants/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ export const REDUX_EXPL_SLICE_VISUALIZATION = 'explorerVisualization';
export const REDUX_EXPL_SLICE_COUNT_DISTRIBUTION = 'countDistributionVisualization';
export const PLOTLY_GAUGE_COLUMN_NUMBER = 5;
export const APP_ANALYTICS_TAB_ID_REGEX = /application-analytics-tab.+/;
export const DEFAULT_AVAILABILITY_QUERY = 'stats count() by span( timestamp, 1h )';
2 changes: 2 additions & 0 deletions dashboards-observability/common/types/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ export interface IExplorerProps {
setStartTime?: any;
setEndTime?: any;
appBaseQuery?: string;
callback?: any;
callbackInApp?: any;
}

export interface SavedQuery {
Expand Down
Loading

0 comments on commit afee280

Please sign in to comment.