Skip to content

Workload monitor add api version2 #11039

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
markcowl merged 19 commits into from
Oct 6, 2020
Merged

Workload monitor add api version2 #11039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dd122c8
added 2020-01-13-preview
juliaweingart Sep 16, 2020
6e3c67c
violation fixes
juliaweingart Sep 17, 2020
c3b2b6a
fixing violations
juliaweingart Sep 17, 2020
79a9875
add monitorId param
juliaweingart Sep 17, 2020
542ddc6
model validation fix
juliaweingart Sep 17, 2020
44cd19e
prettier fix and added api version tag
juliaweingart Sep 17, 2020
c8bf0fc
updated readme
juliaweingart Sep 17, 2020
7bf2e08
lint fix
juliaweingart Sep 17, 2020
2169b06
tag changes
juliaweingart Sep 24, 2020
41dad1b
Merge branch 'master' into workloadMonitor-addApiVersion
juliaweingart Sep 24, 2020
7d5e643
$ref changes
juliaweingart Sep 30, 2020
6eaae57
Merge branch 'workloadMonitor-addApiVersion' of https://github.com/ju…
juliaweingart Sep 30, 2020
3419c40
update error codes
juliaweingart Oct 5, 2020
ca73148
fix defaultError error
juliaweingart Oct 5, 2020
5d2ef80
remove 400, 401
juliaweingart Oct 5, 2020
3a1c234
making changes
juliaweingart Oct 5, 2020
9926776
fixed prettier errors
juliaweingart Oct 5, 2020
5a88b4c
updated operationId
juliaweingart Oct 6, 2020
ed46144
monitorResource to resource
juliaweingart Oct 6, 2020
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
798 changes: 798 additions & 0 deletions ...nager/Microsoft.WorkloadMonitor/preview/2020-01-13-preview/Microsoft.WorkloadMonitor.json
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 64 additions & 0 deletions ...rosoft.WorkloadMonitor/preview/2020-01-13-preview/examples/MonitorHistory_GetDefault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"parameters": {
"subscriptionId": "bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21",
"resourceGroupName": "tugamidiAlerts",
"resourceNamespace": "Microsoft.Compute",
"resourceType": "virtualMachines",
"resourceName": "linuxEUS",
"monitorId": "logical-disks|C@3A",
"api-version": "2020-01-13-preview",
"startTimestampUtc": "2020-01-04T20:20:18.5765757Z",
"endTimestampUtc": "2020-01-09T20:20:18.5765757Z"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578514818",
"name": "1578514818",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-07T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-07T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578255618",
"name": "1578255618",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-06T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-05T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Warning"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578255618",
"name": "1578255618",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-05T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-05T20:20:18.5765757Z",
"previousMonitorState": "Healthy",
"currentMonitorState": "Warning"
}
}
],
"nextLink": null
}
}
}
}
116 changes: 116 additions & 0 deletions ...osoft.WorkloadMonitor/preview/2020-01-13-preview/examples/MonitorHistory_GetExpanded.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
{
"parameters": {
"subscriptionId": "bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21",
"resourceGroupName": "tugamidiAlerts",
"resourceNamespace": "Microsoft.Compute",
"resourceType": "virtualMachines",
"resourceName": "linuxEUS",
"monitorId": "logical-disks|C@3A",
"api-version": "2020-01-13-preview",
"startTimestampUtc": "2020-01-04T20:20:18.5765757Z",
"endTimestampUtc": "2020-01-09T20:20:18.5765757Z",
"$expand": "evidence,configuration"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578514818",
"name": "1578514818",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-07T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-07T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Critical",
"evidence": {
"reason": {
"code": 2100,
"message": "Collected samples met critical condition for this monitor."
},
"samples": [
{
"value": 1361.019,
"timestamp": "2020-03-24T20:51:00.6058242Z"
},
{
"value": 1261.019,
"timestamp": "2020-03-24T21:51:00.6058242Z"
}
]
},
"monitorConfiguration": {}
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578255618",
"name": "1578255618",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-06T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-05T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Warning",
"evidence": {
"reason": {
"code": 2100,
"message": "Collected samples met critical condition for this monitor."
},
"samples": [
{
"value": 1361.019,
"timestamp": "2020-03-24T20:51:00.6058242Z"
},
{
"value": 1261.019,
"timestamp": "2020-03-24T21:51:00.6058242Z"
}
]
},
"monitorConfiguration": {}
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578255618",
"name": "1578255618",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-05T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-05T20:20:18.5765757Z",
"previousMonitorState": "Healthy",
"currentMonitorState": "Warning",
"evidence": {
"reason": {
"code": 2100,
"message": "Collected samples met critical condition for this monitor."
},
"samples": [
{
"value": 1361.019,
"timestamp": "2020-03-24T20:51:00.6058242Z"
},
{
"value": 1261.019,
"timestamp": "2020-03-24T21:51:00.6058242Z"
}
]
},
"monitorConfiguration": {}
}
}
],
"nextLink": null
}
}
}
}
51 changes: 51 additions & 0 deletions ...osoft.WorkloadMonitor/preview/2020-01-13-preview/examples/MonitorHistory_GetFiltered.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"parameters": {
"subscriptionId": "bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21",
"resourceGroupName": "tugamidiAlerts",
"resourceNamespace": "Microsoft.Compute",
"resourceType": "virtualMachines",
"resourceName": "linuxEUS",
"monitorId": "logical-disks|C@3A|disk-free-space-mb",
"api-version": "2020-01-13-preview",
"startTimestampUtc": "2020-01-04T20:20:18.5765757Z",
"endTimestampUtc": "2020-01-09T20:20:18.5765757Z",
"$filter": "isHeartbeat eq false"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578514818",
"name": "1578514818",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-07T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-07T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb/history/1578255618",
"name": "1578255618",
"type": "Microsoft.WorkloadMonitor/monitors/history",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"evaluationTimestamp": "2020-01-05T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-01-05T20:20:18.5765757Z",
"previousMonitorState": "Healthy",
"currentMonitorState": "Warning"
}
}
],
"nextLink": null
}
}
}
}
131 changes: 131 additions & 0 deletions ...Microsoft.WorkloadMonitor/preview/2020-01-13-preview/examples/MonitorList_GetDefault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"parameters": {
"subscriptionId": "bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21",
"resourceGroupName": "tugamidiAlerts",
"resourceNamespace": "Microsoft.Compute",
"resourceType": "virtualMachines",
"resourceName": "linuxEUS",
"api-version": "2020-01-13-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/root",
"name": "root",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "root",
"monitorType": "root",
"monitoredObject": "",
"parentMonitorName": "",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Critical",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks",
"name": "logical-disks",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "logical-disks",
"monitorType": "logical-disks",
"monitoredObject": "",
"parentMonitorName": "root",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Critical",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A",
"name": "logical-disks|C@3A",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "logical-disks|C:",
"monitorType": "logical-disks|*",
"monitoredObject": "C:",
"parentMonitorName": "logical-disks",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Critical",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/logical-disks|C@3A|disk-free-space-mb",
"name": "logical-disks|C@3A|disk-free-space-mb",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "logical-disks|C:|disk-free-space-mb",
"monitorType": "logical-disks|*|disk-free-space-mb",
"monitoredObject": "C:",
"parentMonitorName": "logical-disks|C:",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Critical",
"currentMonitorState": "Critical"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/cpu-utilization-percentage",
"name": "cpu-utilization-percentage",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "cpu-utilization-percentage",
"monitorType": "cpu-utilization-percentage",
"monitoredObject": "",
"parentMonitorName": "root",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Warning",
"currentMonitorState": "Warning"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/memory",
"name": "memory",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "memory",
"monitorType": "memory",
"monitoredObject": "",
"parentMonitorName": "root",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Healthy",
"currentMonitorState": "Healthy"
}
},
{
"id": "/subscriptions/bc27da3b-3ba2-4e00-a6ec-1fde64aa1e21/resourceGroups/tugamidiAlerts/providers/Microsoft.Compute/virtualMachines/linuxEUS/providers/Microsoft.WorkloadMonitor/monitors/available-mb",
"name": "available-mb",
"type": "Microsoft.WorkloadMonitor/monitors",
"properties": {
"monitorName": "memory|available-mb",
"monitorType": "memory|available-mb",
"monitoredObject": "",
"parentMonitorName": "memory",
"evaluationTimestamp": "2020-02-15T20:20:18.5765757Z",
"currentStateFirstObservedTimestamp": "2020-02-15T20:20:1.5765757Z",
"lastReportedTimestamp": "2020-02-15T20:20:18.5765757Z",
"previousMonitorState": "Healthy",
"currentMonitorState": "Healthy"
}
}
],
"nextLink": null
}
}
}
}
Loading