Skip to content
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* [ENHANCEMENT] Make `TempoIngesterFlushesFailing` alert more actionable [#1157](https://github.com/grafana/tempo/pull/1157) (@dannykopping)
* [ENHANCEMENT] Switch open-telemetry/opentelemetry-collector to grafana/opentelemetry-collectorl fork, update it to 0.40.0 and add missing dependencies due to the change [#1142](https://github.com/grafana/tempo/pull/1142) (@tete17)
* [ENHANCEMENT] Allow environment variables for Azure storage credentials [#1147](https://github.com/grafana/tempo/pull/1147) (@zalegrala)
* [ENHANCEMENT] jsonnet: set rollingUpdate.maxSurge to 3 for distributor, frontend and queriers [#1164](https://github.com/grafana/tempo/pull/1164) (@kvrhdn)
* [BUGFIX] Add process name to vulture traces to work around display issues [#1127](https://github.com/grafana/tempo/pull/1127) (@mdisibio)
* [BUGFIX] Fixed issue where compaction sometimes dropped spans. [#1130](https://github.com/grafana/tempo/pull/1130) (@joe-elliott)
* [BUGFIX] Ensure that the admin client jsonnet has correct S3 bucket property. (@hedss)
Expand Down
2 changes: 0 additions & 2 deletions operations/jsonnet/microservices/compactor.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
local volumeMount = k.core.v1.volumeMount,
local deployment = k.apps.v1.deployment,
local volume = k.core.v1.volume,
local service = k.core.v1.service,
local servicePort = k.core.v1.servicePort,

local target_name = 'compactor',
local tempo_config_volume = 'tempo-conf',
Expand Down
4 changes: 1 addition & 3 deletions operations/jsonnet/microservices/distributor.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
local container = k.core.v1.container,
local containerPort = k.core.v1.containerPort,
local volumeMount = k.core.v1.volumeMount,
local pv = k.core.v1.persistentVolume,
local deployment = k.apps.v1.deployment,
local volume = k.core.v1.volume,
local service = k.core.v1.service,
local servicePort = k.core.v1.servicePort,

local target_name = 'distributor',
local tempo_config_volume = 'tempo-conf',
Expand Down Expand Up @@ -40,7 +38,7 @@
app: target_name,
[$._config.gossip_member_label]: 'true',
}) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(3) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
deployment.mixin.spec.template.spec.withTerminationGracePeriodSeconds(60) +
deployment.mixin.spec.template.metadata.withAnnotations({
Expand Down
2 changes: 1 addition & 1 deletion operations/jsonnet/microservices/frontend.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
app: target_name,
}
) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(3) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
deployment.mixin.spec.template.metadata.withAnnotations({
config_hash: std.md5(std.toString($.tempo_query_frontend_configmap.data['tempo.yaml'])),
Expand Down
4 changes: 1 addition & 3 deletions operations/jsonnet/microservices/querier.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
local volumeMount = k.core.v1.volumeMount,
local deployment = k.apps.v1.deployment,
local volume = k.core.v1.volume,
local service = k.core.v1.service,
local servicePort = k.core.v1.servicePort,

local target_name = 'querier',
local tempo_config_volume = 'tempo-conf',
Expand Down Expand Up @@ -39,7 +37,7 @@
[$._config.gossip_member_label]: 'true',
}
) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(3) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) +
deployment.mixin.spec.template.metadata.withAnnotations({
config_hash: std.md5(std.toString($.tempo_querier_configmap.data['tempo.yaml'])),
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-distributor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
tempo-gossip-member: "true"
strategy:
rollingUpdate:
maxSurge: 0
maxSurge: 3
maxUnavailable: 1
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-querier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
tempo-gossip-member: "true"
strategy:
rollingUpdate:
maxSurge: 0
maxSurge: 3
maxUnavailable: 1
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-query-frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
name: query-frontend
strategy:
rollingUpdate:
maxSurge: 0
maxSurge: 3
maxUnavailable: 1
template:
metadata:
Expand Down
4 changes: 2 additions & 2 deletions operations/kube-manifests/util/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
"version": "9927be87af4be9ff6b009e4503868b1b5493011b",
"version": "b102f9ac7d1290ac025c2a7ac99f7fd9a9948503",
"sum": "fFVlCoa/N0qiqTbDhZAEdRm2Vv76Z9Clxp3/haJ+PyA="
},
{
Expand All @@ -18,7 +18,7 @@
"subdir": "memcached"
}
},
"version": "9927be87af4be9ff6b009e4503868b1b5493011b",
"version": "b102f9ac7d1290ac025c2a7ac99f7fd9a9948503",
"sum": "dTOeEux3t9bYSqP2L/uCuLo/wUDpCKH4w+4OD9fePUk="
},
{
Expand Down