diff --git a/values/prometheus/manifests/prometheus.yaml b/values/prometheus/manifests/prometheus.yaml index 536f72ef..1ff094eb 100644 --- a/values/prometheus/manifests/prometheus.yaml +++ b/values/prometheus/manifests/prometheus.yaml @@ -68,7 +68,8 @@ spec: server: 'https://kubernetes.default.svc' source: repoURL: 'https://prometheus-community.github.io/helm-charts' - targetRevision: '14.0.0' + targetRevision: {{- if eq .Values.dapr.cluster "hel1" }} '27.0.0' {{- else }} '14.0.0' {{- end }} + # targetRevision: '27.0.0' chart: prometheus-operator-crds project: sys syncPolicy: diff --git a/values/prometheus/values/prometheus.yaml.gotmpl b/values/prometheus/values/prometheus.yaml.gotmpl index 923c395f..27497630 100644 --- a/values/prometheus/values/prometheus.yaml.gotmpl +++ b/values/prometheus/values/prometheus.yaml.gotmpl @@ -485,6 +485,31 @@ prometheus: prometheusSpec: enableRemoteWriteReceiver: true + enableOTLPReceiver: true + otlp: + promoteResourceAttributes: + - service.instance.id + - service.name + - service.namespace + - cloud.availability_zone + - cloud.region + - container.name + - deployment.environment.name + - k8s.cluster.name + - k8s.container.name + - k8s.cronjob.name + - k8s.daemonset.name + - k8s.deployment.name + - k8s.job.name + - k8s.namespace.name + - k8s.pod.name + - k8s.replicaset.name + - k8s.statefulset.name + - k8s.statefulset.name + translation_strategy: NoUTF8EscapingWithSuffixes + keepIdentifyingResourceAttributes: true + tsdb: + outOfOrderTimeWindow: 30m tolerations: [] # - key: unschedulable