Retrieve bias metrics from thanos querier (#1472) (#1473)

backend/src/routes/api/prometheus/index.ts

@@ -4,8 +4,9 @@ import {
   OauthFastifyRequest,
   PrometheusQueryRangeResponse,
   PrometheusQueryResponse,
+  QueryType,
 } from '../../../types';
-import { callPrometheusPVC, callPrometheusServing } from '../../../utils/prometheusUtils';
+import { callPrometheusThanos, callPrometheusServing } from '../../../utils/prometheusUtils';
 import { createCustomError } from '../../../utils/requestUtils';
 import { logRequestDetails } from '../../../utils/fileUtils';
 
@@ -35,7 +36,22 @@ module.exports = async (fastify: KubeFastifyInstance) => {
     ): Promise<{ code: number; response: PrometheusQueryResponse }> => {
       const { query } = request.body;
 
-      return callPrometheusPVC(fastify, request, query).catch(handleError);
+      return callPrometheusThanos(fastify, request, query).catch(handleError);
+    },
+  );
+
+  fastify.post(
+    '/bias',
+    async (
+      request: OauthFastifyRequest<{
+        Body: { query: string };
+      }>,
+    ): Promise<{ code: number; response: PrometheusQueryResponse }> => {
+      const { query } = request.body;
+
+      return callPrometheusThanos(fastify, request, query, QueryType.QUERY_RANGE).catch(
+        handleError,
+      );
     },
   );
 

backend/src/utils/prometheusUtils.ts

@@ -84,17 +84,18 @@ const generatePrometheusHostURL = (
   return `https://${instanceName}.${namespace}.svc.cluster.local:${port}`;
 };
 
-export const callPrometheusPVC = (
+export const callPrometheusThanos = (
   fastify: KubeFastifyInstance,
   request: OauthFastifyRequest,
   query: string,
+  queryType: QueryType = QueryType.QUERY,
 ): Promise<{ code: number; response: PrometheusQueryResponse }> =>
   callPrometheus(
     fastify,
     request,
     query,
     generatePrometheusHostURL(fastify, 'thanos-querier', 'openshift-monitoring', '9092'),
-    QueryType.QUERY,
+    queryType,
   );
 
 export const callPrometheusServing = (

frontend/src/api/prometheus/serving.ts

@@ -101,6 +101,7 @@ export const useModelServingMetrics = (
     end,
     timeframe,
     trustyResponsePredicate,
+    '/api/prometheus/bias',
   );
 
   const modelTrustyAIDIR = useQueryRangeResourceData(
@@ -109,6 +110,7 @@ export const useModelServingMetrics = (
     end,
     timeframe,
     trustyResponsePredicate,
+    '/api/prometheus/bias',
   );
 
   React.useEffect(() => {

frontend/src/api/prometheus/useQueryRangeResourceData.ts

@@ -11,11 +11,12 @@ const useQueryRangeResourceData = <T = PrometheusQueryRangeResultValue>(
   end: number,
   timeframe: TimeframeTitle,
   responsePredicate: ResponsePredicate<T>,
+  apiPath = '/api/prometheus/serving',
 ): ContextResourceData<T> =>
   useRestructureContextResourceData<T>(
     usePrometheusQueryRange<T>(
       active,
-      '/api/prometheus/serving',
+      apiPath,
       query,
       TimeframeTimeRange[timeframe],
       end,