Removed unused properties and renamed example folder (#6158)

* removed unused properties and renamed example folder * removed provider version property * undone readme changes
Azure · Feb 16, 2022 · fbec1fb · fbec1fb
1 parent 409109a
commit fbec1fb
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 54 deletions.
diff --git a/...ds/NetWeaverProviderInstances_Create.json → ...or/NetWeaverProviderInstances_Create.json b/...ds/NetWeaverProviderInstances_Create.json → ...or/NetWeaverProviderInstances_Create.json
@@ -34,7 +34,6 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapNetWeaver",
@@ -54,7 +53,6 @@
         "name": "myProviderInstance",
         "type": "Microsoft.Workloads/workloads/providerInstances",
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapNetWeaver",

diff --git a/...loads/NetWeaverProviderInstances_Get.json → ...nitor/NetWeaverProviderInstances_Get.json b/...loads/NetWeaverProviderInstances_Get.json → ...nitor/NetWeaverProviderInstances_Get.json
@@ -21,7 +21,6 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapNetWeaver",

diff --git a/...apworkloads/ProviderInstances_Create.json → ...loadmonitor/ProviderInstances_Create.json b/...apworkloads/ProviderInstances_Create.json → ...loadmonitor/ProviderInstances_Create.json
@@ -33,7 +33,6 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapHana",
@@ -51,7 +50,6 @@
         "name": "myProviderInstance",
         "type": "Microsoft.Workloads/workloads/providerInstances",
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapHana",

diff --git a/...apworkloads/ProviderInstances_Delete.json → ...loadmonitor/ProviderInstances_Delete.json b/...apworkloads/ProviderInstances_Delete.json → ...loadmonitor/ProviderInstances_Delete.json
diff --git a/...s/sapworkloads/ProviderInstances_Get.json → ...orkloadmonitor/ProviderInstances_Get.json b/...s/sapworkloads/ProviderInstances_Get.json → ...orkloadmonitor/ProviderInstances_Get.json
@@ -21,7 +21,6 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
-          "providerVersion": "1.0",
           "provisioningState": "Succeeded",
           "providerSettings": {
             "providerType": "SapHana",

diff --git a/.../sapworkloads/ProviderInstances_List.json → ...rkloadmonitor/ProviderInstances_List.json b/.../sapworkloads/ProviderInstances_List.json → ...rkloadmonitor/ProviderInstances_List.json
@@ -14,7 +14,6 @@
             "name": "myProviderInstance1",
             "type": "Microsoft.Workloads/workloads/providerInstances",
             "properties": {
-              "providerVersion": "1.0",
               "provisioningState": "Succeeded",
               "providerSettings": {
                 "providerType": "SapHana",
@@ -30,7 +29,6 @@
             "name": "myProviderInstance2",
             "type": "Microsoft.Workloads/workloads/providerInstances",
             "properties": {
-              "providerVersion": "1.0",
               "provisioningState": "Succeeded",
               "providerSettings": {
                 "providerType": "SapNetWeaver",

diff --git a/...xamples/sapworkloads/monitors_Create.json → ...ples/workloadmonitor/monitors_Create.json b/...xamples/sapworkloads/monitors_Create.json → ...ples/workloadmonitor/monitors_Create.json
@@ -15,9 +15,7 @@
         "managedResourceGroupConfiguration": {
           "name": "myManagedRg"
         },
-        "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
         "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-        "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
         "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
       }
     }
@@ -56,9 +54,7 @@
           "managedResourceGroupConfiguration": {
             "name": "myManagedRg"
           },
-          "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
           "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-          "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
           "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
           "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
         }
@@ -89,9 +85,7 @@
           "managedResourceGroupConfiguration": {
             "name": "myManagedRg"
           },
-          "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
           "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-          "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
           "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
           "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
         }

diff --git a/...xamples/sapworkloads/monitors_Delete.json → ...ples/workloadmonitor/monitors_Delete.json b/...xamples/sapworkloads/monitors_Delete.json → ...ples/workloadmonitor/monitors_Delete.json
diff --git a/...w/examples/sapworkloads/monitors_Get.json → ...xamples/workloadmonitor/monitors_Get.json b/...w/examples/sapworkloads/monitors_Get.json → ...xamples/workloadmonitor/monitors_Get.json
@@ -39,9 +39,7 @@
           "managedResourceGroupConfiguration": {
             "name": "myManagedRg"
           },
-          "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
           "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-          "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
           "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
           "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
         }

diff --git a/.../examples/sapworkloads/monitors_List.json → ...amples/workloadmonitor/monitors_List.json b/.../examples/sapworkloads/monitors_List.json → ...amples/workloadmonitor/monitors_List.json
@@ -31,9 +31,7 @@
               "managedResourceGroupConfiguration": {
                 "name": "myManagedRg1"
               },
-              "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg1",
               "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-              "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
               "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
               "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
             }
@@ -62,9 +60,7 @@
               "managedResourceGroupConfiguration": {
                 "name": "myManagedRg2"
               },
-              "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg2",
               "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-              "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
               "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
               "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
             }

diff --git a/...mples/sapworkloads/monitors_ListByRG.json → ...es/workloadmonitor/monitors_ListByRG.json b/...mples/sapworkloads/monitors_ListByRG.json → ...es/workloadmonitor/monitors_ListByRG.json
@@ -32,9 +32,7 @@
               "managedResourceGroupConfiguration": {
                 "name": "myManagedRg1"
               },
-              "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg1",
               "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/example-rg/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-              "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
               "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-rg/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
               "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
             }
@@ -63,9 +61,7 @@
               "managedResourceGroupConfiguration": {
                 "name": "myManagedRg2"
               },
-              "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg2",
               "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/example-rg/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-              "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
               "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/example-rg/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
               "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
             }

diff --git a/...ples/sapworkloads/monitors_PatchTags.json → ...s/workloadmonitor/monitors_PatchTags.json b/...ples/sapworkloads/monitors_PatchTags.json → ...s/workloadmonitor/monitors_PatchTags.json
@@ -44,9 +44,7 @@
           "managedResourceGroupConfiguration": {
             "name": "myManagedRg"
           },
-          "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
           "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-          "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
           "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
           "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
         }

diff --git a/...pworkloads/monitors_PatchTags_Delete.json → ...oadmonitor/monitors_PatchTags_Delete.json b/...pworkloads/monitors_PatchTags_Delete.json → ...oadmonitor/monitors_PatchTags_Delete.json
@@ -42,9 +42,7 @@
           "managedResourceGroupConfiguration": {
             "name": "myManagedRg"
           },
-          "managedResourceGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myManagedRg",
           "logAnalyticsWorkspaceArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.operationalinsights/workspaces/myWorkspace",
-          "logAnalyticsWorkspaceId": "00000000-0000-0000-0000-000000000000",
           "monitorSubnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
           "msiArmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myMsi"
         }

diff --git a/...n/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json b/...n/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json
@@ -37,7 +37,7 @@
         "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/sapworkloads/monitors_List.json"
+            "$ref": "./examples/workloadmonitor/monitors_List.json"
           }
         },
         "parameters": [
@@ -77,7 +77,7 @@
         "description": "Gets a list of SAP monitors in the specified resource group.",
         "x-ms-examples": {
           "List all SAP Monitors in a resource group": {
-            "$ref": "./examples/sapworkloads/monitors_ListByRG.json"
+            "$ref": "./examples/workloadmonitor/monitors_ListByRG.json"
           }
         },
         "parameters": [
@@ -120,7 +120,7 @@
         "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/sapworkloads/monitors_Get.json"
+            "$ref": "./examples/workloadmonitor/monitors_Get.json"
           }
         },
         "produces": [
@@ -168,7 +168,7 @@
         "description": "Creates a SAP monitor for the specified subscription, resource group, and resource name.",
         "x-ms-examples": {
           "Create a SAP Monitor": {
-            "$ref": "./examples/sapworkloads/monitors_Create.json"
+            "$ref": "./examples/workloadmonitor/monitors_Create.json"
           }
         },
         "parameters": [
@@ -219,7 +219,7 @@
         "description": "Deletes a SAP monitor with the specified subscription, resource group, and monitor name.",
         "x-ms-examples": {
           "Deletes a SAP monitor": {
-            "$ref": "./examples/sapworkloads/monitors_Delete.json"
+            "$ref": "./examples/workloadmonitor/monitors_Delete.json"
           }
         },
         "parameters": [
@@ -266,10 +266,10 @@
         "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/sapworkloads/monitors_PatchTags.json"
+            "$ref": "./examples/workloadmonitor/monitors_PatchTags.json"
           },
           "Delete Tags field of a SAP monitor": {
-            "$ref": "./examples/sapworkloads/monitors_PatchTags_Delete.json"
+            "$ref": "./examples/workloadmonitor/monitors_PatchTags_Delete.json"
           }
         },
         "parameters": [
@@ -315,7 +315,7 @@
         "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 providers in a subscription": {
-            "$ref": "./examples/sapworkloads/ProviderInstances_List.json"
+            "$ref": "./examples/workloadmonitor/ProviderInstances_List.json"
           }
         },
         "parameters": [
@@ -364,10 +364,10 @@
         "description": "Gets properties of a provider instance for the specified subscription, resource group, Monitor name, and resource name.",
         "x-ms-examples": {
           "Get properties of a SAP monitor Hana provider": {
-            "$ref": "./examples/sapworkloads/ProviderInstances_Get.json"
+            "$ref": "./examples/workloadmonitor/ProviderInstances_Get.json"
           },
           "Get properties of a SAP monitor NetWeaver provider": {
-            "$ref": "./examples/sapworkloads/NetWeaverProviderInstances_Get.json"
+            "$ref": "./examples/workloadmonitor/NetWeaverProviderInstances_Get.json"
           }
         },
         "produces": [
@@ -418,10 +418,10 @@
         "description": "Creates a provider instance for the specified subscription, resource group, Monitor name, and resource name.",
         "x-ms-examples": {
           "Create a SAP Monitor Hana provider": {
-            "$ref": "./examples/sapworkloads/ProviderInstances_Create.json"
+            "$ref": "./examples/workloadmonitor/ProviderInstances_Create.json"
           },
           "Create a SAP Monitor NetWeaver provider": {
-            "$ref": "./examples/sapworkloads/NetWeaverProviderInstances_Create.json"
+            "$ref": "./examples/workloadmonitor/NetWeaverProviderInstances_Create.json"
           }
         },
         "parameters": [
@@ -475,7 +475,7 @@
         "description": "Deletes a provider instance for the specified subscription, resource group, Monitor name, and resource name.",
         "x-ms-examples": {
           "Deletes a SAP monitor provider": {
-            "$ref": "./examples/sapworkloads/ProviderInstances_Delete.json"
+            "$ref": "./examples/workloadmonitor/ProviderInstances_Delete.json"
           }
         },
         "parameters": [
@@ -782,18 +782,10 @@
           "description": "Managed resource group configuration",
           "$ref": "#/definitions/ManagedRGConfiguration"
         },
-        "managedResourceGroupId": {
-          "type": "string",
-          "description": "The ARM id of the resource group the monitor resources get deployed into."
-        },
         "logAnalyticsWorkspaceArmId": {
           "type": "string",
           "description": "The ARM ID of the Log Analytics Workspace that is used for monitoring."
         },
-        "logAnalyticsWorkspaceId": {
-          "type": "string",
-          "description": "The workspace ID of the log analytics workspace to be used for monitoring."
-        },
         "monitorSubnet": {
           "type": "string",
           "description": "The subnet which the SAP monitor will be deployed in"
@@ -951,11 +943,6 @@
           ],
           "readOnly": true
         },
-        "providerVersion": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The version of the payload."
-        },
         "providerSettings": {
           "description": "Defines the provider instance errors.",
           "$ref": "#/definitions/ProviderSpecificProperties"