- |
-
- Date Added
-
@@ -1402,7 +1188,7 @@ exports[`Added Integration Table View Test Renders added integration table view
className="euiText euiText--medium"
data-test-subj="nginxIntegrationDescription"
>
- 2023-05-30T14:56:30.139Z
+ logs
@@ -1410,240 +1196,7 @@ exports[`Added Integration Table View Test Renders added integration table view
-
-
- Added By
-
-
- |
-
-
-
-
- Status
-
-
- |
-
-
-
-
-
-
- |
-
- Asset name
-
-
- |
-
-
-
-
- Source
-
-
- |
-
-
-
-
- Type
-
-
- |
-
-
- 2023-05-30T14:56:35.137Z
+ 2023-06-02T15:30:35.281Z
@@ -1687,7 +1240,7 @@ exports[`Added Integration Table View Test Renders added integration table view
unknown
@@ -1794,7 +1347,7 @@ exports[`Added Integration Table View Test Renders added integration table view
10,
15,
],
- "totalItemCount": 2,
+ "totalItemCount": 1,
}
}
>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
index c918798d89..f9998b2997 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
@@ -37,26 +37,8 @@ Array [
}
>
-
- View Details
-
-
-
- Add
-
-
- }
icon={
![]()
}
- layout="vertical"
+ onClick={[Function]}
title="nginx"
- titleSize="xs"
+ titleElement="span"
>
- nginx
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap
new file mode 100644
index 0000000000..98de19d4ee
--- /dev/null
+++ b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap
@@ -0,0 +1,39 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Available Integration Table View Test Renders nginx integration table view using dummy data 1`] = `
+
+
+
+
+
+
+ nginx Details
+
+
+
+
+
+
+
+
+
+ Nginx HTTP server collector
+
+
+
+
+
+
+
+ nginx Fields
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Type
+
+ }
+ closePopover={[Function]}
+ display="inlineBlock"
+ hasArrow={true}
+ id="field_value_selection_0"
+ isOpen={false}
+ ownFocus={true}
+ panelClassName="euiFilterGroup__popoverPanel"
+ panelPaddingSize="none"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+ Name
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ Type
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ Category
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+ Name
+
+
+
+
+ communication
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+
+
+ communication
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+
+
+ communication
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+
+
+ communication
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+
+
+ communication
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+ |
+
+ Name
+
+
+ |
+
+
+
+
+ Type
+
+
+ |
+
+
+
+
+ Category
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :
+ 10
+
+ }
+ closePopover={[Function]}
+ display="inlineBlock"
+ hasArrow={true}
+ isOpen={false}
+ ownFocus={true}
+ panelPaddingSize="none"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add Integration
+
+
+ {renderContent()}
+
+
+
+ onClose()} color="danger">
+ Cancel
+
+
+
+ {
+ onCreate(name, namespace, tags);
+ onClose();
+ }}
+ fill
+ >
+ Add Integration
+
+
+
+
+
+ );
+}
diff --git a/public/components/integrations/components/added_integration.tsx b/public/components/integrations/components/added_integration.tsx
index 256a02353f..f5703caedf 100644
--- a/public/components/integrations/components/added_integration.tsx
+++ b/public/components/integrations/components/added_integration.tsx
@@ -30,34 +30,36 @@ import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
import _ from 'lodash';
import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
import { FILTER_OPTIONS } from '../../../../common/constants/explorer';
-import { OBSERVABILITY_BASE } from '../../../../common/constants/shared';
+import { INTEGRATIONS_BASE, OBSERVABILITY_BASE } from '../../../../common/constants/shared';
import { DeleteModal } from '../../common/helpers/delete_modal';
import { AddedIntegrationProps } from './integration_types';
+import { useToast } from '../../../../public/components/common/toast';
export function AddedIntegration(props: AddedIntegrationProps) {
const { http, integrationInstanceId, chrome, parentBreadcrumbs } = props;
- const [toasts, setToasts] = useState([]);
- const [stateData, setData] = useState({ data: {} });
+ const { setToast } = useToast();
+
+ const [stateData, setData] = useState({ data: {} });
useEffect(() => {
chrome.setBreadcrumbs([
...parentBreadcrumbs,
{
- text: 'Placeholder',
- href: '#/integrations',
+ text: 'Integrations',
+ href: '#/',
},
{
- text: 'Added Integration',
- href: '#/added',
+ text: 'Installed Integration',
+ href: '#/installed',
},
{
- text: integrationInstanceId,
- href: `${last(parentBreadcrumbs)!.href}integrations/added/${integrationInstanceId}`,
+ text: `${stateData.data.data?.name}`,
+ href: `#/installed/${stateData.data.data?.id}`,
},
]);
handleDataRequest();
- }, [integrationInstanceId]);
+ }, [integrationInstanceId, stateData.data.data?.name]);
const [isModalVisible, setIsModalVisible] = useState(false);
const [modalLayout, setModalLayout] = useState();
@@ -67,6 +69,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
{
setIsModalVisible(false);
+ deleteAddedIntegration(integrationInstanceId);
}}
onCancel={() => {
setIsModalVisible(false);
@@ -78,35 +81,21 @@ export function AddedIntegration(props: AddedIntegrationProps) {
setIsModalVisible(true);
};
- async function handleDataRequest() {
- http.get(`${OBSERVABILITY_BASE}/store/id`).then((exists) => setData(exists));
+ async function deleteAddedIntegration(integrationInstance: string) {
+ http.delete(`${INTEGRATIONS_BASE}/store/${integrationInstance}`).then(() => {
+ setToast(`${stateData.data.data?.name} integration successfully deleted!`, 'success');
+ window.location.hash = '#/installed';
+ });
}
- const setToast = (title: string, color = 'success', text?: ReactChild) => {
- if (!text) text = '';
- setToasts([...toasts, { id: new Date().toISOString(), title, text, color } as Toast]);
- };
-
- async function addIntegrationRequest(name: string) {
+ async function handleDataRequest() {
http
- .post(`${OBSERVABILITY_BASE}/store`)
- .then((res) => {
- setToast(
- `${name} integration successfully added!`,
- 'success',
- `View the added assets from ${name} in the Added Integrations list`
- );
- })
- .catch((err) =>
- setToast(
- 'Failed to load integration. Check Added Integrations table for more details',
- 'danger'
- )
- );
+ .get(`${INTEGRATIONS_BASE}/store/${integrationInstanceId}`)
+ .then((exists) => setData(exists));
}
function AddedOverview(overviewProps: any) {
- const { data } = overviewProps;
+ const { data } = overviewProps.data;
return (
@@ -116,17 +105,19 @@ export function AddedIntegration(props: AddedIntegrationProps) {
- {data.data.id}
+ {data?.data?.name}
-
+
{
getModal();
}}
>
- Delete
+ Remove Integration
@@ -138,8 +129,8 @@ export function AddedIntegration(props: AddedIntegrationProps) {
Template
-
- {data.data.templateName}
+
+ {data?.data?.templateName}
@@ -147,28 +138,28 @@ export function AddedIntegration(props: AddedIntegrationProps) {
Date Added
- {data.data.creationDate?.split('T')[0]}
+ {data?.data?.creationDate?.split('T')[0]}
Status
- {data.data.status}
+ {data?.data?.status}
Added By
- {data.data.author}
+ {data?.data?.addedBy}
Tags
- {data.data.license}
+ {data?.data?.license}
@@ -177,7 +168,10 @@ export function AddedIntegration(props: AddedIntegrationProps) {
}
function AddedAssets(assetProps: any) {
- const data = assetProps.data.data.assets || [];
+ const { data } = assetProps.data;
+
+ const assets = data?.data?.assets || [];
+ console.log(assets);
const search = {
box: {
@@ -204,11 +198,20 @@ export function AddedIntegration(props: AddedIntegrationProps) {
name: 'Name',
sortable: true,
truncateText: true,
- render: (value, record) => (
-
- {_.truncate(record.name, { length: 100 })}
-
- ),
+ render: (value, record) => {
+ return record.isDefaultAsset ? (
+ window.location.assign(`dashboards#/view/${record.assetId}`)}
+ >
+ {_.truncate(record.description, { length: 100 })}
+
+ ) : (
+
+ {_.truncate(record.description, { length: 100 })}
+
+ );
+ },
},
{
field: 'type',
@@ -217,7 +220,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
truncateText: true,
render: (value, record) => (
- {_.truncate(record.type, { length: 100 })}
+ {_.truncate(record.assetType, { length: 100 })}
),
},
@@ -244,7 +247,7 @@ export function AddedIntegration(props: AddedIntegrationProps) {
(
- {_.truncate(record.name, { length: 100 })}
+ {_.truncate(record.description, { length: 100 })}
),
},
@@ -335,20 +338,11 @@ export function AddedIntegration(props: AddedIntegrationProps) {
return (
- {
- setToasts(toasts.filter((toast) => toast.id !== removedToast.id));
- }}
- toastLifeTimeMs={6000}
- />
- {AddedOverview({ stateData })}
-
- {AddedAssets({ stateData })}
+ {AddedOverview({ data: stateData })}
- {AddedIntegrationFields({ stateData })}
+ {AddedAssets({ data: stateData })}
{isModalVisible && modalLayout}
diff --git a/public/components/integrations/components/added_integration_overview_page.tsx b/public/components/integrations/components/added_integration_overview_page.tsx
index 735c1a8ad3..719b4af99b 100644
--- a/public/components/integrations/components/added_integration_overview_page.tsx
+++ b/public/components/integrations/components/added_integration_overview_page.tsx
@@ -29,6 +29,7 @@ export interface AddedIntegrationType {
status: string;
assets: any[];
addedBy: string;
+ id: string;
}
export function AddedIntegrationOverviewPage(props: AddedIntegrationOverviewPageProps) {
@@ -40,12 +41,12 @@ export function AddedIntegrationOverviewPage(props: AddedIntegrationOverviewPage
chrome.setBreadcrumbs([
...parentBreadcrumbs,
{
- text: 'Placeholder',
- href: '#/integrations',
+ text: 'Integrations',
+ href: '#/',
},
{
- text: 'Added Integrations',
- href: '#/integrations/added',
+ text: 'Installed Integrations',
+ href: '#/installed',
},
]);
handleDataRequest();
diff --git a/public/components/integrations/components/added_integration_table.tsx b/public/components/integrations/components/added_integration_table.tsx
index dc301b602c..133e95639f 100644
--- a/public/components/integrations/components/added_integration_table.tsx
+++ b/public/components/integrations/components/added_integration_table.tsx
@@ -31,9 +31,7 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
asset.isDefaultAsset)[0].assetId
- }`}
+ href={`#/installed/${record.id}`}
>
{_.truncate(record.name, { length: 100 })}
@@ -60,7 +58,7 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
truncateText: true,
render: (value, record) => (
- {_.truncate(record.type, { length: 100 })}
+ {_.truncate(record.dataSource.sourceType, { length: 100 })}
),
},
@@ -99,7 +97,7 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
},
] as Array>;
- const FILTER_OPTIONS = ['Visualization', 'Query', 'Metric'];
+ const FILTER_OPTIONS = ['logs'];
const search = {
box: {
diff --git a/public/components/integrations/components/available_integration_card_view.tsx b/public/components/integrations/components/available_integration_card_view.tsx
index e6c29c6e1b..ebf37ec842 100644
--- a/public/components/integrations/components/available_integration_card_view.tsx
+++ b/public/components/integrations/components/available_integration_card_view.tsx
@@ -32,35 +32,23 @@ export function AvailableIntegrationsCardView(props: AvailableIntegrationsCardVi
return (
- {
- window.location.assign(`#/available/${i.name}`);
- }}
- >
- View Details
-
-
- {
- props.showModal(i.name);
- }}
- size="s"
- >
- Add
-
-
- }
+ data-test-subj={`integration_card_${i.name.toLowerCase()}`}
+ titleElement="span"
+ // footer={
+ // {
+ // props.showModal(i.name);
+ // }}
+ // size="s"
+ // >
+ // Add
+ //
+ // }
+ onClick={() => (window.location.hash = `#/available/${i.name}`)}
/>
);
diff --git a/public/components/integrations/components/available_integration_overview_page.tsx b/public/components/integrations/components/available_integration_overview_page.tsx
index b613963e23..dfdccc1289 100644
--- a/public/components/integrations/components/available_integration_overview_page.tsx
+++ b/public/components/integrations/components/available_integration_overview_page.tsx
@@ -86,8 +86,8 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
chrome.setBreadcrumbs([
...parentBreadcrumbs,
{
- text: 'Placeholder',
- href: '#/integrations',
+ text: 'Integrations',
+ href: '#/',
},
]);
handleDataRequest();
diff --git a/public/components/integrations/components/integration.tsx b/public/components/integrations/components/integration.tsx
index 9449539cb2..adb98a27f1 100644
--- a/public/components/integrations/components/integration.tsx
+++ b/public/components/integrations/components/integration.tsx
@@ -22,47 +22,48 @@ import { IntegrationAssets } from './integration_assets_panel';
import { getAddIntegrationModal } from './add_integration_modal';
import { AvailableIntegrationProps } from './integration_types';
import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
+import { IntegrationScreenshots } from './integration_screenshots_panel';
+import { AddIntegrationFlyout } from './add_integration_flyout';
export function Integration(props: AvailableIntegrationProps) {
const { http, integrationTemplateId, chrome, parentBreadcrumbs } = props;
- const [isModalVisible, setIsModalVisible] = useState(false);
- const [modalLayout, setModalLayout] = useState();
+ const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
const [toasts, setToasts] = useState([]);
const [data, setData] = useState({
data: null,
});
- const getModal = (name: string) => {
- setModalLayout(
- getAddIntegrationModal(
- () => {
- addIntegrationRequest(name);
- setIsModalVisible(false);
- },
- () => {
- setIsModalVisible(false);
- },
- 'Name',
- 'Namespace',
- 'Tags (optional)',
- name,
- 'prod',
- 'Add Integration Options',
- 'Cancel',
- 'Add',
- 'test'
- )
- );
- setIsModalVisible(true);
- };
+ // const getModal = (name: string) => {
+ // setModalLayout(
+ // getAddIntegrationModal(
+ // () => {
+ // addIntegrationRequest(name);
+ // setIsModalVisible(false);
+ // },
+ // () => {
+ // setIsModalVisible(false);
+ // },
+ // 'Name',
+ // 'Namespace',
+ // 'Tags (optional)',
+ // name,
+ // 'prod',
+ // 'Add Integration Options',
+ // 'Cancel',
+ // 'Add',
+ // 'test'
+ // )
+ // );
+ // setIsModalVisible(true);
+ // };
useEffect(() => {
chrome.setBreadcrumbs([
...parentBreadcrumbs,
{
- text: 'Placeholder',
- href: '#/integrations',
+ text: 'Integrations',
+ href: '#/',
},
{
text: integrationTemplateId,
@@ -74,7 +75,7 @@ export function Integration(props: AvailableIntegrationProps) {
async function handleDataRequest() {
// TODO fill in ID request here
- http.get(`${INTEGRATIONS_BASE}/repository/nginx`).then((exists) => {
+ http.get(`${INTEGRATIONS_BASE}/repository/${integrationTemplateId}`).then((exists) => {
setData(exists.data);
});
}
@@ -84,9 +85,12 @@ export function Integration(props: AvailableIntegrationProps) {
setToasts([...toasts, { id: new Date().toISOString(), title, text, color } as Toast]);
};
- async function addIntegrationRequest(name: string) {
+ async function addIntegrationRequest(templateName: string, name: string) {
+ console.log(name);
http
- .post(`${INTEGRATIONS_BASE}/store`)
+ .post(`${INTEGRATIONS_BASE}/store/${templateName}`, {
+ body: JSON.stringify({ name }),
+ })
.then((res) => {
setToast(
`${name} integration successfully added!`,
@@ -102,6 +106,10 @@ export function Integration(props: AvailableIntegrationProps) {
);
}
+ // return await http.post(TRACE_ANALYTICS_DSL_ROUTE, {
+ // body: JSON.stringify(body),
+ // });
+
if (!data.data) {
return ;
}
@@ -116,16 +124,33 @@ export function Integration(props: AvailableIntegrationProps) {
/>
- {IntegrationOverview({ data, getModal })}
+ {IntegrationOverview({
+ data,
+ showFlyout: () => {
+ setIsFlyoutVisible(true);
+ },
+ })}
{IntegrationDetails({ data })}
+ {IntegrationScreenshots({ data })}
+
{IntegrationAssets({ data })}
{IntegrationFields({ data })}
- {isModalVisible && modalLayout}
+ {isFlyoutVisible && (
+ {
+ setIsFlyoutVisible(false);
+ }}
+ onCreate={(name) => {
+ addIntegrationRequest(integrationTemplateId, name);
+ }}
+ integrationName={integrationTemplateId}
+ />
+ )}
);
}
diff --git a/public/components/integrations/components/integration_assets_panel.tsx b/public/components/integrations/components/integration_assets_panel.tsx
index bc5bc8ed58..f7ef3f67e1 100644
--- a/public/components/integrations/components/integration_assets_panel.tsx
+++ b/public/components/integrations/components/integration_assets_panel.tsx
@@ -12,9 +12,10 @@ import {
} from '@elastic/eui';
import React from 'react';
import _ from 'lodash';
-import { FILTER_OPTIONS } from '../../../../common/constants/explorer';
import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
+const FILTER_OPTIONS = ['index-pattern', 'search', 'visualization', 'dashboard'];
+
export function IntegrationAssets(props: any) {
const data = props.data.data.displayAssets.map((x: any) => JSON.parse(x.body)) || [];
diff --git a/public/components/integrations/components/integration_details_panel.tsx b/public/components/integrations/components/integration_details_panel.tsx
index c5798dd6ea..c88f0d865a 100644
--- a/public/components/integrations/components/integration_details_panel.tsx
+++ b/public/components/integrations/components/integration_details_panel.tsx
@@ -3,14 +3,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import { EuiFlexGroup, EuiPanel, EuiSpacer, EuiFlexItem, EuiText } from '@elastic/eui';
+import { EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
export function IntegrationDetails(props: any) {
let screenshots;
- if (props.data.data.statics.mapping.gallery) {
- screenshots = props.data.data.data.statics.gallery;
+ if (props.data.data.statics.gallery) {
+ screenshots = props.data.data.statics.gallery;
}
return (
@@ -18,17 +18,6 @@ export function IntegrationDetails(props: any) {
{props.data.data.description}
-
-
-
- {screenshots?.map((i, v) => {
- return (
-
- 
-
- );
- })}
-
);
}
diff --git a/public/components/integrations/components/integration_overview_panel.tsx b/public/components/integrations/components/integration_overview_panel.tsx
index d24b430d5a..1f8ccf81c5 100644
--- a/public/components/integrations/components/integration_overview_panel.tsx
+++ b/public/components/integrations/components/integration_overview_panel.tsx
@@ -27,7 +27,7 @@ export function IntegrationOverview(props: any) {
return (
@@ -42,12 +42,13 @@ export function IntegrationOverview(props: any) {
-
+
{
- props.getModal(data.data.name);
+ props.showFlyout(data.data.name);
}}
+ fill
>
Add
diff --git a/public/components/integrations/components/integration_screenshots_panel.tsx b/public/components/integrations/components/integration_screenshots_panel.tsx
new file mode 100644
index 0000000000..3fb6164b82
--- /dev/null
+++ b/public/components/integrations/components/integration_screenshots_panel.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EuiFlexGroup, EuiPanel, EuiFlexItem } from '@elastic/eui';
+import React from 'react';
+import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
+import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
+
+export function IntegrationScreenshots(props: any) {
+ let screenshots;
+ if (props.data.data.statics.gallery) {
+ screenshots = props.data.data.statics.gallery;
+ }
+
+ return (
+
+
+
+ {screenshots?.map((i, v) => {
+ return (
+
+ 
+
+ );
+ })}
+
+
+ );
+}
diff --git a/public/components/integrations/components/integration_side_nav.tsx b/public/components/integrations/components/integration_side_nav.tsx
index 6ac0223322..5905596744 100644
--- a/public/components/integrations/components/integration_side_nav.tsx
+++ b/public/components/integrations/components/integration_side_nav.tsx
@@ -26,9 +26,9 @@ export const Sidebar = (props: { children: React.ReactNode }) => {
href: '#/available',
},
{
- name: 'Added integrations',
+ name: 'Installed integrations',
id: 2,
- href: '#/added',
+ href: '#/installed',
},
],
},
diff --git a/public/components/integrations/home.tsx b/public/components/integrations/home.tsx
index 919e9c5081..1608fac276 100644
--- a/public/components/integrations/home.tsx
+++ b/public/components/integrations/home.tsx
@@ -53,7 +53,7 @@ export const Home = (props: HomeProps) => {
/>
(
@@ -62,7 +62,7 @@ export const Home = (props: HomeProps) => {
/>
(
{
};
const mockResponse = {
saved_objects: [
- { type: 'dashboard', id: 'dashboard1' },
- { type: 'visualization', id: 'visualization1' },
+ { type: 'dashboard', id: 'dashboard1', attributes: { title: 'hi' } },
+ { type: 'visualization', id: 'visualization1', attributes: { title: 'hi' } },
],
};
const expectedInstance = {
@@ -55,12 +60,14 @@ describe('IntegrationInstanceBuilder', () => {
assetId: 'dashboard1',
status: 'available',
isDefaultAsset: true,
+ description: 'hi',
},
{
assetType: 'visualization',
assetId: 'visualization1',
status: 'available',
isDefaultAsset: false,
+ description: 'hi',
},
],
addedBy: 'unknown',
diff --git a/server/adaptors/integrations/__test__/kibana_backend.test.ts b/server/adaptors/integrations/__test__/kibana_backend.test.ts
index 1ba117669f..7b00e8c065 100644
--- a/server/adaptors/integrations/__test__/kibana_backend.test.ts
+++ b/server/adaptors/integrations/__test__/kibana_backend.test.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
import { IntegrationsKibanaBackend } from '../integrations_kibana_backend';
import { SavedObjectsClientContract } from '../../../../../../src/core/server/types';
import { IntegrationInstanceBuilder } from '../integrations_builder';
@@ -13,6 +18,7 @@ describe('IntegrationsKibanaBackend', () => {
mockClient = {
find: jest.fn(),
create: jest.fn(),
+ delete: jest.fn(),
} as any;
mockRepository = {
get: jest.fn(),
@@ -64,7 +70,10 @@ describe('IntegrationsKibanaBackend', () => {
.spyOn(IntegrationInstanceBuilder.prototype, 'build')
.mockImplementationOnce(builderMock.build);
- const result = await backend.loadIntegrationInstance(templateName);
+ const result = await backend.loadIntegrationInstance(
+ templateName,
+ 'Placeholder Nginx Integration'
+ );
expect(mockRepository.getByName).toHaveBeenCalledWith(templateName);
expect(builderMock.build).toHaveBeenCalledWith(template, {
@@ -76,6 +85,14 @@ describe('IntegrationsKibanaBackend', () => {
expect(result).toEqual(instance);
});
+ it('should delete an integration instance', async () => {
+ const mockDelete = jest.fn();
+ (mockClient.create as jest.Mock).mockResolvedValue(mockDelete);
+
+ await backend.deleteIntegrationInstance('deletedId');
+ expect(mockClient.delete).toHaveBeenCalledWith('integration-instance', 'deletedId');
+ });
+
it('should reject when loading an integration instance fails', async () => {
const templateName = 'Template 1';
const template = { name: templateName };
@@ -88,14 +105,14 @@ describe('IntegrationsKibanaBackend', () => {
.spyOn(IntegrationInstanceBuilder.prototype, 'build')
.mockImplementationOnce(builderMock.build);
- await expect(backend.loadIntegrationInstance(templateName)).rejects.toEqual({
+ await expect(backend.loadIntegrationInstance(templateName, 'test')).rejects.toEqual({
message: errorMessage,
statusCode: 500,
});
expect(mockRepository.getByName).toHaveBeenCalledWith(templateName);
expect(builderMock.build).toHaveBeenCalledWith(template, {
- name: 'Placeholder Nginx Integration',
+ name: 'test',
dataset: 'nginx',
namespace: 'prod',
});
diff --git a/server/adaptors/integrations/__test__/repository.test.ts b/server/adaptors/integrations/__test__/repository.test.ts
index 935f36ccc6..a6f8252376 100644
--- a/server/adaptors/integrations/__test__/repository.test.ts
+++ b/server/adaptors/integrations/__test__/repository.test.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
import * as fs from 'fs';
import { IntegrationsRepository } from '../integrations_repository';
diff --git a/server/adaptors/integrations/integrations_adaptor.ts b/server/adaptors/integrations/integrations_adaptor.ts
index 554f310af2..e2aba76eed 100644
--- a/server/adaptors/integrations/integrations_adaptor.ts
+++ b/server/adaptors/integrations/integrations_adaptor.ts
@@ -3,8 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
-import { SavedObjectsBulkCreateObject } from '../../../../../src/core/server';
-
export interface IntegrationsAdaptor {
getIntegrationTemplates: (
query?: IntegrationTemplateQuery
@@ -12,9 +10,13 @@ export interface IntegrationsAdaptor {
getIntegrationInstances: (
query?: IntegrationInstanceQuery
- ) => Promise;
+ ) => Promise;
+
+ getIntegrationInstance: (query?: IntegrationInstanceQuery) => Promise;
+
+ loadIntegrationInstance: (templateName: string, name: string) => Promise;
- loadIntegrationInstance: (templateName: string) => Promise;
+ deleteIntegrationInstance: (id: string) => Promise;
getStatic: (templateName: string, path: string) => Promise;
}
diff --git a/server/adaptors/integrations/integrations_builder.ts b/server/adaptors/integrations/integrations_builder.ts
index 72b4d86bc3..8299c0fdeb 100644
--- a/server/adaptors/integrations/integrations_builder.ts
+++ b/server/adaptors/integrations/integrations_builder.ts
@@ -1,3 +1,9 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { v4 as uuidv4 } from 'uuid';
import { SavedObjectsClientContract } from '../../../../../src/core/server';
import { templateValidator } from './validators';
@@ -46,12 +52,14 @@ export class IntegrationInstanceBuilder {
try {
const deserializedAssets = assets.map((asset) => JSON.parse(asset.body));
const response = await this.client.bulkCreate(deserializedAssets);
- const refs: AssetReference[] = response.saved_objects.map((obj) => {
+ console.log('bAWIEHIOGHIAORHGIOAEHRG' + JSON.stringify(response));
+ const refs: AssetReference[] = response.saved_objects.map((obj: any) => {
return {
assetType: obj.type,
assetId: obj.id,
status: 'available', // Assuming a successfully created object is available
isDefaultAsset: obj.type === 'dashboard', // Assuming for now that dashboards are default
+ description: obj.attributes.title,
};
});
return Promise.resolve(refs);
diff --git a/server/adaptors/integrations/integrations_kibana_backend.ts b/server/adaptors/integrations/integrations_kibana_backend.ts
index aa625803ef..fa9305b8df 100644
--- a/server/adaptors/integrations/integrations_kibana_backend.ts
+++ b/server/adaptors/integrations/integrations_kibana_backend.ts
@@ -1,7 +1,13 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
import { IntegrationsAdaptor } from './integrations_adaptor';
import { SavedObjectsClientContract } from '../../../../../src/core/server/types';
import { IntegrationInstanceBuilder } from './integrations_builder';
import { IntegrationsRepository } from './integrations_repository';
+import { SimpleSavedObject } from '../../../../../src/core/public';
export class IntegrationsKibanaBackend implements IntegrationsAdaptor {
client: SavedObjectsClientContract;
@@ -11,6 +17,10 @@ export class IntegrationsKibanaBackend implements IntegrationsAdaptor {
this.client = client;
this.repository = repository ?? new IntegrationsRepository();
}
+ deleteIntegrationInstance = async (id: string): Promise => {
+ const result = await this.client.delete('integration-instance', id);
+ return Promise.resolve(result);
+ };
getIntegrationTemplates = async (
query?: IntegrationTemplateQuery
@@ -28,19 +38,35 @@ export class IntegrationsKibanaBackend implements IntegrationsAdaptor {
getIntegrationInstances = async (
_query?: IntegrationInstanceQuery
- ): Promise => {
+ ): Promise => {
const result = await this.client.find({ type: 'integration-instance' });
+ console.log(result);
return Promise.resolve({
total: result.total,
- hits: result.saved_objects.map((x) => x.attributes) as IntegrationInstance[],
+ hits: result.saved_objects?.map((x) => ({
+ ...x.attributes!,
+ id: x.id,
+ })) as IntegrationInstanceResult[],
});
};
- loadIntegrationInstance = async (templateName: string): Promise => {
+ getIntegrationInstance = async (
+ _query?: IntegrationInstanceQuery
+ ): Promise => {
+ console.log(`id:${_query!.id}`);
+ const result = await this.client.get('integration-instance', `${_query!.id}`);
+ console.log(savedObjectToIntegrationInstance(result));
+ return Promise.resolve(savedObjectToIntegrationInstance(result));
+ };
+
+ loadIntegrationInstance = async (
+ templateName: string,
+ name: string
+ ): Promise => {
const template = await this.repository.getByName(templateName);
try {
const result = await new IntegrationInstanceBuilder(this.client).build(template, {
- name: 'Placeholder Nginx Integration',
+ name,
dataset: 'nginx',
namespace: 'prod',
});
@@ -66,3 +92,11 @@ export class IntegrationsKibanaBackend implements IntegrationsAdaptor {
return Promise.resolve(data);
};
}
+
+/*
+ ** UTILITY FUNCTIONS
+ */
+const savedObjectToIntegrationInstance = (so: any): IntegrationInstanceResult => ({
+ id: so.id,
+ ...so.attributes,
+});
diff --git a/server/adaptors/integrations/integrations_repository.ts b/server/adaptors/integrations/integrations_repository.ts
index f08d36dd8a..ac055bfe90 100644
--- a/server/adaptors/integrations/integrations_repository.ts
+++ b/server/adaptors/integrations/integrations_repository.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
import * as fs from 'fs';
const DEFAULT_REPOSITORY_PATH: string = __dirname + '/__data__/repository.json';
diff --git a/server/adaptors/integrations/types.ts b/server/adaptors/integrations/types.ts
index 4bf1dfc4d6..cb5e66be70 100644
--- a/server/adaptors/integrations/types.ts
+++ b/server/adaptors/integrations/types.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
interface IntegrationTemplate {
name: string;
version: string;
@@ -64,17 +69,35 @@ interface IntegrationInstance {
assets: AssetReference[];
}
+interface IntegrationInstanceResult {
+ name: string;
+ templateName: string;
+ dataSource: {
+ sourceType: string;
+ dataset: string;
+ namespace: string;
+ };
+ creationDate: Date;
+ tags?: string[];
+ status: string;
+ addedBy?: string;
+ assets: AssetReference[];
+ id: string;
+}
+
interface AssetReference {
assetType: string;
assetId: string;
status: string;
isDefaultAsset: boolean;
+ description: string;
}
-interface IntegrationInstanceSearchResult {
- hits: IntegrationInstance[];
+interface IntegrationInstancesSearchResult {
+ hits: IntegrationInstanceResult[];
}
interface IntegrationInstanceQuery {
added?: boolean;
+ id?: string;
}
diff --git a/server/routes/integrations/integrations_router.ts b/server/routes/integrations/integrations_router.ts
index 43fb3f8e0d..13e32331f5 100644
--- a/server/routes/integrations/integrations_router.ts
+++ b/server/routes/integrations/integrations_router.ts
@@ -36,7 +36,7 @@ export const handleWithCallback = async (
): Promise => {
try {
const data = await callback(adaptor);
- console.log(`handleWithCallback: callback returned ${data.toString().length} bytes`);
+ // console.log(`handleWithCallback: callback returned ${data.toString().length} bytes`);
return response.ok({
body: {
data,
@@ -74,13 +74,20 @@ export function registerIntegrationsRoute(router: IRouter) {
router.post(
{
- path: `${INTEGRATIONS_BASE}/store`,
- validate: false,
+ path: `${INTEGRATIONS_BASE}/store/{templateName}`,
+ validate: {
+ params: schema.object({
+ templateName: schema.string(),
+ }),
+ body: schema.object({
+ name: schema.string(),
+ }),
+ },
},
async (context, request, response): Promise => {
const adaptor = getAdaptor(context, request);
return handleWithCallback(adaptor, response, async (a: IntegrationsAdaptor) => {
- return a.loadIntegrationInstance('nginx');
+ return a.loadIntegrationInstance(request.params.templateName, request.body.name);
});
}
);
@@ -139,29 +146,82 @@ export function registerIntegrationsRoute(router: IRouter) {
router.get(
{
- path: `${INTEGRATIONS_BASE}/store`,
+ path: `${INTEGRATIONS_BASE}/store/list_added`,
validate: false,
},
async (context, request, response): Promise => {
const adaptor = getAdaptor(context, request);
return handleWithCallback(adaptor, response, async (a: IntegrationsAdaptor) => {
- return await a.getIntegrationTemplates();
+ return await a.getIntegrationInstances({
+ added,
+ });
+ });
+ }
+ );
+
+ router.delete(
+ {
+ path: `${INTEGRATIONS_BASE}/store/{id}`,
+ validate: {
+ params: schema.object({
+ id: schema.string(),
+ }),
+ },
+ },
+ async (context, request, response): Promise => {
+ const adaptor = getAdaptor(context, request);
+ return handleWithCallback(adaptor, response, async (a: IntegrationsAdaptor) => {
+ return {
+ data: await a.deleteIntegrationInstance(request.params.id),
+ };
});
}
);
router.get(
{
- path: `${INTEGRATIONS_BASE}/store/list_added`,
- validate: false,
+ path: `${INTEGRATIONS_BASE}/store/{id}`,
+ validate: {
+ params: schema.object({
+ id: schema.string(),
+ }),
+ },
},
async (context, request, response): Promise => {
const adaptor = getAdaptor(context, request);
+ console.log(request);
+ console.log(request.params.id);
return handleWithCallback(adaptor, response, async (a: IntegrationsAdaptor) => {
- return await a.getIntegrationInstances({
- added,
- });
+ return {
+ data: await a.getIntegrationInstance({
+ added,
+ id: request.params.id,
+ }),
+ };
});
}
);
+
+ // router.get(
+ // {
+ // path: `${INTEGRATIONS_BASE}/repository/{name}`,
+ // validate: {
+ // params: schema.object({
+ // name: schema.string(),
+ // }),
+ // },
+ // },
+ // async (context, request, response): Promise => {
+ // const adaptor = getAdaptor(context, request);
+ // return handleWithCallback(adaptor, response, async (a: IntegrationsAdaptor) => {
+ // return {
+ // data: (
+ // await a.getIntegrationTemplates({
+ // name: request.params.name,
+ // })
+ // ).hits[0],
+ // };
+ // });
+ // }
+ // );
}
|