mirror of
https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz
synced 2025-08-14 02:55:53 +08:00
chore: enable AWS integrations for all (#7111)
* chore: enable AWS integrations for all * chore: don't show either of configure/enable for a service when not in ctx of a cloud account * chore: remove AWS integration feature flag
This commit is contained in:
parent
52f41e0064
commit
966f11fd5c
@ -157,13 +157,6 @@ var BasicPlan = basemodel.FeatureSet{
|
|||||||
UsageLimit: -1,
|
UsageLimit: -1,
|
||||||
Route: "",
|
Route: "",
|
||||||
},
|
},
|
||||||
basemodel.Feature{
|
|
||||||
Name: basemodel.AWSIntegration,
|
|
||||||
Active: false,
|
|
||||||
Usage: 0,
|
|
||||||
UsageLimit: -1,
|
|
||||||
Route: "",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var ProPlan = basemodel.FeatureSet{
|
var ProPlan = basemodel.FeatureSet{
|
||||||
@ -286,13 +279,6 @@ var ProPlan = basemodel.FeatureSet{
|
|||||||
UsageLimit: -1,
|
UsageLimit: -1,
|
||||||
Route: "",
|
Route: "",
|
||||||
},
|
},
|
||||||
basemodel.Feature{
|
|
||||||
Name: basemodel.AWSIntegration,
|
|
||||||
Active: false,
|
|
||||||
Usage: 0,
|
|
||||||
UsageLimit: -1,
|
|
||||||
Route: "",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var EnterprisePlan = basemodel.FeatureSet{
|
var EnterprisePlan = basemodel.FeatureSet{
|
||||||
@ -429,11 +415,4 @@ var EnterprisePlan = basemodel.FeatureSet{
|
|||||||
UsageLimit: -1,
|
UsageLimit: -1,
|
||||||
Route: "",
|
Route: "",
|
||||||
},
|
},
|
||||||
basemodel.Feature{
|
|
||||||
Name: basemodel.AWSIntegration,
|
|
||||||
Active: false,
|
|
||||||
Usage: 0,
|
|
||||||
UsageLimit: -1,
|
|
||||||
Route: "",
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
@ -23,5 +23,4 @@ export enum FeatureKeys {
|
|||||||
PREMIUM_SUPPORT = 'PREMIUM_SUPPORT',
|
PREMIUM_SUPPORT = 'PREMIUM_SUPPORT',
|
||||||
QUERY_BUILDER_SEARCH_V2 = 'QUERY_BUILDER_SEARCH_V2',
|
QUERY_BUILDER_SEARCH_V2 = 'QUERY_BUILDER_SEARCH_V2',
|
||||||
ANOMALY_DETECTION = 'ANOMALY_DETECTION',
|
ANOMALY_DETECTION = 'ANOMALY_DETECTION',
|
||||||
AWS_INTEGRATION = 'AWS_INTEGRATION',
|
|
||||||
}
|
}
|
||||||
|
@ -115,7 +115,8 @@ function ServiceDetails(): JSX.Element | null {
|
|||||||
<ServiceStatus serviceStatus={serviceDetailsData.status} />
|
<ServiceStatus serviceStatus={serviceDetailsData.status} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!!cloudAccountId && isAnySignalConfigured ? (
|
{!!cloudAccountId &&
|
||||||
|
(isAnySignalConfigured ? (
|
||||||
<Button
|
<Button
|
||||||
className="configure-button configure-button--default"
|
className="configure-button configure-button--default"
|
||||||
onClick={(): void => setIsConfigureServiceModalOpen(true)}
|
onClick={(): void => setIsConfigureServiceModalOpen(true)}
|
||||||
@ -130,7 +131,7 @@ function ServiceDetails(): JSX.Element | null {
|
|||||||
>
|
>
|
||||||
Enable Service
|
Enable Service
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="service-details__overview">
|
<div className="service-details__overview">
|
||||||
|
@ -4,10 +4,8 @@ import './Integrations.styles.scss';
|
|||||||
|
|
||||||
import { Color } from '@signozhq/design-tokens';
|
import { Color } from '@signozhq/design-tokens';
|
||||||
import { Button, List, Typography } from 'antd';
|
import { Button, List, Typography } from 'antd';
|
||||||
import { FeatureKeys } from 'constants/features';
|
|
||||||
import { useGetAllIntegrations } from 'hooks/Integrations/useGetAllIntegrations';
|
import { useGetAllIntegrations } from 'hooks/Integrations/useGetAllIntegrations';
|
||||||
import { MoveUpRight, RotateCw } from 'lucide-react';
|
import { MoveUpRight, RotateCw } from 'lucide-react';
|
||||||
import { useAppContext } from 'providers/App/App';
|
|
||||||
import { Dispatch, SetStateAction, useMemo } from 'react';
|
import { Dispatch, SetStateAction, useMemo } from 'react';
|
||||||
import { IntegrationsProps } from 'types/api/integrations/types';
|
import { IntegrationsProps } from 'types/api/integrations/types';
|
||||||
import { isCloudUser } from 'utils/app';
|
import { isCloudUser } from 'utils/app';
|
||||||
@ -46,18 +44,10 @@ function IntegrationsList(props: IntegrationsListProps): JSX.Element {
|
|||||||
refetch,
|
refetch,
|
||||||
} = useGetAllIntegrations();
|
} = useGetAllIntegrations();
|
||||||
|
|
||||||
const { featureFlags } = useAppContext();
|
|
||||||
const isAwsIntegrationEnabled =
|
|
||||||
featureFlags?.find((flag) => flag.name === FeatureKeys.AWS_INTEGRATION)
|
|
||||||
?.active || false;
|
|
||||||
|
|
||||||
const filteredDataList = useMemo(() => {
|
const filteredDataList = useMemo(() => {
|
||||||
let integrationsList: IntegrationsProps[] = [];
|
let integrationsList: IntegrationsProps[] = [];
|
||||||
|
|
||||||
if (
|
if (AWS_INTEGRATION.title.toLowerCase().includes(searchTerm.toLowerCase())) {
|
||||||
isAwsIntegrationEnabled &&
|
|
||||||
AWS_INTEGRATION.title.toLowerCase().includes(searchTerm.toLowerCase())
|
|
||||||
) {
|
|
||||||
integrationsList.push(AWS_INTEGRATION);
|
integrationsList.push(AWS_INTEGRATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +62,7 @@ function IntegrationsList(props: IntegrationsListProps): JSX.Element {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return integrationsList;
|
return integrationsList;
|
||||||
}, [data?.data.data.integrations, isAwsIntegrationEnabled, searchTerm]);
|
}, [data?.data.data.integrations, searchTerm]);
|
||||||
|
|
||||||
const loading = isLoading || isFetching || isRefetching;
|
const loading = isLoading || isFetching || isRefetching;
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@ const AlertChannelOpsgenie = "ALERT_CHANNEL_OPSGENIE"
|
|||||||
const AlertChannelEmail = "ALERT_CHANNEL_EMAIL"
|
const AlertChannelEmail = "ALERT_CHANNEL_EMAIL"
|
||||||
const AnomalyDetection = "ANOMALY_DETECTION"
|
const AnomalyDetection = "ANOMALY_DETECTION"
|
||||||
const HostsInfraMonitoring = "HOSTS_INFRA_MONITORING"
|
const HostsInfraMonitoring = "HOSTS_INFRA_MONITORING"
|
||||||
const AWSIntegration = "AWS_INTEGRATION"
|
|
||||||
|
|
||||||
var BasicPlan = FeatureSet{
|
var BasicPlan = FeatureSet{
|
||||||
Feature{
|
Feature{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user