Skip to content

Commit

Permalink
Fidalgo internal dogfood updates (#5279)
Browse files Browse the repository at this point in the history
* Fidalgo internal dogfood updates

API changes:
- added imageReference to MachineDefintion to separate marketplace and custom image configuration
- Added healthCheckStatus to NetworkSettings to represent overall health status
- Added HealthCheckDetails as a read-only sub-resource of network settings, allowing customer to retrieve more details about failures

* Added list for health check status details
  • Loading branch information
tbyfield authored Nov 11, 2021
1 parent 4dcfbba commit e352d7a
Show file tree
Hide file tree
Showing 11 changed files with 425 additions and 18 deletions.
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ hdinsight
Headnode
healthbot
healthcareapis
healthchecks
Heatbeat
heatmap
HHMM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
"machineDefinitionName": "{machineDefinitionName}",
"body": {
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
}
},
"location": "centralus"
}
Expand All @@ -19,8 +20,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
},
"provisioningState": "Succeeded"
},
"systemData": {
Expand All @@ -40,8 +42,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
},
"provisioningState": "Created"
},
"systemData": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"parameters": {
"api-version": "2021-08-01-privatepreview",
"subscriptionId": "{subscriptionId}",
"resourceGroupName": "rg1",
"machineDefinitionName": "{machineDefinitionName}",
"body": {
"properties": {
"imageReference": {
"publisher": "MicrosoftWindowsDesktop",
"offer": "windows-11-preview",
"sku": "win11-21h2-ent-cpc-m365"
}
},
"location": "centralus"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/rg1/providers/Microsoft.Fidalgo/machinedefinitions/{machineDefinitionName}",
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageReference": {
"publisher": "MicrosoftWindowsDesktop",
"offer": "windows-11-preview",
"sku": "win11-21h2-ent-cpc-m365"
},
"provisioningState": "Succeeded"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2020-11-18T18:00:36.993Z",
"lastModifiedBy": "user1",
"lastModifiedByType": "User",
"lastModifiedAt": "2020-11-18T18:30:36.993Z"
},
"location": "centralus"
}
},
"201": {
"body": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/rg1/providers/Microsoft.Fidalgo/machinedefinitions/{machineDefinitionName}",
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageReference": {
"publisher": "MicrosoftWindowsDesktop",
"offer": "windows-11-preview",
"sku": "win11-21h2-ent-cpc-m365"
},
"provisioningState": "Created"
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
"createdAt": "2020-11-18T18:00:36.993Z",
"lastModifiedBy": "user1",
"lastModifiedByType": "User",
"lastModifiedAt": "2020-11-18T18:30:36.993Z"
},
"location": "centralus"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
},
"provisioningState": "Succeeded"
},
"systemData": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
},
"provisioningState": "Succeeded"
},
"systemData": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage"
},
"provisioningState": "Succeeded"
},
"systemData": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"machineDefinitionName": "{machineDefinitionName}",
"body": {
"properties": {
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/image2"
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/image2"
}
}
}
},
Expand All @@ -17,8 +19,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/image2"
},
"provisioningState": "Succeeded"
},
"systemData": {
Expand All @@ -38,8 +41,9 @@
"name": "{machineDefinitionName}",
"type": "Microsoft.Fidalgo/machinedefinitions",
"properties": {
"imageType": "Custom",
"imageId": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/exampleImage",
"imageReference": {
"id": "/subscriptions/0ac520ee-14c0-480f-b6c9-0a90c58ffff/resourceGroups/Example/providers/Microsoft.Compute/images/image2"
},
"provisioningState": "Accepted"
},
"systemData": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"networkingResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ExampleRG",
"virtualNetworkId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ExampleRG/providers/Microsoft.Network/virtualNetworks/ExampleVNet",
"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ExampleRG/providers/Microsoft.Network/virtualNetworks/ExampleVNet/subnets/default",
"provisioningState": "Succeeded"
"provisioningState": "Succeeded",
"healthCheckStatus": "Passed"
},
"systemData": {
"createdBy": "user1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"parameters": {
"api-version": "2021-08-01-privatepreview",
"subscriptionId": "{subscriptionId}",
"resourceGroupName": "rg1",
"networkSettingName": "{networkSettingName}"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/rg1/providers/Microsoft.Fidalgo/networksettings/{networkSettingName}/healthchecks/latest",
"name": "latest",
"type": "Microsoft.Fidalgo/networksettings/healthchecks",
"properties": {
"startDateTime": "2021-07-03T12:43:14Z",
"endDateTime": "2021-07-03T12:43:15Z",
"healthChecks": [
{
"displayName": "Azure AD device sync",
"endDateTime": "2021-07-03T12:43:14Z",
"startDateTime": "2021-07-03T12:43:15Z",
"status": "Passed"
}
]
},
"systemData": {
"createdBy": "System",
"createdByType": "Application",
"createdAt": "2020-11-18T18:00:36.993Z",
"lastModifiedBy": "System",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-11-18T18:30:36.993Z"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"parameters": {
"api-version": "2021-08-01-privatepreview",
"subscriptionId": "{subscriptionId}",
"resourceGroupName": "rg1",
"networkSettingName": "{networkSettingName}"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/{subscriptionId}/resourceGroups/rg1/providers/Microsoft.Fidalgo/networksettings/{networkSettingName}/healthchecks/latest",
"name": "latest",
"type": "Microsoft.Fidalgo/networksettings/healthchecks",
"properties": {
"startDateTime": "2021-07-03T12:43:14Z",
"endDateTime": "2021-07-03T12:43:15Z",
"healthChecks": [
{
"displayName": "Azure AD device sync",
"endDateTime": "2021-07-03T12:43:14Z",
"startDateTime": "2021-07-03T12:43:15Z",
"status": "Passed"
}
]
},
"systemData": {
"createdBy": "System",
"createdByType": "Application",
"createdAt": "2020-11-18T18:00:36.993Z",
"lastModifiedBy": "System",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-11-18T18:30:36.993Z"
}
}
]
}
}
}
}
Loading

0 comments on commit e352d7a

Please sign in to comment.