Skip to content

Commit 8264081

Browse files
v-dhbeduv-dhbedu
committed
Fixed corrupted dataConnector resource name in mainTemplate by removing the stray '{{GUID}}' suffix from the poller name expressions.
1 parent 807f7fe commit 8264081

3 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎Solutions/VMware Workspace ONE/Data Connectors/VMwareWorkspaceOneConnector_CCF/VMwareWorkspaceOne_PollerConfig.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[
22
{
33
"type": "Microsoft.SecurityInsights/dataConnectors",
4-
"apiVersion": "2023-02-01-preview",
5-
"name": "[concat(parameters('workspace'), '/Microsoft.SecurityInsights/', 'VMwareWorkspaceOneDevices_CL', uniqueString(parameters('friendlyName')), '-', '{{GUID}}')]",
4+
"apiVersion": "2024-09-01",
5+
"name": "[[concat('parameters('workspace')', '/Microsoft.SecurityInsights/','VMwareWorkspaceOneDevices_CL' , uniqueString(parameters('friendlyName')) )]",
66
"location": "[parameters('workspace-location')]",
77
"kind": "RestApiPoller",
88
"properties": {
99
"auth": {
1010
"type": "OAuth2",
11-
"ClientId": "[parameters('clientId')]",
12-
"ClientSecret": "[parameters('clientSecret')]",
11+
"ClientId": "[[parameters('clientId')]",
12+
"ClientSecret": "[[parameters('clientSecret')]",
1313
"GrantType": "client_credentials",
14-
"TokenEndpoint": "[concat(parameters('authUrl'), '/connect/token')]",
14+
"TokenEndpoint": "[[concat(parameters('authUrl'), '/connect/token')]",
1515
"TokenEndpointHeaders": {
16-
"Authorization": "[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
16+
"Authorization": "[[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
1717
"Content-Type": "application/x-www-form-urlencoded"
1818
}
1919
},
2020
"request": {
21-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
21+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
2222
"httpMethod": "GET",
2323
"rateLimitQPS": 1,
2424
"queryWindowInMin": 1440,
@@ -49,31 +49,31 @@
4949
"dataCollectionRuleImmutableId": "{{dataCollectionRuleImmutableId}}"
5050
},
5151
"addOnAttributes": {
52-
"friendlyName": "[parameters('friendlyName')]",
53-
"instanceUrl": "[parameters('instanceUrl')]"
52+
"friendlyName": "[[parameters('friendlyName')]",
53+
"instanceUrl": "[[parameters('instanceUrl')]"
5454
}
5555
}
5656
},
5757
{
5858
"type": "Microsoft.SecurityInsights/dataConnectors",
59-
"apiVersion": "2023-02-01-preview",
60-
"name": "[concat(parameters('workspace'), '/Microsoft.SecurityInsights/', 'VMwareWorkspaceOneDeviceApps_CL', uniqueString(parameters('friendlyName')), '-', '{{GUID}}')]",
59+
"apiVersion": "2024-09-01",
60+
"name": "[[concat('parameters('workspace')', '/Microsoft.SecurityInsights/','VMwareWorkspaceOneDeviceApps_CL' , uniqueString(parameters('friendlyName')) )]",
6161
"location": "[parameters('workspace-location')]",
6262
"kind": "RestApiPoller",
6363
"properties": {
6464
"auth": {
6565
"type": "OAuth2",
66-
"ClientId": "[parameters('clientId')]",
67-
"ClientSecret": "[parameters('clientSecret')]",
66+
"ClientId": "[[parameters('clientId')]",
67+
"ClientSecret": "[[parameters('clientSecret')]",
6868
"GrantType": "client_credentials",
69-
"TokenEndpoint": "[concat(parameters('authUrl'), '/connect/token')]",
69+
"TokenEndpoint": "[[concat(parameters('authUrl'), '/connect/token')]",
7070
"TokenEndpointHeaders": {
71-
"Authorization": "[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
71+
"Authorization": "[[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
7272
"Content-Type": "application/x-www-form-urlencoded"
7373
}
7474
},
7575
"request": {
76-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
76+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
7777
"httpMethod": "GET",
7878
"rateLimitQPS": 1,
7979
"queryWindowInMin": 1440,
@@ -109,7 +109,7 @@
109109
"fetchAppsForDevice": {
110110
"shouldJoinNestedData": false,
111111
"request": {
112-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/$device_id$/apps/search')]",
112+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/$device_id$/apps/search')]",
113113
"httpMethod": "GET",
114114
"rateLimitQPS": 1,
115115
"queryWindowInMin": 5,
@@ -143,11 +143,11 @@
143143
"dataCollectionRuleImmutableId": "{{dataCollectionRuleImmutableId}}"
144144
},
145145
"addOnAttributes": {
146-
"friendlyName": "[parameters('friendlyName')]",
147-
"instanceUrl": "[parameters('instanceUrl')]",
146+
"friendlyName": "[[parameters('friendlyName')]",
147+
"instanceUrl": "[[parameters('instanceUrl')]",
148148
"device_id": "$device_id$"
149149
}
150150
},
151-
"condition": "[equals(parameters('collectAppsDetails'), 'true')]"
151+
"condition": "[[contains(parameters('collectAppsDetails'), 'true')]"
152152
}
153153
]

‎Solutions/VMware Workspace ONE/Package/3.0.0.zip‎

-39 Bytes
Binary file not shown.

‎Solutions/VMware Workspace ONE/Package/mainTemplate.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,8 +1160,8 @@
11601160
"minLength": 1
11611161
},
11621162
"collectAppsDetails": {
1163-
"defaultValue": "false",
1164-
"type": "string"
1163+
"defaultValue": "collectAppsDetails",
1164+
"type": "array"
11651165
}
11661166
},
11671167
"variables": {
@@ -1195,25 +1195,25 @@
11951195
}
11961196
},
11971197
{
1198-
"name": "[[concat([concat(parameters('workspace'), ', '/Microsoft.SecurityInsights', '/', 'VMwareWorkspaceOneDevices_CL', uniqueString(parameters('friendlyName')), '-', '')]', parameters('GUID'), parameters('guidValue'))]",
1198+
"name": "[[concat('parameters('workspace')', '/Microsoft.SecurityInsights/','VMwareWorkspaceOneDevices_CL' , uniqueString(parameters('friendlyName')) )]",
11991199
"apiVersion": "2023-02-01-preview",
12001200
"type": "Microsoft.OperationalInsights/workspaces/providers/dataConnectors",
12011201
"location": "[parameters('workspace-location')]",
12021202
"kind": "RestApiPoller",
12031203
"properties": {
12041204
"auth": {
12051205
"type": "OAuth2",
1206-
"ClientId": "[parameters('clientId')]",
1207-
"ClientSecret": "[parameters('clientSecret')]",
1206+
"ClientId": "[[parameters('clientId')]",
1207+
"ClientSecret": "[[parameters('clientSecret')]",
12081208
"GrantType": "client_credentials",
1209-
"TokenEndpoint": "[concat(parameters('authUrl'), '/connect/token')]",
1209+
"TokenEndpoint": "[[concat(parameters('authUrl'), '/connect/token')]",
12101210
"TokenEndpointHeaders": {
1211-
"Authorization": "[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
1211+
"Authorization": "[[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
12121212
"Content-Type": "application/x-www-form-urlencoded"
12131213
}
12141214
},
12151215
"request": {
1216-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
1216+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
12171217
"httpMethod": "GET",
12181218
"rateLimitQPS": 1,
12191219
"queryWindowInMin": 1440,
@@ -1244,31 +1244,31 @@
12441244
"dataCollectionRuleImmutableId": "[[parameters('dcrConfig').dataCollectionRuleImmutableId]"
12451245
},
12461246
"addOnAttributes": {
1247-
"friendlyName": "[parameters('friendlyName')]",
1248-
"instanceUrl": "[parameters('instanceUrl')]"
1247+
"friendlyName": "[[parameters('friendlyName')]",
1248+
"instanceUrl": "[[parameters('instanceUrl')]"
12491249
}
12501250
}
12511251
},
12521252
{
1253-
"name": "[[concat([concat(parameters('workspace'), ', '/Microsoft.SecurityInsights', '/', 'VMwareWorkspaceOneDeviceApps_CL', uniqueString(parameters('friendlyName')), '-', '')]', parameters('GUID'), parameters('guidValue'))]",
1253+
"name": "[[concat('parameters('workspace')', '/Microsoft.SecurityInsights/','VMwareWorkspaceOneDeviceApps_CL' , uniqueString(parameters('friendlyName')) )]",
12541254
"apiVersion": "2023-02-01-preview",
12551255
"type": "Microsoft.OperationalInsights/workspaces/providers/dataConnectors",
12561256
"location": "[parameters('workspace-location')]",
12571257
"kind": "RestApiPoller",
12581258
"properties": {
12591259
"auth": {
12601260
"type": "OAuth2",
1261-
"ClientId": "[parameters('clientId')]",
1262-
"ClientSecret": "[parameters('clientSecret')]",
1261+
"ClientId": "[[parameters('clientId')]",
1262+
"ClientSecret": "[[parameters('clientSecret')]",
12631263
"GrantType": "client_credentials",
1264-
"TokenEndpoint": "[concat(parameters('authUrl'), '/connect/token')]",
1264+
"TokenEndpoint": "[[concat(parameters('authUrl'), '/connect/token')]",
12651265
"TokenEndpointHeaders": {
1266-
"Authorization": "[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
1266+
"Authorization": "[[concat('Basic ', base64(concat(parameters('clientId'), ':', parameters('clientSecret'))))]",
12671267
"Content-Type": "application/x-www-form-urlencoded"
12681268
}
12691269
},
12701270
"request": {
1271-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
1271+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/search')]",
12721272
"httpMethod": "GET",
12731273
"rateLimitQPS": 1,
12741274
"queryWindowInMin": 1440,
@@ -1304,7 +1304,7 @@
13041304
"fetchAppsForDevice": {
13051305
"shouldJoinNestedData": false,
13061306
"request": {
1307-
"apiEndpoint": "[concat(parameters('instanceUrl'), '/api/mdm/devices/$device_id$/apps/search')]",
1307+
"apiEndpoint": "[[concat(parameters('instanceUrl'), '/api/mdm/devices/$device_id$/apps/search')]",
13081308
"httpMethod": "GET",
13091309
"rateLimitQPS": 1,
13101310
"queryWindowInMin": 5,
@@ -1338,12 +1338,12 @@
13381338
"dataCollectionRuleImmutableId": "[[parameters('dcrConfig').dataCollectionRuleImmutableId]"
13391339
},
13401340
"addOnAttributes": {
1341-
"friendlyName": "[parameters('friendlyName')]",
1342-
"instanceUrl": "[parameters('instanceUrl')]",
1341+
"friendlyName": "[[parameters('friendlyName')]",
1342+
"instanceUrl": "[[parameters('instanceUrl')]",
13431343
"device_id": "$device_id$"
13441344
}
13451345
},
1346-
"condition": "[equals(parameters('collectAppsDetails'), 'true')]"
1346+
"condition": "[[contains(parameters('collectAppsDetails'), 'true')]"
13471347
}
13481348
]
13491349
},
@@ -1686,4 +1686,4 @@
16861686
}
16871687
],
16881688
"outputs": {}
1689-
}
1689+
}

0 commit comments

Comments
 (0)