From 0ca4e587fdeda820d486c0874c416a2bf2e5d82c Mon Sep 17 00:00:00 2001 From: aydany Date: Thu, 3 Jan 2019 14:55:12 -0500 Subject: [PATCH 01/12] Adds base for updating Microsoft.Insights from version preview/2018-06-01-preview to version 2018-11-27-preview --- ...createOrUpdateGuestDiagnosticSettings.json | 153 +++++ ...ateGuestDiagnosticSettingsAssociation.json | 42 ++ ...eteGuestDiagnosticSettingsAssociation.json | 17 + .../examples/getGuestDiagnosticSettings.json | 168 +++++ ...getGuestDiagnosticSettingsAssociation.json | 22 + ...ateGuestDiagnosticSettingsAssociation.json | 28 + ...uestDiagnosticSettingsAssociation_API.json | 444 ++++++++++++++ .../guestDiagnosticSettings_API.json | 580 ++++++++++++++++++ 8 files changed, 1454 insertions(+) create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json new file mode 100644 index 000000000000..e57cc6ec6235 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json @@ -0,0 +1,153 @@ +{ + "parameters": { + "subscriptionId": "187f412d-1758-44d9-b052-169e2564721d", + "resourceGroupName": "Default-ResourceGroup", + "diagnosticSettingsName": "SampleDiagSetting", + "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" + } + ] + }, + { + "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" + } + ] + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json new file mode 100644 index 000000000000..c35cff6c5de2 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json @@ -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" + } + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json new file mode 100644 index 000000000000..2de5c4bb50ef --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json @@ -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 + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json new file mode 100644 index 000000000000..09a003c11131 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json @@ -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" + } + ] + } + + ] + } + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json new file mode 100644 index 000000000000..5ee3afd4ef02 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json @@ -0,0 +1,22 @@ +{ + "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": { + "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/SampleDiagnosticSettingsName" + } + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json new file mode 100644 index 000000000000..e33341549273 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", + "associationName": "healthSystemMachineConfigAssociation", + "api-version": "2018-06-01-preview", + "parameters": { + "tags": null, + "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": null, + "properties": { + "guestDiagnosticSettingsName": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-Association-ResourceGroup/providers/providers/microsoft.insights/guestDiagnosticSettings/vmSettingForSecurity" + } + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json new file mode 100644 index 000000000000..80487b3dc64d --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json @@ -0,0 +1,444 @@ +{ + "swagger": "2.0", + "info": { + "title": "Guest Diagnostic Settings Association API", + "description": "API to Add/Remove/List Guest Diagnostics Settings Association for Azure Resources", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "version": "2018-06-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{resourceUri}/providers/microsoft.insights/guestDiagnosticSettingsAssociation/{associationName}": { + "put": { + "description": "Creates or updates guest diagnostics settings association.", + "tags": [ + "GuestDiagnosticsSettingsAssociation" + ], + "operationId": "guestDiagnosticsSettingsAssociation_CreateOrUpdate", + "x-ms-examples": { + "Create or update an guest diagnostic settings association": { + "$ref": "./examples/createOrUpdateGuestDiagnosticSettingsAssociation.json" + } + }, + "parameters": [ + { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified ID of the resource, including the resource name and resource type.", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "diagnosticSettingsAssociation", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + }, + "description": "The diagnostic settings association to create or update." + } + ], + "responses": { + "200": { + "description": "An existing guest diagnostic settings association was successfully updated.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + } + }, + "201": { + "description": "A new guest diagnostic settings association was successfully created.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + } + }, + "default": { + "description": "An error occurred and the guest diagnostic settings association could not be created or updated.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "description": "Gets guest diagnostics association settings.", + "tags": [ + "GuestDiagnosticsSettingsAssociation" + ], + "operationId": "guestDiagnosticsSettingsAssociation_Get", + "x-ms-examples": { + "Create or update an guest diagnostic settings association": { + "$ref": "./examples/getGuestDiagnosticSettingsAssociation.json" + } + }, + "parameters": [ + { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified ID of the resource, including the resource name and resource type.", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + } + }, + "default": { + "description": "An error occurred and the diagnostic settings association could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "description": "Delete guest diagnostics association settings.", + "tags": [ + "GuestDiagnosticsSettingsAssociation" + ], + "x-ms-examples": { + "Create or update an guest diagnostic settings association": { + "$ref": "./examples/deleteGuestDiagnosticSettingsAssociation.json" + } + }, + "operationId": "GuestDiagnosticsSettingsAssociation_Delete", + "parameters": [ + { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified ID of the resource, including the resource name and resource type.", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The diagnostic settings association was successfully deleted." + }, + "204": { + "description": "The diagnostic settings association does not exist. It may have already been deleted." + }, + "default": { + "description": "An error occurred and the diagnostic settings association could not be deleted.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "description": "Updates an existing guestDiagnosticsSettingsAssociation Resource. To update other fields use the CreateOrUpdate method", + "operationId": "guestDiagnosticsSettingsAssociation_Update", + "parameters": [ + { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified ID of the resource, including the resource name and resource type.", + "x-ms-skip-url-encoding": true + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResourcePatch" + }, + "description": "Parameters supplied to the operation." + } + ], + "responses": { + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + }, + "200": { + "description": "An existing guest diagnostics setting resource was successfully updated.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + } + } + }, + "x-ms-examples": { + "Update a service diagnostic setting": { "$ref": "./examples/updateGuestDiagnosticSettingsAssociation.json" } + } + } + }, + "/subscriptions/{subscriptionId}/providers/microsoft.insights/guestDiagnosticSettingsAssociations": { + "get": { + "description": "Get a list of all guest diagnostic settings association in a subscription.", + "operationId": "guestDiagnosticsSettingsAssociation_List", + "x-ms-pageable": { + "nextLinkName": null + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationList" + } + }, + "default": { + "description": "An error occurred and the list of guest diagnostic settings association could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettingsAssociations": { + "get": { + "description": "Get a list of all guest diagnostic settings association in a resource group.", + "operationId": "guestDiagnosticsSettingsAssociation_ListByResourceGroup", + "x-ms-pageable": { + "nextLinkName": null + }, + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationList" + } + }, + "default": { + "description": "An error occurred and the list of guest diagnostic settings association could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ErrorResponse": { + "description": "Describes the format of Error response.", + "type": "object", + "properties": { + "code": { + "description": "Error code", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + } + }, + "GuestDiagnosticSettingsAssociationList": { + "description": "A list of guest diagnostic settings association.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" + }, + "description": "The list of guest diagnostic settings association." + }, + "nextLink": { + "type": "string", + "description": "Provides the link to retrieve the next set of elements." + } + } + }, + "GuestDiagnosticSettingsAssociationResourcePatch": { + "description": "Guest diagnostic setting resource for patch operations", + "properties": { + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/GuestDiagnosticSettingsAssociation", + "description": "The service diagnostics settings for an update operation." + } + } + }, + "GuestDiagnosticSettingsAssociation": { + "description": "A guest diagnostic settings association.", + "properties": { + "guestDiagnosticSettingsName": { + "type": "string", + "description": "The guest diagnostic settings name." + } + }, + "required": [ + "guestDiagnosticSettingsName" + ] + }, + "GuestDiagnosticSettingsAssociationResource": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/GuestDiagnosticSettingsAssociation", + "description": "The diagnostics settings associations of the resource." + } + }, + "description": "Virtual machine guest diagnostic settings resource." + }, + "Resource": { + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "Azure resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Azure resource name" + }, + "type": { + "type": "string", + "readOnly": true, + "description": "Azure resource type" + }, + "location": { + "type": "string", + "description": "Resource location", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true, + "description": "An azure resource object" + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription Id." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "DiagnosticSettingsAssociationNameParameter": { + "name": "associationName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the diagnostic settings association.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + } + } + } \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json new file mode 100644 index 000000000000..092ba0613f6f --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json @@ -0,0 +1,580 @@ +{ + "swagger": "2.0", + "info": { + "title": "Guest Diagnostic Settings API", + "description": "API to Add/Remove/List Guest Diagnostics Configuration to Azure Resources", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "version": "2018-06-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettings/{diagnosticSettingsName}": { + "put": { + "description": "Creates or updates guest diagnostics settings.", + "tags": [ + "GuestDiagnosticsSettings" + ], + "operationId": "guestDiagnosticsSettings_CreateOrUpdate", + "x-ms-examples": { + "Create or update a guest diagnostic settings": { + "$ref": "./examples/createOrUpdateGuestDiagnosticSettings.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiagnosticSettingNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "diagnosticSettings", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + }, + "description": "The configuration to create or update." + } + ], + "responses": { + "200": { + "description": "An existing guest diagnostic settings was successfully updated.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + } + }, + "201": { + "description": "A new guest diagnostic settings was successfully created.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + } + }, + "default": { + "description": "An error occurred and the guest diagnostic settings could not be created or updated.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "get": { + "description": "Gets guest diagnostics settings.", + "tags": [ + "GuestDiagnosticsSettings" + ], + "operationId": "guestDiagnosticsSettings_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiagnosticSettingNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + } + }, + "default": { + "description": "An error occurred and the diagnostic settings could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "description": "Updates guest diagnostics settings.", + "operationId": "guestDiagnosticsSettings_Update", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiagnosticSettingNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsPatchResource" + }, + "description": "The configuration to patch." + } + ], + "responses": { + "200": { + "description": "An existing guest diagnostic settings was successfully updated.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + } + }, + "201": { + "description": "A new guest diagnostic settings was successfully created.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + } + }, + "default": { + "description": "An error occurred and the guest diagnostic settings could not be created or updated.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "description": "Delete guest diagnostics settings.", + "tags": [ + "GuestDiagnosticsSettings" + ], + "operationId": "guestDiagnosticsSettings_Delete", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/DiagnosticSettingNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The diagnostic settings was successfully deleted." + }, + "204": { + "description": "The diagnostic settings does not exist. It may have already been deleted." + }, + "default": { + "description": "An error occurred and the diagnostic settings could not be deleted.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/microsoft.insights/guestDiagnosticSettings": { + "get": { + "description": "Get a list of all guest diagnostic settings in a subscription.", + "operationId": "guestDiagnosticsSettings_List", + "x-ms-pageable": { + "nextLinkName": null + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsList" + } + }, + "default": { + "description": "An error occurred and the list of guest diagnostic settings could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettings": { + "get": { + "description": "Get a list of all guest diagnostic settings in a resource group.", + "operationId": "guestDiagnosticsSettings_ListByResourceGroup", + "x-ms-pageable": { + "nextLinkName": null + }, + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request succeeded.", + "schema": { + "$ref": "#/definitions/GuestDiagnosticSettingsList" + } + }, + "default": { + "description": "An error occurred and the list of guest diagnostic settings could not be retrieved.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "ErrorResponse": { + "description": "Describes the format of Error response.", + "type": "object", + "properties": { + "code": { + "description": "Error code", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + } + }, + "GuestDiagnosticSettingsList": { + "description": "A list of guest diagnostic settings.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/GuestDiagnosticSettingsResource" + }, + "description": "The list of guest diagnostic settings." + }, + "nextLink": { + "type": "string", + "description": "Provides the link to retrieve the next set of elements." + } + } + }, + "GuestDiagnosticSettingsResource": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "required": [ + "properties" + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/GuestDiagnosticSettings", + "description": "The diagnostic settings to be applied to azure resources." + } + }, + "description": "Virtual machine guest diagnostics settings resource." + }, + "GuestDiagnosticSettings": { + "description": "Virtual machine diagnostic settings", + "properties": { + "osType": { + "type": "string", + "enum": [ + "Windows", + "Linux" + ], + "description" : "Operating system type for the configuration" + }, + "dataSources": { + "type": "array", + "items": { + "$ref": "#/definitions/DataSource" + }, + "description": "the array of data source object which are configured to collect and send data" + }, + "proxySetting": { + "type": "string" + } + } + }, + "GuestDiagnosticSettingsPatchResource": { + "description": "An diagnostic settings object for the body of patch operations.", + "properties": { + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/GuestDiagnosticSettings", + "description": "The diagnostic settings for an update operation." + } + } + }, + "DataSource": { + "type": "object", + "required": [ + "kind", + "configuration", + "sinks" + ], + "properties": { + "kind": { + "type": "string", + "enum": [ + "PerformanceCounter", + "ETWProviders", + "WindowsEventLogs" + ], + "description": "Datasource kind" + }, + "configuration": { + "type": "object", + "$ref": "#/definitions/DataSourceConfiguration" + }, + "sinks": { + "type": "array", + "items": { + "$ref": "#/definitions/SinkConfiguration" + } + } + }, + "description": "Data source object contains configuration to collect telemetry and one or more sinks to send that telemetry data to" + }, + "SinkConfiguration": { + "type": "object", + "required": [ + "kind" + ], + "properties": { + "kind": { + "type": "string", + "enum": [ + "EventHub", + "ApplicationInsights", + "LogAnalytics" + ] + } + } + }, + "DataSourceConfiguration": { + "type": "object", + "properties": { + "providers": { + "type": "array", + "items": { + "$ref": "#/definitions/EtwProviderConfiguration" + }, + "description": "ETW providers configuration" + }, + "perfCounters": { + "type": "array", + "items": { + "$ref": "#/definitions/PerformanceCounterConfiguration" + }, + "description": "Performance counter configuration" + }, + "eventLogs": { + "type": "array", + "items": { + "$ref": "#/definitions/EventLogConfiguration" + }, + "description": "Windows event logs configuration." + } + } + }, + "EtwEventConfiguration": { + "type": "object", + "required": [ + "name", + "id" + ], + "properties": { + "name": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "filter": { + "type": "string" + } + } + }, + "EtwProviderConfiguration": { + "type": "object", + "required": [ + "id", + "events" + ], + "properties": { + "id": { + "type": "string" + }, + "events": { + "type": "array", + "items": { + "$ref": "#/definitions/EtwEventConfiguration" + } + } + } + }, + "PerformanceCounterConfiguration": { + "type": "object", + "required": [ + "name", + "samplingPeriod" + ], + "properties": { + "name": { + "type": "string" + }, + "samplingPeriod": { + "type": "string" + }, + "instance": { + "type": "string" + } + } + }, + "EventLogConfiguration": { + "type": "object", + "required": [ + "logName" + ], + "properties": { + "logName": { + "type": "string" + }, + "filter": { + "type": "string" + } + } + }, + "Resource": { + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "Azure resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Azure resource name" + }, + "type": { + "type": "string", + "readOnly": true, + "description": "Azure resource type" + }, + "location": { + "type": "string", + "description": "Resource location", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "required": [ + "location" + ], + "x-ms-azure-resource": true, + "description": "An azure resource object" + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription Id." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "DiagnosticSettingNameParameter": { + "name": "diagnosticSettingsName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the diagnostic setting.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + } + } + } \ No newline at end of file From 09ce935c2c08c16a64c7b0fa0bc494570dd42566 Mon Sep 17 00:00:00 2001 From: aydany Date: Thu, 3 Jan 2019 14:55:13 -0500 Subject: [PATCH 02/12] Updates readme --- .../monitor/resource-manager/readme.md | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 99c43d876c8e..770758ef3d0d 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -4,10 +4,10 @@ This is the AutoRest configuration file for MonitorClient. - - --- + ## Getting Started + To build the SDK for MonitorClient, simply [Install AutoRest](https://aka.ms/autorest/install) and in this folder, run: > `autorest` @@ -15,22 +15,31 @@ To build the SDK for MonitorClient, simply [Install AutoRest](https://aka.ms/aut To see additional help and options, run: > `autorest --help` + --- ## Configuration - - ### Basic Information + These are the global settings for the MonitorClient API. ``` yaml title: MonitorClient description: Monitor Management Client openapi-type: arm +tag: package-preview-2018-11 +``` -tag: package-2018-09 +### Tag: package-preview-2018-11 + +These settings apply only when `--tag=package-preview-2018-11` is specified on the command line. + +```yaml $(tag) == 'package-preview-2018-11' +input-file: + - Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json + - Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json ``` ### Tag: package-2018-09 @@ -85,7 +94,6 @@ input-file: - Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json ``` - ### Tag: package-2018-02-preview These settings apply only when `--tag=package-2018-02-preview` is specified on the command line. @@ -110,7 +118,6 @@ input-file: - Microsoft.Insights/preview/2017-11-01-preview/calculateBaseline_API.json ``` - ### Tag: package-2017-12 These settings apply only when `--tag=package-2017-12` is specified on the command line. @@ -273,8 +280,8 @@ input-file: ``` --- -# Code Generation +# Code Generation ## Swagger to SDK @@ -293,7 +300,6 @@ swagger-to-sdk: - bundle install && rake arm:regen_all_profiles['azure_mgmt_monitor'] ``` - ## C# These settings apply only when `--csharp` is specified on the command line. From 789dd40135c920d4917d5efccf71a09cb60e10f5 Mon Sep 17 00:00:00 2001 From: aydany Date: Thu, 3 Jan 2019 14:55:14 -0500 Subject: [PATCH 03/12] Updates API version in new specs and examples --- .../examples/createOrUpdateGuestDiagnosticSettings.json | 2 +- .../createOrUpdateGuestDiagnosticSettingsAssociation.json | 2 +- .../examples/deleteGuestDiagnosticSettingsAssociation.json | 2 +- .../2018-11-27-preview/examples/getGuestDiagnosticSettings.json | 2 +- .../examples/getGuestDiagnosticSettingsAssociation.json | 2 +- .../examples/updateGuestDiagnosticSettingsAssociation.json | 2 +- .../guestDiagnosticSettingsAssociation_API.json | 2 +- .../preview/2018-11-27-preview/guestDiagnosticSettings_API.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json index e57cc6ec6235..80a30ab18d45 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json @@ -3,7 +3,7 @@ "subscriptionId": "187f412d-1758-44d9-b052-169e2564721d", "resourceGroupName": "Default-ResourceGroup", "diagnosticSettingsName": "SampleDiagSetting", - "api-version": "2018-06-01-preview", + "api-version": "2018-11-27-preview", "diagnosticSettings": { "location": "Global", "tags": {}, diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json index c35cff6c5de2..3eb5ccb367ee 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json @@ -2,7 +2,7 @@ "parameters": { "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-06-01-preview", + "api-version": "2018-11-27-preview", "diagnosticSettingsAssociation": { "location": "Global", "tags": {}, diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json index 2de5c4bb50ef..b8b79b69f490 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json @@ -2,7 +2,7 @@ "parameters": { "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-06-01-preview" + "api-version": "2018-11-27-preview" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json index 09a003c11131..5a05093802a4 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json @@ -3,7 +3,7 @@ "subscriptionId": "187f412d-1758-44d9-b052-169e2564721d", "resourceGroupName": "Default-ResourceGroup", "diagnosticSettingsName": "productionMachineSetting", - "api-version": "2018-06-01-preview" + "api-version": "2018-11-27-preview" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json index 5ee3afd4ef02..13f581ab830f 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json @@ -2,7 +2,7 @@ "parameters": { "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-06-01-preview" + "api-version": "2018-11-27-preview" }, "responses": { "200": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json index e33341549273..b8e066680f7a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json @@ -2,7 +2,7 @@ "parameters": { "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-06-01-preview", + "api-version": "2018-11-27-preview", "parameters": { "tags": null, "properties": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json index 80487b3dc64d..c58d6e0f9f98 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json @@ -6,7 +6,7 @@ "x-ms-code-generation-settings": { "name": "MonitorManagementClient" }, - "version": "2018-06-01-preview" + "version": "2018-11-27-preview" }, "host": "management.azure.com", "schemes": [ diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json index 092ba0613f6f..867426943361 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json @@ -6,7 +6,7 @@ "x-ms-code-generation-settings": { "name": "MonitorManagementClient" }, - "version": "2018-06-01-preview" + "version": "2018-11-27-preview" }, "host": "management.azure.com", "schemes": [ From 839519fbe48105d4f368f0a16cc00935d8b69a3f Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Thu, 3 Jan 2019 15:41:06 -0500 Subject: [PATCH 04/12] Add initial swagger Removed some of the autogenerated files and added the swagger file and examples for the new api. --- ...createOrUpdateGuestDiagnosticSettings.json | 153 ----- ...ateGuestDiagnosticSettingsAssociation.json | 42 -- ...eteGuestDiagnosticSettingsAssociation.json | 17 - .../examples/getGuestDiagnosticSettings.json | 168 ----- ...getGuestDiagnosticSettingsAssociation.json | 22 - .../getOnboardingStatusResourceGroup.json | 32 + .../examples/getOnboardingStatusSingleVM.json | 32 + .../getOnboardingStatusSingleVMUnknown.json | 22 + .../getOnboardingStatusSubscription.json | 38 ++ .../getOnboardingStatusVMScaleSet.json | 32 + ...ateGuestDiagnosticSettingsAssociation.json | 28 - ...uestDiagnosticSettingsAssociation_API.json | 444 -------------- .../guestDiagnosticSettings_API.json | 580 ------------------ .../vmInsightsOnboarding_API.json | 259 ++++++++ .../monitor/resource-manager/readme.md | 28 +- 15 files changed, 438 insertions(+), 1459 deletions(-) delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json delete mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json create mode 100644 specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json deleted file mode 100644 index 80a30ab18d45..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettings.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "parameters": { - "subscriptionId": "187f412d-1758-44d9-b052-169e2564721d", - "resourceGroupName": "Default-ResourceGroup", - "diagnosticSettingsName": "SampleDiagSetting", - "api-version": "2018-11-27-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" - } - ] - }, - { - "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" - } - ] - } - ] - } - } - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json deleted file mode 100644 index 3eb5ccb367ee..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/createOrUpdateGuestDiagnosticSettingsAssociation.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parameters": { - "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", - "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-11-27-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" - } - } - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json deleted file mode 100644 index b8b79b69f490..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/deleteGuestDiagnosticSettingsAssociation.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", - "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-11-27-preview" - }, - "responses": { - "200": { - "headers": {}, - "body": null - }, - "204": { - "headers": {}, - "body": null - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json deleted file mode 100644 index 5a05093802a4..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettings.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "parameters": { - "subscriptionId": "187f412d-1758-44d9-b052-169e2564721d", - "resourceGroupName": "Default-ResourceGroup", - "diagnosticSettingsName": "productionMachineSetting", - "api-version": "2018-11-27-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" - } - ] - } - - ] - } - } - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json deleted file mode 100644 index 13f581ab830f..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getGuestDiagnosticSettingsAssociation.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parameters": { - "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", - "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-11-27-preview" - }, - "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/SampleDiagnosticSettingsName" - } - } - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json new file mode 100644 index 000000000000..c6ef42599ac8 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/resource-group-with-vms", + "api-version": "2018-11-27-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "properties": { + "resourceId": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/resource-group-with-vms", + "onboardingStatus": "onboarded", + "dataStatus": "present", + "data": [ + { + "workspace": { + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourcegroups/monitoring/providers/microsoft.operationalinsights/workspaces/vm-monitoring", + "location": "eastus", + "properties": { + "customerId": "c7f8f44d-d8ee-4b79-9d9a-4d8a1f2a112a" + } + } + } + ] + }, + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/resource-group-with-vms/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default", + "type": "Microsoft.Insights/vmInsightsOnboardingStatuses", + "name": "default" + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json new file mode 100644 index 000000000000..d5caf053572a --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "api-version": "2018-11-27-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "properties": { + "resourceId": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "onboardingStatus": "onboarded", + "dataStatus": "present", + "data": [ + { + "workspace": { + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourcegroups/monitoring/providers/microsoft.operationalinsights/workspaces/vm-monitoring", + "location": "eastus", + "properties": { + "customerId": "c7f8f44d-d8ee-4b79-9d9a-4d8a1f2a112a" + } + } + } + ] + }, + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default", + "type": "Microsoft.Insights/vmInsightsOnboardingStatuses", + "name": "default" + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json new file mode 100644 index 000000000000..008568902c02 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "api-version": "2018-11-27-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "properties": { + "resourceId": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "onboardingStatus": "unknown", + "dataStatus": "notPresent", + "data": [] + }, + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default", + "type": "Microsoft.Insights/vmInsightsOnboardingStatuses", + "name": "default" + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json new file mode 100644 index 000000000000..b13b88d68ee7 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87", + "api-version": "2018-11-27-preview" + }, + "responses": { + "200": { + "properties": { + "resourceId": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87", + "onboardingStatus": "onboarded", + "dataStatus": "present", + "data": [ + { + "workspace": { + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourcegroups/monitoring/providers/microsoft.operationalinsights/workspaces/vm-monitoring-secondary", + "location": "eastus", + "properties": { + "customerId": "f096d163-206e-4abf-9db3-2c62af003d68" + } + } + }, + { + "workspace": { + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourcegroups/monitoring/providers/microsoft.operationalinsights/workspaces/vm-monitoring", + "location": "eastus", + "properties": { + "customerId": "c7f8f44d-d8ee-4b79-9d9a-4d8a1f2a112a" + } + } + } + ] + }, + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default", + "type": "Microsoft.Insights/vmInsightsOnboardingStatuses", + "name": "default" + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json new file mode 100644 index 000000000000..2c5bc492af68 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/my-service-cluster/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-01", + "api-version": "2018-11-27-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "properties": { + "resourceId": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/my-service-cluster/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-01", + "onboardingStatus": "onboarded", + "dataStatus": "present", + "data": [ + { + "workspace": { + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourcegroups/monitoring/providers/microsoft.operationalinsights/workspaces/vm-monitoring", + "location": "eastus", + "properties": { + "customerId": "c7f8f44d-d8ee-4b79-9d9a-4d8a1f2a112a" + } + } + } + ] + }, + "id": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/my-service-cluster/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-01/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default", + "type": "Microsoft.Insights/vmInsightsOnboardingStatuses", + "name": "default" + } + } + } +} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json deleted file mode 100644 index b8e066680f7a..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/updateGuestDiagnosticSettingsAssociation.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parameters": { - "resourceUri":"subscriptions/8498f01b-8064-4e37-856e-318f3c6c685f/resourceGroups/healthsystem/providers/Microsoft.Compute/virtualMachines/eastussojai", - "associationName": "healthSystemMachineConfigAssociation", - "api-version": "2018-11-27-preview", - "parameters": { - "tags": null, - "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": null, - "properties": { - "guestDiagnosticSettingsName": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-Association-ResourceGroup/providers/providers/microsoft.insights/guestDiagnosticSettings/vmSettingForSecurity" - } - } - } - } -} \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json deleted file mode 100644 index c58d6e0f9f98..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json +++ /dev/null @@ -1,444 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Guest Diagnostic Settings Association API", - "description": "API to Add/Remove/List Guest Diagnostics Settings Association for Azure Resources", - "x-ms-code-generation-settings": { - "name": "MonitorManagementClient" - }, - "version": "2018-11-27-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{resourceUri}/providers/microsoft.insights/guestDiagnosticSettingsAssociation/{associationName}": { - "put": { - "description": "Creates or updates guest diagnostics settings association.", - "tags": [ - "GuestDiagnosticsSettingsAssociation" - ], - "operationId": "guestDiagnosticsSettingsAssociation_CreateOrUpdate", - "x-ms-examples": { - "Create or update an guest diagnostic settings association": { - "$ref": "./examples/createOrUpdateGuestDiagnosticSettingsAssociation.json" - } - }, - "parameters": [ - { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The fully qualified ID of the resource, including the resource name and resource type.", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "name": "diagnosticSettingsAssociation", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - }, - "description": "The diagnostic settings association to create or update." - } - ], - "responses": { - "200": { - "description": "An existing guest diagnostic settings association was successfully updated.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - } - }, - "201": { - "description": "A new guest diagnostic settings association was successfully created.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - } - }, - "default": { - "description": "An error occurred and the guest diagnostic settings association could not be created or updated.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "description": "Gets guest diagnostics association settings.", - "tags": [ - "GuestDiagnosticsSettingsAssociation" - ], - "operationId": "guestDiagnosticsSettingsAssociation_Get", - "x-ms-examples": { - "Create or update an guest diagnostic settings association": { - "$ref": "./examples/getGuestDiagnosticSettingsAssociation.json" - } - }, - "parameters": [ - { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The fully qualified ID of the resource, including the resource name and resource type.", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - } - }, - "default": { - "description": "An error occurred and the diagnostic settings association could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "description": "Delete guest diagnostics association settings.", - "tags": [ - "GuestDiagnosticsSettingsAssociation" - ], - "x-ms-examples": { - "Create or update an guest diagnostic settings association": { - "$ref": "./examples/deleteGuestDiagnosticSettingsAssociation.json" - } - }, - "operationId": "GuestDiagnosticsSettingsAssociation_Delete", - "parameters": [ - { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The fully qualified ID of the resource, including the resource name and resource type.", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The diagnostic settings association was successfully deleted." - }, - "204": { - "description": "The diagnostic settings association does not exist. It may have already been deleted." - }, - "default": { - "description": "An error occurred and the diagnostic settings association could not be deleted.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "patch": { - "description": "Updates an existing guestDiagnosticsSettingsAssociation Resource. To update other fields use the CreateOrUpdate method", - "operationId": "guestDiagnosticsSettingsAssociation_Update", - "parameters": [ - { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The fully qualified ID of the resource, including the resource name and resource type.", - "x-ms-skip-url-encoding": true - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/DiagnosticSettingsAssociationNameParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResourcePatch" - }, - "description": "Parameters supplied to the operation." - } - ], - "responses": { - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - }, - "200": { - "description": "An existing guest diagnostics setting resource was successfully updated.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - } - } - }, - "x-ms-examples": { - "Update a service diagnostic setting": { "$ref": "./examples/updateGuestDiagnosticSettingsAssociation.json" } - } - } - }, - "/subscriptions/{subscriptionId}/providers/microsoft.insights/guestDiagnosticSettingsAssociations": { - "get": { - "description": "Get a list of all guest diagnostic settings association in a subscription.", - "operationId": "guestDiagnosticsSettingsAssociation_List", - "x-ms-pageable": { - "nextLinkName": null - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationList" - } - }, - "default": { - "description": "An error occurred and the list of guest diagnostic settings association could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettingsAssociations": { - "get": { - "description": "Get a list of all guest diagnostic settings association in a resource group.", - "operationId": "guestDiagnosticsSettingsAssociation_ListByResourceGroup", - "x-ms-pageable": { - "nextLinkName": null - }, - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationList" - } - }, - "default": { - "description": "An error occurred and the list of guest diagnostic settings association could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "ErrorResponse": { - "description": "Describes the format of Error response.", - "type": "object", - "properties": { - "code": { - "description": "Error code", - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } - }, - "GuestDiagnosticSettingsAssociationList": { - "description": "A list of guest diagnostic settings association.", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/GuestDiagnosticSettingsAssociationResource" - }, - "description": "The list of guest diagnostic settings association." - }, - "nextLink": { - "type": "string", - "description": "Provides the link to retrieve the next set of elements." - } - } - }, - "GuestDiagnosticSettingsAssociationResourcePatch": { - "description": "Guest diagnostic setting resource for patch operations", - "properties": { - "tags": { - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/GuestDiagnosticSettingsAssociation", - "description": "The service diagnostics settings for an update operation." - } - } - }, - "GuestDiagnosticSettingsAssociation": { - "description": "A guest diagnostic settings association.", - "properties": { - "guestDiagnosticSettingsName": { - "type": "string", - "description": "The guest diagnostic settings name." - } - }, - "required": [ - "guestDiagnosticSettingsName" - ] - }, - "GuestDiagnosticSettingsAssociationResource": { - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "required": [ - "properties" - ], - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/GuestDiagnosticSettingsAssociation", - "description": "The diagnostics settings associations of the resource." - } - }, - "description": "Virtual machine guest diagnostic settings resource." - }, - "Resource": { - "properties": { - "id": { - "type": "string", - "readOnly": true, - "description": "Azure resource Id" - }, - "name": { - "type": "string", - "readOnly": true, - "description": "Azure resource name" - }, - "type": { - "type": "string", - "readOnly": true, - "description": "Azure resource type" - }, - "location": { - "type": "string", - "description": "Resource location", - "x-ms-mutability": [ - "create", - "read" - ] - }, - "tags": { - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - } - }, - "required": [ - "location" - ], - "x-ms-azure-resource": true, - "description": "An azure resource object" - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The Azure subscription Id." - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" - }, - "DiagnosticSettingsAssociationNameParameter": { - "name": "associationName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the diagnostic settings association.", - "x-ms-parameter-location": "method" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - } - } - } \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json deleted file mode 100644 index 867426943361..000000000000 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json +++ /dev/null @@ -1,580 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Guest Diagnostic Settings API", - "description": "API to Add/Remove/List Guest Diagnostics Configuration to Azure Resources", - "x-ms-code-generation-settings": { - "name": "MonitorManagementClient" - }, - "version": "2018-11-27-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettings/{diagnosticSettingsName}": { - "put": { - "description": "Creates or updates guest diagnostics settings.", - "tags": [ - "GuestDiagnosticsSettings" - ], - "operationId": "guestDiagnosticsSettings_CreateOrUpdate", - "x-ms-examples": { - "Create or update a guest diagnostic settings": { - "$ref": "./examples/createOrUpdateGuestDiagnosticSettings.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiagnosticSettingNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "name": "diagnosticSettings", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - }, - "description": "The configuration to create or update." - } - ], - "responses": { - "200": { - "description": "An existing guest diagnostic settings was successfully updated.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - } - }, - "201": { - "description": "A new guest diagnostic settings was successfully created.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - } - }, - "default": { - "description": "An error occurred and the guest diagnostic settings could not be created or updated.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "get": { - "description": "Gets guest diagnostics settings.", - "tags": [ - "GuestDiagnosticsSettings" - ], - "operationId": "guestDiagnosticsSettings_Get", - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiagnosticSettingNameParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - } - }, - "default": { - "description": "An error occurred and the diagnostic settings could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "patch": { - "description": "Updates guest diagnostics settings.", - "operationId": "guestDiagnosticsSettings_Update", - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiagnosticSettingNameParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsPatchResource" - }, - "description": "The configuration to patch." - } - ], - "responses": { - "200": { - "description": "An existing guest diagnostic settings was successfully updated.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - } - }, - "201": { - "description": "A new guest diagnostic settings was successfully created.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - } - }, - "default": { - "description": "An error occurred and the guest diagnostic settings could not be created or updated.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - }, - "delete": { - "description": "Delete guest diagnostics settings.", - "tags": [ - "GuestDiagnosticsSettings" - ], - "operationId": "guestDiagnosticsSettings_Delete", - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/DiagnosticSettingNameParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The diagnostic settings was successfully deleted." - }, - "204": { - "description": "The diagnostic settings does not exist. It may have already been deleted." - }, - "default": { - "description": "An error occurred and the diagnostic settings could not be deleted.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/providers/microsoft.insights/guestDiagnosticSettings": { - "get": { - "description": "Get a list of all guest diagnostic settings in a subscription.", - "operationId": "guestDiagnosticsSettings_List", - "x-ms-pageable": { - "nextLinkName": null - }, - "parameters": [ - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsList" - } - }, - "default": { - "description": "An error occurred and the list of guest diagnostic settings could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.insights/guestDiagnosticSettings": { - "get": { - "description": "Get a list of all guest diagnostic settings in a resource group.", - "operationId": "guestDiagnosticsSettings_ListByResourceGroup", - "x-ms-pageable": { - "nextLinkName": null - }, - "parameters": [ - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "The request succeeded.", - "schema": { - "$ref": "#/definitions/GuestDiagnosticSettingsList" - } - }, - "default": { - "description": "An error occurred and the list of guest diagnostic settings could not be retrieved.", - "schema": { - "$ref": "#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "ErrorResponse": { - "description": "Describes the format of Error response.", - "type": "object", - "properties": { - "code": { - "description": "Error code", - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } - }, - "GuestDiagnosticSettingsList": { - "description": "A list of guest diagnostic settings.", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/GuestDiagnosticSettingsResource" - }, - "description": "The list of guest diagnostic settings." - }, - "nextLink": { - "type": "string", - "description": "Provides the link to retrieve the next set of elements." - } - } - }, - "GuestDiagnosticSettingsResource": { - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "required": [ - "properties" - ], - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/GuestDiagnosticSettings", - "description": "The diagnostic settings to be applied to azure resources." - } - }, - "description": "Virtual machine guest diagnostics settings resource." - }, - "GuestDiagnosticSettings": { - "description": "Virtual machine diagnostic settings", - "properties": { - "osType": { - "type": "string", - "enum": [ - "Windows", - "Linux" - ], - "description" : "Operating system type for the configuration" - }, - "dataSources": { - "type": "array", - "items": { - "$ref": "#/definitions/DataSource" - }, - "description": "the array of data source object which are configured to collect and send data" - }, - "proxySetting": { - "type": "string" - } - } - }, - "GuestDiagnosticSettingsPatchResource": { - "description": "An diagnostic settings object for the body of patch operations.", - "properties": { - "tags": { - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/GuestDiagnosticSettings", - "description": "The diagnostic settings for an update operation." - } - } - }, - "DataSource": { - "type": "object", - "required": [ - "kind", - "configuration", - "sinks" - ], - "properties": { - "kind": { - "type": "string", - "enum": [ - "PerformanceCounter", - "ETWProviders", - "WindowsEventLogs" - ], - "description": "Datasource kind" - }, - "configuration": { - "type": "object", - "$ref": "#/definitions/DataSourceConfiguration" - }, - "sinks": { - "type": "array", - "items": { - "$ref": "#/definitions/SinkConfiguration" - } - } - }, - "description": "Data source object contains configuration to collect telemetry and one or more sinks to send that telemetry data to" - }, - "SinkConfiguration": { - "type": "object", - "required": [ - "kind" - ], - "properties": { - "kind": { - "type": "string", - "enum": [ - "EventHub", - "ApplicationInsights", - "LogAnalytics" - ] - } - } - }, - "DataSourceConfiguration": { - "type": "object", - "properties": { - "providers": { - "type": "array", - "items": { - "$ref": "#/definitions/EtwProviderConfiguration" - }, - "description": "ETW providers configuration" - }, - "perfCounters": { - "type": "array", - "items": { - "$ref": "#/definitions/PerformanceCounterConfiguration" - }, - "description": "Performance counter configuration" - }, - "eventLogs": { - "type": "array", - "items": { - "$ref": "#/definitions/EventLogConfiguration" - }, - "description": "Windows event logs configuration." - } - } - }, - "EtwEventConfiguration": { - "type": "object", - "required": [ - "name", - "id" - ], - "properties": { - "name": { - "type": "string" - }, - "id": { - "type": "integer" - }, - "filter": { - "type": "string" - } - } - }, - "EtwProviderConfiguration": { - "type": "object", - "required": [ - "id", - "events" - ], - "properties": { - "id": { - "type": "string" - }, - "events": { - "type": "array", - "items": { - "$ref": "#/definitions/EtwEventConfiguration" - } - } - } - }, - "PerformanceCounterConfiguration": { - "type": "object", - "required": [ - "name", - "samplingPeriod" - ], - "properties": { - "name": { - "type": "string" - }, - "samplingPeriod": { - "type": "string" - }, - "instance": { - "type": "string" - } - } - }, - "EventLogConfiguration": { - "type": "object", - "required": [ - "logName" - ], - "properties": { - "logName": { - "type": "string" - }, - "filter": { - "type": "string" - } - } - }, - "Resource": { - "properties": { - "id": { - "type": "string", - "readOnly": true, - "description": "Azure resource Id" - }, - "name": { - "type": "string", - "readOnly": true, - "description": "Azure resource name" - }, - "type": { - "type": "string", - "readOnly": true, - "description": "Azure resource type" - }, - "location": { - "type": "string", - "description": "Resource location", - "x-ms-mutability": [ - "create", - "read" - ] - }, - "tags": { - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - } - }, - "required": [ - "location" - ], - "x-ms-azure-resource": true, - "description": "An azure resource object" - } - }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "The Azure subscription Id." - }, - "ResourceGroupNameParameter": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" - }, - "DiagnosticSettingNameParameter": { - "name": "diagnosticSettingsName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the diagnostic setting.", - "x-ms-parameter-location": "method" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." - } - } - } \ No newline at end of file diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json new file mode 100644 index 000000000000..9e58b98a9576 --- /dev/null +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -0,0 +1,259 @@ +{ + "swagger": "2.0", + "info": { + "title": "VM Insights Onboarding API", + "description": "API to manage VM Insights Onboarding", + "x-ms-code-generation-settings": { + "name": "MonitorManagementClient" + }, + "version": "2018-11-27-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{resourceUri}/providers/Microsoft.Insights/vmInsightsOnboardingStatuses/default": { + "get": { + "tags": [ + "VM Insights Onboarding" + ], + "operationId": "VMInsights_GetOnboardingStatus", + "description": "Retrieves the VM Insights onboarding status for the specified resource.", + "x-ms-examples": { + "Get status for single vm that has not yet reported data": { + "$ref": "./examples/getOnboardingStatusSingleVMUnknown.json" + }, + "Get status for single VM that is actively reporting data": { + "$ref": "./examples/getOnboardingStatusSingleVM.json" + }, + "Get status for a VM Scale Set that is actively reporting data": { + "$ref": "./examples/getOnboardingStatusVMScaleSet.json" + }, + "Get status for a resource group that has at least one VM that is actively reporting data": { + "$ref": "./examples/getOnboardingStatusResourceGroup.json" + }, + "Get status for a subscription that has at least one VM that is actively reporting data": { + "$ref": "./examples/getOnboardingStatusSubscription.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The fully qualified Azure Resource manager identifier of the resource, or scope, whose status to retrieve.", + "x-ms-skip-url-encoding": true + } + ], + "responses": { + "200": { + "description": "The operation completed successfully.", + "schema": { + "$ref": "#/definitions/VMInsightsOnboardingStatus" + } + }, + "default": { + "description": "An error occurred while processing the request. See the error.code parameter to identify the specific error.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Resource": { + "description": "Resource model definition.", + "properties": { + "id": { + "type": "string", + "description": "Resource identifier.", + "readOnly": true + }, + "type": { + "type": "string", + "description": "Resource type.", + "readOnly": true + }, + "name": { + "type": "string", + "description": "Resource name.", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "ErrorResponse": { + "type": "object", + "description": "An error response from the API.", + "properties": { + "error": { + "$ref": "#/definitions/Error", + "description": "Error information." + } + }, + "required": [ + "error" + ] + }, + "Error": { + "type": "object", + "description": "Error details.", + "properties": { + "code": { + "type": "string", + "description": "Error code identifying the specific error." + }, + "message": { + "type": "string", + "description": "Error message in the caller's locale." + } + }, + "required": [ + "code" + ] + }, + "WorkspaceInfo": { + "type": "object", + "description": "Information about a Log Analytics Workspace.", + "properties": { + "id": { + "type": "string", + "description": "Azure Resource Manager identifier of the Log Analytics Workspace." + }, + "location": { + "type": "string", + "description": "Location of the Log Analytics workspace." + }, + "properties": { + "x-ms-client-flatten": true, + "type": "object", + "description": "Resource properties.", + "properties": { + "customerId": { + "type": "string", + "description": "Log Analytics workspace identifier." + } + }, + "required": [ + "customerId" + ] + } + }, + "required": [ + "id", + "location", + "properties" + ] + }, + "DataContainer": { + "type": "object", + "description": "Information about a container with data for a given resource.", + "properties": { + "workspace": { + "$ref": "#/definitions/WorkspaceInfo", + "description": "Log Analytics workspace information." + } + }, + "required": [ + "workspace" + ] + }, + "VMInsightsOnboardingStatus": { + "description": "VM Insights onboarding status for a resource.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "x-ms-client-flatten": true, + "type": "object", + "description": "Resource properties.", + "properties": { + "resourceId": { + "type": "string", + "description": "Azure Resource Manager identifier of the resource whose onboarding status is being represented.", + }, + "onboardingStatus": { + "type": "string", + "enum": [ + "onboarded", + "unknown" + ], + "x-ms-enum": { + "name": "OnboardingStatus", + "modelAsString": true + }, + "description": "The onboarding status for the resource. Note that, a higher level scope, e.g., resource group or subscription, is considered onboarded if at least one resource under it is onboarded. Future versions of the API may provide more detailed information, e.g., identifying that eligible resources within a subscription or resource group are not yet onboarded.", + }, + "dataStatus": { + "type": "string", + "enum": [ + "present", + "notPresent" + ], + "x-ms-enum": { + "name": "DataStatus", + "modelAsString": true + }, + "description": "The status of VM Insights data from the resource. When reported as `present` the data array will contain information about the data containers to which data for the specified resource is being routed.", + }, + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/DataContainer" + }, + "description": "Containers that currently store VM Insights data for the specified resource.", + } + }, + "required": [ + "resourceId", + "onboardingStatus", + "dataStatus" + ] + } + } + } + }, + "parameters": { + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "API version." + } + } + } \ No newline at end of file diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 770758ef3d0d..919f68164b8f 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -28,18 +28,36 @@ These are the global settings for the MonitorClient API. title: MonitorClient description: Monitor Management Client openapi-type: arm -tag: package-preview-2018-11 +tag: package-2018-11 ``` -### Tag: package-preview-2018-11 +### Tag: package-2018-11 -These settings apply only when `--tag=package-preview-2018-11` is specified on the command line. +These settings apply only when `--tag=package-2018-11` is specified on the command line. ```yaml $(tag) == 'package-preview-2018-11' input-file: - - Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettingsAssociation_API.json - - Microsoft.Insights/preview/2018-11-27-preview/guestDiagnosticSettings_API.json +- Microsoft.Insights/stable/2015-04-01/autoscale_API.json +- Microsoft.Insights/stable/2015-04-01/operations_API.json +- Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json +- Microsoft.Insights/stable/2016-03-01/alertRules_API.json +- Microsoft.Insights/stable/2016-03-01/logProfiles_API.json +- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json +- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json +- Microsoft.Insights/stable/2018-09-01/actionGroups_API.json +- Microsoft.Insights/stable/2017-04-01/activityLogAlerts_API.json +- Microsoft.Insights/stable/2015-04-01/activityLogs_API.json +- Microsoft.Insights/stable/2015-04-01/eventCategories_API.json +- Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json +- Microsoft.Insights/stable/2018-01-01/metricDefinitions_API.json +- Microsoft.Insights/stable/2018-01-01/metrics_API.json +- Microsoft.Insights/preview/2017-11-01-preview/baseline_API.json +- Microsoft.Insights/preview/2017-11-01-preview/calculateBaseline_API.json +- Microsoft.Insights/stable/2018-03-01/metricAlert_API.json +- Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json +- Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json +- Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json ``` ### Tag: package-2018-09 From 0f57a91536fad63c517bfb7f5c46c13ce972b18e Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Thu, 3 Jan 2019 15:51:41 -0500 Subject: [PATCH 05/12] Remove extra / from examples --- .../examples/getOnboardingStatusResourceGroup.json | 2 +- .../examples/getOnboardingStatusSingleVM.json | 2 +- .../examples/getOnboardingStatusSingleVMUnknown.json | 2 +- .../examples/getOnboardingStatusSubscription.json | 2 +- .../examples/getOnboardingStatusVMScaleSet.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json index c6ef42599ac8..3500766bd62a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusResourceGroup.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/resource-group-with-vms", + "resourceUri": "subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/resource-group-with-vms", "api-version": "2018-11-27-preview" }, "responses": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json index d5caf053572a..8fb2b0190191 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVM.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "resourceUri": "subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", "api-version": "2018-11-27-preview" }, "responses": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json index 008568902c02..41d1f25fdf8d 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSingleVMUnknown.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", + "resourceUri": "subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/vm-resource-group/providers/Microsoft.Compute/virtualMachines/ubuntu-vm", "api-version": "2018-11-27-preview" }, "responses": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json index b13b88d68ee7..57eb902d9b23 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusSubscription.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87", + "resourceUri": "subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87", "api-version": "2018-11-27-preview" }, "responses": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json index 2c5bc492af68..be3a9a8d3a61 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/examples/getOnboardingStatusVMScaleSet.json @@ -1,6 +1,6 @@ { "parameters": { - "resourceUri": "/subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/my-service-cluster/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-01", + "resourceUri": "subscriptions/3d51de47-8d1c-4d24-b42f-bcae075dfa87/resourceGroups/my-service-cluster/providers/Microsoft.Compute/virtualMachineScaleSets/scale-set-01", "api-version": "2018-11-27-preview" }, "responses": { From 699c4493a28b53e0e179158f8ddb5e7ac655fc87 Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Thu, 3 Jan 2019 16:04:33 -0500 Subject: [PATCH 06/12] Fix swagger file --- .../2018-11-27-preview/vmInsightsOnboarding_API.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json index 9e58b98a9576..b63c7f8bb905 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -204,7 +204,7 @@ "properties": { "resourceId": { "type": "string", - "description": "Azure Resource Manager identifier of the resource whose onboarding status is being represented.", + "description": "Azure Resource Manager identifier of the resource whose onboarding status is being represented." }, "onboardingStatus": { "type": "string", @@ -216,7 +216,7 @@ "name": "OnboardingStatus", "modelAsString": true }, - "description": "The onboarding status for the resource. Note that, a higher level scope, e.g., resource group or subscription, is considered onboarded if at least one resource under it is onboarded. Future versions of the API may provide more detailed information, e.g., identifying that eligible resources within a subscription or resource group are not yet onboarded.", + "description": "The onboarding status for the resource. Note that, a higher level scope, e.g., resource group or subscription, is considered onboarded if at least one resource under it is onboarded. Future versions of the API may provide more detailed information, e.g., identifying that eligible resources within a subscription or resource group are not yet onboarded." }, "dataStatus": { "type": "string", @@ -228,14 +228,14 @@ "name": "DataStatus", "modelAsString": true }, - "description": "The status of VM Insights data from the resource. When reported as `present` the data array will contain information about the data containers to which data for the specified resource is being routed.", + "description": "The status of VM Insights data from the resource. When reported as `present` the data array will contain information about the data containers to which data for the specified resource is being routed." }, "data": { "type": "array", "items": { "$ref": "#/definitions/DataContainer" }, - "description": "Containers that currently store VM Insights data for the specified resource.", + "description": "Containers that currently store VM Insights data for the specified resource." } }, "required": [ From a9a9b3237460139f9a649d7593bdb321ecd13e7d Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Fri, 4 Jan 2019 09:47:32 -0500 Subject: [PATCH 07/12] Improve docs --- .../2018-11-27-preview/vmInsightsOnboarding_API.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json index b63c7f8bb905..b01f640df668 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -43,15 +43,15 @@ "VM Insights Onboarding" ], "operationId": "VMInsights_GetOnboardingStatus", - "description": "Retrieves the VM Insights onboarding status for the specified resource.", + "description": "Retrieves the VM Insights onboarding status for the specified resource or resource scope.", "x-ms-examples": { - "Get status for single vm that has not yet reported data": { + "Get status for a VM that has not yet reported data": { "$ref": "./examples/getOnboardingStatusSingleVMUnknown.json" }, - "Get status for single VM that is actively reporting data": { + "Get status for a VM that is actively reporting data": { "$ref": "./examples/getOnboardingStatusSingleVM.json" }, - "Get status for a VM Scale Set that is actively reporting data": { + "Get status for a VM scale set that is actively reporting data": { "$ref": "./examples/getOnboardingStatusVMScaleSet.json" }, "Get status for a resource group that has at least one VM that is actively reporting data": { @@ -210,13 +210,14 @@ "type": "string", "enum": [ "onboarded", + "notOnboarded", "unknown" ], "x-ms-enum": { "name": "OnboardingStatus", "modelAsString": true }, - "description": "The onboarding status for the resource. Note that, a higher level scope, e.g., resource group or subscription, is considered onboarded if at least one resource under it is onboarded. Future versions of the API may provide more detailed information, e.g., identifying that eligible resources within a subscription or resource group are not yet onboarded." + "description": "The onboarding status for the resource. Note that, a higher level scope, e.g., resource group or subscription, is considered onboarded if at least one resource under it is onboarded." }, "dataStatus": { "type": "string", From 444d940d3135d4e14b92b8385919c5980c917b91 Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Fri, 4 Jan 2019 09:55:15 -0500 Subject: [PATCH 08/12] Update resource model Made it the same as the rest of the specs --- .../vmInsightsOnboarding_API.json | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json index b01f640df668..f88d6bc23e6b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -93,25 +93,42 @@ }, "definitions": { "Resource": { - "description": "Resource model definition.", "properties": { "id": { "type": "string", - "description": "Resource identifier.", - "readOnly": true + "readOnly": true, + "description": "Azure resource Id" + }, + "name": { + "type": "string", + "readOnly": true, + "description": "Azure resource name" }, "type": { "type": "string", - "description": "Resource type.", - "readOnly": true + "readOnly": true, + "description": "Azure resource type" }, - "name": { + "location": { "type": "string", - "description": "Resource name.", - "readOnly": true + "description": "Resource location", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "tags": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" } }, - "x-ms-azure-resource": true + "required": [ + "location" + ], + "x-ms-azure-resource": true, + "description": "An azure resource object" }, "ErrorResponse": { "type": "object", From 6b4c7167d2cfa2f41e4bbd541210d55b0936972e Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Fri, 4 Jan 2019 10:01:37 -0500 Subject: [PATCH 09/12] Fix the resource data model: no location and tags --- .../vmInsightsOnboarding_API.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json index f88d6bc23e6b..20ee2c4d5d5e 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -108,25 +108,8 @@ "type": "string", "readOnly": true, "description": "Azure resource type" - }, - "location": { - "type": "string", - "description": "Resource location", - "x-ms-mutability": [ - "create", - "read" - ] - }, - "tags": { - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" } }, - "required": [ - "location" - ], "x-ms-azure-resource": true, "description": "An azure resource object" }, From 0be37eb03c8233b5ffac681528d5de5f424c4f2e Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Fri, 4 Jan 2019 10:12:59 -0500 Subject: [PATCH 10/12] Fix readme --- specification/monitor/resource-manager/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 919f68164b8f..7db3a2e56704 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -28,15 +28,14 @@ These are the global settings for the MonitorClient API. title: MonitorClient description: Monitor Management Client openapi-type: arm -tag: package-2018-11 +tag: package-2018-09 ``` +### Tag: package-2018-11-preview -### Tag: package-2018-11 +These settings apply only when `--tag=package-2018-11-preview` is specified on the command line. -These settings apply only when `--tag=package-2018-11` is specified on the command line. - -```yaml $(tag) == 'package-preview-2018-11' +```yaml $(tag) == 'package-2018-11-preview' input-file: - Microsoft.Insights/stable/2015-04-01/autoscale_API.json - Microsoft.Insights/stable/2015-04-01/operations_API.json @@ -59,6 +58,7 @@ input-file: - Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json - Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json ``` + ### Tag: package-2018-09 These settings apply only when `--tag=package-2018-09` is specified on the command line. From 102b10e51722dbd8a03e50fad0396c2cc34f1602 Mon Sep 17 00:00:00 2001 From: Aydan Yumerefendi Date: Mon, 7 Jan 2019 10:03:24 -0500 Subject: [PATCH 11/12] Generate the latest package The latest package including support for the new API will be generated. This required several changes: - The defintion of Resource used by the other specs was incompatible. This was because the other resources were tracked and the new ones is proxy. Defined a new ProxyResource type. - The ErrorResponse definition was incompatible with the rest of the specs in the folder. This is actually a bug in the exesiting specs. They do not respect the contract of { "error": {"code": "", "message": ""}}, i.e., they lack the top-level error element. To work around this issue, defined a new response type, ResponseWithError, which is compliant with the latest ARM requirements. --- .../2018-11-27-preview/vmInsightsOnboarding_API.json | 8 ++++---- specification/monitor/resource-manager/readme.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json index 20ee2c4d5d5e..b6385a6437bd 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json @@ -84,7 +84,7 @@ "default": { "description": "An error occurred while processing the request. See the error.code parameter to identify the specific error.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/ResponseWithError" } } } @@ -92,7 +92,7 @@ } }, "definitions": { - "Resource": { + "ProxyResource": { "properties": { "id": { "type": "string", @@ -113,7 +113,7 @@ "x-ms-azure-resource": true, "description": "An azure resource object" }, - "ErrorResponse": { + "ResponseWithError": { "type": "object", "description": "An error response from the API.", "properties": { @@ -193,7 +193,7 @@ "description": "VM Insights onboarding status for a resource.", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 7db3a2e56704..6fe368f32359 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -28,7 +28,7 @@ These are the global settings for the MonitorClient API. title: MonitorClient description: Monitor Management Client openapi-type: arm -tag: package-2018-09 +tag: package-2018-11-preview ``` ### Tag: package-2018-11-preview From 9771d96d4a2f4caa435cd59ae81736e910b8ee89 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 8 Jan 2019 10:57:03 -0800 Subject: [PATCH 12/12] Update Python version --- specification/monitor/resource-manager/readme.python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.python.md b/specification/monitor/resource-manager/readme.python.md index 04fa322fe2ce..f911c3f03204 100644 --- a/specification/monitor/resource-manager/readme.python.md +++ b/specification/monitor/resource-manager/readme.python.md @@ -12,7 +12,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.monitor package-name: azure-mgmt-monitor - package-version: 0.5.0 + package-version: 0.6.0 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update'