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

Cherry-pick #16754 to 7.x: Move azure module to GA #16793

Merged
merged 1 commit into from
Mar 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -277,6 +277,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Release `statsd` module as GA. {pull}16447[16447] {issue}14280[14280]
- Add `redisenterprise` module. {pull}16482[16482] {issue}15269[15269]
- Add `cloudfoundry` module to send events from Cloud Foundry. {pull}16671[16671]
- Align fields to ECS and add more tests for the azure module. {issue}16024[16024] {pull}16754[16754]

*Packetbeat*

Expand Down
10 changes: 0 additions & 10 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3123,16 +3123,6 @@ The resource specified



*`azure.resource.name`*::
+
--
The name of the resource


type: keyword

--

*`azure.resource.type`*::
+
--
Expand Down
4 changes: 0 additions & 4 deletions x-pack/metricbeat/module/azure/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
description: >
The resource specified
fields:
- name: name
type: keyword
description: >
The name of the resource
- name: type
type: keyword
description: >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -513,7 +513,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -616,7 +616,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -767,7 +767,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.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": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -553,7 +553,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -656,7 +656,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -759,7 +759,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -910,7 +910,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.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": "azure.resource.name",
"pivot_id": "cloud.instance.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": "azure.resource.name",
"terms_field": "cloud.instance.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": "azure.resource.name",
"pivot_id": "cloud.instance.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": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -513,7 +513,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -616,7 +616,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -719,7 +719,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -870,7 +870,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -504,7 +504,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -607,7 +607,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -710,7 +710,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -861,7 +861,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down Expand Up @@ -1116,7 +1116,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -1146,7 +1146,7 @@
"split_color_mode": "gradient",
"split_mode": "terms",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
"index_pattern": "metricbeat-*",
"interval": "60m",
"isModelInvalid": false,
"pivot_id": "azure.resource.name",
"pivot_id": "cloud.instance.name",
"pivot_label": "Resource Name",
"pivot_rows": "30",
"pivot_type": "string",
Expand Down Expand Up @@ -513,7 +513,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -616,7 +616,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -719,7 +719,7 @@
"split_color_mode": "gradient",
"split_mode": "everything",
"stacked": "none",
"terms_field": "azure.resource.name",
"terms_field": "cloud.instance.name",
"terms_order_by": "61fb4192-32e4-11ea-b9f8-4d0b340ad993",
"type": "timeseries",
"value_template": "{{value}}"
Expand Down Expand Up @@ -870,7 +870,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.name",
"id": "1578578146383",
"indexPatternRefName": "control_2_index_pattern",
"label": "Resource Name",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
"type": "list"
},
{
"fieldName": "azure.resource.name",
"fieldName": "cloud.instance.name",
"id": "1570774891724",
"indexPatternRefName": "control_2_index_pattern",
"label": "VM Name",
Expand Down
Loading