From 0026f86cc667a538886aaf772bf7338005645751 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 6 Mar 2023 17:41:24 +0000 Subject: [PATCH] Fixing operation ID. --- packages/server/specs/openapi.json | 2 +- packages/server/specs/openapi.yaml | 2 +- packages/server/src/api/controllers/public/metrics.ts | 4 ++-- packages/server/src/api/routes/public/metrics.ts | 2 +- packages/server/src/definitions/openapi.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json index 275c1af4f1..bcff78e861 100644 --- a/packages/server/specs/openapi.json +++ b/packages/server/specs/openapi.json @@ -2068,7 +2068,7 @@ }, "/metrics": { "get": { - "operationId": "getById", + "operationId": "metricsGet", "summary": "Retrieve Budibase tenant metrics", "description": "Output metrics in OpenMetrics format compatible with Prometheus", "tags": [ diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml index 5647872d6b..a9daed6c76 100644 --- a/packages/server/specs/openapi.yaml +++ b/packages/server/specs/openapi.yaml @@ -1685,7 +1685,7 @@ paths: $ref: "#/components/examples/applications" /metrics: get: - operationId: getById + operationId: metricsGet summary: Retrieve Budibase tenant metrics description: Output metrics in OpenMetrics format compatible with Prometheus tags: diff --git a/packages/server/src/api/controllers/public/metrics.ts b/packages/server/src/api/controllers/public/metrics.ts index f702a47831..b6a8de3b7c 100644 --- a/packages/server/src/api/controllers/public/metrics.ts +++ b/packages/server/src/api/controllers/public/metrics.ts @@ -1,10 +1,10 @@ -import { App, BBContext } from "@budibase/types" +import { Ctx } from "@budibase/types" import { users as userCore, db as dbCore } from "@budibase/backend-core" import { quotas, licensing } from "@budibase/pro" import os from "os" -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: Ctx) { // *** OPERATING SYSTEM *** const freeMem = os.freemem() const totalMem = os.totalmem() diff --git a/packages/server/src/api/routes/public/metrics.ts b/packages/server/src/api/routes/public/metrics.ts index ff993d2ec6..841da0e804 100644 --- a/packages/server/src/api/routes/public/metrics.ts +++ b/packages/server/src/api/routes/public/metrics.ts @@ -7,7 +7,7 @@ const read = [] * @openapi * /metrics: * get: - * operationId: getById + * operationId: metricsGet * summary: Retrieve Budibase tenant metrics * description: Output metrics in OpenMetrics format compatible with Prometheus * tags: diff --git a/packages/server/src/definitions/openapi.ts b/packages/server/src/definitions/openapi.ts index b7b77b42d6..5ca4990647 100644 --- a/packages/server/src/definitions/openapi.ts +++ b/packages/server/src/definitions/openapi.ts @@ -24,7 +24,7 @@ export interface paths { }; "/metrics": { /** Output metrics in OpenMetrics format compatible with Prometheus */ - get: operations["getById"]; + get: operations["metricsGet"]; }; "/queries/{queryId}": { /** Queries which have been created within a Budibase app can be executed using this, */ @@ -849,7 +849,7 @@ export interface operations { }; }; /** Output metrics in OpenMetrics format compatible with Prometheus */ - getById: { + metricsGet: { responses: { /** Returns tenant metrics. */ 200: {