Merge pull request #607 from JupiterOne/INT-9873

Disable steps by default
JupiterOne-Archives · Nov 17, 2023 · 8d2bb53 · 8d2bb53
2 parents f2c583a + 7903a2f
commit 8d2bb53
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -13,7 +13,14 @@ export const ingestionConfig: IntegrationIngestionConfigFieldMap = {
     title: 'Active directory groups',
     description:
       'Gather information related to user groups and group membership.',
-    defaultsToDisabled: false,
+    defaultsToDisabled: true,
+    cannotBeDisabled: false,
+  },
+  [INGESTION_SOURCE_IDS.AD_DEVICES]: {
+    title: 'Active directory devices',
+    description:
+      'Gather information related to user devices and device ownership.',
+    defaultsToDisabled: true,
     cannotBeDisabled: false,
   },
   [INGESTION_SOURCE_IDS.ADVISOR_RECOMMENDATIONS]: {
@@ -130,13 +137,13 @@ export const ingestionConfig: IntegrationIngestionConfigFieldMap = {
     title: 'Network',
     description:
       'Fetch network configuration and information, such as public IP addresses, network interfaces, virtual networks, security groups, load balancers, Azure Firewalls, private endpoints, and more',
-    defaultsToDisabled: false,
+    defaultsToDisabled: true,
     cannotBeDisabled: false,
   },
   [INGESTION_SOURCE_IDS.POLICY]: {
     title: 'Authorization policy',
     description: 'Gather information about policy assignments and definitions.',
-    defaultsToDisabled: false,
+    defaultsToDisabled: true,
     cannotBeDisabled: false,
   },
   [INGESTION_SOURCE_IDS.POLICY_INSIGHTS]: {
@@ -180,7 +187,7 @@ export const ingestionConfig: IntegrationIngestionConfigFieldMap = {
     title: 'Storage',
     description:
       'Ingest storage accounts, tables, queues, containers and file shares.',
-    defaultsToDisabled: false,
+    defaultsToDisabled: true,
     cannotBeDisabled: false,
   },
   [INGESTION_SOURCE_IDS.SUBSCRIPTIONS]: {
@@ -189,4 +196,10 @@ export const ingestionConfig: IntegrationIngestionConfigFieldMap = {
     defaultsToDisabled: false,
     cannotBeDisabled: true,
   },
+  [INGESTION_SOURCE_IDS.SUBSCRIPTION_USAGE]: {
+    title: 'Subscription Usage',
+    description: 'Ingest subscription usage details.',
+    defaultsToDisabled: true,
+    cannotBeDisabled: false,
+  },
 };
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,6 +1,7 @@
 export const INGESTION_SOURCE_IDS = {
   AD_GENERALS: 'ad-generals',
   AD_GROUPS: 'ad-groups',
+  AD_DEVICES: 'ad-devices',
   ADVISOR_RECOMMENDATIONS: 'advisor-recommendations',
   API_MANAGEMENT: 'api-management',
   APPSERVICE: 'app-service',
@@ -29,4 +30,5 @@ export const INGESTION_SOURCE_IDS = {
   SERVICE_BUS: 'service-bus',
   STORAGE: 'storage',
   SUBSCRIPTIONS: 'subscriptions',
+  SUBSCRIPTION_USAGE: 'subscriptions_usage',
 };
diff --git a/src/steps/active-directory/index.ts b/src/steps/active-directory/index.ts
@@ -297,6 +297,7 @@ export const activeDirectorySteps: AzureIntegrationStep[] = [
     dependsOn: [STEP_AD_USERS],
     executionHandler: fetchDevices,
     apiPermissions: ['Device.Read.All'],
+    ingestionSourceId: INGESTION_SOURCE_IDS.AD_DEVICES,
   },
   {
     id: STEP_AD_GROUPS,

diff --git a/src/steps/resource-manager/subscriptions/executionHandlers/usageDetails.ts b/src/steps/resource-manager/subscriptions/executionHandlers/usageDetails.ts
@@ -54,6 +54,6 @@ export const usageDetailsSteps: AzureIntegrationStep[] = [
     dependsOn: [steps.SUBSCRIPTION, steps.SUBSCRIPTION_DIAGNOSTIC_SETTINGS],
     executionHandler: fetchSubscriptionUsageDetails,
     rolePermissions: ['Microsoft.Consumption/usageDetails/read'],
-    ingestionSourceId: INGESTION_SOURCE_IDS.SUBSCRIPTIONS,
+    ingestionSourceId: INGESTION_SOURCE_IDS.SUBSCRIPTION_USAGE,
   },
 ];