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.

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

[Monitor Control Service] Update Data Collection Rules #4716

Merged
merged 7 commits into from
Apr 22, 2022
Merged

[Monitor Control Service] Update Data Collection Rules #4716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
03c1e6a
{MonitorControlService}Bump up azure-mgmt-amcs SDK
ZengTaoxu Apr 21, 2022
92b4ab0
update
ZengTaoxu Apr 21, 2022
10e28b6
update
ZengTaoxu Apr 21, 2022
1acfd82
Merge https://github.com/ZengTaoxu/azure-cli-extensions into monitor-…
ZengTaoxu Apr 21, 2022
662c9cc
update
ZengTaoxu Apr 21, 2022
fb4564d
update
ZengTaoxu Apr 21, 2022
d7ac1f2
refine changelog
necusjz Apr 21, 2022
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
Prev Previous commit
refine changelog
  • Loading branch information
@necusjz
necusjz committed Apr 21, 2022
commit d7ac1f26d8c08eaf4c76220ed1d6e3c92adc68fc
10 changes: 4 additions & 6 deletions src/monitor-control-service/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ Release History

0.3.0
++++++
* 'az monitor data-collection rule create': add parameter '--rule-file'
* 'az monitor data-collection rule create': remove parameters '--data-flows' and '--log-analytics'
and '--monitor-metrics' and '--performance-counters' and '--windows-event-logs' and '--syslog' and '--extensions'
* 'az monitor data-collection rule association list': add parameter '--data-collection-endpoint-name'
* Bump up azure-mgmt-amcs SDK to 2021_09_01_preview

* `az monitor data-collection rule create`: Add parameter --rule-file.
* `az monitor data-collection rule create`: Remove parameters --data-flows, --log-analytics, --monitor-metrics, --performance-counters, --windows-event-logs, --syslog and --extensions.
* `az monitor data-collection rule association list`: Add parameter --data-collection-endpoint-name.
* Bump api version from 2021-04-01 to 2021_09_01_preview.

0.2.0
++++++
Expand Down
80 changes: 40 additions & 40 deletions ...ontrol-service/azext_amcs/tests/latest/recordings/test_amcs_data_collection_endpoint.yaml
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions ...or-control-service/azext_amcs/tests/latest/recordings/test_amcs_data_collection_rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ interactions:
ParameterSetName:
- --resource-group --location --name --rule-file
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule?api-version=2021-09-01-preview
response:
body:
string: '{"properties":{"immutableId":"dcr-d663af842f794226ab17986d26a83d4c","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":10,"counterSpecifiers":["\\Processor
Information(_Total)\\% Processor Time"],"name":"perfCounter01"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"15006458-0000-0800-0000-626115720000\"","systemData":{"createdBy":"v-taoxuzeng@microsoft.com","createdByType":"User","createdAt":"2022-04-21T08:27:29.3970312Z","lastModifiedBy":"v-taoxuzeng@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T08:27:29.3970312Z"}}'
string: '{"properties":{"immutableId":"dcr-f6061dec0df342efa0ce098bc816649a","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":10,"counterSpecifiers":["\\Processor
Information(_Total)\\% Processor Time"],"name":"perfCounter01"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"1500a89e-0000-0800-0000-626128cc0000\"","systemData":{"createdBy":"ethanyang@microsoft.com","createdByType":"User","createdAt":"2022-04-21T09:50:03.3050825Z","lastModifiedBy":"ethanyang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T09:50:03.3050825Z"}}'
headers:
api-supported-versions:
- 2019-11-01-preview, 2021-04-01, 2021-09-01-preview
cache-control:
- no-cache
content-length:
- '1028'
- '1024'
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:32 GMT
- Thu, 21 Apr 2022 09:50:06 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -75,24 +75,24 @@ interactions:
ParameterSetName:
- --resource-group --name --performance-counters
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule?api-version=2021-09-01-preview
response:
body:
string: '{"properties":{"immutableId":"dcr-d663af842f794226ab17986d26a83d4c","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":10,"counterSpecifiers":["\\Processor
Information(_Total)\\% Processor Time"],"name":"perfCounter01"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"15006458-0000-0800-0000-626115720000\"","systemData":{"createdBy":"v-taoxuzeng@microsoft.com","createdByType":"User","createdAt":"2022-04-21T08:27:29.3970312Z","lastModifiedBy":"v-taoxuzeng@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T08:27:29.3970312Z"}}'
string: '{"properties":{"immutableId":"dcr-f6061dec0df342efa0ce098bc816649a","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":10,"counterSpecifiers":["\\Processor
Information(_Total)\\% Processor Time"],"name":"perfCounter01"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"1500a89e-0000-0800-0000-626128cc0000\"","systemData":{"createdBy":"ethanyang@microsoft.com","createdByType":"User","createdAt":"2022-04-21T09:50:03.3050825Z","lastModifiedBy":"ethanyang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T09:50:03.3050825Z"}}'
headers:
api-supported-versions:
- 2019-11-01-preview, 2021-04-01, 2021-09-01-preview
cache-control:
- no-cache
content-length:
- '1028'
- '1024'
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:34 GMT
- Thu, 21 Apr 2022 09:50:09 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -135,24 +135,24 @@ interactions:
ParameterSetName:
- --resource-group --name --performance-counters
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule?api-version=2021-09-01-preview
response:
body:
string: '{"properties":{"immutableId":"dcr-d663af842f794226ab17986d26a83d4c","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"15007858-0000-0800-0000-626115770000\"","systemData":{"createdBy":"v-taoxuzeng@microsoft.com","createdByType":"User","createdAt":"2022-04-21T08:27:29.3970312Z","lastModifiedBy":"v-taoxuzeng@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T08:27:35.6290531Z"}}'
string: '{"properties":{"immutableId":"dcr-f6061dec0df342efa0ce098bc816649a","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"1500bd9e-0000-0800-0000-626128d10000\"","systemData":{"createdBy":"ethanyang@microsoft.com","createdByType":"User","createdAt":"2022-04-21T09:50:03.3050825Z","lastModifiedBy":"ethanyang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T09:50:09.5638593Z"}}'
headers:
api-supported-versions:
- 2019-11-01-preview, 2021-04-01, 2021-09-01-preview
cache-control:
- no-cache
content-length:
- '1030'
- '1026'
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:36 GMT
- Thu, 21 Apr 2022 09:50:09 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -188,24 +188,24 @@ interactions:
ParameterSetName:
- -g -n
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule?api-version=2021-09-01-preview
response:
body:
string: '{"properties":{"immutableId":"dcr-d663af842f794226ab17986d26a83d4c","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"15007858-0000-0800-0000-626115770000\"","systemData":{"createdBy":"v-taoxuzeng@microsoft.com","createdByType":"User","createdAt":"2022-04-21T08:27:29.3970312Z","lastModifiedBy":"v-taoxuzeng@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T08:27:35.6290531Z"}}'
string: '{"properties":{"immutableId":"dcr-f6061dec0df342efa0ce098bc816649a","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"1500bd9e-0000-0800-0000-626128d10000\"","systemData":{"createdBy":"ethanyang@microsoft.com","createdByType":"User","createdAt":"2022-04-21T09:50:03.3050825Z","lastModifiedBy":"ethanyang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T09:50:09.5638593Z"}}'
headers:
api-supported-versions:
- 2019-11-01-preview, 2021-04-01, 2021-09-01-preview
cache-control:
- no-cache
content-length:
- '1030'
- '1026'
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:38 GMT
- Thu, 21 Apr 2022 09:50:10 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -239,24 +239,24 @@ interactions:
ParameterSetName:
- -g
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules?api-version=2021-09-01-preview
response:
body:
string: '{"value":[{"properties":{"immutableId":"dcr-d663af842f794226ab17986d26a83d4c","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"15007858-0000-0800-0000-626115770000\"","systemData":{"createdBy":"v-taoxuzeng@microsoft.com","createdByType":"User","createdAt":"2022-04-21T08:27:29.3970312Z","lastModifiedBy":"v-taoxuzeng@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T08:27:35.6290531Z"}}],"nextLink":null}'
string: '{"value":[{"properties":{"immutableId":"dcr-f6061dec0df342efa0ce098bc816649a","dataSources":{"performanceCounters":[{"streams":["Microsoft-InsightsMetrics"],"samplingFrequencyInSeconds":20,"counterSpecifiers":["[\\Processor
Information(_Total)\\% Processor Time]"],"name":"perfCounter02"}]},"destinations":{"azureMonitorMetrics":{"name":"azureMonitorMetrics-default"}},"dataFlows":[{"streams":["Microsoft-InsightsMetrics"],"destinations":["azureMonitorMetrics-default"]}],"provisioningState":"Succeeded"},"location":"westus2","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule","name":"testrule","type":"Microsoft.Insights/dataCollectionRules","etag":"\"1500bd9e-0000-0800-0000-626128d10000\"","systemData":{"createdBy":"ethanyang@microsoft.com","createdByType":"User","createdAt":"2022-04-21T09:50:03.3050825Z","lastModifiedBy":"ethanyang@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2022-04-21T09:50:09.5638593Z"}}],"nextLink":null}'
headers:
api-supported-versions:
- 2019-11-01-preview, 2021-04-01, 2021-09-01-preview
cache-control:
- no-cache
content-length:
- '1058'
- '1054'
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:40 GMT
- Thu, 21 Apr 2022 09:50:12 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -292,7 +292,7 @@ interactions:
ParameterSetName:
- -g -n -y
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: DELETE
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules/testrule?api-version=2021-09-01-preview
response:
Expand All @@ -306,7 +306,7 @@ interactions:
content-length:
- '0'
date:
- Thu, 21 Apr 2022 08:27:47 GMT
- Thu, 21 Apr 2022 09:50:24 GMT
expires:
- '-1'
pragma:
Expand Down Expand Up @@ -338,7 +338,7 @@ interactions:
ParameterSetName:
- -g
User-Agent:
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.9.5 (Windows-10-10.0.19044-SP0)
- AZURECLI/2.35.0 azsdk-python-mgmt-monitor/1.0.0b1 Python/3.8.10 (Windows-10-10.0.19044-SP0)
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest_amcs_rule000001/providers/Microsoft.Insights/dataCollectionRules?api-version=2021-09-01-preview
response:
Expand All @@ -352,7 +352,7 @@ interactions:
content-type:
- application/json; charset=utf-8
date:
- Thu, 21 Apr 2022 08:27:48 GMT
- Thu, 21 Apr 2022 09:50:24 GMT
expires:
- '-1'
pragma:
Expand Down
Loading