From 09ffe272a7caccc0b01febc2a416b07d2d9b7964 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 13:56:57 -0800 Subject: [PATCH 01/17] Added new version 2020-02-07-preview of SapMonitor APIs --- .../examples/ProviderInstances_Create.json | 25 + .../examples/ProviderInstances_Delete.json | 14 + .../examples/ProviderInstances_Get.json | 19 + .../examples/SapMonitors_Create.json | 80 +++ .../examples/SapMonitors_Delete.json | 13 + .../examples/SapMonitors_Get.json | 35 + .../examples/SapMonitors_List.json | 60 ++ .../examples/SapMonitors_PatchTags.json | 40 ++ .../SapMonitors_PatchTags_Delete.json | 36 + .../2020-02-07-preview/hanaonazure.json | 628 ++++++++++++++++++ 10 files changed, 950 insertions(+) create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Delete.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json new file mode 100644 index 000000000000..193bfe775cd7 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -0,0 +1,25 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceNameParameter": "myProviderInstance", + "ProviderInstanceParameter": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + }, + "responses": { + "200": { + "body": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + + } + } + } + } + \ No newline at end of file diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json new file mode 100644 index 000000000000..e7a49ca1e5f1 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceNameParameter": "myProviderInstance" + }, + "responses": { + "200": {}, + "204": {} + } + } + \ No newline at end of file diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json new file mode 100644 index 000000000000..5fb0385f37f8 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceName": "myProviderInstance" + }, + "responses": { + "200": { + "body": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + } + } +} + \ No newline at end of file diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json new file mode 100644 index 000000000000..6caf951acec3 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -0,0 +1,80 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "sapMonitorParameter": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor", + "name": "mySapMonitor", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ] + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/hanaInstances/myHanaInstance", + "name": "myHanaInstance", + "type": "Microsoft.HanaOnAzure/hanaInstances", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/hanaInstances/myHanaInstance", + "name": "myHanaInstance", + "type": "Microsoft.HanaOnAzure/hanaInstances", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Accepted" + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Delete.json new file mode 100644 index 000000000000..94841d22526a --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Delete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json new file mode 100644 index 000000000000..eef101333261 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor", + "name": "mySapMonitor", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json new file mode 100644 index 000000000000..9591169af853 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor1", + "name": "mySapMonitor1", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor2", + "name": "mySapMonitor2", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": { + "key": "value" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance2", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } + ] + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json new file mode 100644 index 000000000000..b83dc610a747 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -0,0 +1,40 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "tagsParameter": { + "tags": { + "testkey": "testvalue" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor", + "name": "mySapMonitor", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": { + "testkey": "testvalue" + }, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json new file mode 100644 index 000000000000..f5ef83f22a78 --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "tagsParameter": { + "tags": {} + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor", + "name": "mySapMonitor", + "type": "Microsoft.HanaOnAzure/sapMonitors", + "location": "westus", + "tags": {}, + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "ManagedResourceGroupName": "", + "SapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json new file mode 100644 index 000000000000..8ab6b4beecdc --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -0,0 +1,628 @@ +{ + "swagger": "2.0", + "info": { + "title": "HanaManagementClient", + "description": "The SAP HANA on Azure Management Client.", + "version": "2020-02-07-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "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}/providers/Microsoft.HanaOnAzure/sapMonitors": { + "get": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "SapMonitors_List", + "summary": "Gets a list of SAP monitors in the specified subscription.", + "description": "Gets a list of SAP monitors in the specified subscription. The operations returns various properties of each SAP monitor.", + "x-ms-examples": { + "List all SAP Monitors in a subscription": { + "$ref": "./examples/SapMonitors_List.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SapMonitorListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/sapMonitors/{sapMonitorName}": { + "get": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "SapMonitors_Get", + "summary": "Gets properties of a SAP monitor.", + "description": "Gets properties of a SAP monitor for the specified subscription, resource group, and resource name.", + "x-ms-examples": { + "Get properties of a SAP monitor": { + "$ref": "./examples/SapMonitors_Get.json" + } + }, + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SapMonitor" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "SapMonitors_Create", + "x-ms-long-running-operation": true, + "summary": "Creates a SAP monitor.", + "description": "Creates a SAP monitor for the specified subscription, resource group, and resource name.", + "x-ms-examples": { + "Create a SAP Monitor": { + "$ref": "./examples/SapMonitors_Create.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorParameter" + } + ], + "responses": { + "200": { + "description": "Created SapMonitor", + "schema": { + "$ref": "#/definitions/SapMonitor" + } + }, + "201": { + "description": "Creating SapMonitor", + "schema": { + "$ref": "#/definitions/SapMonitor" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "SapMonitors_Delete", + "x-ms-long-running-operation": true, + "summary": "Deletes a SAP monitor.", + "description": "Deletes a SAP monitor with the specified subscription, resource group, and monitor name.", + "x-ms-examples": { + "Deletes a SAP monitor": { + "$ref": "./examples/SapMonitors_Delete.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + } + ], + "responses": { + "200": { + "description": "Deleted SapMonitor" + }, + "202": { + "description": "Deleting SapMonitor" + }, + "204": { + "description": "No SapMonitor to delete" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "patch": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "SapMonitors_Update", + "summary": "Patches the Tags field of a SAP monitor.", + "description": "Patches the Tags field of a SAP monitor for the specified subscription, resource group, and monitor name.", + "x-ms-examples": { + "Update Tags field of a SAP monitor": { + "$ref": "./examples/SapMonitors_PatchTags.json" + }, + "Delete Tags field of a SAP monitor": { + "$ref": "./examples/SapMonitors_PatchTags_Delete.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + }, + { + "$ref": "#/parameters/TagsParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SapMonitor" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/sapMonitors/{sapMonitorName}/providerInstances/{providerInstanceName}": { + "get": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "ProviderInstances_Get", + "summary": "Gets properties of a provider instance.", + "description": "Gets properties of a provider instance for the specified subscription, resource group, SapMonitor name, and resource name.", + "x-ms-examples": { + "Get properties of a SAP monitor": { + "$ref": "./examples/ProviderInstances_Get.json" + } + }, + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + }, + { + "$ref": "#/parameters/ProviderInstanceNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProviderInstance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "put": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "ProviderInstance_Create", + "x-ms-long-running-operation": true, + "summary": "Creates a provider instance.", + "description": "Creates a provider instance for the specified subscription, resource group, SapMonitor name, and resource name.", + "x-ms-examples": { + "Create a SAP Monitor": { + "$ref": "./examples/ProviderInstances_Create.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + }, + { + "$ref": "#/parameters/ProviderInstanceNameParameter" + }, + { + "$ref": "#/parameters/ProviderInstanceParameter" + } + ], + "responses": { + "200": { + "description": "Created provider instance", + "schema": { + "$ref": "#/definitions/ProviderInstance" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + }, + "delete": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "ProviderInstance_Delete", + "x-ms-long-running-operation": true, + "summary": "Deletes a provider instance.", + "description": "Deletes a provider instance for the specified subscription, resource group, SapMonitor name, and resource name.", + "x-ms-examples": { + "Deletes a SAP monitor": { + "$ref": "./examples/ProviderInstances_Delete.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + }, + { + "$ref": "#/parameters/ProviderInstanceNameParameter" + } + ], + "responses": { + "200": { + "description": "Deleted provider instance" + }, + "204": { + "description": "No provider instance to delete" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Resource": { + "description": "The resource model definition.", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource ID" + }, + "name": { + "readOnly": true, + "type": "string", + "description": "Resource name" + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Resource type" + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "tags": { + "readOnly": true, + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Resource tags" + } + }, + "x-ms-azure-resource": true + }, + "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" + } + } + }, + "Tags": { + "type": "object", + "properties": { + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Tags field of the resource." + } + }, + "description": "Tags field of the resource." + }, + "SapMonitorListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/SapMonitor" + }, + "description": "The list of SAP monitors." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of SAP monitors." + } + }, + "description": "The response from the List SAP monitors operation." + }, + "SapMonitor": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SapMonitorProperties", + "description": "SAP monitor properties" + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "description": "SAP monitor info on Azure (ARM properties and SAP monitor properties)" + }, + "SapMonitorProperties": { + "properties": { + "provisioningState": { + "readOnly": true, + "type": "string", + "enum": [ + "Accepted", + "Creating", + "Updating", + "Failed", + "Succeeded", + "Deleting", + "Migrating" + ], + "x-ms-enum": { + "name": "HanaProvisioningStatesEnum", + "modelAsString": true + }, + "description": "State of provisioning of the HanaInstance" + }, + "managedResourceGroupName": { + "readOnly": true, + "type": "string", + "description": "The name of the resource group the SAP Monitor resources get deployed into." + }, + "logAnalyticsWorkspaceArmId": { + "type": "string", + "description": "The ARM ID of the Log Analytics Workspace that is used for monitoring" + }, + "enableCustomerAnalytics": { + "type": "boolean", + "description": "The value indicating whether to send analytics to Microsoft" + }, + "logAnalyticsWorkspaceId": { + "type": "string", + "description": "The workspace ID of the log analytics workspace to be used for monitoring" + }, + "logAnalyticsWorkspaceSharedKey": { + "type": "string", + "description": "The shared key of the log analytics workspace that is used for monitoring" + }, + "sapMonitorCollectorVersion": { + "type": "string", + "description": "The version of the payload running int he Collector VM" + }, + "monitorProviders": { + "type": "array", + "items": { + "$ref": "#/definitions/providerInstance" + }, + "description": "The list of monitor provider instances." + } + }, + "description": "Describes the properties of a SAP monitor." + }, + "ProviderInstance": { + "properties": { + "name": { + "type": "string", + "description": "The name of the provider instance." + }, + "type": { + "type": "string", + "description": "The provider instance type." + }, + "properties": { + "type": "string", + "description": "A JSON string containing the properties of the provider instance." + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription ID which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the resource group.", + "x-ms-parameter-location": "method" + }, + "SapMonitorNameParameter": { + "name": "sapMonitorName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the SAP monitor resource.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client API version." + }, + "TagsParameter": { + "name": "tagsParameter", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/Tags" + }, + "description": "Request body that only contains the new Tags field", + "x-ms-parameter-location": "method" + }, + "SapMonitorParameter": { + "name": "sapMonitorParameter", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/SapMonitor" + }, + "description": "Request body representing a SAP Monitor", + "x-ms-parameter-location": "method" + }, + "ProviderInstanceParameter": { + "name": "providerInstanceParameter", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ProviderInstance" + }, + "description": "Request body representing a provider instance", + "x-ms-parameter-location": "method" + } + } +} From f98c5664cd9ce2dd002bd4d76c0a5d7101a7e08f Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:08:03 -0800 Subject: [PATCH 02/17] bugs --- .../preview/2020-02-07-preview/hanaonazure.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index 8ab6b4beecdc..fca2130ba085 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -539,7 +539,7 @@ "monitorProviders": { "type": "array", "items": { - "$ref": "#/definitions/providerInstance" + "$ref": "#/definitions/ProviderInstance" }, "description": "The list of monitor provider instances." } @@ -587,6 +587,14 @@ "description": "Name of the SAP monitor resource.", "x-ms-parameter-location": "method" }, + "ProviderInstanceNameParameter": { + "name": "providerInstanceNameParameter", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the provider instance.", + "x-ms-parameter-location": "method" + }, "ApiVersionParameter": { "name": "api-version", "in": "query", From 49deb5bcc21b265be504a869f91583113d75eba8 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:18:10 -0800 Subject: [PATCH 03/17] Fixed parameter naming --- .../preview/2020-02-07-preview/hanaonazure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index fca2130ba085..a76625c62a0f 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -588,7 +588,7 @@ "x-ms-parameter-location": "method" }, "ProviderInstanceNameParameter": { - "name": "providerInstanceNameParameter", + "name": "providerInstanceName", "in": "path", "required": true, "type": "string", From 39c7f760d5cbf19f26f91c03c7c6d01d9d51536e Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:25:03 -0800 Subject: [PATCH 04/17] fixed examples --- .../2020-02-07-preview/examples/ProviderInstances_Create.json | 4 ++-- .../2020-02-07-preview/examples/ProviderInstances_Delete.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index 193bfe775cd7..73a457094cd1 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -4,8 +4,8 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "sapMonitorName": "mySapMonitor", - "providerInstanceNameParameter": "myProviderInstance", - "ProviderInstanceParameter": { + "providerInstanceName": "myProviderInstance", + "providerInstanceParameter": { "name": "myProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json index e7a49ca1e5f1..b0da05136a9d 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json @@ -4,7 +4,7 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "sapMonitorName": "mySapMonitor", - "providerInstanceNameParameter": "myProviderInstance" + "providerInstanceName": "myProviderInstance" }, "responses": { "200": {}, From a0a7433caeaf5b0b68f37e1430672e113f96a9ba Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:41:03 -0800 Subject: [PATCH 05/17] fixed more examples --- .../examples/SapMonitors_Create.json | 34 ++++++----- .../examples/SapMonitors_Get.json | 30 +++++----- .../examples/SapMonitors_List.json | 60 ++++++++++--------- .../examples/SapMonitors_PatchTags.json | 30 +++++----- .../SapMonitors_PatchTags_Delete.json | 30 +++++----- .../2020-02-07-preview/hanaonazure.json | 1 + 6 files changed, 99 insertions(+), 86 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index 6caf951acec3..877f8de9f93b 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -46,8 +46,8 @@ "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" } ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" } }, @@ -60,20 +60,22 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Accepted" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Accepted" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json index eef101333261..d7bc7266d167 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -15,20 +15,22 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json index 9591169af853..24a7d4e0d774 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -15,20 +15,22 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } }, { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor2", @@ -38,20 +40,22 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance2", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance2", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } } ] } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json index b83dc610a747..3ac021d09468 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -20,20 +20,22 @@ "tags": { "testkey": "testvalue" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json index f5ef83f22a78..4cec3b009849 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -16,20 +16,22 @@ "type": "Microsoft.HanaOnAzure/sapMonitors", "location": "westus", "tags": {}, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "ManagedResourceGroupName": "", - "SapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmID": "", + "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index a76625c62a0f..a3ff88c2bb98 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -533,6 +533,7 @@ "description": "The shared key of the log analytics workspace that is used for monitoring" }, "sapMonitorCollectorVersion": { + "readOnly": true, "type": "string", "description": "The version of the payload running int he Collector VM" }, From ef42ba9f04cf139d8dc70fe875a31d10b694d2cc Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:51:53 -0800 Subject: [PATCH 06/17] various fixed --- .../examples/ProviderInstances_Create.json | 3 +-- .../examples/ProviderInstances_Get.json | 2 +- .../examples/SapMonitors_Create.json | 14 +++++++------- .../examples/SapMonitors_Get.json | 6 +++--- .../examples/SapMonitors_List.json | 12 ++++++------ .../examples/SapMonitors_PatchTags.json | 6 +++--- .../examples/SapMonitors_PatchTags_Delete.json | 6 +++--- .../preview/2020-02-07-preview/hanaonazure.json | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index 73a457094cd1..cde1a7b29217 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -16,8 +16,7 @@ "body": { "name": "myProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json index 5fb0385f37f8..979586f49b4e 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json @@ -11,7 +11,7 @@ "body": { "name": "myProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index 877f8de9f93b..9d416950ff7c 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -13,8 +13,8 @@ "key": "value" }, "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { @@ -36,8 +36,8 @@ "key": "value" }, "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { @@ -62,14 +62,14 @@ }, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json index d7bc7266d167..c2e5ed269321 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -17,14 +17,14 @@ }, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json index 24a7d4e0d774..2aaac8cb264e 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -17,14 +17,14 @@ }, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", @@ -42,14 +42,14 @@ }, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance2", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json index 3ac021d09468..d879457deb68 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -22,14 +22,14 @@ }, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json index 4cec3b009849..bb39899e6834 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -18,14 +18,14 @@ "tags": {}, "properties": { "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmID": "", - "logAnalyticsWorkspaceID": "", + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", "monitorProviders": [ { "name": "myHanaProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } ], "managedResourceGroupName": "", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index a3ff88c2bb98..ad2f9cd84da8 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -535,7 +535,7 @@ "sapMonitorCollectorVersion": { "readOnly": true, "type": "string", - "description": "The version of the payload running int he Collector VM" + "description": "The version of the payload running in the Collector VM" }, "monitorProviders": { "type": "array", From 0bbb80391ff001c2f4679370070e905a64f1dbe3 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 14:56:22 -0800 Subject: [PATCH 07/17] more fixes --- .../examples/SapMonitors_Create.json | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index 9d416950ff7c..574d6cddb1f7 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -12,17 +12,19 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmId": "", - "logAnalyticsWorkspaceId": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ] + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ] + } } }, "responses": { @@ -35,20 +37,22 @@ "tags": { "key": "value" }, - "enableCustomerAnalytics": true, - "logAnalyticsWorkspaceArmId": "", - "logAnalyticsWorkspaceId": "", - "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], - "managedResourceGroupName": "", - "sapMonitorCollectorVersion": "", - "provisioningState": "Succeeded" + "properties": { + "enableCustomerAnalytics": true, + "logAnalyticsWorkspaceArmId": "", + "logAnalyticsWorkspaceId": "", + "logAnalyticsWorkspaceSharedKey": "", + "monitorProviders": [ + { + "name": "myHanaProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + ], + "managedResourceGroupName": "", + "sapMonitorCollectorVersion": "", + "provisioningState": "Succeeded" + } } }, "201": { From c99eaf41a1e56a64e9d09b8a9f86a502623359ae Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 15:06:50 -0800 Subject: [PATCH 08/17] ran prettier --- .../examples/ProviderInstances_Create.json | 35 +++++++++---------- .../examples/ProviderInstances_Delete.json | 23 ++++++------ .../examples/ProviderInstances_Get.json | 27 +++++++------- 3 files changed, 41 insertions(+), 44 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index cde1a7b29217..99284eed791d 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -1,24 +1,23 @@ { - "parameters": { - "api-version": "2020-02-07-preview", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "myResourceGroup", - "sapMonitorName": "mySapMonitor", - "providerInstanceName": "myProviderInstance", - "providerInstanceParameter": { + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceName": "myProviderInstance", + "providerInstanceParameter": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } + }, + "responses": { + "200": { + "body": { "name": "myProviderInstance", "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - }, - "responses": { - "200": { - "body": { - "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } } } - \ No newline at end of file +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json index b0da05136a9d..33512eb0fde0 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json @@ -1,14 +1,13 @@ { - "parameters": { - "api-version": "2020-02-07-preview", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "myResourceGroup", - "sapMonitorName": "mySapMonitor", - "providerInstanceName": "myProviderInstance" - }, - "responses": { - "200": {}, - "204": {} - } + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceName": "myProviderInstance" + }, + "responses": { + "200": {}, + "204": {} } - \ No newline at end of file +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json index 979586f49b4e..6b963c635491 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json @@ -1,19 +1,18 @@ { - "parameters": { - "api-version": "2020-02-07-preview", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "resourceGroupName": "myResourceGroup", - "sapMonitorName": "mySapMonitor", - "providerInstanceName": "myProviderInstance" - }, - "responses": { - "200": { - "body": { - "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor", + "providerInstanceName": "myProviderInstance" + }, + "responses": { + "200": { + "body": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } } } } - \ No newline at end of file From ff0ca1c406054950f65c1c61a2d23184c4e56f75 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 15:17:12 -0800 Subject: [PATCH 09/17] renamed monitorProviders to providerInstances --- .../2020-02-07-preview/examples/SapMonitors_Create.json | 6 +++--- .../2020-02-07-preview/examples/SapMonitors_Get.json | 2 +- .../2020-02-07-preview/examples/SapMonitors_List.json | 4 ++-- .../2020-02-07-preview/examples/SapMonitors_PatchTags.json | 2 +- .../examples/SapMonitors_PatchTags_Delete.json | 2 +- .../preview/2020-02-07-preview/hanaonazure.json | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index 574d6cddb1f7..c0ba2f540fe0 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -17,7 +17,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", @@ -42,7 +42,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", @@ -69,7 +69,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json index c2e5ed269321..9151acb7793c 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -20,7 +20,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json index 2aaac8cb264e..f13d056da58d 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -20,7 +20,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", @@ -45,7 +45,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance2", "type": "hana", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json index d879457deb68..44adf14ca91a 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -25,7 +25,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json index bb39899e6834..1bf2ca17fb5a 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -21,7 +21,7 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "monitorProviders": [ + "providerInstances": [ { "name": "myHanaProviderInstance", "type": "hana", diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index ad2f9cd84da8..dcea3d4c1a6a 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -537,7 +537,7 @@ "type": "string", "description": "The version of the payload running in the Collector VM" }, - "monitorProviders": { + "providerInstances": { "type": "array", "items": { "$ref": "#/definitions/ProviderInstance" From 853f3ba1e3151c4ea4de2105e5c04ec9719fcbe7 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Wed, 26 Feb 2020 16:20:02 -0800 Subject: [PATCH 10/17] updated README --- specification/hanaonazure/resource-manager/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/hanaonazure/resource-manager/readme.md b/specification/hanaonazure/resource-manager/readme.md index 2faae789bcf4..a5c2ca611e50 100644 --- a/specification/hanaonazure/resource-manager/readme.md +++ b/specification/hanaonazure/resource-manager/readme.md @@ -42,6 +42,16 @@ input-file: - Microsoft.HanaOnAzure/preview/2017-11-03-preview/hanaonazure.json ``` +### Tag: package-2020-02-07-preview + +These settings apply only when `--tag=package-2020-02-07-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2020-02-07-preview' +input-file: +- Microsoft.HanaOnAzure/preview/package-2020-02-07-preview/hanaonazure.json +``` + + # Code Generation From a3e5de347937edf73c0fafe5283fe407c0e6095e Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Fri, 28 Feb 2020 14:32:28 -0800 Subject: [PATCH 11/17] Added 201 and 202 for create and delete provider instances --- .../examples/ProviderInstances_Create.json | 9 ++++++++- .../examples/ProviderInstances_Delete.json | 1 + .../preview/2020-02-07-preview/hanaonazure.json | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index 99284eed791d..2870dc95445d 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -18,6 +18,13 @@ "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } - } + }, + "201": { + "body": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } + } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json index 33512eb0fde0..1e0a487fc052 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index dcea3d4c1a6a..7e3648774c7c 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -344,6 +344,12 @@ "$ref": "#/definitions/ProviderInstance" } }, + "201": { + "description": "Creating provider instance", + "schema": { + "$ref": "#/definitions/ProviderInstance" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -386,6 +392,9 @@ "200": { "description": "Deleted provider instance" }, + "202": { + "description": "Deleting provider instance" + }, "204": { "description": "No provider instance to delete" }, From c6ff07e465d053183892e8c15fbacfe0af57dfba Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Fri, 28 Feb 2020 14:36:45 -0800 Subject: [PATCH 12/17] ran prettier --- .../examples/ProviderInstances_Create.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index 2870dc95445d..f9b165897061 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -20,11 +20,11 @@ } }, "201": { - "body": { - "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } + "body": { + "name": "myProviderInstance", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" } + } } } From 1f058cf451ca40f8fab3e7b3d7c8fa3d9724d7e2 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Mon, 2 Mar 2020 14:40:20 -0800 Subject: [PATCH 13/17] fixed path in readme --- specification/hanaonazure/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/hanaonazure/resource-manager/readme.md b/specification/hanaonazure/resource-manager/readme.md index a5c2ca611e50..2cb8335cdd5f 100644 --- a/specification/hanaonazure/resource-manager/readme.md +++ b/specification/hanaonazure/resource-manager/readme.md @@ -48,7 +48,7 @@ These settings apply only when `--tag=package-2020-02-07-preview` is specified o ``` yaml $(tag) == 'package-2020-02-07-preview' input-file: -- Microsoft.HanaOnAzure/preview/package-2020-02-07-preview/hanaonazure.json +- Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json ``` From ea21c3f676e024694c92ed5b6b05475ad81912f8 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Tue, 10 Mar 2020 10:14:26 -0700 Subject: [PATCH 14/17] added id field to providerInstances --- .../examples/ProviderInstances_Create.json | 2 ++ .../2020-02-07-preview/examples/SapMonitors_Create.json | 2 ++ .../preview/2020-02-07-preview/examples/SapMonitors_Get.json | 1 + .../2020-02-07-preview/examples/SapMonitors_List.json | 2 ++ .../2020-02-07-preview/examples/SapMonitors_PatchTags.json | 1 + .../examples/SapMonitors_PatchTags_Delete.json | 1 + .../preview/2020-02-07-preview/hanaonazure.json | 5 +++++ 7 files changed, 14 insertions(+) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index f9b165897061..08c7cf65e851 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -14,6 +14,7 @@ "responses": { "200": { "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" @@ -21,6 +22,7 @@ }, "201": { "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index c0ba2f540fe0..8a54945671d7 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -44,6 +44,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" @@ -71,6 +72,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json index 9151acb7793c..e042fded4d2f 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -22,6 +22,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json index f13d056da58d..baee964e83bf 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -22,6 +22,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" @@ -47,6 +48,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor2/providerInstances/myProviderInstance2", "name": "myHanaProviderInstance2", "type": "hana", "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json index 44adf14ca91a..110348d56084 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -27,6 +27,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json index 1bf2ca17fb5a..bbc74a934cbf 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -23,6 +23,7 @@ "logAnalyticsWorkspaceSharedKey": "", "providerInstances": [ { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myHanaProviderInstance", "type": "hana", "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index 7e3648774c7c..1b61904bcfbf 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -558,6 +558,11 @@ }, "ProviderInstance": { "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Resource ID" + }, "name": { "type": "string", "description": "The name of the provider instance." From eacfca836e948c894a0a7622cad49fcf64967aa2 Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Fri, 13 Mar 2020 16:44:34 -0700 Subject: [PATCH 15/17] Separate SapMonitor and providerInstance APIs Added List providerInstance API --- .../examples/ProviderInstances_List.json | 28 ++++ .../examples/SapMonitors_Create.json | 25 +--- .../examples/SapMonitors_Get.json | 8 -- .../examples/SapMonitors_List.json | 16 --- .../examples/SapMonitors_PatchTags.json | 8 -- .../SapMonitors_PatchTags_Delete.json | 8 -- .../2020-02-07-preview/hanaonazure.json | 136 ++++++++++++++---- 7 files changed, 134 insertions(+), 95 deletions(-) create mode 100644 specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json new file mode 100644 index 000000000000..ef057dfcab6f --- /dev/null +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "api-version": "2020-02-07-preview", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "resourceGroupName": "myResourceGroup", + "sapMonitorName": "mySapMonitor" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance1", + "name": "myProviderInstance1", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance2", + "name": "myProviderInstance2", + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } + ] + } + } + } +} diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json index 8a54945671d7..055f3a318453 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Create.json @@ -16,14 +16,7 @@ "enableCustomerAnalytics": true, "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", - "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ] + "logAnalyticsWorkspaceSharedKey": "" } } }, @@ -42,14 +35,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" @@ -70,14 +55,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Accepted" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json index e042fded4d2f..ff22fcd5be25 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_Get.json @@ -20,14 +20,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json index baee964e83bf..d8706519f371 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_List.json @@ -20,14 +20,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" @@ -46,14 +38,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor2/providerInstances/myProviderInstance2", - "name": "myHanaProviderInstance2", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json index 110348d56084..0e4796827ea7 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags.json @@ -25,14 +25,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json index bbc74a934cbf..08aabdc9078d 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/SapMonitors_PatchTags_Delete.json @@ -21,14 +21,6 @@ "logAnalyticsWorkspaceArmId": "", "logAnalyticsWorkspaceId": "", "logAnalyticsWorkspaceSharedKey": "", - "providerInstances": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", - "name": "myHanaProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" - } - ], "managedResourceGroupName": "", "sapMonitorCollectorVersion": "", "provisioningState": "Succeeded" diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index 1b61904bcfbf..3f8c3f3c9ba5 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -256,6 +256,52 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/sapMonitors/{sapMonitorName}/providerInstances": { + "get": { + "tags": [ + "HanaOnAzure" + ], + "operationId": "ProviderInstances_List", + "summary": "Gets a list of provider instnaces in the specified SAP monitor.", + "description": "Gets a list of provider instnaces in the specified SAP monitor. The operations returns various properties of each provider instnaces.", + "x-ms-examples": { + "List all SAP Monitors in a subscription": { + "$ref": "./examples/ProviderInstances_List.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/SapMonitorNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProviderInstanceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/sapMonitors/{sapMonitorName}/providerInstances/{providerInstanceName}": { "get": { "tags": [ @@ -410,37 +456,63 @@ }, "definitions": { "Resource": { - "description": "The resource model definition.", + "description": "The core properties of ARM resources", "properties": { "id": { "readOnly": true, "type": "string", - "description": "Resource ID" + "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{resourceName}" }, "name": { "readOnly": true, "type": "string", - "description": "Resource name" + "description": "The name of the resource" }, "type": { "readOnly": true, "type": "string", - "description": "Resource type" - }, - "location": { - "type": "string", - "description": "Resource location" - }, + "description": "The type of the resource. Ex- Microsoft.Network/trafficManagerProfiles." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource": { + "description": "The resource model definition for a ARM tracked top level resource", + "properties": { "tags": { - "readOnly": true, "type": "object", "additionalProperties": { "type": "string" }, - "description": "Resource tags" + "x-ms-mutability": [ + "read", + "create", + "update" + ], + "description": "Resource tags." + }, + "location": { + "type": "string", + "x-ms-mutability": [ + "read", + "create" + ], + "description": "The Azure Region where the resource lives" } }, - "x-ms-azure-resource": true + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProxyResource": { + "description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] }, "ErrorResponse": { "description": "Describes the format of Error response.", @@ -495,7 +567,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/TrackedResource" } ], "description": "SAP monitor info on Azure (ARM properties and SAP monitor properties)" @@ -545,37 +617,39 @@ "readOnly": true, "type": "string", "description": "The version of the payload running in the Collector VM" - }, - "providerInstances": { + } + }, + "description": "Describes the properties of a SAP monitor." + }, + "ProviderInstanceListResult": { + "properties": { + "value": { "type": "array", "items": { "$ref": "#/definitions/ProviderInstance" }, - "description": "The list of monitor provider instances." + "description": "The list of provider instances." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of provider instances." } }, - "description": "Describes the properties of a SAP monitor." + "description": "The response from the List provider instances operation." }, "ProviderInstance": { "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID" - }, - "name": { - "type": "string", - "description": "The name of the provider instance." - }, - "type": { - "type": "string", - "description": "The provider instance type." - }, "properties": { "type": "string", "description": "A JSON string containing the properties of the provider instance." } - } + }, + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "description": "A provider instance associated with a SAP monitor." } }, "parameters": { From e336f58fdfb2ffadf01456b4db46ceaa810a6ced Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Fri, 13 Mar 2020 16:56:27 -0700 Subject: [PATCH 16/17] fixed spelling --- .../preview/2020-02-07-preview/hanaonazure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index 3f8c3f3c9ba5..6965e6072666 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -262,8 +262,8 @@ "HanaOnAzure" ], "operationId": "ProviderInstances_List", - "summary": "Gets a list of provider instnaces in the specified SAP monitor.", - "description": "Gets a list of provider instnaces in the specified SAP monitor. The operations returns various properties of each provider instnaces.", + "summary": "Gets a list of provider instances in the specified SAP monitor.", + "description": "Gets a list of provider instances in the specified SAP monitor. The operations returns various properties of each provider instances.", "x-ms-examples": { "List all SAP Monitors in a subscription": { "$ref": "./examples/ProviderInstances_List.json" From 32548ed63de21ddc0904083fd7596bc7bff1c6ca Mon Sep 17 00:00:00 2001 From: Donald Liu Date: Thu, 19 Mar 2020 13:58:50 -0700 Subject: [PATCH 17/17] updated provider instance payload --- .../examples/ProviderInstances_Create.json | 20 +++++++---- .../examples/ProviderInstances_Get.json | 8 +++-- .../examples/ProviderInstances_List.json | 14 +++++--- .../2020-02-07-preview/hanaonazure.json | 34 ++++++++++++++++++- 4 files changed, 63 insertions(+), 13 deletions(-) diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json index 08c7cf65e851..3df0e7631d11 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Create.json @@ -7,8 +7,10 @@ "providerInstanceName": "myProviderInstance", "providerInstanceParameter": { "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\",\"dbPassword\":\"PASSWORD\"}" + } } }, "responses": { @@ -16,16 +18,22 @@ "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "type": "Microsoft.HanaOnAzure/sapMonitors/providerInstances", + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } } }, "201": { "body": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "type": "Microsoft.HanaOnAzure/sapMonitors/providerInstances", + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json index 6b963c635491..e149fb1ae2cc 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_Get.json @@ -9,9 +9,13 @@ "responses": { "200": { "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance", "name": "myProviderInstance", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "type": "Microsoft.HanaOnAzure/sapMonitors/providerInstances", + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } } } } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json index ef057dfcab6f..746caacf9576 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/examples/ProviderInstances_List.json @@ -12,14 +12,20 @@ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance1", "name": "myProviderInstance1", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "type": "Microsoft.HanaOnAzure/sapMonitors/providerInstances", + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.10\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } }, { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.HanaOnAzure/sapMonitors/mySapMonitor/providerInstances/myProviderInstance2", "name": "myProviderInstance2", - "type": "hana", - "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + "type": "Microsoft.HanaOnAzure/sapMonitors/providerInstances", + "properties": { + "type": "hana", + "properties": "{\"hostname\":\"10.0.0.11\",\"dbName\":\"SYSTEMDB\",\"sqlPort\":30015,\"dbUsername\":\"SYSTEM\"}" + } } ] } diff --git a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json index 6965e6072666..de62afbb7180 100644 --- a/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json +++ b/specification/hanaonazure/resource-manager/Microsoft.HanaOnAzure/preview/2020-02-07-preview/hanaonazure.json @@ -640,8 +640,27 @@ "ProviderInstance": { "properties": { "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ProviderInstanceProperties", + "description": "Provider Instance properties" + }, + "provisioningState": { + "readOnly": true, "type": "string", - "description": "A JSON string containing the properties of the provider instance." + "enum": [ + "Accepted", + "Creating", + "Updating", + "Failed", + "Succeeded", + "Deleting", + "Migrating" + ], + "x-ms-enum": { + "name": "HanaProvisioningStatesEnum", + "modelAsString": true + }, + "description": "State of provisioning of the provider instance" } }, "allOf": [ @@ -650,6 +669,19 @@ } ], "description": "A provider instance associated with a SAP monitor." + }, + "ProviderInstanceProperties": { + "properties": { + "type": { + "type": "string", + "description": "The type of provider instance." + }, + "properties": { + "type": "string", + "description": "A JSON string containing the properties of the provider instance." + } + }, + "description": "Describes the properties of a provider instance." } }, "parameters": {