Skip to content
2 changes: 1 addition & 1 deletion charts/opentelemetry-kube-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-kube-stack
version: 0.15.0
version: 0.15.1
description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: OpAMPBridge
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Instrumentation
metadata:
name: example
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: agent
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -232,7 +232,7 @@ metadata:
name: gateway
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -365,7 +365,7 @@ metadata:
name: ingress
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-cluster-stats
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down Expand Up @@ -173,7 +173,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-apiserver
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-controller-manager
jobLabel: kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-controller-manager
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-dns
jobLabel: kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-dns
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-etcd
jobLabel: kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-etcd
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-proxy
jobLabel: kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-proxy
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: opentelemetry-kube-stack-kube-scheduler
jobLabel: kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: default
labels:
app: opentelemetry-kube-stack-kube-scheduler
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-daemon
namespace: default
labels:
helm.sh/chart: opentelemetry-kube-stack-0.15.0
helm.sh/chart: opentelemetry-kube-stack-0.15.1
app.kubernetes.io/version: "0.151.0"
app.kubernetes.io/managed-by: Helm
release: "example"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ spec:
- "delete"
- "instrumentations,opampbridges,opentelemetrycollectors"
- "-l"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"
13 changes: 13 additions & 0 deletions charts/opentelemetry-kube-stack/templates/_config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,26 @@ Constructs the final config for the given collector
This allows a user to supply a scrape_configs_file. This file is templated and loaded as a yaml array.
If a user has already supplied a prometheus receiver config, the file's config is appended. Finally,
the config is written as YAML.

When no scrape_configs_file is supplied but the targetAllocator is enabled, a minimal prometheus
receiver (with an empty scrape_configs list) is injected if one isn't already defined, so the
target allocator has a receiver to populate.
*/}}
{{- define "opentelemetry-kube-stack.config" -}}
{{- $collector := .collector }}
{{- $config := .collector.config }}
{{- if .collector.scrape_configs_file }}
{{- $config = (include "opentelemetry-kube-stack.collector.appendPrometheusScrapeFile" . | fromYaml) }}
{{- $_ := set $collector "config" $config }}
{{- else if (dig "targetAllocator" "enabled" false .collector) }}
{{- $receivers := (dig "receivers" dict $config) }}
{{- if not (hasKey $receivers "prometheus") }}
{{- $config = (mustMergeOverwrite $config (dict "receivers" (dict "prometheus" (dict "config" (dict "scrape_configs" list))))) }}
{{- $_ := set $collector "config" $config }}
{{- end }}
{{- if and (dig "service" "pipelines" "metrics" false $config) (not (has "prometheus" (dig "service" "pipelines" "metrics" "receivers" list $config))) }}
{{- $_ := set $config.service.pipelines.metrics "receivers" (append ($config.service.pipelines.metrics.receivers | default list) "prometheus" | uniq) }}
{{- end }}
{{- end }}
{{- if .collector.presets.logsCollection.enabled }}
{{- $_ := set $collector "exclude" (list (printf "/var/log/pods/%s_%s*_*/otc-container/*.log" .namespace (include "opentelemetry-kube-stack.collectorFullname" .))) }}
Expand Down
Loading