Add /api/v1/receive route to config and change ns

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
rhobs · Mar 1, 2022 · 094d498 · 094d498
1 parent 1c5b302
commit 094d498
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/resources/services/metric-federation-rule-template.yaml b/resources/services/metric-federation-rule-template.yaml
@@ -50,7 +50,7 @@ objects:
       - "headers":
           "THANOS-TENANT": "770c1124-6ae8-4324-a9d4-9ce08590094b"
         "name": "receive-rhobs"
-        "url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291"
+        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
         "write_relabel_configs":
         - "action": "keep"
           "regex": "770c1124-6ae8-4324-a9d4-9ce08590094b"
@@ -59,7 +59,7 @@ objects:
       - "headers":
           "THANOS-TENANT": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
         "name": "receive-telemeter"
-        "url": "http://observatorium-thanos-receive.${THANOS_QUERIER_NAMESPACE}.svc.cluster.local:19291"
+        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
         "write_relabel_configs":
         - "action": "keep"
           "regex": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"

diff --git a/resources/services/observatorium-metrics-template.yaml b/resources/services/observatorium-metrics-template.yaml
@@ -1695,7 +1695,7 @@ objects:
       - "headers":
           "THANOS-TENANT": "770c1124-6ae8-4324-a9d4-9ce08590094b"
         "name": "receive-rhobs"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291"
+        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
         "write_relabel_configs":
         - "action": "keep"
           "regex": "770c1124-6ae8-4324-a9d4-9ce08590094b"
@@ -1704,7 +1704,7 @@ objects:
       - "headers":
           "THANOS-TENANT": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
         "name": "receive-telemeter"
-        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291"
+        "url": "http://observatorium-thanos-receive.${NAMESPACE}.svc.cluster.local:19291/api/v1/receive"
         "write_relabel_configs":
         - "action": "keep"
           "regex": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"

diff --git a/services/observatorium-metrics.libsonnet b/services/observatorium-metrics.libsonnet
@@ -163,7 +163,11 @@ local oauthProxy = import './sidecars/oauth-proxy.libsonnet';
         },
         data: {
           [statelessRulerKey]: std.manifestYamlDoc(remoteWriteConfig({
-            url: 'http://observatorium-thanos-receive.%s.svc.cluster.local:19291' % thanosSharedConfig.namespace,
+            url: 'http://%s.%s.svc.cluster.local:%d/api/v1/receive' % [
+              thanos.receiversService.metadata.name,
+              thanosSharedConfig.namespace,
+              thanos.receiversService.spec.ports[2].port,
+            ],
           })),
         },
       },
@@ -259,7 +263,11 @@ local oauthProxy = import './sidecars/oauth-proxy.libsonnet';
         },
         data: {
           [statelessRulerKey]: std.manifestYamlDoc(remoteWriteConfig({
-            url: 'http://observatorium-thanos-receive.%s.svc.cluster.local:19291' % '${THANOS_QUERIER_NAMESPACE}',
+            url: 'http://%s.%s.svc.cluster.local:%d/api/v1/receive' % [
+              thanos.receiversService.metadata.name,
+              thanosSharedConfig.namespace,
+              thanos.receiversService.spec.ports[2].port,
+            ],
           })),
         },
       },