Skip to content

Commit

Permalink
agent: rename namespace => project
Browse files Browse the repository at this point in the history
  • Loading branch information
d7561985 committed Jul 2, 2023
1 parent dea603d commit 0ede108
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion charts/agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.5.33-k
version: 0.5.33-l

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
14 changes: 7 additions & 7 deletions charts/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
info:
name: agent
license: PLZ_CHANGE
namespace: PLZ_CHANGE
project: PLZ_CHANGE
deployment_environment: PLZ_CHANGE

IsDaemonSet: false
Expand Down Expand Up @@ -126,7 +126,7 @@ receivers:
target_label: __metrics_path__
replacement: /api/v1/nodes/$$1/proxy/metrics/cadvisor
- action: replace
replacement: "{{ .Values.info.namespace }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
replacement: "{{ .Values.info.project }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
target_label: cluster
kubernetes:
enabled: true
Expand Down Expand Up @@ -169,7 +169,7 @@ receivers:
- __meta_kubernetes_pod_phase
regex: (Failed|Succeeded)
- action: replace
replacement: "{{ .Values.info.namespace }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
replacement: "{{ .Values.info.project }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
target_label: origin_prometheus
metric_relabel_configs: [ ]
# required helm name: kube-state-metrics
Expand Down Expand Up @@ -199,7 +199,7 @@ receivers:
- __meta_kubernetes_pod_phase
regex: (Failed|Succeeded)
- action: replace
replacement: "{{ .Values.info.namespace }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
replacement: "{{ .Values.info.project }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
target_label: cluster
# coredns
# https://grafana.com/grafana/dashboards/14981-coredns/
Expand Down Expand Up @@ -292,7 +292,7 @@ receivers:
source_labels:
- __meta_kubernetes_pod_phase
- action: replace
replacement: "{{ .Values.info.namespace }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
replacement: "{{ .Values.info.project }}/{{ .Values.info.license }}/{{ .Values.info.deployment_environment }}"
target_label: cluster
- action: replace
source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_component]
Expand Down Expand Up @@ -524,8 +524,8 @@ config:
value: resource, service, namespace, license, deployment_environment, department, namespace, container, aws_region
resource:
attributes:
- key: department
value: "{{ .Values.info.namespace }}"
- key: project
value: "{{ .Values.info.project }}"
action: upsert
- key: license
action: upsert
Expand Down

0 comments on commit 0ede108

Please sign in to comment.