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

Jump to bottom

microservices jsonnet: add search_enabled, set http_api_prefix in config #1072

Merged
merged 3 commits into from
Oct 25, 2021
Merged

microservices jsonnet: add search_enabled, set http_api_prefix in config #1072

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
3d7a579
microservices jsonnet: add search_enabled, set http_api_prefix in config
kvrhdn Oct 23, 2021
8f67469
Update CHANGELOG.md
Oct 25, 2021
d67f655
make kube-manifests
kvrhdn Oct 25, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
* [ENHANCEMENT] Add query parameter to show the default config values and the difference between the current values and the defaults. [#1045](https:/grafana/tempo/pull/1045) (@MichelHollands)
* [ENHANCEMENT] Adding metrics around ingester flush retries [#1049](https:/grafana/tempo/pull/944) (@dannykopping)
* [ENHANCEMENT] Allow search disablement in vulture [#1069](https:/grafana/tempo/pull/1069) (@zalegrala)
* [ENHANCEMENT] Jsonnet: add `$._config.search_enabled`, correctly set `http_api_prefix` in config [#1072](https:/grafana/tempo/pull/1072) (@kvrhdn)
* [BUGFIX] Update port spec for GCS docker-compose example [#869](https:/grafana/tempo/pull/869) (@zalegrala)
* [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https:/grafana/tempo/issues/937) (@mdisibio)
* [BUGFIX] Fix compactor memory leak [#806](https:/grafana/tempo/pull/806) (@mdisibio)
Expand Down
1 change: 1 addition & 0 deletions operations/jsonnet/microservices/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
gossip_ring_port: 7946,
backend: error 'Must specify a backend', // gcs|s3
bucket: error 'Must specify a bucket',
search_enabled: false,

overrides_configmap_name: 'tempo-overrides',
overrides+:: {
Expand Down
3 changes: 3 additions & 0 deletions operations/jsonnet/microservices/configmap.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
local configMap = k.core.v1.configMap,

tempo_config:: {
search_enabled: $._config.search_enabled,
http_api_prefix: $._config.http_api_prefix,

server: {
http_listen_port: $._config.port,
},
Expand Down
2 changes: 2 additions & 0 deletions operations/kube-manifests/ConfigMap-tempo-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ data:
kvstore:
store: memberlist
distributor: {}
http_api_prefix: ""
ingester:
lifecycler:
ring:
Expand All @@ -20,6 +21,7 @@ data:
- gossip-ring.tracing.svc.cluster.local:7946
overrides:
per_tenant_override_config: /overrides/overrides.yaml
search_enabled: false
server:
http_listen_port: 3200
storage:
Expand Down
2 changes: 2 additions & 0 deletions operations/kube-manifests/ConfigMap-tempo-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ data:
protocols:
grpc:
endpoint: 0.0.0.0:55680
http_api_prefix: ""
ingester:
lifecycler:
ring:
Expand All @@ -23,6 +24,7 @@ data:
- gossip-ring.tracing.svc.cluster.local:7946
overrides:
per_tenant_override_config: /overrides/overrides.yaml
search_enabled: false
server:
http_listen_port: 3200
storage:
Expand Down
2 changes: 2 additions & 0 deletions operations/kube-manifests/ConfigMap-tempo-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data:
tempo.yaml: |
compactor: {}
distributor: {}
http_api_prefix: ""
ingester:
lifecycler:
ring:
Expand All @@ -14,6 +15,7 @@ data:
- gossip-ring.tracing.svc.cluster.local:7946
overrides:
per_tenant_override_config: /overrides/overrides.yaml
search_enabled: false
server:
http_listen_port: 3200
storage:
Expand Down
2 changes: 2 additions & 0 deletions operations/kube-manifests/ConfigMap-tempo-querier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data:
tempo.yaml: |
compactor: {}
distributor: {}
http_api_prefix: ""
ingester:
lifecycler:
ring:
Expand All @@ -17,6 +18,7 @@ data:
querier:
frontend_worker:
frontend_address: query-frontend-discovery.tracing.svc.cluster.local:9095
search_enabled: false
server:
http_listen_port: 3200
log_level: debug
Expand Down
2 changes: 2 additions & 0 deletions operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data:
tempo.yaml: |
compactor: {}
distributor: {}
http_api_prefix: ""
ingester:
lifecycler:
ring:
Expand All @@ -14,6 +15,7 @@ data:
- gossip-ring.tracing.svc.cluster.local:7946
overrides:
per_tenant_override_config: /overrides/overrides.yaml
search_enabled: false
server:
http_listen_port: 3200
storage:
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
template:
metadata:
annotations:
config_hash: 9e1f883a7a6ce95d5952bb119bdde93d
config_hash: 032f910723ddd3da0551644ee2db68c1
labels:
app: compactor
name: compactor
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
config_hash: 3c0ba38c611e090f34119e99081a6c83
config_hash: cbac2ba3a3dacc4cff00935d6e309cc8
labels:
app: distributor
name: distributor
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-querier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
config_hash: a1b5f8315434d8ce62f63fb8d5e132f0
config_hash: aaa069186e50a272903a5e0e38de02c3
labels:
app: querier
name: querier
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/Deployment-query-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
template:
metadata:
annotations:
config_hash: 48de574bb668780f2434f8e3d827b9ef
config_hash: fbe5395186d4d543947100523de19ad2
labels:
app: query-frontend
name: query-frontend
Expand Down
2 changes: 1 addition & 1 deletion operations/kube-manifests/StatefulSet-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
template:
metadata:
annotations:
config_hash: 48de574bb668780f2434f8e3d827b9ef
config_hash: fbe5395186d4d543947100523de19ad2
labels:
app: ingester
name: ingester
Expand Down