Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Adding version 2023-02-01-preview with User API Key changes for Elastic #22638

Merged
merged 31 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
39cdb2d
Base API Commit
poshett Feb 15, 2023
89d78ce
Changing API version to 2023-02-01-preview
poshett Feb 15, 2023
74b19db
Adding new getOrganizationApiKey post API
poshett Feb 15, 2023
8de5555
Adding returnApiKey property in ElasticMonitorResource
poshett Feb 15, 2023
ea7b7fe
Updating getOrganizationApiKey URI
poshett Feb 15, 2023
5d4a3f7
Adding SubscriptionIdParameter in getOrganizationApiKey
poshett Feb 15, 2023
43f8a75
Renaming ex to Organizations_GetApiKey
poshett Feb 15, 2023
51cfd73
Updating description for UserApiKeyResponse
poshett Feb 16, 2023
c406182
Updating examples
poshett Feb 16, 2023
ed27fd4
Updating readme.md
poshett Feb 16, 2023
05dd9e6
Updated Depolyment Info, added marketplace info
RheaHooda23 Feb 16, 2023
be66029
prettier check fixed
RheaHooda23 Feb 16, 2023
c2b91af
model validation fixed
RheaHooda23 Feb 16, 2023
39c708a
validation fix
RheaHooda23 Feb 16, 2023
aa5c4c8
prettier fix
RheaHooda23 Feb 16, 2023
7bd3547
Increasing max length limit of companyName and business from 50 to 100
poshett Feb 16, 2023
c8977b6
Increasing companyName and business max length limits to 100 in all v…
poshett Feb 16, 2023
4226c12
Revert "Increasing companyName and business max length limits to 100 …
poshett Feb 16, 2023
ae051dd
Revert "Increasing max length limit of companyName and business from …
poshett Feb 16, 2023
7f8aee6
Updating summary for getOrganizationApiKey
poshett Feb 17, 2023
ed69f27
Renaming "returnApiKey" to "generateApiKey"
poshett Feb 19, 2023
4623f64
Adding "x-ms-secret": true for apiKey
poshett Feb 19, 2023
7d202dd
Updating getOrganizationApiKey API to /subscriptions/{subscriptionId}…
poshett Feb 20, 2023
c72f24b
Rearranging APIs
poshett Feb 20, 2023
de001b0
Adding "consumes" to getOrganizationApiKey
poshett Feb 20, 2023
5f3cd26
Changing case of emailId
poshett Feb 20, 2023
334e5ae
Moving the API under paths
poshett Feb 20, 2023
b60cb52
Updating User and Company related properties' max length limit to 64
poshett Feb 28, 2023
65c18a4
Adding Location in response header of LROs
poshett Feb 28, 2023
365ec88
Updating getOrganizationApiKey path
poshett Mar 6, 2023
7b68ec0
Updating getOrganizationApiKey Summary
poshett Mar 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor"
},
"responses": {
"200": {
"body": {
"rulesets": [
{
"id": "31d91b5afb6f4c2eaaf104c97b1991dd",
"name": "IPFromApi",
"description": "created from azure",
"type": "ip",
"includeByDefault": false,
"region": "azure-eastus",
"rules": [
{
"id": "f0297dad72af4a5e964cddf817f35e65",
"description": "Allow inbound traffic from IP address 192.168.131.0",
"source": "192.168.131.0"
},
{
"id": "f9c00169f0e54931ae72aabde326b589",
"description": "Allow inbound traffic from IP address block 192.168.132.6/22",
"source": "192.168.132.6/22"
}
]
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"rulesetId": "31d91b5afb6f4c2eaaf104c97b1991dd"
},
"responses": {
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.Elastic/monitor/monitorname/associateTrafficFilter?api-version=2023-02-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor"
},
"responses": {
"200": {
"body": {
"rulesets": [
{
"id": "31d91b5afb6f4c2eaaf104c97b1991dd",
"name": "IPFromApi",
"description": "created from azure",
"type": "ip",
"includeByDefault": false,
"region": "azure-eastus",
"rules": [
{
"id": "f0297dad72af4a5e964cddf817f35e65",
"description": "Allow inbound traffic from IP address 192.168.131.0",
"source": "192.168.131.0"
},
{
"id": "f9c00169f0e54931ae72aabde326b589",
"description": "Allow inbound traffic from IP address block 192.168.132.6/22",
"source": "192.168.132.6/22"
}
]
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor"
},
"responses": {
"200": {
"body": {
"status": "Healthy",
"version": "7.9.3",
"memoryCapacity": "1024",
"diskCapacity": "245760",
"deploymentUrl": "https://endpoint.eastus.kb.azure.elastic-cloud.com:9243",
"marketplaceSaasInfo": {
"marketplaceSubscription": {
"id": "12345678-1234-1234-1234-123456789012"
},
"marketplaceName": "MP_RESOURCE",
"marketplaceResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.SaaS/resources/AzElastic_b1190c8f"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"rulesetId": "31d91b5afb6f4c2eaaf104c97b1991dd"
},
"responses": {
"200": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"rulesetId": "31d91b5afb6f4c2eaaf104c97b1991dd"
},
"responses": {
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.Elastic/monitor/monitorname/detachTrafficFilter?api-version=2023-02-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"requestBody": {
"UserName": "newuser",
"FullName": "fullname",
"Password": "Password",
"EmailId": "myemail@outlook.com",
"Roles": [
"admin",
"other_role1"
]
}
},
"responses": {
"200": {
"body": {
"created": true
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"rulesetId": "31d91b5afb6f4c2eaaf104c97b1991dd",
"ips": "192.168.131.0, 192.168.132.6/22"
},
"responses": {
"200": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.Elastic/monitor/monitorname/createAndAssociateIPFilter?api-version=2023-02-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"requestBody": {
"version": "7.15.1"
}
},
"responses": {
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.Elastic/monitor/monitorname/upgrade?api-version=2023-02-01-preview"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myVault",
"sendingLogs": "True",
"reasonForLogsStatus": "CapturedByRules"
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor",
"requestBody": {
"name": "myMonitor",
"sku": {
"name": "free_Monthly"
},
"properties": {
"userInfo": {
"firstName": "Alice",
"lastName": "Bob",
"companyName": "Microsoft",
"emailAddress": "alice@microsoft.com",
"companyInfo": {
"domain": "microsoft.com",
"business": "Technology",
"employeeNumber": "10000",
"state": "WA",
"country": "US"
}
}
},
"tags": {
"Environment": "Dev"
},
"location": "West US 2"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/monitors/myMonitor",
"name": "myMonitor",
"type": "Microsoft.Elastic/monitors",
"sku": {
"name": "free_Monthly"
},
"properties": {
"provisioningState": "Succeeded",
"elasticProperties": {
"elasticCloudUser": {
"emailAddress": "alice@microsoft.com",
"id": "myid123",
"elasticCloudSsoDefaultUrl": "https://examplessourl.com"
},
"elasticCloudDeployment": {
"name": "deploymentname",
"deploymentId": "deployment_id",
"azureSubscriptionId": "00000000-0000-0000-0000-000000000000",
"elasticsearchRegion": "azure-westus2",
"elasticsearchServiceUrl": "https://elasticsearchendpoint.com",
"kibanaServiceUrl": "https://kibanaserviceurl.com",
"kibanaSsoUrl": "https://kibanssourl.com"
}
}
},
"tags": {
"Environment": "Dev"
},
"location": "West US 2"
}
},
"201": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/monitors/myMonitor",
"name": "myMonitor",
"type": "Microsoft.Elastic/monitors",
"sku": {
"name": "free_Monthly"
},
"properties": {
"provisioningState": "Accepted",
"monitoringStatus": "Enabled",
"elasticProperties": {
"elasticCloudUser": {
"emailAddress": "alice@microsoft.com",
"id": "myid123",
"elasticCloudSsoDefaultUrl": "https://examplessourl.com"
},
"elasticCloudDeployment": {
"name": "deploymentname",
"deploymentId": "deployment_id",
"azureSubscriptionId": "00000000-0000-0000-0000-000000000000",
"elasticsearchRegion": "azure-westus2",
"elasticsearchServiceUrl": "https://elasticsearchendpoint.com",
"kibanaServiceUrl": "https://kibanaserviceurl.com",
"kibanaSsoUrl": "https://kibanssourl.com"
}
},
"liftrResourceCategory": "MonitorLogs",
"liftrResourcePreference": 0
},
"tags": {
"Environment": "Dev"
},
"location": "West US 2"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"api-version": "2023-02-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"monitorName": "myMonitor"
},
"responses": {
"200": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/subid/resourceGroups/resourceGroup/providers/Microsoft.Elastic/monitor/monitorname?api-version=2022-07-01-preview"
}
},
"204": {}
}
}
Loading