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

Jump to bottom

Make compute_vm light metricset and add update cloud instance id #20889

Merged
merged 27 commits into from Sep 7, 2020
Merged

Make compute_vm light metricset and add update cloud instance id #20889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 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
7c0e211
rewrite
narph Aug 27, 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
7884bef
fix
narph Sep 1, 2020
7c1ccbf
temp
narph Sep 2, 2020
2e5ac91
tests
narph Sep 2, 2020
7dca82e
work
narph Sep 2, 2020
48b3714
changelog
narph Sep 2, 2020
bdf21e9
Merge branch 'master' of github.com:elastic/beats
narph Sep 2, 2020
9495bc3
Merge branch 'master' into az-inven
narph Sep 2, 2020
a5337cc
fit tests
narph Sep 3, 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
0797af5
update dashboards
narph Sep 7, 2020
4ba8817
Merge branch 'master' of github.com:elastic/beats
narph Sep 7, 2020
1061900
Merge branch 'master' into az-inven
narph Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Expand Up @@ -672,6 +672,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add state_daemonset metricset for Kubernetes Metricbeat module {pull}20649[20649]
- Add host inventory metrics to azure compute_vm metricset. {pull}20641[20641]
- Add host inventory metrics to googlecloud compute metricset. {pull}20391[20391]
- Migrate `compute_vm` metricset to a light one, map `cloud.instance.id` field. {pull}20889[20889]
- Request prometheus endpoints to be gzipped by default {pull}20766[20766]
- Release all kubernetes `state` metricsets as GA {pull}20901[20901]
- Add billing metricset into googlecloud module. {pull}20812[20812] {issue}20738[20738]
Expand Down
1 change: 1 addition & 0 deletions metricbeat/docs/modules/azure/compute_vm.asciidoc
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ This file is generated! See scripts/mage/docs_collector.go

include::../../../../x-pack/metricbeat/module/azure/compute_vm/_meta/docs.asciidoc[]

This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.

==== Fields

Expand Down
1 change: 0 additions & 1 deletion x-pack/metricbeat/include/list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...k/metricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-billing-overview.json
View file
Open in desktop
Expand Up @@ -238,7 +238,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1578578146383",
"indexPatternRefName": "control_4_index_pattern",
"label": "Resource Name",
Expand Down Expand Up @@ -483,7 +483,7 @@
"enabled": true,
"id": "2",
"params": {
"field": "cloud.instance.name",
"field": "azure.resource.name",
"missingBucket": false,
"missingBucketLabel": "Missing",
"order": "desc",
Expand Down
10 changes: 5 additions & 5 deletions ...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-blob-storage-overview.json
View file
Open in desktop
Expand Up @@ -480,7 +480,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "cloud.instance.name",
"pivot_id": "azure.resource.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -510,7 +510,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -613,7 +613,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -765,7 +765,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down Expand Up @@ -1048,7 +1048,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down
10 changes: 5 additions & 5 deletions ...t/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-instance-overview.json
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -306,7 +306,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -372,7 +372,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1584710535722",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource",
Expand Down Expand Up @@ -471,7 +471,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -544,7 +544,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down
10 changes: 5 additions & 5 deletions ...t/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-registry-overview.json
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -301,7 +301,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -367,7 +367,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1584710535722",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource",
Expand Down Expand Up @@ -461,7 +461,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -529,7 +529,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down
6 changes: 3 additions & 3 deletions ...at/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-container-service-overview.json
View file
Open in desktop
Expand Up @@ -254,7 +254,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -322,7 +322,7 @@
"separate_axis": 0,
"split_mode": "terms",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"type": "timeseries"
}
],
Expand Down Expand Up @@ -388,7 +388,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1584710535722",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource",
Expand Down
2 changes: 1 addition & 1 deletion ...eat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-database-account-overview.json
View file
Open in desktop
Expand Up @@ -438,7 +438,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1584710535722",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource",
Expand Down
18 changes: 9 additions & 9 deletions ...ricbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-file-storage-overview.json
View file
Open in desktop
Expand Up @@ -520,7 +520,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "cloud.instance.name",
"pivot_id": "azure.resource.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -550,7 +550,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -653,7 +653,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -756,7 +756,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -908,7 +908,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down Expand Up @@ -1165,7 +1165,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "cloud.instance.name",
"pivot_id": "azure.resource.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -1195,7 +1195,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -1272,7 +1272,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "cloud.instance.name",
"pivot_id": "azure.resource.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -1302,7 +1302,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down
10 changes: 5 additions & 5 deletions ...icbeat/module/azure/_meta/kibana/7/dashboard/Metricbeat-azure-queue-storage-overview.json
View file
Open in desktop
Expand Up @@ -480,7 +480,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "cloud.instance.name",
"pivot_id": "azure.resource.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -510,7 +510,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -613,7 +613,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -716,7 +716,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "cloud.instance.name",
"terms_field": "azure.resource.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -868,7 +868,7 @@
"type": "list"
},
{
"fieldName": "cloud.instance.name",
"fieldName": "azure.resource.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down