Skip to content

K8s cluster name #1

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
atillaqb wants to merge 4 commits into
base: main
Choose a base branch
from
Open

K8s cluster name #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58d6273
add label name to cluster
atillaqb May 6, 2024
d87efd8
update sources
atillaqb May 6, 2024
b6350ce
update proccessors services name service.name - to grafana tempo
atillaqb Jun 4, 2024
0b37b77
add
atillaqb Jun 4, 2024
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
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 0.13.4
appVersion: 2.2.0
icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
sources:
- https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/k8s-monitoring
- https://github.com/atillaqb/k8s-monitoring-helm/tree/k8s-cluster-name/charts/k8s-monitoring
maintainers:
- email: [email protected]
name: petewall
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/templates/agent_config/_logs_service.river.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ remote.kubernetes.secret "logs_service" {
loki.process "logs_service" {
stage.static_labels {
values = {
cluster = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }},
{{ required ".Values.cluster.metricsLabelName is a required value. Please set it and try again." .Values.cluster.metricsLabelName | quote }} = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }},
}
}

Expand Down
5 changes: 5 additions & 0 deletions charts/k8s-monitoring/templates/agent_config/_logs_service_otlp.river.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ otelcol.processor.attributes "logs_service" {
value = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }}
action = "upsert"
}
action {
key = "loki.resource.labels"
action = "insert"
value = "service.name"
}
{{ with .Values.externalServices.loki }}
{{- range $key, $value := .externalLabels }}
action {
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/templates/agent_config/_metrics_service.river.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ prometheus.relabel "metrics_service" {
source_labels = ["cluster"]
regex = ""
replacement = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }}
target_label = "cluster"
target_label = {{ required ".Values.cluster.metricsLabelName is a required value. Please set it and try again." .Values.cluster.metricsLabelName | quote }}
}

{{- if .Values.metrics.extraMetricRelabelingRules }}
Expand Down
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/templates/agent_config/_profiles_service.river.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pyroscope.write "profiles_service" {
{{ $key }} = {{ $value | quote }},
{{- end }}
{{- end }}
cluster = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }},
{{ required ".Values.cluster.metricsLabelName is a required value. Please set it and try again." .Values.cluster.metricsLabelName | quote }} = {{ required ".Values.cluster.name is a required value. Please set it and try again." .Values.cluster.name | quote }},
}
}
{{ end }}
1 change: 1 addition & 0 deletions charts/k8s-monitoring/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
cluster:
# -- The name of this cluster, which will be set in all labels. Required.
name: ""
metricsLabelName: "agent_k8s_cluster"

# -- The Kubernetes service. Change this if your cluster DNS is configured differently than the default.
kubernetesAPIService: kubernetes.default.svc.cluster.local:443
Expand Down