Skip to content

Commit

Permalink
Merge branch 'main' into replace-bluebird-with-native-promise
Browse files Browse the repository at this point in the history
  • Loading branch information
hainenber authored Sep 24, 2024
2 parents df0ac85 + 9fd0f0b commit 53e09a0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 4 deletions.
1 change: 1 addition & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ https://www.quandl.com/api/v1/datasets/
https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
http:/adomas.org/javascript-mouse-wheel/
site.com
https://sites.google.com/site/murmurhash
2 changes: 2 additions & 0 deletions changelogs/fragments/8299.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fix:
- Expose datasets and data_frames directories for specific imports ([#8299](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8299))
2 changes: 0 additions & 2 deletions docs/multi-datasource/high_level_design.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ To support multiple data source in OpenSearch Dashboards, we will add “data so

With this new “data source” reference in index pattern, OpenSearch Dashboards users will need to first create data sources in OpenSearch Dashboards, then select a data source when creating index patterns. Then the visualization and dashboard creation experience will remain the same. Also for any other save object types, if they reference index-pattern, or reference any save object that references index-pattern. Retrieving data from data source will be supported out of the box.

- For OpenSearch Dashboards multiple data source user experience, refer to [OpenSearch Dashboards Multiple OpenSearch Data Source Support User Stories](https://quip-amazon.com/VXQ0AhpPs3gU)

- The OpenSearch Dashboards visualization rendering flow will look like following with multi-datasource support: ![image](./img/hld_vis_flow.png)

### Backward Compatibility
Expand Down
8 changes: 7 additions & 1 deletion src/plugins/data/opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
"ui": true,
"requiredPlugins": ["expressions", "uiActions"],
"optionalPlugins": ["usageCollection", "dataSource"],
"extraPublicDirs": ["common", "common/utils/abort_utils", "common/index_patterns/utils.ts"],
"extraPublicDirs": [
"common",
"common/utils/abort_utils",
"common/index_patterns/utils.ts",
"common/data_frames",
"common/datasets"
],
"requiredBundles": [
"usageCollection",
"opensearchDashboardsUtils",
Expand Down
13 changes: 12 additions & 1 deletion src/plugins/usage_collection/public/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
* under the License.
*/

import { UsageCollectionSetup, METRIC_TYPE } from '.';
import { UsageCollectionSetup, UsageCollectionStart, METRIC_TYPE } from '.';

export type Setup = jest.Mocked<UsageCollectionSetup>;
export type Start = jest.Mocked<UsageCollectionStart>;

const createSetupContract = (): Setup => {
const setupContract: Setup = {
Expand All @@ -45,6 +46,16 @@ const createSetupContract = (): Setup => {
return setupContract;
};

const createStartContract = (): Start => {
const startContract: Start = {
reportUiStats: jest.fn(),
METRIC_TYPE,
};

return startContract;
};

export const usageCollectionPluginMock = {
createSetupContract,
createStartContract,
};

0 comments on commit 53e09a0

Please sign in to comment.