Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@etichy
etichy committed Oct 9, 2023
1 parent 6fd6848 commit e34b9ad
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 48 deletions.
60 changes: 56 additions & 4 deletions deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,23 @@ Metrics config should match snapshot when using default values:
match_type: regexp
metric_names:
- .*
attributes/unify_endpoint_attribute:
actions:
- action: insert
from_attribute: endpoint
key: k8s.service.name
include:
match_type: regexp
metric_names:
- kube_endpoint_.*
attributes/unify_node_attribute:
actions:
- action: insert
from_attribute: node
key: k8s.node.name
- action: insert
from_attribute: kubernetes_io_hostname
key: k8s.node.name
include:
match_type: regexp
metric_names:
Expand All @@ -349,6 +361,33 @@ Metrics config should match snapshot when using default values:
- kube_pod_container_resource_limits
- kube_pod_init_container_resource_requests
- kube_pod_init_container_resource_limits
attributes/unify_pod_attribute:
actions:
- action: insert
from_attribute: uid
key: k8s.pod.uid
include:
match_type: regexp
metric_names:
- kube_pod_.*
attributes/unify_service_attribute:
actions:
- action: insert
from_attribute: service
key: k8s.service.name
- action: insert
from_attribute: external_name
key: sw.k8s.service.external_name
- action: insert
from_attribute: type
key: sw.k8s.service.type
- action: insert
from_attribute: cluster_ip
key: sw.k8s.cluster.ip
include:
match_type: regexp
metric_names:
- kube_service_.*
attributes/unify_volume_attribute:
actions:
- action: insert
Expand Down Expand Up @@ -523,12 +562,21 @@ Metrics config should match snapshot when using default values:
- ^kube_persistentvolumeclaim_resource_requests_storage_bytes$
- ^kube_persistentvolumeclaim_created$
- ^kube_pod_spec_volumes_persistentvolumeclaims_info$
- ^kube_service_annotations$
- ^kube_service_info$
- ^kube_service_labels$
- ^kube_service_created$
- ^kube_service_spec_type$
- ^kube_service_spec_external_ip$
- ^kube_service_status_load_balancer_ingress$
- ^kube_endpoint_annotations$
- ^kube_endpoint_address_not_ready$
- ^kube_endpoint_address_available$
- ^kube_endpoint_info$
- ^kube_endpoint_labels$
- ^kube_endpoint_created$
- ^kube_endpoint_ports$
- ^kube_endpoint_address$
filter/receiver:
metrics:
exclude:
Expand Down Expand Up @@ -557,6 +605,7 @@ Metrics config should match snapshot when using default values:
- os_image
- namespace
- uid
- k8s.pod.uid
- pod_ip
- host_ip
- created_by_kind
Expand Down Expand Up @@ -587,7 +636,10 @@ Metrics config should match snapshot when using default values:
- sw.k8s.persistentvolumeclaim.status
- sw.k8s.persistentvolume.status
- storageclass
- access_mode
- k8s.service.name
- sw.k8s.service.external_name
- sw.k8s.service.type
- sw.k8s.cluster.ip
groupbyattrs/node:
keys:
- k8s.node.name
Expand Down Expand Up @@ -1663,9 +1715,6 @@ Metrics config should match snapshot when using default values:
- action: insert
from_attribute: pod
key: k8s.pod.name
- action: insert
from_attribute: uid
key: k8s.pod.uid
- action: insert
from_attribute: pod_ip
key: sw.k8s.pod.ip
Expand Down Expand Up @@ -2001,6 +2050,9 @@ Metrics config should match snapshot when using default values:
- attributes/unify_node_attribute
- transform/unify_node_attribute
- attributes/unify_volume_attribute
- attributes/unify_service_attribute
- attributes/unify_endpoint_attribute
- attributes/unify_pod_attribute
- attributes/identify_init_container
- attributes/identify_standard_container
- metricstransform/rename
Expand Down
88 changes: 44 additions & 44 deletions deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,14 @@ Metrics config should match snapshot when using default values:
metric_names:
- .*
attributes/unify_endpoint_attribute:
actions:
- action: insert
from_attribute: endpoint
key: k8s.service.name
include:
match_type: regexp
metric_names:
- kube_endpoint_.*
actions:
- action: insert
from_attribute: endpoint
key: k8s.service.name
include:
match_type: regexp
metric_names:
- kube_endpoint_.*
attributes/unify_node_attribute:
actions:
- action: insert
Expand All @@ -362,32 +362,32 @@ Metrics config should match snapshot when using default values:
- kube_pod_init_container_resource_requests
- kube_pod_init_container_resource_limits
attributes/unify_pod_attribute:
actions:
- action: insert
from_attribute: uid
key: k8s.pod.uid
include:
match_type: regexp
metric_names:
- kube_pod_.*
attributes/unify_service_attribute:
actions:
- action: insert
from_attribute: service
key: k8s.service.name
- action: insert
from_attribute: external_name
key: sw.k8s.service.external_name
- action: insert
from_attribute: type
key: sw.k8s.service.type
- action: insert
from_attribute: cluster_ip
key: sw.k8s.cluster.ip
include:
match_type: regexp
metric_names:
- kube_service_.*
actions:
- action: insert
from_attribute: uid
key: k8s.pod.uid
include:
match_type: regexp
metric_names:
- kube_pod_.*
attributes/unify_service_attribute:
actions:
- action: insert
from_attribute: service
key: k8s.service.name
- action: insert
from_attribute: external_name
key: sw.k8s.service.external_name
- action: insert
from_attribute: type
key: sw.k8s.service.type
- action: insert
from_attribute: cluster_ip
key: sw.k8s.cluster.ip
include:
match_type: regexp
metric_names:
- kube_service_.*
attributes/unify_volume_attribute:
actions:
- action: insert
Expand Down Expand Up @@ -570,13 +570,13 @@ Metrics config should match snapshot when using default values:
- ^kube_service_spec_external_ip$
- ^kube_service_status_load_balancer_ingress$
- ^kube_endpoint_annotations$
- ^kube_endpoint_address_not_ready$
- ^kube_endpoint_address_available$
- ^kube_endpoint_info$
- ^kube_endpoint_labels$
- ^kube_endpoint_created$
- ^kube_endpoint_ports$
- ^kube_endpoint_address$
- ^kube_endpoint_address_not_ready$
- ^kube_endpoint_address_available$
- ^kube_endpoint_info$
- ^kube_endpoint_labels$
- ^kube_endpoint_created$
- ^kube_endpoint_ports$
- ^kube_endpoint_address$
filter/receiver:
metrics:
exclude:
Expand Down Expand Up @@ -637,9 +637,9 @@ Metrics config should match snapshot when using default values:
- sw.k8s.persistentvolume.status
- storageclass
- k8s.service.name
- sw.k8s.service.external_name
- sw.k8s.service.type
- sw.k8s.cluster.ip
- sw.k8s.service.external_name
- sw.k8s.service.type
- sw.k8s.cluster.ip
groupbyattrs/node:
keys:
- k8s.node.name
Expand Down

0 comments on commit e34b9ad

Please sign in to comment.