Skip to content
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.

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

[tempo-distributed] Changed the default port #3500

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/tempo-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.28.0
version: 1.28.1
appVersion: 2.6.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
10 changes: 5 additions & 5 deletions charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.28.0](https://img.shields.io/badge/Version-1.28.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)
![Version: 1.28.1](https://img.shields.io/badge/Version-1.28.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -396,7 +396,7 @@ The memcached default args are removed and should be provided manually. The sett
| enterpriseFederationFrontend.service.annotations | object | `{}` | Annotations for enterpriseFederationFrontend service |
| enterpriseFederationFrontend.service.loadBalancerIP | string | `""` | If type is LoadBalancer you can assign the IP to the LoadBalancer |
| enterpriseFederationFrontend.service.loadBalancerSourceRanges | list | `[]` | If type is LoadBalancer limit incoming traffic from IPs. |
| enterpriseFederationFrontend.service.port | int | `3100` | Port of the federation-frontend service |
| enterpriseFederationFrontend.service.port | int | `3200` | Port of the federation-frontend service |
| enterpriseFederationFrontend.service.type | string | `"ClusterIP"` | Type of service for the enterpriseFederationFrontend |
| enterpriseFederationFrontend.terminationGracePeriodSeconds | int | `30` | Grace period to allow the federation-frontend to shutdown before it is killed |
| enterpriseFederationFrontend.tolerations | list | `[]` | Tolerations for federation-frontend pods |
Expand Down Expand Up @@ -682,7 +682,7 @@ The memcached default args are removed and should be provided manually. The sett
| metricsGenerator.persistentVolumeClaimRetentionPolicy.whenScaled | string | `"Retain"` | Volume retention behavior when the replica count of the StatefulSet is reduced |
| metricsGenerator.podAnnotations | object | `{}` | Annotations for metrics-generator pods |
| metricsGenerator.podLabels | object | `{}` | Labels for metrics-generator pods |
| metricsGenerator.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-memberlist","port":7946,"service":false},{"name":"http-metrics","port":3100,"service":true}]` | Default ports |
| metricsGenerator.ports | list | `[{"name":"grpc","port":9095,"service":true},{"name":"http-memberlist","port":7946,"service":false},{"name":"http-metrics","port":3200,"service":true}]` | Default ports |
| metricsGenerator.priorityClassName | string | `nil` | The name of the PriorityClass for metrics-generator pods |
| metricsGenerator.replicas | int | `1` | Number of replicas for the metrics-generator |
| metricsGenerator.resources | object | `{}` | Resource requests and limits for the metrics-generator |
Expand Down Expand Up @@ -796,7 +796,7 @@ The memcached default args are removed and should be provided manually. The sett
| queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods |
| queryFrontend.podLabels | object | `{}` | Labels for queryFrontend pods |
| queryFrontend.priorityClassName | string | `nil` | The name of the PriorityClass for query-frontend pods |
| queryFrontend.query.config | string | `"backend: 127.0.0.1:3100\n"` | |
| queryFrontend.query.config | string | `"backend: 127.0.0.1:3200\n"` | |
| queryFrontend.query.enabled | bool | `false` | Required for grafana version <7.5 for compatibility with jaeger-ui. Doesn't work on ARM arch |
| queryFrontend.query.extraArgs | list | `[]` | Additional CLI args for tempo-query pods |
| queryFrontend.query.extraEnv | list | `[]` | Environment variables to add to the tempo-query pods |
Expand Down Expand Up @@ -835,7 +835,7 @@ The memcached default args are removed and should be provided manually. The sett
| rollout_operator.securityContext.readOnlyRootFilesystem | bool | `true` | |
| server.grpc_server_max_recv_msg_size | int | `4194304` | Max gRPC message size that can be received |
| server.grpc_server_max_send_msg_size | int | `4194304` | Max gRPC message size that can be sent |
| server.httpListenPort | int | `3100` | HTTP server listen host |
| server.httpListenPort | int | `3200` | HTTP server listen host |
| server.http_server_read_timeout | string | `"30s"` | Read timeout for HTTP server |
| server.http_server_write_timeout | string | `"30s"` | Write timeout for HTTP server |
| server.logFormat | string | `"logfmt"` | Log format. Can be set to logfmt (default) or json. |
Expand Down
2 changes: 1 addition & 1 deletion charts/tempo-distributed/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ configMap:
Internal servers http listen port - derived from Loki default
*/}}
{{- define "tempo.serverHttpListenPort" -}}
{{ (((.Values.tempo).structuredConfig).server).http_listen_port | default "3100" }}
{{ (((.Values.tempo).structuredConfig).server).http_listen_port | default "3200" }}
{{- end -}}

{{/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec:
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: compactor
ports:
- containerPort: 3100
- containerPort: 3200
name: http-metrics
- containerPort: {{ include "tempo.memberlistBindPort" . }}
name: http-memberlist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ spec:
type: ClusterIP
ports:
- name: http-metrics
port: 3100
targetPort: 3100
port: 3200
targetPort: 3200
protocol: TCP
selector:
{{- include "tempo.selectorLabels" (dict "ctx" . "component" "compactor") | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
- containerPort: {{ include "tempo.memberlistBindPort" . }}
name: http-memberlist
protocol: TCP
- containerPort: 3100
- containerPort: 3200
name: http-metrics
{{- if .Values.traces.jaeger.thriftCompact.enabled }}
- containerPort: 6831
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
clusterIP: None
ports:
- name: http-metrics
port: 3100
port: 3200
targetPort: http-metrics
{{- if .Values.traces.jaeger.thriftCompact.enabled }}
- name: distributor-jaeger-thrift-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
ports:
- name: http-metrics
port: 3100
port: 3200
targetPort: http-metrics
- name: grpc
port: 9095
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: federation-frontend
ports:
- containerPort: 3100
- containerPort: 3200
name: http-metrics
{{- if or .Values.global.extraEnv .Values.enterpriseFederationFrontend.extraEnv }}
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ spec:
type: {{ .Values.enterpriseFederationFrontend.service.type }}
ports:
- name: http-metrics
port: 3100
targetPort: 3100
port: 3200
targetPort: 3200
{{- if .Values.enterpriseFederationFrontend.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.enterpriseFederationFrontend.service.loadBalancerIP }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ spec:
clusterIP: None
ports:
- name: http-metrics
port: 3100
port: 3200
protocol: TCP
targetPort: 3100
targetPort: 3200
- name: grpc
port: 9095
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ spec:
ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
ports:
- name: http-metrics
port: 3100
port: 3200
protocol: TCP
targetPort: 3100
targetPort: 3200
- name: grpc
port: 9095
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ spec:
- name: http-memberlist
containerPort: {{ include "tempo.memberlistBindPort" . }}
- name: http-metrics
containerPort: 3100
containerPort: 3200
{{- if or .Values.global.extraEnv .Values.ingester.extraEnv }}
env:
{{- with .Values.global.extraEnv }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
- containerPort: {{ include "tempo.memberlistBindPort" . }}
name: http-memberlist
protocol: TCP
- containerPort: 3100
- containerPort: 3200
name: http-metrics
{{- if or .Values.global.extraEnv .Values.querier.extraEnv }}
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ spec:
ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
ports:
- name: http-metrics
port: 3100
port: 3200
protocol: TCP
targetPort: 3100
targetPort: 3200
- name: grpc
port: 9095
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: query-frontend
ports:
- containerPort: 3100
- containerPort: 3200
name: http-metrics
- containerPort: 9095
name: grpc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ spec:
clusterIP: None
ports:
- name: http
port: 3100
targetPort: 3100
port: 3200
targetPort: 3200
- name: grpc
port: 9095
protocol: TCP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ spec:
ipFamilyPolicy: {{ .Values.tempo.service.ipFamilyPolicy }}
ports:
- name: http-metrics
port: 3100
targetPort: 3100
port: 3200
targetPort: 3200
- name: grpc
port: 9095
protocol: TCP
Expand Down
20 changes: 10 additions & 10 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ metricsGenerator:
port: 7946
service: false
- name: http-metrics
port: 3100
port: 3200
service: true
# -- More information on configuration: https://grafana.com/docs/tempo/latest/configuration/#metrics-generator
config:
Expand Down Expand Up @@ -852,7 +852,7 @@ queryFrontend:
# -- Extra volumes for tempo-query deployment
extraVolumes: []
config: |
backend: 127.0.0.1:3100
backend: 127.0.0.1:3200
# -- Number of replicas for the query-frontend
replicas: 1
# -- hostAliases to add
Expand Down Expand Up @@ -1053,7 +1053,7 @@ enterpriseFederationFrontend:
tag: null
service:
# -- Port of the federation-frontend service
port: 3100
port: 3200
# -- Annotations for enterpriseFederationFrontend service
annotations: {}
# -- Type of service for the enterpriseFederationFrontend
Expand Down Expand Up @@ -1503,7 +1503,7 @@ config: |
# Refers to https://grafana.com/docs/tempo/latest/configuration/#server
server:
# -- HTTP server listen host
httpListenPort: 3100
httpListenPort: 3200
# -- Log level. Can be set to debug, info (default), warn, error
logLevel: info
# -- Log format. Can be set to logfmt (default) or json.
Expand Down Expand Up @@ -2057,32 +2057,32 @@ gateway:

location ^~ /api {
set $query_frontend {{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$query_frontend:3100$request_uri;
proxy_pass http://$query_frontend:3200$request_uri;
}

location = /flush {
set $ingester {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$ingester:3100$request_uri;
proxy_pass http://$ingester:3200$request_uri;
}

location = /shutdown {
set $ingester {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$ingester:3100$request_uri;
proxy_pass http://$ingester:3200$request_uri;
}

location = /distributor/ring {
set $distributor {{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$distributor:3100$request_uri;
proxy_pass http://$distributor:3200$request_uri;
}

location = /ingester/ring {
set $distributor {{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$distributor:3100$request_uri;
proxy_pass http://$distributor:3200$request_uri;
}

location = /compactor/ring {
set $compactor {{ include "tempo.resourceName" (dict "ctx" . "component" "compactor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
proxy_pass http://$compactor:3100$request_uri;
proxy_pass http://$compactor:3200$request_uri;
}

{{- with .Values.gateway.nginxConfig.serverSnippet }}
Expand Down
Loading