diff --git a/CHANGELOG.md b/CHANGELOG.md index 75da16ad649..3b2579555c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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://github.com/grafana/tempo/pull/1045) (@MichelHollands) * [ENHANCEMENT] Adding metrics around ingester flush retries [#1049](https://github.com/grafana/tempo/pull/944) (@dannykopping) * [ENHANCEMENT] Allow search disablement in vulture [#1069](https://github.com/grafana/tempo/pull/1069) (@zalegrala) +* [ENHANCEMENT] Jsonnet: add `$._config.search_enabled`, correctly set `http_api_prefix` in config [#1072](https://github.com/grafana/tempo/pull/1072) (@kvrhdn) * [BUGFIX] Update port spec for GCS docker-compose example [#869](https://github.com/grafana/tempo/pull/869) (@zalegrala) * [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https://github.com/grafana/tempo/issues/937) (@mdisibio) * [BUGFIX] Fix compactor memory leak [#806](https://github.com/grafana/tempo/pull/806) (@mdisibio) diff --git a/operations/jsonnet/microservices/config.libsonnet b/operations/jsonnet/microservices/config.libsonnet index 4fbbc7439ab..008c3a93515 100644 --- a/operations/jsonnet/microservices/config.libsonnet +++ b/operations/jsonnet/microservices/config.libsonnet @@ -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+:: { diff --git a/operations/jsonnet/microservices/configmap.libsonnet b/operations/jsonnet/microservices/configmap.libsonnet index d261a2b835b..be5afeb33c7 100644 --- a/operations/jsonnet/microservices/configmap.libsonnet +++ b/operations/jsonnet/microservices/configmap.libsonnet @@ -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, }, diff --git a/operations/kube-manifests/ConfigMap-tempo-compactor.yaml b/operations/kube-manifests/ConfigMap-tempo-compactor.yaml index 2c9a60a8d76..538b3671123 100644 --- a/operations/kube-manifests/ConfigMap-tempo-compactor.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-compactor.yaml @@ -9,6 +9,7 @@ data: kvstore: store: memberlist distributor: {} + http_api_prefix: "" ingester: lifecycler: ring: @@ -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: diff --git a/operations/kube-manifests/ConfigMap-tempo-distributor.yaml b/operations/kube-manifests/ConfigMap-tempo-distributor.yaml index 48c213b3859..3c6429bc20f 100644 --- a/operations/kube-manifests/ConfigMap-tempo-distributor.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-distributor.yaml @@ -12,6 +12,7 @@ data: protocols: grpc: endpoint: 0.0.0.0:55680 + http_api_prefix: "" ingester: lifecycler: ring: @@ -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: diff --git a/operations/kube-manifests/ConfigMap-tempo-ingester.yaml b/operations/kube-manifests/ConfigMap-tempo-ingester.yaml index ef07b2d6187..1be54ea217c 100644 --- a/operations/kube-manifests/ConfigMap-tempo-ingester.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-ingester.yaml @@ -3,6 +3,7 @@ data: tempo.yaml: | compactor: {} distributor: {} + http_api_prefix: "" ingester: lifecycler: ring: @@ -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: diff --git a/operations/kube-manifests/ConfigMap-tempo-querier.yaml b/operations/kube-manifests/ConfigMap-tempo-querier.yaml index 95ba2833038..f14f1552123 100644 --- a/operations/kube-manifests/ConfigMap-tempo-querier.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-querier.yaml @@ -3,6 +3,7 @@ data: tempo.yaml: | compactor: {} distributor: {} + http_api_prefix: "" ingester: lifecycler: ring: @@ -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 diff --git a/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml b/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml index d4fcc21039b..9f166d5900d 100644 --- a/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml +++ b/operations/kube-manifests/ConfigMap-tempo-query-frontend.yaml @@ -3,6 +3,7 @@ data: tempo.yaml: | compactor: {} distributor: {} + http_api_prefix: "" ingester: lifecycler: ring: @@ -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: diff --git a/operations/kube-manifests/Deployment-compactor.yaml b/operations/kube-manifests/Deployment-compactor.yaml index 234118f36a4..12ed311ba39 100644 --- a/operations/kube-manifests/Deployment-compactor.yaml +++ b/operations/kube-manifests/Deployment-compactor.yaml @@ -18,7 +18,7 @@ spec: template: metadata: annotations: - config_hash: 9e1f883a7a6ce95d5952bb119bdde93d + config_hash: 032f910723ddd3da0551644ee2db68c1 labels: app: compactor name: compactor diff --git a/operations/kube-manifests/Deployment-distributor.yaml b/operations/kube-manifests/Deployment-distributor.yaml index fec60240fec..0120066527d 100644 --- a/operations/kube-manifests/Deployment-distributor.yaml +++ b/operations/kube-manifests/Deployment-distributor.yaml @@ -19,7 +19,7 @@ spec: template: metadata: annotations: - config_hash: 3c0ba38c611e090f34119e99081a6c83 + config_hash: cbac2ba3a3dacc4cff00935d6e309cc8 labels: app: distributor name: distributor diff --git a/operations/kube-manifests/Deployment-querier.yaml b/operations/kube-manifests/Deployment-querier.yaml index 316d12666ef..d9dbda869aa 100644 --- a/operations/kube-manifests/Deployment-querier.yaml +++ b/operations/kube-manifests/Deployment-querier.yaml @@ -19,7 +19,7 @@ spec: template: metadata: annotations: - config_hash: a1b5f8315434d8ce62f63fb8d5e132f0 + config_hash: aaa069186e50a272903a5e0e38de02c3 labels: app: querier name: querier diff --git a/operations/kube-manifests/Deployment-query-frontend.yaml b/operations/kube-manifests/Deployment-query-frontend.yaml index fd5bc42b97d..d02e259b332 100644 --- a/operations/kube-manifests/Deployment-query-frontend.yaml +++ b/operations/kube-manifests/Deployment-query-frontend.yaml @@ -18,7 +18,7 @@ spec: template: metadata: annotations: - config_hash: 48de574bb668780f2434f8e3d827b9ef + config_hash: fbe5395186d4d543947100523de19ad2 labels: app: query-frontend name: query-frontend diff --git a/operations/kube-manifests/StatefulSet-ingester.yaml b/operations/kube-manifests/StatefulSet-ingester.yaml index 2a797967008..b5e770956bc 100644 --- a/operations/kube-manifests/StatefulSet-ingester.yaml +++ b/operations/kube-manifests/StatefulSet-ingester.yaml @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - config_hash: 48de574bb668780f2434f8e3d827b9ef + config_hash: fbe5395186d4d543947100523de19ad2 labels: app: ingester name: ingester