Skip to content

Commit

Permalink
Add secrets support to the Azure Metrics integration (#9621)
Browse files Browse the repository at this point in the history
* Remove duplicate field definition

* Bump package-spec from 1.0.0 to 3.1.2

* Define vars.client_secret as secret

* Update changelog

* Bump stack version to 8.12.0

This version offers a stable implementation of secrets.
  • Loading branch information
zmoog authored Apr 16, 2024
1 parent 0497b03 commit 8d670cf
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 58 deletions.
5 changes: 5 additions & 0 deletions packages/azure_metrics/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.6.0"
changes:
- description: Add support for integration secrets.
type: enhancement
link: https://github.com/elastic/integrations/pull/9621
- version: "1.5.0"
changes:
- description: Update visualizations of Queue Storage Overview, Table Storage Overview, File Storage Overview & Storage Overview dashboards.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,3 @@
type: keyword
dimension: true
description: The container name
- name: metrics
type: group
fields:
- name: cpu_usage.avg
type: float
metric_type: gauge
description: CPU usage on all cores in millicores.
- name: memory_usage.avg
type: float
metric_type: gauge
unit: byte
description: Total memory usage in byte.
- name: network_bytes_received_per_second.avg
type: float
metric_type: gauge
unit: byte
description: The network bytes received per second.
- name: network_bytes_transmitted_per_second.avg
type: float
metric_type: gauge
unit: byte
description: The network bytes transmitted per second.
Original file line number Diff line number Diff line change
Expand Up @@ -55,34 +55,6 @@
- name: image.id
type: keyword
description: Image ID for the cloud instance.
- name: container
title: Container
group: 2
description: 'Container fields are used for meta information about the specific container that is the source of information.
These fields help correlate data based containers from any runtime.'
type: group
fields:
- name: id
level: core
type: keyword
ignore_above: 1024
description: Unique container id.
- name: image.name
level: extended
type: keyword
ignore_above: 1024
description: Name of the image the container was built on.
- name: labels
level: extended
type: object
object_type: keyword
description: Image labels.
- name: name
level: extended
type: keyword
ignore_above: 1024
description: Container name.
- name: host
title: Host
group: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
external: ecs
- name: container.name
external: ecs
- name: container.labels
external: ecs
- name: container.runtime
external: ecs
- name: container.image.name
Expand Down
2 changes: 1 addition & 1 deletion packages/azure_metrics/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ so the `period` for `container_instance` should be `300s` or multiples of `300s`
| azure.container_instance.network_bytes_received_per_second.avg | The network bytes received per second. | float | byte | gauge |
| azure.container_instance.network_bytes_transmitted_per_second.avg | The network bytes transmitted per second. | float | byte | gauge |
| azure.dimensions.container_name | The container name | keyword | | |
| azure.metrics.cpu_usage.avg | CPU usage on all cores in millicores. | float | | gauge |
| azure.metrics.cpu_usage.avg | | alias | | |
| azure.metrics.memory_usage.avg | | alias | | |
| azure.metrics.network_bytes_received_per_second.avg | | alias | | |
| azure.metrics.network_bytes_transmitted_per_second.avg | | alias | | |
Expand Down
2 changes: 1 addition & 1 deletion packages/azure_metrics/docs/container_instance.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Authentication: we are handling authentication on our side (creating/renewing th
| azure.container_instance.network_bytes_received_per_second.avg | The network bytes received per second. | float | byte | gauge |
| azure.container_instance.network_bytes_transmitted_per_second.avg | The network bytes transmitted per second. | float | byte | gauge |
| azure.dimensions.container_name | The container name | keyword | | |
| azure.metrics.cpu_usage.avg | CPU usage on all cores in millicores. | float | | gauge |
| azure.metrics.cpu_usage.avg | | alias | | |
| azure.metrics.memory_usage.avg | | alias | | |
| azure.metrics.network_bytes_received_per_second.avg | | alias | | |
| azure.metrics.network_bytes_transmitted_per_second.avg | | alias | | |
Expand Down
13 changes: 7 additions & 6 deletions packages/azure_metrics/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: azure_metrics
title: Azure Resource Metrics
version: 1.5.0
release: ga
version: 1.6.0
description: Collect metrics from Azure resources with Elastic Agent.
type: integration
icons:
Expand All @@ -14,13 +13,13 @@ screenshots:
title: Azure VM metrics overview
size: 5120x2562
type: image/png
format_version: 1.0.0
license: basic
format_version: 3.1.2
categories:
- observability
- azure
conditions:
kibana.version: "^8.11.2"
kibana:
version: "^8.12.0"
vars:
- name: client_id
type: text
Expand All @@ -29,11 +28,12 @@ vars:
required: true
show_user: true
- name: client_secret
type: text
type: password
title: Client Secret
multi: false
required: true
show_user: true
secret: true
- name: tenant_id
type: text
title: Tenant ID
Expand Down Expand Up @@ -236,3 +236,4 @@ policy_templates:
type: image/png
owner:
github: elastic/obs-ds-hosted-services
type: elastic
3 changes: 3 additions & 0 deletions packages/azure_metrics/validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
errors:
exclude_checks:
- SVR00002 # Mandatory filters in dashboards.

0 comments on commit 8d670cf

Please sign in to comment.