Skip to content

Commit ce4ba4d

Browse files
authored
Enabling Customer Initiated Diagnostic Log Collection (#16071)
* Enabling Customer Initiated Log Collection Enabling Customer Initiated Log Collection * Update deviceupdate.json * Update Instances_Create.json * pretty * Update deviceupdate.json * Update readme.go.md
1 parent c481083 commit ce4ba4d

File tree

6 files changed

+66
-7
lines changed

6 files changed

+66
-7
lines changed

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,9 @@
10871087
"enableDiagnostics": {
10881088
"description": "Enables or Disables the diagnostic logs collection",
10891089
"type": "boolean"
1090+
},
1091+
"diagnosticStorageProperties": {
1092+
"$ref": "#/definitions/DiagnosticStorageProperties"
10901093
}
10911094
}
10921095
}
@@ -1095,6 +1098,37 @@
10951098
"properties"
10961099
]
10971100
},
1101+
"DiagnosticStorageProperties": {
1102+
"description": "Customer-initiated diagnostic log collection storage properties",
1103+
"type": "object",
1104+
"properties": {
1105+
"authenticationType": {
1106+
"description": "Authentication Type",
1107+
"enum": [
1108+
"KeyBased"
1109+
],
1110+
"type": "string",
1111+
"readOnly": false,
1112+
"x-ms-enum": {
1113+
"name": "AuthenticationType",
1114+
"modelAsString": true
1115+
}
1116+
},
1117+
"connectionString": {
1118+
"description": "ConnectionString of the diagnostic storage account",
1119+
"x-ms-secret": true,
1120+
"type": "string"
1121+
},
1122+
"resourceId": {
1123+
"description": "ResourceId of the diagnostic storage account",
1124+
"type": "string"
1125+
}
1126+
},
1127+
"required": [
1128+
"authenticationType",
1129+
"resourceId"
1130+
]
1131+
},
10981132
"InstanceList": {
10991133
"description": "List of Instances.",
11001134
"type": "object",

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Create.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
"eventHubConnectionString": "string"
1616
}
1717
],
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+
}
1924
}
2025
}
2126
},
@@ -34,7 +39,11 @@
3439
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
3540
}
3641
],
37-
"enableDiagnostics": false
42+
"enableDiagnostics": false,
43+
"diagnosticStorageProperties": {
44+
"authenticationType": "KeyBased",
45+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/adu-resource-group/providers/Microsoft.Storage/storageAccounts/testAccount"
46+
}
3847
}
3948
}
4049
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Get.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
2222
}
2323
],
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+
}
2529
}
2630
}
2731
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_ListByAccount.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
2424
}
2525
],
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+
}
2731
}
2832
},
2933
{
@@ -39,7 +43,11 @@
3943
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/red-contoso-hub"
4044
}
4145
],
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+
}
4351
}
4452
}
4553
]

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Instances/Instances_Update.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Devices/IotHubs/blue-contoso-hub"
2626
}
2727
],
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+
}
2933
},
3034
"tags": {
3135
"tagKey": "tagValue"

specification/deviceupdate/resource-manager/readme.go.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ These settings apply only when `--go` is specified on the command line.
55
```yaml $(go)
66
go:
77
license-header: MICROSOFT_MIT_NO_VERSION
8+
namespace: deviceupdate
89
clear-output-folder: true
910
```
1011
@@ -21,6 +22,5 @@ These settings apply only when `--tag=package-2020-03-01-preview --go` is specif
2122
Please also specify `--go-sdks-folder=<path to the root directory of your azure-sdk-for-go clone>`.
2223

2324
```yaml $(tag) == 'package-2020-03-01-preview' && $(go)
24-
namespace: deviceupdate
2525
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-03-01-preview/$(namespace)
2626
```

0 commit comments

Comments
 (0)