update read-only data source view

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

Author: jackiehanyang

public/pages/DetectorDetail/containers/DetectorDetail.tsx

@@ -59,6 +59,7 @@ import { DETECTOR_STATE } from '../../../../server/utils/constants';
 import { CatIndex } from '../../../../server/models/types';
 import { containsIndex } from '../utils/helpers';
 import { DataSourceManagementPluginSetup, DataSourceViewConfig } from '../../../../../../src/plugins/data_source_management/public';
+import { getNotifications, getSavedObjectsClient } from '../../../services';
 
 export interface DetectorRouterProps {
   detectorId?: string;
@@ -378,9 +379,10 @@ export const DetectorDetail = (props: DetectorDetailProps) => {
             setMenuMountPoint={props.setActionMenu}
             componentType={'DataSourceView'}
             componentConfig={{
-              // give a placeholder label for now, will update it once neo team allows empty label field
-              activeOption: [{label: 'labelPlaceHolder', id: dataSourceId}],
-              fullWidth: true
+              activeOption: [{ id: dataSourceId}],
+              fullWidth: false,
+              savedObjects: getSavedObjectsClient(),
+              notifications: getNotifications(),
             }}
           />
         )}

public/pages/DetectorsList/containers/List/List.tsx

@@ -170,15 +170,15 @@ export const DetectorList = (props: ListProps) => {
   const [indexQuery, setIndexQuery] = useState('');
   useEffect(() => {
     const getInitialIndices = async () => {
-      await dispatch(getIndices(indexQuery));
+      await dispatch(getIndices(indexQuery, state.selectedDataSourceId));
     };
     getInitialIndices();
   }, []);
 
   // Getting all initial monitors
   useEffect(() => {
     const getInitialMonitors = async () => {
-      dispatch(searchMonitors());
+      dispatch(searchMonitors(state.selectedDataSourceId));
     };
     getInitialMonitors();
   }, []);
@@ -339,7 +339,7 @@ export const DetectorList = (props: ListProps) => {
     if (searchValue !== indexQuery) {
       const sanitizedQuery = sanitizeSearchText(searchValue);
       setIndexQuery(sanitizedQuery);
-      await dispatch(getPrioritizedIndices(sanitizedQuery));
+      await dispatch(getPrioritizedIndices(sanitizedQuery, state.selectedDataSourceId));
       setState((state) => ({
         ...state,
         page: 0,
@@ -479,7 +479,7 @@ export const DetectorList = (props: ListProps) => {
       DETECTOR_ACTION.START
     ).map((detector) => detector.id);
     const promises = validIds.map(async (id: string) => {
-      return dispatch(startDetector(id));
+      return dispatch(startDetector(id, state.selectedDataSourceId));
     });
     await Promise.all(promises)
       .then(() => {
@@ -506,7 +506,7 @@ export const DetectorList = (props: ListProps) => {
       DETECTOR_ACTION.STOP
     ).map((detector) => detector.id);
     const promises = validIds.map(async (id: string) => {
-      return dispatch(stopDetector(id));
+      return dispatch(stopDetector(id, state.selectedDataSourceId));
     });
     await Promise.all(promises)
       .then(() => {
@@ -538,7 +538,7 @@ export const DetectorList = (props: ListProps) => {
       DETECTOR_ACTION.DELETE
     ).map((detector) => detector.id);
     const promises = validIds.map(async (id: string) => {
-      return dispatch(deleteDetector(id));
+      return dispatch(deleteDetector(id, state.selectedDataSourceId));
     });
     await Promise.all(promises)
       .then(() => {

public/redux/reducers/alerting.ts

@@ -94,9 +94,9 @@ const reducer = handleActions<Monitors>(
   initialDetectorsState
 );
 
-export const searchMonitors = (): APIAction => ({
+export const searchMonitors = (dataSourceId: string): APIAction => ({
   type: SEARCH_MONITORS,
-  request: (client: HttpSetup) => client.post(`..${ALERTING_NODE_API._SEARCH}`),
+  request: (client: HttpSetup) => client.post(`..${ALERTING_NODE_API._SEARCH}/${dataSourceId}`),
 });
 
 export const searchAlerts = (

public/redux/reducers/opensearch.ts

@@ -252,10 +252,10 @@ export const getIndices = (searchKey: string = '', dataSourceId: string): APIAct
     client.get(`..${AD_NODE_API._INDICES}/${dataSourceId}`, { query: { index: searchKey } }),
 });
 
-export const getAliases = (searchKey: string = ''): APIAction => ({
+export const getAliases = (searchKey: string = '', dataSourceId: string): APIAction => ({
   type: GET_ALIASES,
   request: (client: HttpSetup) =>
-    client.get(`..${AD_NODE_API._ALIASES}`, { query: { alias: searchKey } }),
+    client.get(`..${AD_NODE_API._ALIASES}/${dataSourceId}`, { query: { alias: searchKey } }),
 });
 
 export const getMappings = (searchKey: string = ''): APIAction => ({
@@ -295,11 +295,11 @@ export const deleteIndex = (index: string): APIAction => ({
 });
 
 export const getPrioritizedIndices =
-  (searchKey: string): ThunkAction =>
+  (searchKey: string, datSourceId: string): ThunkAction =>
   async (dispatch, getState) => {
     //Fetch Indices and Aliases with text provided
-    await dispatch(getIndices(searchKey));
-    await dispatch(getAliases(searchKey));
+    await dispatch(getIndices(searchKey, datSourceId));
+    await dispatch(getAliases(searchKey, datSourceId));
     const osState = getState().opensearch;
     const exactMatchedIndices = osState.indices;
     const exactMatchedAliases = osState.aliases;
@@ -311,8 +311,8 @@ export const getPrioritizedIndices =
       };
     } else {
       //No results found for exact match, append wildCard and get partial matches if exists
-      await dispatch(getIndices(`${searchKey}*`));
-      await dispatch(getAliases(`${searchKey}*`));
+      await dispatch(getIndices(`${searchKey}*`, datSourceId));
+      await dispatch(getAliases(`${searchKey}*`, datSourceId));
       const osState = getState().opensearch;
       const partialMatchedIndices = osState.indices;
       const partialMatchedAliases = osState.aliases;

server/plugin.ts

@@ -88,7 +88,7 @@ export class AnomalyDetectionOpenSearchDashboardsPlugin
 
     // Create services & register with OpenSearch client
     const adService = new AdService(client, dataSourceEnabled);
-    const alertingService = new AlertingService(client);
+    const alertingService = new AlertingService(client, dataSourceEnabled);
     const opensearchService = new OpenSearchService(client, dataSourceEnabled);
     const sampleDataService = new SampleDataService(client);
 

server/routes/alerting.ts

@@ -22,20 +22,23 @@ import {
   OpenSearchDashboardsResponseFactory,
   IOpenSearchDashboardsResponse,
 } from '../../../../src/core/server';
+import { getClientBasedOnDataSource } from '../utils/helpers';
 
 export function registerAlertingRoutes(
   apiRouter: Router,
   alertingService: AlertingService
 ) {
-  apiRouter.post('/monitors/_search', alertingService.searchMonitors);
+  apiRouter.post('/monitors/_search/{detectorId}', alertingService.searchMonitors);
   apiRouter.get('/monitors/alerts', alertingService.searchAlerts);
 }
 
 export default class AlertingService {
   private client: any;
+  dataSourceEnabled: boolean;
 
-  constructor(client: any) {
+  constructor(client: any, dataSourceEnabled: boolean) {
     this.client = client;
+    this.dataSourceEnabled = dataSourceEnabled;
   }
 
   searchMonitors = async (
@@ -44,6 +47,8 @@ export default class AlertingService {
     opensearchDashboardsResponse: OpenSearchDashboardsResponseFactory
   ): Promise<IOpenSearchDashboardsResponse<any>> => {
     try {
+      const { dataSourceId } = request.params as { dataSourceId: string };
+
       const requestBody = {
         size: MAX_MONITORS,
         query: {
@@ -71,9 +76,16 @@ export default class AlertingService {
           },
         },
       };
-      const response: SearchResponse<Monitor> = await this.client
-        .asScoped(request)
-        .callAsCurrentUser('alerting.searchMonitors', { body: requestBody });
+
+      const callWithRequest = getClientBasedOnDataSource(
+        context, 
+        this.dataSourceEnabled, 
+        request, 
+        dataSourceId,
+        this.client);
+        
+      const response: SearchResponse<Monitor> = await callWithRequest(
+        'alerting.searchMonitors', { body: requestBody });
       const totalMonitors = get(response, 'hits.total.value', 0);
       const allMonitors = get(response, 'hits.hits', []).reduce(
         (acc: any, monitor: any) => ({

server/routes/opensearch.ts

@@ -40,7 +40,7 @@ export function registerOpenSearchRoutes(
   opensearchService: OpenSearchService
 ) {
   apiRouter.get('/_indices/{dataSourceId}', opensearchService.getIndices);
-  apiRouter.get('/_aliases', opensearchService.getAliases);
+  apiRouter.get('/_aliases/{dataSourceId}', opensearchService.getAliases);
   apiRouter.get('/_mappings', opensearchService.getMapping);
   apiRouter.post('/_search', opensearchService.executeSearch);
   apiRouter.put('/create_index', opensearchService.createIndex);
@@ -160,10 +160,17 @@ export default class OpenSearchService {
     opensearchDashboardsResponse: OpenSearchDashboardsResponseFactory
   ): Promise<IOpenSearchDashboardsResponse<any>> => {
     const { alias } = request.query as { alias: string };
+    const { dataSourceId } = request.params as { dataSourceId: string };
+
     try {
-      const response: IndexAlias[] = await this.client
-        .asScoped(request)
-        .callAsCurrentUser('cat.aliases', {
+      const callWithRequest = getClientBasedOnDataSource(
+        context, 
+        this.dataSourceEnabled, 
+        request, 
+        dataSourceId,
+        this.client);
+      const response: IndexAlias[] = await callWithRequest(
+        'cat.aliases', {
           alias,
           format: 'json',
           h: 'alias,index',