diff --git a/packages/azure_metrics/changelog.yml b/packages/azure_metrics/changelog.yml index 28e7ca6f658..22ad275d05e 100644 --- a/packages/azure_metrics/changelog.yml +++ b/packages/azure_metrics/changelog.yml @@ -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 diff --git a/packages/azure_metrics/data_stream/compute_vm_scaleset/agent/stream/stream.yml.hbs b/packages/azure_metrics/data_stream/compute_vm_scaleset/agent/stream/stream.yml.hbs index 3111686d215..2e1da9624aa 100644 --- a/packages/azure_metrics/data_stream/compute_vm_scaleset/agent/stream/stream.yml.hbs +++ b/packages/azure_metrics/data_stream/compute_vm_scaleset/agent/stream/stream.yml.hbs @@ -34,9 +34,8 @@ 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 @@ -44,6 +43,15 @@ resources: 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" @@ -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" @@ -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" diff --git a/packages/azure_metrics/data_stream/container_registry/agent/stream/stream.yml.hbs b/packages/azure_metrics/data_stream/container_registry/agent/stream/stream.yml.hbs index 620ac99cc75..41f6c868428 100644 --- a/packages/azure_metrics/data_stream/container_registry/agent/stream/stream.yml.hbs +++ b/packages/azure_metrics/data_stream/container_registry/agent/stream/stream.yml.hbs @@ -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}} @@ -47,6 +50,9 @@ resources: - name: ["StorageUsed"] namespace: "Microsoft.ContainerRegistry/registries" timegrain: "PT1H" + dimensions: + - name: "Geolocation" + value: "*" {{/each}} {{/if}} @@ -64,6 +70,9 @@ resources: timegrain: "PT5M" - name: ["StorageUsed"] namespace: "Microsoft.ContainerRegistry/registries" - timegrain: "PT1H" + timegrain: "PT1H" + dimensions: + - name: "Geolocation" + value: "*" {{/unless}} -{{/unless}} \ No newline at end of file +{{/unless}} diff --git a/packages/azure_metrics/manifest.yml b/packages/azure_metrics/manifest.yml index 3f68f692448..d56aa33bb0f 100644 --- a/packages/azure_metrics/manifest.yml +++ b/packages/azure_metrics/manifest.yml @@ -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