Skip to content

CP-34395: collect Kubernetes region labels #514

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −6
Open

CP-34395: collect Kubernetes region labels #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/functions/agent-validator/config/internal/scrape_config.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ scrape_configs:
action: replace
metric_relabel_configs:
- separator: ;
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|topology_kubernetes_io_region|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
replacement: $1
action: labelkeep
- source_labels: [__name__]
Expand Down Expand Up @@ -108,7 +108,7 @@ scrape_configs:
replacement: $1
action: keep
- separator: ;
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|topology_kubernetes_io_region|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
replacement: $1
action: labelkeep
static_configs:
Expand Down
1 change: 1 addition & 0 deletions helm/templates/_defaults.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ metricFilters:
- provider_id
- resource
- resource_type
- topology_kubernetes_io_region
- unit
- uid
- workload
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Required metric labels
*/}}
{{- define "cloudzero-agent.requiredMetricLabels" -}}
{{- $requiredSpecialMetricLabels := tuple "_.*" "label_.*" "app.kubernetes.io/*" "k8s.*" -}}
{{- $requiredCZMetricLabels := tuple "board_asset_tag" "container" "created_by_kind" "created_by_name" "image" "instance" "name" "namespace" "node" "node_kubernetes_io_instance_type" "pod" "product_name" "provider_id" "resource" "unit" "uid" -}}
{{- $requiredCZMetricLabels := tuple "board_asset_tag" "container" "created_by_kind" "created_by_name" "image" "instance" "name" "namespace" "node" "node_kubernetes_io_instance_type" "pod" "product_name" "provider_id" "resource" "topology_kubernetes_io_region" "unit" "uid" -}}
{{- $total := concat $requiredCZMetricLabels $requiredSpecialMetricLabels -}}
{{- $result := join "|" $total -}}
{{- $result -}}
Expand Down
4 changes: 3 additions & 1 deletion tests/helm/template/cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ data:

# Labels to keep.
- action: labelkeep
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|topology_kubernetes_io_region|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$

# Metrics to keep.
- source_labels: [__name__]
Expand Down Expand Up @@ -438,6 +438,8 @@ data:
match: exact
- pattern: "resource_type"
match: exact
- pattern: "topology_kubernetes_io_region"
match: exact
- pattern: "unit"
match: exact
- pattern: "uid"
Expand Down
4 changes: 3 additions & 1 deletion tests/helm/template/federated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ data:

# Labels to keep.
- action: labelkeep
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|topology_kubernetes_io_region|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$

# Metrics to keep.
- source_labels: [__name__]
Expand Down Expand Up @@ -507,6 +507,8 @@ data:
match: exact
- pattern: "resource_type"
match: exact
- pattern: "topology_kubernetes_io_region"
match: exact
- pattern: "unit"
match: exact
- pattern: "uid"
Expand Down
4 changes: 3 additions & 1 deletion tests/helm/template/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ data:

# Labels to keep.
- action: labelkeep
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$
regex: ^(board_asset_tag|container|created_by_kind|created_by_name|image|instance|name|namespace|node|node_kubernetes_io_instance_type|pod|product_name|provider_id|resource|topology_kubernetes_io_region|unit|uid|_.*|label_.*|app.kubernetes.io/*|k8s.*)$

# Metrics to keep.
- source_labels: [__name__]
Expand Down Expand Up @@ -454,6 +454,8 @@ data:
match: exact
- pattern: "resource_type"
match: exact
- pattern: "topology_kubernetes_io_region"
match: exact
- pattern: "unit"
match: exact
- pattern: "uid"
Expand Down
Loading