Skip to content

Commit ba1ccdf

Browse files
committed
Add /api/v1/receive route to config
Signed-off-by: Saswata Mukherjee <[email protected]>
1 parent adebab3 commit ba1ccdf

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

resources/services/metric-federation-rule-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ objects:
5050
- "headers":
5151
"THANOS-TENANT": "770c1124-6ae8-4324-a9d4-9ce08590094b"
5252
"name": "receive-rhobs"
53-
"url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291"
53+
"url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
5454
"write_relabel_configs":
5555
- "action": "keep"
5656
"regex": "770c1124-6ae8-4324-a9d4-9ce08590094b"
@@ -59,7 +59,7 @@ objects:
5959
- "headers":
6060
"THANOS-TENANT": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
6161
"name": "receive-telemeter"
62-
"url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291"
62+
"url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
6363
"write_relabel_configs":
6464
- "action": "keep"
6565
"regex": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"

resources/services/observatorium-metrics-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,7 @@ objects:
16951695
- "headers":
16961696
"THANOS-TENANT": "770c1124-6ae8-4324-a9d4-9ce08590094b"
16971697
"name": "receive-rhobs"
1698-
"url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291"
1698+
"url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
16991699
"write_relabel_configs":
17001700
- "action": "keep"
17011701
"regex": "770c1124-6ae8-4324-a9d4-9ce08590094b"
@@ -1704,7 +1704,7 @@ objects:
17041704
- "headers":
17051705
"THANOS-TENANT": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
17061706
"name": "receive-telemeter"
1707-
"url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291"
1707+
"url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
17081708
"write_relabel_configs":
17091709
- "action": "keep"
17101710
"regex": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"

services/observatorium-metrics.libsonnet

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,11 @@ local oauthProxy = import './sidecars/oauth-proxy.libsonnet';
163163
},
164164
data: {
165165
[statelessRulerKey]: std.manifestYamlDoc(remoteWriteConfig({
166-
url: 'http://observatorium-thanos-receive.%s.svc.cluster.local:19291' % thanosSharedConfig.namespace,
166+
url: 'http://%s.%s.svc.cluster.local:%d/api/v1/receive' % [
167+
thanos.receiversService.metadata.name,
168+
thanosSharedConfig.namespace,
169+
thanos.receiversService.spec.ports[2].port,
170+
],
167171
})),
168172
},
169173
},
@@ -259,7 +263,11 @@ local oauthProxy = import './sidecars/oauth-proxy.libsonnet';
259263
},
260264
data: {
261265
[statelessRulerKey]: std.manifestYamlDoc(remoteWriteConfig({
262-
url: 'http://observatorium-thanos-receive.%s.svc.cluster.local:19291' % '${THANOS_QUERIER_NAMESPACE}',
266+
url: 'http://%s.%s.svc.cluster.local:%d/api/v1/receive' % [
267+
thanos.receiversService.metadata.name,
268+
'${THANOS_QUERIER_NAMESPACE}',
269+
thanos.receiversService.spec.ports[2].port,
270+
],
263271
})),
264272
},
265273
},

0 commit comments

Comments
 (0)