Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swagger for diagnostic settings and association resource types #3295

Merged
merged 24 commits into from
Jul 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-ResourceGroup",
"diagnosticSettingsName": "SampleDiagSetting",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: instead of SampleDiagSetting, use "productionMachineSetting" , which is more like a real customer scenario (one setting for all production machines)

"api-version": "2018-06-01-preview",
"diagnosticSettings": {
"location": "Global",
"tags": {},
"properties": {
"osType": "Windows",
"dataSources": [
{
"kind": "PerformanceCounter",
"configuration": {
"perfCounters": [
{
"name": "\\Process(_Total)\\%Processor Time",
"samplingPeriod": "PT1M"
},
{
"name": "\\Process(_Total)\\Working Set",
"samplingPeriod": "PT1M"
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you need the details for the kind? The workspace resource ID at least?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this private preview. Remember - multi-homing is not supported. Workspace resource id would be passed by extension

}
]
},
{
"kind": "ETWProviders",
"configuration": {
"providers": [
{
"name": "AuditLog",
"id": 1,
"filter": "filter exp"
},
{
"name": "TraceLog",
"id": 2
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
},
{
"kind": "WindowsEventLogs",
"configuration": {
"eventLogs": [
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"CatWoman\""

},
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"BatMan\""
}

]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
}

]
}
}
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-ResourceGroup/providers/microsoft.insights/guestDiagnosticSettings/SampleDiagSetting",
"name": "productionMachineSetting",
"type": "Microsoft.Insights/guestDiagnosticSettings",
"location": "West US",
"tags": {},
"properties": {
"osType": "Windows",
"dataSources": [
{
"kind": "PerformanceCounter",
"configuration": {
"perfCounters": [
{
"name": "\\Process(_Total)\\%Processor Time",
"samplingPeriod": "PT1M"
},
{
"name": "\\Process(_Total)\\Working Set",
"samplingPeriod": "PT1M"
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
}
]
}
}
},
"201": {
"headers": {},
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-ResourceGroup/providers/microsoft.insights/guestDiagnosticSettings/SampleDiagSetting",
"name": "SampleDiagSetting",
"type": "Microsoft.Insights/guestDiagnosticSettings",
"location": "West US",
"tags": {},
"properties": {
"osType": "Windows",
"dataSources": [
{
"kind": "PerformanceCounter",
"configuration": {
"perfCounters": [
{
"name": "\\Process(_Total)\\%Processor Time",
"samplingPeriod": "PT1M"
},
{
"name": "\\Process(_Total)\\Working Set",
"samplingPeriod": "PT1M"
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parameters": {
"resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai",
"associationName": "healthSystemMachineConfigAssociation",
"api-version": "2018-06-01-preview",
"diagnosticSettingsAssociation": {
"location": "Global",
"tags": {},
"properties": {
"guestDiagnosticSettingsName": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-Association-ResourceGroup/providers/providers/microsoft.insights/guestDiagnosticSettings/vmSettingForSecurity"
}
}
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai/providers/microsoft.insights/guestDiagnosticSettingsAssociation/healthSystemMachineConfigAssociation",
"type": "Microsoft.Insights/GuestDiagnosticSettingsAssociation",
"name": "healthSystemMachineConfigAssociation",
"location": "Global",
"tags": {},
"properties": {
"guestDiagnosticSettingsName": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-Association-ResourceGroup/providers/providers/microsoft.insights/guestDiagnosticSettings/vmSettingForSecurity"
}
}
},
"201": {
"headers": {},
"body": {
"id": "/subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai/providers/microsoft.insights/guestDiagnosticSettingsAssociation/healthSystemMachineConfigAssociation",
"type": "Microsoft.Insights/GuestDiagnosticSettingsAssociation",
"name": "healthSystemMachineConfigAssociation",
"location": "Global",
"tags": {},
"properties": {
"guestDiagnosticSettingsName": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-Association-ResourceGroup/providers/providers/microsoft.insights/guestDiagnosticSettings/vmSettingForSecurity"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai",
"associationName": "healthSystemMachineConfigAssociation",
"api-version": "2018-06-01-preview"
},
"responses": {
"200": {
"headers": {},
"body": null
},
"204": {
"headers": {},
"body": null
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-ResourceGroup",
"diagnosticSettingsName": "productionMachineSetting",
"api-version": "2018-06-01-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-ResourceGroup/providers/microsoft.insights/guestDiagnosticSettings/productionMachineSetting",
"name": "productionMachineSetting",
"type": "Microsoft.Insights/guestDiagnosticSettings",
"location": "West US",
"tags": {},
"properties": {
"osType": "windows",
"dataSources": [
{
"kind": "PerformanceCounter",
"configuration": {
"perfCounters": [
{
"name": "\\Process(_Total)\\%Processor Time",
"samplingPeriod": "PT1M"
},
{
"name": "\\Process(_Total)\\Working Set",
"samplingPeriod": "PT1M"
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
},
{
"kind": "ETWProviders",
"configuration": {
"providers": [
{
"name": "AuditLog",
"id": 1,
"filter": "filter exp"
},
{
"name": "TraceLog",
"id": 2
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
},
{
"kind": "WindowsEventLogs",
"configuration": {
"eventLogs": [
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"CatWoman\""

},
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"BatMan\""
}

]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
}

]
}
}
},
"202": {
"headers": {},
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-ResourceGroup/providers/microsoft.insights/guestDiagnosticSettings/productionMachineSetting",
"name": "productionMachineSetting",
"type": "Microsoft.Insights/guestDiagnosticSettings",
"location": "West US",
"tags": {},
"properties": {
"osType": "windows",
"dataSources": [
{
"kind": "PerformanceCounter",
"configuration": {
"perfCounters": [
{
"name": "\\Process(_Total)\\%Processor Time",
"samplingPeriod": "PT1M"
},
{
"name": "\\Process(_Total)\\Working Set",
"samplingPeriod": "PT1M"
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
},
{
"kind": "ETWProviders",
"configuration": {
"providers": [
{
"name": "AuditLog",
"id": 1,
"filter": "filter exp"
},
{
"name": "TraceLog",
"id": 2
}
]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
},
{
"kind": "WindowsEventLogs",
"configuration": {
"eventLogs": [
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"CatWoman\""

},
{
"logName": "Application",
"filter": "SourceName == Xyz AND EventId = \"100\" AND $Xpath/Column=\"DCName\" = \"BatMan\""
}

]
},
"sinks": [
{
"kind": "LogAnalytics"
}
]
}

]
}
}
}
}
}
Loading