Enabling Customer Initiated Log Collection

visingl · visingl · commit f47f73adac8c · 2021-09-16T15:42:15.000-07:00
diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json
@@ -796,6 +796,11 @@
             "enableDiagnostics": {
               "description": "Enables or Disables the diagnostic logs collection",
               "type": "boolean"
+            },
+            "diagnosticStorageProperties": {
+              "description": "Customer initiated diagnostic log collection storage properties",
+              "type": "object",
+              "$ref": "#/definitions/DiagnosticStorageProperties"
             }
           }
         }
@@ -804,6 +809,36 @@
         "properties"
       ]
     },
+    "DiagnosticStorageProperties": {
+      "description": "Customer-initiated diagnostic log collection storage properties",
+      "type": "object",
+      "properties": {
+        "authenticationType": {
+          "description": "Authentication Type",
+          "enum": [
+            "KeyBased"
+          ],
+          "type": "string",
+          "readOnly": false,
+          "x-ms-enum": {
+            "name": "AuthenticationType",
+            "modelAsString": true
+          }
+        },
+        "connectionString": {
+          "description": "ConnectionString of the diagnostic storage account",
+          "type": "string"
+        },
+        "resourceId": {
+          "description": "ResourceId of the diagnostic storage account",
+          "type": "string"
+        }
+      },
+      "required": [
+        "authenticationType",
+        "resourceId"
+      ]
+    },
     "InstanceList": {
       "description": "List of Instances.",
       "type": "object",
diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Create.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Create.json
@@ -15,7 +15,12 @@
             "eventHubConnectionString": "string"
           }
         ],
-        "enableDiagnostics": false
+        "enableDiagnostics": false,
+        "diagnosticStorageProperties": {
+          "authenticationType": "KeyBased",
+          "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount",
+          "connectionString": "string"
+        }
       }
     }
   },
@@ -35,8 +40,12 @@
             }
           ],
           "enableDiagnostics": false
+        },
+        "diagnosticStorageProperties": {
+          "authenticationType": "KeyBased",
+          "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
         }
       }
     }
   }
-}
+}
diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Get.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Get.json
@@ -21,9 +21,13 @@
               "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
             }
           ],
-          "enableDiagnostics": false
+          "enableDiagnostics": false,
+          "diagnosticStorageProperties": {
+            "authenticationType": "KeyBased",
+            "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
+          }
         }
       }
     }
   }
-}
+}
diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_ListByAccount.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_ListByAccount.json
@@ -23,7 +23,11 @@
                   "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
                 }
               ],
-              "enableDiagnostics": false
+              "enableDiagnostics": false,
+              "diagnosticStorageProperties": {
+                "authenticationType": "KeyBased",
+                "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
+              }
             }
           },
           {
@@ -39,11 +43,15 @@
                   "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/red-contoso-hub"
                 }
               ],
-              "enableDiagnostics": false
+              "enableDiagnostics": false,
+              "diagnosticStorageProperties": {
+                "authenticationType": "KeyBased",
+                "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
+              }
             }
           }
         ]
       }
     }
   }
-}
+}
diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Update.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Update.json
@@ -25,12 +25,16 @@
               "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
             }
           ],
-          "enableDiagnostics": false
+          "enableDiagnostics": false,
+          "diagnosticStorageProperties": {
+            "authenticationType": "KeyBased",
+            "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
+          }
         },
         "tags": {
           "tagKey": "tagValue"
         }
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,12 @@`
`15`	`15`	`"eventHubConnectionString": "string"`
`16`	`16`	`}`
`17`	`17`	`],`
`18`		`- "enableDiagnostics": false`
	`18`	`+ "enableDiagnostics": false,`
	`19`	`+ "diagnosticStorageProperties": {`
	`20`	`+ "authenticationType": "KeyBased",`
	`21`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount",`
	`22`	`+ "connectionString": "string"`
	`23`	`+ }`
`19`	`24`	`}`
`20`	`25`	`}`
`21`	`26`	`},`
`@@ -35,8 +40,12 @@`
`35`	`40`	`}`
`36`	`41`	`],`
`37`	`42`	`"enableDiagnostics": false`
	`43`	`+ },`
	`44`	`+ "diagnosticStorageProperties": {`
	`45`	`+ "authenticationType": "KeyBased",`
	`46`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"`
`38`	`47`	`}`
`39`	`48`	`}`
`40`	`49`	`}`
`41`	`50`	`}`
`42`		`-}`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,13 @@`
`21`	`21`	`"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"`
`22`	`22`	`}`
`23`	`23`	`],`
`24`		`- "enableDiagnostics": false`
	`24`	`+ "enableDiagnostics": false,`
	`25`	`+ "diagnosticStorageProperties": {`
	`26`	`+ "authenticationType": "KeyBased",`
	`27`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"`
	`28`	`+ }`
`25`	`29`	`}`
`26`	`30`	`}`
`27`	`31`	`}`
`28`	`32`	`}`
`29`		`-}`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,11 @@`
`23`	`23`	`"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"`
`24`	`24`	`}`
`25`	`25`	`],`
`26`		`- "enableDiagnostics": false`
	`26`	`+ "enableDiagnostics": false,`
	`27`	`+ "diagnosticStorageProperties": {`
	`28`	`+ "authenticationType": "KeyBased",`
	`29`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"`
	`30`	`+ }`
`27`	`31`	`}`
`28`	`32`	`},`
`29`	`33`	`{`
`@@ -39,11 +43,15 @@`
`39`	`43`	`"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/red-contoso-hub"`
`40`	`44`	`}`
`41`	`45`	`],`
`42`		`- "enableDiagnostics": false`
	`46`	`+ "enableDiagnostics": false,`
	`47`	`+ "diagnosticStorageProperties": {`
	`48`	`+ "authenticationType": "KeyBased",`
	`49`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"`
	`50`	`+ }`
`43`	`51`	`}`
`44`	`52`	`}`
`45`	`53`	`]`
`46`	`54`	`}`
`47`	`55`	`}`
`48`	`56`	`}`
`49`		`-}`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,16 @@`
`25`	`25`	`"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"`
`26`	`26`	`}`
`27`	`27`	`],`
`28`		`- "enableDiagnostics": false`
	`28`	`+ "enableDiagnostics": false,`
	`29`	`+ "diagnosticStorageProperties": {`
	`30`	`+ "authenticationType": "KeyBased",`
	`31`	`+ "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"`
	`32`	`+ }`
`29`	`33`	`},`
`30`	`34`	`"tags": {`
`31`	`35`	`"tagKey": "tagValue"`
`32`	`36`	`}`
`33`	`37`	`}`
`34`	`38`	`}`
`35`	`39`	`}`
`36`		`-}`
	`40`	`+}`