Skip to content

[TrafficManager] Real User Metrics (RUM) fixes #1920

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.

Sign up for GitHub

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

Merged
lmazuel merged 17 commits into from
Nov 2, 2017
Merged

[TrafficManager] Real User Metrics (RUM) fixes #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
db5f3c2
[Traffic Manager] Adding new RealtimeUserMetrics preview feature to T…
allencal Aug 29, 2017
aafe5a6
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Aug 29, 2017
c71f516
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Aug 29, 2017
c371a75
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Aug 29, 2017
396e934
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Aug 30, 2017
145673b
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Aug 31, 2017
124f131
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Sep 1, 2017
302f17e
[Traffic Manager] Adding new Realtime User Metrics (RUM) preview feat…
allencal Sep 1, 2017
b703b5e
RUM fixes
allencal Oct 24, 2017
ec2107e
Merge remote-tracking branch 'upstream/current' into current
allencal Oct 25, 2017
a73736e
Revert "RUM fixes"
allencal Oct 25, 2017
053271f
RUM fixes
allencal Oct 25, 2017
61675da
RUM fixes
allencal Oct 25, 2017
a99cc15
Remove unreferenced metrics key properties / model from 2017-05-01
allencal Oct 25, 2017
27609c1
Merge branch 'current' of https://github.com/allencal/azure-rest-api-…
allencal Oct 25, 2017
e431c84
Remove files
allencal Oct 25, 2017
0e39d9c
[TrafficManager] Real User Metrics (RUM) fixes II - remove default fr…
allencal Oct 27, 2017
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
24 changes: 0 additions & 24 deletions ...fication/trafficmanager/resource-manager/Microsoft.Network/2017-05-01/trafficmanager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,30 +1106,6 @@
},
"description": "The content of an error returned by the Azure Resource Manager",
"x-ms-external": true
},
"TrafficManagerUserMetricsKeyProperties": {
"properties": {
"key": {
"type" : "string",
"description": "The key returned by the Realtime User Metrics operation."
}
},
"description": "Class representing the properties of a Real User Metrics key operation response."
},
"TrafficManagerUserMetricsKeyModel": {
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/TrafficManagerUserMetricsKeyProperties",
"description": "The key property returned from a Realtime User Metrics GET operation."
}
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
}
],
"description": "Class representing a Traffic Manager Real User Metrics key response."
}
},
"parameters": {
Expand Down
7 changes: 1 addition & 6 deletions ...icManagerUserMetricsKeys-GET-default.json → ...es/TrafficManagerUserMetricsKeys-GET.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@
"id": "/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default",
"name": "default",
"type": "Microsoft.Network/trafficManagerUserMetricsKeys",
"properties": {
"key": "9ea056eb38f145a0891b5d5dc15e9aa2"
}
"key": "9ea056eb38f145a0891b5d5dc15e9aa2"
}
},
"204": {
"body": ""
}
}
}
7 changes: 6 additions & 1 deletion ...ager/Microsoft.Network/2017-09-01-preview/examples/TrafficManagerUserMetricsKeys-PUT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
},
"responses": {
"201": {
"body": ""
"body": {
"id": "/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default",
"name": "default",
"type": "Microsoft.Network/trafficManagerUserMetricsKeys",
"key": "9ea056eb38f145a0891b5d5dc15e9aa2"
}
}
}
}
77 changes: 38 additions & 39 deletions ...anager/resource-manager/Microsoft.Network/2017-09-01-preview/trafficmanageranalytics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@
}
}
},
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default": {
"/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys": {
"get": {
"tags": [
"RealtimeUserMetrics"
"RealUserMetrics"
],
"operationId": "TrafficManagerUserMetricsKeys_GetDefault",
"description": "Get the subscription-level key used for Realtime User Metrics collection.",
"operationId": "TrafficManagerUserMetricsKeys_Get",
"description": "Get the subscription-level key used for Real User Metrics collection.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
Expand All @@ -126,14 +126,11 @@
],
"responses": {
"200": {
"description": "The subscription-level Traffic Manager Realtime User Metrics key.",
"description": "The subscription-level Traffic Manager Real User Metrics key.",
"schema": {
"$ref": "#/definitions/TrafficManagerUserMetricsKeyModel"
}
},
"204": {
Copy link
Member

@lmazuel lmazuel Oct 26, 2017

Choose a reason for hiding this comment

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

Does this mean that 204 is impossible, or you want now a 204 to raise an exception?

Copy link
Contributor Author

@allencal allencal Oct 27, 2017

Choose a reason for hiding this comment

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

The "Get" operation never returns a 204. If the subscription has no RUM key, it returns a 200 and the body returns a blank key ("key": "")

"description": "There is no Realtime User Metrics key for this subscription."
},
"default": {
"description": "Default response. It will be deserialized as per the Error definition.",
"schema": {
Expand All @@ -142,17 +139,17 @@
}
},
"x-ms-examples": {
"TrafficManagerUserMetricsKeys-GET-default": {
"$ref": "./examples/TrafficManagerUserMetricsKeys-GET-default.json"
"TrafficManagerUserMetricsKeys-GET": {
"$ref": "./examples/TrafficManagerUserMetricsKeys-GET.json"
}
}
},
"put": {
"tags": [
"RealtimeUserMetrics"
"RealUserMetrics"
],
"operationId": "TrafficManagerUserMetricsKeys_CreateOrUpdate",
"description": "Create or update a subscription-level key used for Realtime User Metrics collection.",
"description": "Create or update a subscription-level key used for Real User Metrics collection.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
Expand All @@ -163,7 +160,7 @@
],
"responses": {
"201": {
"description": "A new subscription-level key has been created for Realtime User Metrics collection.",
"description": "A new subscription-level key has been created for Real User Metrics collection.",
"schema": {
"$ref": "#/definitions/TrafficManagerUserMetricsKeyModel"
}
Expand All @@ -183,10 +180,10 @@
},
"delete": {
"tags": [
"RealtimeUserMetrics"
"RealUserMetrics"
],
"operationId": "TrafficManagerUserMetricsKeys_Delete",
"description": "Delete a subscription-level key used for Realtime User Metrics collection.",
"description": "Delete a subscription-level key used for Real User Metrics collection.",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
Expand All @@ -197,7 +194,7 @@
],
"responses": {
"200": {
"description": "The Traffic Manager Realtime User Metrics key was deleted successfully.",
"description": "The Traffic Manager Real User Metrics key was deleted successfully.",
"schema": {
"$ref": "#/definitions/DeleteOperationResult"
}
Expand Down Expand Up @@ -430,30 +427,32 @@
],
"description": "Class representing a Traffic Manager HeatMap."
},
"TrafficManagerUserMetricsKeyProperties": {
"properties": {
"key": {
"type" : "string",
"description": "The key returned by the Realtime User Metrics operation."
}
},
"description": "Class representing the properties of a Real User Metrics key operation response."
},
"TrafficManagerUserMetricsKeyModel": {
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/TrafficManagerUserMetricsKeyProperties",
"description": "The key property returned from a Realtime User Metrics GET operation."
}
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
}
"TrafficManagerUserMetricsKeyModel": {
"properties": {
"id": {
"type" : "string",
"description": "Fully qualified resource Id for the resource. Ex - /providers/Microsoft.Network/trafficManagerUserMetricsKeys"
},
"name": {
"type" : "string",
"description": "The word default."
},
"type": {
"type" : "string",
"description": "The type of the resource. Ex- Microsoft.Network/trafficManagerUserMetricsKeys."
},
"key": {
"type" : "string",
"description": "The key returned by the Real User Metrics operation."
}
},
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
}
],
"description": "Class representing a Traffic Manager Real User Metrics key response."
}
"description": "Class representing a Traffic Manager Real User Metrics key response."
}
},
"parameters": {
"SubscriptionIdParameter": {
Expand Down