Revert "Revert "Merge pull request opendatahub-io#1503 from alexcreas…

…y/configurable-thanos-port"" This reverts commit fec931d.
alexcreasy · Jul 18, 2023 · b758ee8 · b758ee8
1 parent a617178
commit b758ee8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/backend/src/routes/api/prometheus/index.ts b/backend/src/routes/api/prometheus/index.ts
@@ -9,6 +9,7 @@ import {
 import { callPrometheusThanos } from '../../../utils/prometheusUtils';
 import { createCustomError } from '../../../utils/requestUtils';
 import { logRequestDetails } from '../../../utils/fileUtils';
+import { THANOS_DEFAULT_OAUTH_PORT } from '../../../utils/constants';
 
 const handleError = (e: createError.HttpError) => {
   if (e?.code) {
@@ -56,6 +57,7 @@ module.exports = async (fastify: KubeFastifyInstance) => {
         request,
         query,
         QueryType.QUERY_RANGE,
+        THANOS_DEFAULT_OAUTH_PORT,
       ).catch(handleError);
     },
   );

diff --git a/backend/src/utils/constants.ts b/backend/src/utils/constants.ts
@@ -136,3 +136,6 @@ export const DEFAULT_NOTEBOOK_SIZES: NotebookSize[] = [
 
 export const imageUrlRegex =
   /^([\w.\-_]+((?::\d+|)(?=\/[a-z0-9._-]+\/[a-z0-9._-]+))|)(?:\/|)([a-z0-9.\-_]+(?:\/[a-z0-9.\-_]+|))(?::([\w.\-_]{1,127})|)/;
+
+export const THANOS_DEFAULT_RBAC_PORT = '9092';
+export const THANOS_DEFAULT_OAUTH_PORT = '9091';
diff --git a/backend/src/utils/prometheusUtils.ts b/backend/src/utils/prometheusUtils.ts
@@ -4,7 +4,7 @@ import {
   PrometheusQueryRangeResponse,
   QueryType,
 } from '../types';
-import { DEV_MODE } from './constants';
+import { DEV_MODE, THANOS_DEFAULT_RBAC_PORT } from './constants';
 import { getNamespaces } from './notebookUtils';
 import { getDashboardConfig } from './resourceUtils';
 import { createCustomError } from './requestUtils';
@@ -88,12 +88,13 @@ export const callPrometheusThanos = <T>(
   request: OauthFastifyRequest,
   query: string,
   queryType: QueryType = QueryType.QUERY,
+  port = THANOS_DEFAULT_RBAC_PORT,
 ): Promise<{ code: number; response: T }> =>
   callPrometheus<T>(
     fastify,
     request,
     query,
-    generatePrometheusHostURL(fastify, 'thanos-querier', 'openshift-monitoring', '9092'),
+    generatePrometheusHostURL(fastify, 'thanos-querier', 'openshift-monitoring', port),
     queryType,
   );