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

Update fields.yml in azure module #20918

Merged
merged 23 commits into from
Sep 7, 2020
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
938e66c
mofidy doc
narph Jul 23, 2020
4daef08
Merge branch 'master' of github.com:elastic/beats
narph Aug 3, 2020
b613178
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
05364cf
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
f147c4d
Merge branch 'master' of github.com:elastic/beats
narph Aug 4, 2020
4574718
Merge branch 'master' of github.com:elastic/beats
narph Aug 17, 2020
1e43077
Merge branch 'master' of github.com:elastic/beats
narph Aug 19, 2020
807cf06
Merge branch 'master' of github.com:elastic/beats
narph Aug 24, 2020
2096668
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
da8ac1f
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
c2d8930
Merge branch 'master' of github.com:elastic/beats
narph Aug 27, 2020
7bd9e73
Merge branch 'master' of github.com:elastic/beats
narph Aug 31, 2020
6e89a84
Merge branch 'master' of github.com:elastic/beats
narph Aug 31, 2020
5f9dbdf
fix
narph Sep 2, 2020
dd1dd0c
generate json
narph Sep 2, 2020
01b5ce7
changelog
narph Sep 2, 2020
0efd795
fields
narph Sep 2, 2020
3f4db58
test
narph Sep 2, 2020
bdf21e9
Merge branch 'master' of github.com:elastic/beats
narph Sep 2, 2020
7833687
Merge branch 'master' of github.com:elastic/beats
narph Sep 3, 2020
bbf6178
Merge branch 'master' of github.com:elastic/beats
narph Sep 4, 2020
4f19452
Merge branch 'master' into fix-event
narph Sep 4, 2020
5548c72
update fields
narph Sep 4, 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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix resource tags in aws cloudwatch metricset {issue}20326[20326] {pull}20385[20385]
- Fix ec2 disk and network metrics to use Sum statistic method. {pull}20680[20680]
- Fill cloud.account.name with accountID if account alias doesn't exist. {pull}20736[20736]
- Adds missing `monitor` object inside event azure data. {pull}20918[20918]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/azure/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func EventsMapping(metrics []Metric, metricset string, report mb.ReporterV2) err
event, metricList = createEvent(timestamp, defaultMetric, groupTimeValues)
}
if metricset == nativeMetricset {
event.ModuleFields.Put("metrics", metricList)
event.ModuleFields.Put(fmt.Sprintf("%s.metrics", nativeMetricset), metricList)
narph marked this conversation as resolved.
Show resolved Hide resolved
} else {
for key, metric := range metricList {
event.MetricSetFields.Put(key, metric)
Expand Down
30 changes: 18 additions & 12 deletions x-pack/metricbeat/module/azure/monitor/_meta/data.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"@timestamp": "2017-10-12T08:05:34.853Z",
"azure": {
"metrics": {
"data_usage": {
"total": 0
},
"document_count": {
"total": 0
},
"document_quota": {
"total": 53687091200
"monitor": {
"metrics": {
"data_usage": {
"total": 131072
},
"document_count": {
"total": 2
},
"document_quota": {
"total": 107374182400
}
}
},
"namespace": "Microsoft.DocumentDb/databaseAccounts",
Expand All @@ -20,12 +22,12 @@
},
"type": "Microsoft.DocumentDb/databaseAccounts"
},
"subscription_id": "fd675b6f-b5e5-426e-ac45-d1f876d0ffa6",
"subscription_id": "70bd6e77-4b1e-4835-8896-db77b8eef364",
"timegrain": "PT5M"
},
"cloud": {
"instance": {
"id": "/subscriptions/fd675b6f-b5e5-426e-ac45-d1f876d0ffa6/resourceGroups/obs-infrastructure/providers/Microsoft.DocumentDb/databaseAccounts/obsaccount",
"id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.DocumentDb/databaseAccounts/obsaccount",
"name": "obsaccount"
},
"provider": "azure",
Expand All @@ -36,11 +38,15 @@
"duration": 115000,
"module": "azure"
},
"host": {
"id": "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.DocumentDb/databaseAccounts/obsaccount",
"name": "obsaccount"
},
"metricset": {
"name": "monitor",
"period": 10000
},
"service": {
"type": "azure"
}
}
}