Merge pull request #10 from AndreZiviani/tempo-service

Tempo service
AndreZiviani · May 27, 2021 · 9ea512d · 9ea512d
2 parents 97f4136 + 36788eb
commit 9ea512d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/charts/grafana-agent/Chart.yaml b/charts/grafana-agent/Chart.yaml
@@ -3,7 +3,7 @@ name: grafana-agent
 description: Grafana Agent is a telemetry collector for sending metrics, logs, and trace data to the opinionated Grafana observability stack.
 type: application
 appVersion: 0.14.0
-version: 1.0.7
+version: 1.0.8
 home: https://github.com/grafana/agent/
 sources:
   - https://grafana.com/docs/grafana-cloud/agent/

diff --git a/charts/grafana-agent/README.md b/charts/grafana-agent/README.md
@@ -1,6 +1,6 @@
 # grafana-agent
 
-![Version: 1.0.7](https://img.shields.io/badge/Version-1.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
+![Version: 1.0.8](https://img.shields.io/badge/Version-1.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
 
 This chart is a temporary solution while the [Operator is not finished](https://github.com/grafana/agent/pull/549),
 after that this chart will be discontinued.

diff --git a/charts/grafana-agent/templates/secret.yaml b/charts/grafana-agent/templates/secret.yaml
@@ -20,7 +20,7 @@ stringData:
     {{- end }}
     {{- if .Values.tempo.enabled }}
     tempo:
-      {{- tpl .Values.loki.config . | nindent 6 }}
+      {{- tpl .Values.tempo.config . | nindent 6 }}
     {{- end }}
   agent-deployment.yaml: |
     {{- if .Values.prometheusDeployment.enabled }}

diff --git a/charts/grafana-agent/templates/service.yaml b/charts/grafana-agent/templates/service.yaml
@@ -0,0 +1,47 @@
+{{- if .Values.tempo.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "agent.fullname" . }}-traces
+  labels:
+    {{- include "agent.labels" . | nindent 4 }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+  - name: agent-http-metrics
+    port: 80
+    targetPort: 80
+  - name: agent-thrift-compact
+    port: 6831
+    protocol: UDP
+    targetPort: 6831
+  - name: agent-thrift-binary
+    port: 6832
+    protocol: UDP
+    targetPort: 6832
+  - name: agent-thrift-http
+    port: 14268
+    protocol: TCP
+    targetPort: 14268
+  - name: agent-thrift-grpc
+    port: 14250
+    protocol: TCP
+    targetPort: 14250
+  - name: agent-zipkin
+    port: 9411
+    protocol: TCP
+    targetPort: 9411
+  - name: agent-otlp
+    port: 55680
+    protocol: TCP
+    targetPort: 55680
+  - name: agent-opencensus
+    port: 55678
+    protocol: TCP
+    targetPort: 55678
+  selector:
+    name: {{ include "agent.fullname" . }}
+{{- end }}