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.

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

[tempo] Add servicemonitor namespace and values note #3506

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+24 −17
Open

[tempo] Add servicemonitor namespace and values note #3506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02cc770
chore: add servicemonitor configuration and values note
daviderli614 Dec 31, 2024
bb193d1
chore: delete the extra lines
daviderli614 Jan 2, 2025
f92f2cd
chore: apply suggestion
daviderli614 Jan 12, 2025
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/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo
description: Grafana Tempo Single Binary Mode
type: application
version: 1.16.0
version: 1.16.1
appVersion: 2.6.1
engine: gotpl
home: https://grafana.net
Expand Down
8 changes: 4 additions & 4 deletions charts/tempo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo

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

Grafana Tempo Single Binary Mode

Expand Down Expand Up @@ -61,7 +61,7 @@ Grafana Tempo Single Binary Mode
| tempo.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods |
| tempo.extraVolumeMounts | list | `[]` | Volume mounts to add |
| tempo.global_overrides.per_tenant_override_config | string | `"/conf/overrides.yaml"` | |
| tempo.ingester | object | `{}` | Configuration options for the ingester |
| tempo.ingester | object | `{}` | Configuration options for the ingester. Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester |
| tempo.livenessProbe.failureThreshold | int | `3` | |
| tempo.livenessProbe.httpGet.path | string | `"/ready"` | |
| tempo.livenessProbe.httpGet.port | int | `3100` | |
Expand All @@ -75,8 +75,8 @@ Grafana Tempo Single Binary Mode
| tempo.multitenancyEnabled | bool | `false` | |
| tempo.overrides | object | `{}` | |
| tempo.pullPolicy | string | `"IfNotPresent"` | |
| tempo.querier | object | `{}` | Configuration options for the querier |
| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted |
| tempo.querier | object | `{}` | Configuration options for the querier. Refers to: https://grafana.com/docs/tempo/latest/configuration/#querier |
| tempo.queryFrontend | object | `{}` | Configuration options for the query-fronted. Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend |
| tempo.readinessProbe.failureThreshold | int | `3` | |
| tempo.readinessProbe.httpGet.path | string | `"/ready"` | |
| tempo.readinessProbe.httpGet.port | int | `3100` | |
Expand Down
4 changes: 0 additions & 4 deletions charts/tempo/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -47,6 +46,3 @@ spec:
{{- end }}
selector:
{{- include "tempo.selectorLabels" . | nindent 4 }}



1 change: 1 addition & 0 deletions charts/tempo/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "tempo.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "tempo.name" . }}
chart: {{ template "tempo.chart" . }}
Expand Down
26 changes: 18 additions & 8 deletions charts/tempo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,30 @@ tempo:
# -- If true, enables Tempo's metrics generator (https://grafana.com/docs/tempo/next/metrics-generator/)
enabled: false
remoteWriteUrl: "http://prometheus.monitoring:9090/api/v1/write"
# -- Configuration options for the ingester
# -- Configuration options for the ingester.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#ingester
ingester: {}
# -- Configuration options for the querier
# flush_check_period: 10s
# trace_idle_period: 10s
# max_block_duration: 30m
# complete_block_timeout: 1h
# -- Configuration options for the querier.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#querier
querier: {}
# -- Configuration options for the query-fronted
# max_concurrent_queries: 20
# -- Configuration options for the query-fronted.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#query-frontend
queryFrontend: {}
# search:
# concurrent_jobs: 2000
retention: 24h
# Global overrides
global_overrides:
per_tenant_override_config: /conf/overrides.yaml
overrides: {}

# Tempo server configuration
# Refers to https://grafana.com/docs/tempo/latest/configuration/#server
# Tempo server configuration.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#server
server:
# -- HTTP server listen port
http_listen_port: 3100
Expand All @@ -86,8 +96,8 @@ tempo:
successThreshold: 1
storage:
trace:
# tempo storage backend
# refer https://grafana.com/docs/tempo/latest/configuration/
# tempo storage backend.
# Refers to: https://grafana.com/docs/tempo/latest/configuration/#storage
## Use s3 for example
# backend: s3
# store traces in s3
Expand Down Expand Up @@ -185,7 +195,7 @@ tempoQuery:
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
## Refers to: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
# pullSecrets:
# - myRegistryKeySecretName
Expand Down