Merge branch 'main' into counter-at-edges

SigNoz · Feb 7, 2025 · 4e1fa5a · 4e1fa5a
2 parents 275d3c0 + 37323a6
commit 4e1fa5a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/...tend/src/container/CloudIntegrationPage/HeroSection/components/RenderConnectionParams.tsx b/...tend/src/container/CloudIntegrationPage/HeroSection/components/RenderConnectionParams.tsx
@@ -14,7 +14,8 @@ function RenderConnectionFields({
 		isConnectionParamsLoading ||
 		(!!connectionParams?.ingestion_url &&
 			!!connectionParams?.ingestion_key &&
-			!!connectionParams?.signoz_api_url)
+			!!connectionParams?.signoz_api_url &&
+			!!connectionParams?.signoz_api_key)
 	) {
 		return null;
 	}
@@ -48,6 +49,15 @@ function RenderConnectionFields({
 					<Input placeholder="Enter SigNoz API URL" disabled={isFormDisabled} />
 				</Form.Item>
 			)}
+			{!connectionParams?.signoz_api_key && (
+				<Form.Item
+					name="signoz_api_key"
+					label="SigNoz API KEY"
+					rules={[{ required: true, message: 'Please enter SigNoz API Key' }]}
+				>
+					<Input placeholder="Enter SigNoz API Key" disabled={isFormDisabled} />
+				</Form.Item>
+			)}
 		</Form.Item>
 	);
 }

diff --git a/frontend/src/hooks/integrations/aws/useIntegrationModal.ts b/frontend/src/hooks/integrations/aws/useIntegrationModal.ts
@@ -140,6 +140,7 @@ export function useIntegrationModal({
 					ingestion_url: connectionParams?.ingestion_url || values.ingestion_url,
 					ingestion_key: connectionParams?.ingestion_key || values.ingestion_key,
 					signoz_api_url: connectionParams?.signoz_api_url || values.signoz_api_url,
+					signoz_api_key: connectionParams?.signoz_api_key || values.signoz_api_key,
 				},
 				account_config: {
 					regions: includeAllRegions ? ['all'] : selectedRegions,

diff --git a/frontend/src/types/api/integrations/aws.ts b/frontend/src/types/api/integrations/aws.ts
@@ -4,6 +4,7 @@ export interface ConnectionParams {
 	ingestion_url?: string;
 	ingestion_key?: string;
 	signoz_api_url?: string;
+	signoz_api_key?: string;
 }
 
 export interface GenerateConnectionUrlPayload {