Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO] Increment version to 2.16.0.0 #2062

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4570f9e
added changes for moving notebooks to .kibana (#1937) (#1952)
opensearch-trigger-bot[bot] Jul 22, 2024
71e2db0
[Navigation] Remove integrations from new NavGroups (#1950) (#1954)
opensearch-trigger-bot[bot] Jul 22, 2024
1354f7e
Version-decoupling for Observability (#1953) (#1958)
opensearch-trigger-bot[bot] Jul 22, 2024
2a1b809
[Navigation] Observability Overview and GettingStarted (#1957) (#1964)
opensearch-trigger-bot[bot] Jul 23, 2024
d959726
replace dashboards with the getting started dashboards (#1963) (#1969)
opensearch-trigger-bot[bot] Jul 23, 2024
346cc1c
added fixes for ui (#1971) (#1973)
opensearch-trigger-bot[bot] Jul 23, 2024
da593f9
Unregister observability datasource from old and new nav group (#1972…
opensearch-trigger-bot[bot] Jul 23, 2024
89b81e5
Add toast message and bug fix trace (#1977) (#1978)
opensearch-trigger-bot[bot] Jul 23, 2024
4ba3612
added upgrade button in callout (#1981) (#1982)
opensearch-trigger-bot[bot] Jul 23, 2024
46657ee
Add 2.16 notes (#1980) (#1985)
opensearch-trigger-bot[bot] Jul 24, 2024
9999979
Backport 2.x Fix CVEs for ag-grid, ws and braces packages (#1990)
TackAdam Jul 24, 2024
eb87de0
[Backport 2.x] backport of integrations for MDS support (#1996)
sumukhswamy Jul 25, 2024
f380597
[BUG] fix redirection url in saved objects management page for notebo…
opensearch-trigger-bot[bot] Jul 25, 2024
2e3ff67
[Backport 2.x] 2001 to 2.x Remove ag grid package (#2002)
TackAdam Jul 29, 2024
1e00975
[Bug] Trace Analytics bug fix for local cluster being rendered (#2006…
sumukhswamy Jul 30, 2024
4b4b281
update getting-started links to match recent catalog PR merges (#2012)
YANG-DB Jul 31, 2024
356f419
update ndjson so workflow matches patterns created (#2016) (#2018)
opensearch-trigger-bot[bot] Jul 31, 2024
c258de2
Fix docker links & index patterns names (#2017)
YANG-DB Jul 31, 2024
cf0c959
Increment version to 2.16.0.0 (#1995)
opensearch-trigger-bot[bot] Aug 1, 2024
084e269
Traces and Spans tab Fix for application analytics (#2023) (#2025)
opensearch-trigger-bot[bot] Aug 1, 2024
7f82a5c
link fixes for csv (#2031) (#2035)
opensearch-trigger-bot[bot] Aug 2, 2024
aa1e9bb
Fix direct url load for trace analytics (#2024) (#2028)
opensearch-trigger-bot[bot] Aug 2, 2024
6bb3ac1
[Bug] Trace Analytics bugfix for breadcrumbs and id pathing (#2037) (…
opensearch-trigger-bot[bot] Aug 3, 2024
10165d0
feat: remove useless registration method (#2044) (#2047)
opensearch-trigger-bot[bot] Aug 8, 2024
71f4a73
Fix Observability CI workflow checks (#2046) (#2054)
ps48 Aug 12, 2024
7f504c6
[Page Header] New page header for metrics (#2050) (#2060)
ps48 Aug 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

21 changes: 2 additions & 19 deletions .cypress/integration/notebooks_test/notebooks.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,33 +93,16 @@ describe('Testing notebooks table', () => {
cy.contains(TEST_NOTEBOOK).should('exist');
});

it('Duplicates a notebook', () => {
cy.get('.euiCheckbox__input[title="Select this row"]').eq(0).click();
cy.get('button[data-test-subj="notebookTableActionBtn"]').click();
cy.get('button[data-test-subj="duplicateNotebookBtn"]').click();
cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();

cy.get('.euiCheckbox__input[title="Select this row"]').eq(1).click();
});

it('Renames a notebook', () => {
cy.get('.euiCheckbox__input[title="Select this row"]').eq(0).click();
cy.get('button[data-test-subj="notebookTableActionBtn"]').click();
cy.get('button[data-test-subj="renameNotebookBtn"]').click();
cy.get('input[data-test-subj="custom-input-modal-input"]').focus().type(' (rename)');
cy.get('button[data-test-subj="custom-input-modal-confirm-button"]').click();
});

it('Searches existing notebooks', () => {
cy.get('input.euiFieldSearch').focus().type('this notebook should not exist');
cy.get('.euiTableCellContent__text').contains('No items found').should('exist');
cy.get('.euiFormControlLayoutClearButton').click();
cy.get('input.euiFieldSearch')
.focus()
.type(TEST_NOTEBOOK + ' (copy) (rename)');
.type(TEST_NOTEBOOK);

cy.get('a.euiLink')
.contains(TEST_NOTEBOOK + ' (copy) (rename)')
.contains(TEST_NOTEBOOK)
.should('exist');
});

Expand Down
28 changes: 20 additions & 8 deletions .github/workflows/ftr-e2e-dashboards-observability-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
pull_request:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

env:
PLUGIN_NAME: dashboards-observability
OPENSEARCH_DASHBOARDS_VERSION: '2.x'
OPENSEARCH_DASHBOARDS_VERSION: "2.x"

jobs:
tests:
Expand All @@ -31,12 +31,12 @@ jobs:
- name: Set up Java 11
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '11'
distribution: "corretto"
java-version: "11"

- name: Checkout Branch
uses: actions/checkout@v3

- name: Set env
run: |
opensearch_version=$(node -p "require('./opensearch_dashboards.json').opensearchDashboardsVersion")
Expand All @@ -45,6 +45,13 @@ jobs:
echo "OPENSEARCH_PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
shell: bash

- name: Download Job Scheduler artifact
uses: suisei-cn/[email protected]
with:
url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip
target: plugin-artifacts/
filename: opensearch-job-scheduler.zip

- name: Download observability artifact
uses: suisei-cn/[email protected]
with:
Expand All @@ -70,6 +77,11 @@ jobs:
rm -f opensearch-*.tar.gz
shell: bash

- name: Install job scheduler plugin
run: |
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/bin/opensearch-plugin install file:$(pwd)/plugin-artifacts/opensearch-job-scheduler.zip"
shell: bash

- name: Install observability plugin
run: |
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/bin/opensearch-plugin install file:$(pwd)/plugin-artifacts/observability.zip"
Expand Down Expand Up @@ -107,7 +119,7 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ steps.versions_step.outputs.node_version }}
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"

- name: Install correct yarn version for OpenSearch Dashboards
run: |
Expand All @@ -125,7 +137,7 @@ jobs:
cd OpenSearch-Dashboards
nohup yarn start --no-base-path --no-watch | tee dashboard.log &

- name : Check If OpenSearch Dashboards Is Ready
- name: Check If OpenSearch Dashboards Is Ready
if: ${{ runner.os == 'Linux' }}
run: |
cd ./OpenSearch-Dashboards
Expand All @@ -143,7 +155,7 @@ jobs:
repository: opensearch-project/opensearch-dashboards-functional-test
ref: ${{ env.OPENSEARCH_DASHBOARDS_VERSION }}
fetch-depth: 0

- name: Install Cypress
run: |
npm install cypress --save-dev
Expand Down
23 changes: 17 additions & 6 deletions .github/workflows/integration-tests-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request, push]

env:
PLUGIN_NAME: dashboards-observability
OPENSEARCH_DASHBOARDS_VERSION: '2.x'
OPENSEARCH_DASHBOARDS_VERSION: "2.x"

jobs:
tests:
Expand All @@ -24,7 +24,6 @@ jobs:
testgroups:
[
app_analytics_test,
datasources_test,
event_analytics_test,
integrations_test,
metrics_analytics_test,
Expand All @@ -41,8 +40,8 @@ jobs:
- name: Set up Java 11
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '11'
distribution: "corretto"
java-version: "11"

- name: Checkout Branch
uses: actions/checkout@v3
Expand All @@ -55,6 +54,13 @@ jobs:
echo "OPENSEARCH_PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
shell: bash

- name: Download Job Scheduler artifact
uses: suisei-cn/[email protected]
with:
url: https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=${{ env.OPENSEARCH_PLUGIN_VERSION }}-SNAPSHOT&p=zip
target: plugin-artifacts/
filename: opensearch-job-scheduler.zip

- name: Download observability artifact
uses: suisei-cn/[email protected]
with:
Expand All @@ -80,6 +86,11 @@ jobs:
rm -f opensearch-*.tar.gz
shell: bash

- name: Install job scheduler plugin
run: |
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/bin/opensearch-plugin install file:$(pwd)/plugin-artifacts/opensearch-job-scheduler.zip"
shell: bash

- name: Install observability plugin
run: |
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/bin/opensearch-plugin install file:$(pwd)/plugin-artifacts/observability.zip"
Expand Down Expand Up @@ -117,7 +128,7 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ steps.versions_step.outputs.node_version }}
registry-url: 'https://registry.npmjs.org'
registry-url: "https://registry.npmjs.org"

- name: Configure OpenSearch Dashboards
run: |
Expand Down Expand Up @@ -189,4 +200,4 @@ jobs:
if: always()
with:
name: cypress-videos-${{ matrix.os }}
path: OpenSearch-Dashboards/plugins/dashboards-observability/.cypress/videos
path: OpenSearch-Dashboards/plugins/dashboards-observability/.cypress/videos
8 changes: 3 additions & 5 deletions .github/workflows/link-checker.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: Link Checker
on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
linkchecker:

runs-on: ubuntu-latest

steps:
Expand All @@ -16,9 +15,8 @@ jobs:
id: lychee
uses: lycheeverse/lychee-action@master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt" --exclude "http://localhost" --exclude "https://localhost"
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Fail if there were link errors
run: exit ${{ steps.lychee.outputs.exit_code }}

8 changes: 8 additions & 0 deletions common/constants/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ export const observabilityID = 'observability-logs';
export const observabilityTitle = 'Observability';
export const observabilityPluginOrder = 1500;

export const observabilityOverviewID = 'observability-overview';
export const observabilityOverviewTitle = 'Observability overview';
export const observabilityOverviewPluginOrder = 5088;

export const observabilityGettingStartedID = 'observability-gettingStarted';
export const observabilityGettingStartedTitle = 'Getting Started';
export const observabilityGettingStartedPluginOrder = 5089;

export const observabilityApplicationsID = 'observability-applications';
export const observabilityApplicationsTitle = 'Applications';
export const observabilityApplicationsPluginOrder = 5090;
Expand Down
12 changes: 6 additions & 6 deletions common/types/notebooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
*/

import { RefObject } from 'react';
import { DashboardStart } from "../../../../src/plugins/dashboard/public";
import { NavigationPublicPluginStart } from "../../../../src/plugins/navigation/public";

export interface NotebooksPluginSetup {
getGreeting: () => string;
}
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface NotebooksPluginStart {}

export interface optionsType {
export interface OptionsType {
baseUrl: string;
payload?: any;
headers?: any;
Expand All @@ -27,7 +25,7 @@ export interface optionsType {
ciphers?: string; // The TLS ciphers to support
}

export type ParaType = {
export interface ParaType {
uniqueId: string;
isRunning: boolean;
inQueue: boolean;
Expand All @@ -41,7 +39,7 @@ export type ParaType = {
inp: string;
lang: string;
editorLanguage: string;
typeOut: Array<string>;
typeOut: string[];
out: any[];
isInputExpanded: boolean;
isOutputStale: boolean;
Expand All @@ -50,4 +48,6 @@ export type ParaType = {
visStartTime?: string;
visEndTime?: string;
visSavedObjId?: string;
};
dataSourceMDSId?: string;
dataSourceMDSLabel?: string;
}
2 changes: 2 additions & 0 deletions common/types/observability_saved_object_attributes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import { SavedQuery, SavedVisualization } from './explorer';

export const VISUALIZATION_SAVED_OBJECT = 'observability-visualization';
export const SEARCH_SAVED_OBJECT = 'observability-search';
export const NOTEBOOK_SAVED_OBJECT = 'observability-notebook';
export const OBSERVABILTY_SAVED_OBJECTS = [
VISUALIZATION_SAVED_OBJECT,
SEARCH_SAVED_OBJECT,
NOTEBOOK_SAVED_OBJECT,
] as const;
export const SAVED_OBJECT_VERSION = 1;

Expand Down
13 changes: 13 additions & 0 deletions common/utils/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

import semver from 'semver';
import { SavedObject } from '../../../../src/core/public';
import { DataSourceAttributes } from '../../../../src/plugins/data_source/common/data_sources';
import * as pluginManifest from '../../opensearch_dashboards.json';
import { coreRefs } from '../../public/framework/core_refs';

/**
Expand Down Expand Up @@ -62,3 +66,12 @@ export const basePathLink = (link: string): string => {
return link;
}
};

export const dataSourceFilterFn = (dataSource: SavedObject<DataSourceAttributes>) => {
const dataSourceVersion = dataSource?.attributes?.dataSourceVersion || '';
const installedPlugins = dataSource?.attributes?.installedPlugins || [];
return (
semver.satisfies(dataSourceVersion, pluginManifest.supportedOSDataSourceVersions) &&
pluginManifest.requiredOSDataSourcePlugins.every((plugin) => installedPlugins.includes(plugin))
);
};
5 changes: 5 additions & 0 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,10 @@
],
"configPath": [
"observability"
],
"supportedOSDataSourceVersions": ">=2.9.0",
"requiredOSDataSourcePlugins": [
"opensearch-sql",
"opensearch-observability"
]
}
Loading
Loading