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-distributed] Misplaced proxy-target examples #3433

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

[tempo-distributed] Misplaced proxy-target examples #3433

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1cad7cf
Fixed misplaced proxy-target examples
xogoodnow Nov 16, 2024
4087aa0
Ran helm-docs
xogoodnow Dec 11, 2024
9458bdf
bumbped version
xogoodnow Dec 13, 2024
7f5e25f
Merge branch 'main' into misplaced-proxy-target
xogoodnow Dec 13, 2024
1efb0be
Merge remote-tracking branch 'origin/misplaced-proxy-target' into mis…
xogoodnow Dec 13, 2024
eb396af
resolve conflic
xogoodnow Dec 13, 2024
1148515
fixed mistake
xogoodnow Dec 13, 2024
cb0fa4b
Added new line
xogoodnow Dec 13, 2024
4d45765
Merge branch 'main' into misplaced-proxy-target
Sheikh-Abubaker Dec 13, 2024
a4c104d
Bumbped version
xogoodnow Dec 14, 2024
d3bdf19
Bumbped version
xogoodnow Dec 16, 2024
69c9ea3
Merge branch 'main' into misplaced-proxy-target
xogoodnow Dec 16, 2024
77fc657
Bumbped version
xogoodnow Dec 16, 2024
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
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-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.22.1
version: 1.25.2
appVersion: 2.6.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
2 changes: 1 addition & 1 deletion charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.22.1](https://img.shields.io/badge/Version-1.22.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)
![Version: 1.25.2](https://img.shields.io/badge/Version-1.25.2-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
3 changes: 1 addition & 2 deletions charts/tempo-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,15 +967,14 @@ enterpriseFederationFrontend:
# - ip: 1.2.3.4
# hostnames:
# - domain.tld
# proxy_targets:
proxy_targets: []
# - name: own-data-center
# url: http://get/tempo
# - name: grafana-cloud
# url: https://tempo-us-central1.grafana.net/tempo
# basic_auth:
# username: <instance-id>
# password: <token>
proxy_targets: []
autoscaling:
# -- Enable autoscaling for the federation-frontend
enabled: false
Expand Down