Skip to content

[Azure][container_registry][compute_vm_scaleset] add missing dimensions to the container_registry and compute_vm_scaleset #7314

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
tetianakravchenko merged 4 commits into from
Aug 11, 2023
Merged

[Azure][container_registry][compute_vm_scaleset] add missing dimensions to the container_registry and compute_vm_scaleset #7314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d5e849
add missing dimensions to the container_registry and compute_vm_scaleset
tetianakravchenko Aug 8, 2023
85f7a90
align geolocation -> Geolocation as defined in documentation; fix pr …
tetianakravchenko Aug 8, 2023
1cf80a1
add missing dimensions in configuration
tetianakravchenko Aug 10, 2023
3f5b3a3
fix merge conflicts
tetianakravchenko Aug 10, 2023
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
5 changes: 5 additions & 0 deletions packages/azure_metrics/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.0.20"
changes:
- description: Add missing azure dimensions to the container_registry and compute_vm_scaleset datastreams
type: enhancement
link: https://github.com/elastic/integrations/pull/7314
- version: "1.0.19"
changes:
- description: Add dimension and metric_type metadata to the container_service datastream
Expand Down
46 changes: 35 additions & 11 deletions packages/azure_metrics/data_stream/compute_vm_scaleset/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,24 @@ resources:
namespace: "Microsoft.Compute/virtualMachineScaleSets"
timegrain: "PT5M"
ignore_unsupported: true
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Network Out Total",
"Network In Total", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage",
"Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Network Out Total",
"Network In Total", "Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
"OS Disk Queue Depth", "OS Disk Write Operations/Sec", "OS Disk Read Operations/Sec", "OS Disk Write Bytes/sec", "OS Disk Read Bytes/sec"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: ["Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: "LUN"
value: "*"
- name: ["Memory\\Commit Limit", "Memory\\Committed Bytes", "Memory\\% Committed Bytes In Use", "Memory\\Available Bytes"]
namespace: "Azure.VM.Windows.GuestMetrics"
timegrain: "PT5M"
Expand All @@ -61,16 +69,24 @@ resources:
namespace: "Microsoft.Compute/virtualMachineScaleSets"
timegrain: "PT5M"
ignore_unsupported: true
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Network Out Total",
"Network In Total", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage",
"Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
"OS Disk Queue Depth", "OS Disk Write Operations/Sec", "OS Disk Read Operations/Sec", "OS Disk Write Bytes/sec", "OS Disk Read Bytes/sec"]
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Network Out Total",
"Network In Total", "Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
"OS Disk Queue Depth", "OS Disk Write Operations/Sec", "OS Disk Read Operations/Sec", "OS Disk Write Bytes/sec", "OS Disk Read Bytes/sec"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: ["Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: "LUN"
value: "*"
- name: ["Memory\\Commit Limit", "Memory\\Committed Bytes", "Memory\\% Committed Bytes In Use", "Memory\\Available Bytes"]
namespace: "Azure.VM.Windows.GuestMetrics"
timegrain: "PT5M"
Expand All @@ -88,16 +104,24 @@ resources:
namespace: "Microsoft.Compute/virtualMachineScaleSets"
timegrain: "PT5M"
ignore_unsupported: true
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Network Out Total",
"Network In Total", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage",
"Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
"OS Disk Queue Depth", "OS Disk Write Operations/Sec", "OS Disk Read Operations/Sec", "OS Disk Write Bytes/sec", "OS Disk Read Bytes/sec"]
- name: ["Available Memory Bytes", "Percentage CPU", "Disk Read Bytes", "Disk Write Bytes", "Disk Read Operations/Sec", "Disk Write Operations/Sec", "Network Out Total",
"Network In Total", "Outbound Flows Maximum Creation Rate", "Inbound Flows Maximum Creation Rate", "Outbound Flows", "Inbound Flows",
"OS Disk Queue Depth", "OS Disk Write Operations/Sec", "OS Disk Read Operations/Sec", "OS Disk Write Bytes/sec", "OS Disk Read Bytes/sec"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: ["Data Disk Read Bytes/sec", "Data Disk Write Bytes/sec", "Data Disk Read Operations/Sec", "Data Disk Write Operations/Sec", "Data Disk Queue Depth", "Data Disk Bandwidth Consumed Percentage"]
namespace: "Microsoft.Compute/virtualMachineScaleSets"
ignore_unsupported: true
timegrain: "PT5M"
dimensions:
- name: "VMName"
value: "*"
- name: "LUN"
value: "*"
- name: ["Memory\\Commit Limit", "Memory\\Committed Bytes", "Memory\\% Committed Bytes In Use", "Memory\\Available Bytes"]
namespace: "Azure.VM.Windows.GuestMetrics"
timegrain: "PT5M"
Expand Down
15 changes: 12 additions & 3 deletions packages/azure_metrics/data_stream/container_registry/agent/stream/stream.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ resources:
timegrain: "PT5M"
- name: ["StorageUsed"]
namespace: "Microsoft.ContainerRegistry/registries"
timegrain: "PT1H"
timegrain: "PT1H"
dimensions:
- name: "Geolocation"
value: "*"
{{/each}}
{{/if}}
{{#if resource_ids}}
Expand All @@ -47,6 +50,9 @@ resources:
- name: ["StorageUsed"]
namespace: "Microsoft.ContainerRegistry/registries"
timegrain: "PT1H"
dimensions:
- name: "Geolocation"
value: "*"
{{/each}}
{{/if}}

Expand All @@ -64,6 +70,9 @@ resources:
timegrain: "PT5M"
- name: ["StorageUsed"]
namespace: "Microsoft.ContainerRegistry/registries"
timegrain: "PT1H"
timegrain: "PT1H"
dimensions:
- name: "Geolocation"
value: "*"
{{/unless}}
{{/unless}}
{{/unless}}
2 changes: 1 addition & 1 deletion packages/azure_metrics/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: azure_metrics
title: Azure Resource Metrics
version: 1.0.19
version: 1.0.20
release: ga
description: Collect metrics from Azure resources with Elastic Agent.
type: integration
Expand Down