martin/doorman
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

add basic auth for metrics
All checks were successful
Build and push image for doorman-homeassistant / docker (push) Successful in 28s
Details
Build and push Doorman UI / API / docker (push) Successful in 1m32s
Details
Build and push image for doorman-homeassistant / deploy-gitainer (push) Successful in 4s
Details

Browse Source
This commit is contained in:
Martin Dimitrov 2024-12-22 14:38:26 -08:00
parent c3c12e1591
commit 070c5634cd
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/doorman-api/src/common/DoormanHandler.ts
View File

@ -2,6 +2,7 @@ import { ServerlessCallback, ServerlessFunctionSignature } from "@twilio-labs/se
import { PrometheusContentType, Registry, Pushgateway, Summary, Counter } from "prom-client"; import { PrometheusContentType, Registry, Pushgateway, Summary, Counter } from "prom-client";
import { DoormanLambdaContext } from "./DoormanHandlerContext"; import { DoormanLambdaContext } from "./DoormanHandlerContext";
import { shouldBlockRequest } from "../utils/blockUserAgent"; import { shouldBlockRequest } from "../utils/blockUserAgent";
import { RequestOptions } from "https";
export type BaseEvent = { request: { cookies: {}; headers: {}; }; } export type BaseEvent = { request: { cookies: {}; headers: {}; }; }
@ -34,7 +35,13 @@ export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>
return async (context, event, callback) => { return async (context, event, callback) => {
console.log("[CommonHandler] creating metrics registry"); console.log("[CommonHandler] creating metrics registry");
const metricsRegistry = new Registry(); const metricsRegistry = new Registry();
const pushGateway = new Pushgateway(context.PUSHGATEWAY_URL, {}, metricsRegistry); const requestOptions: RequestOptions = {
headers: {
'Authorization': 'Basic ' + Buffer.from(context.PUSHGATEWAY_USER + ':' + context.PUSHGATEWAY_PW).toString('base64'),
},
};
const pushGateway = new Pushgateway(context.PUSHGATEWAY_URL, requestOptions, metricsRegistry);
metricsRegistry.registerMetric(new Summary({ metricsRegistry.registerMetric(new Summary({
name: CommonMetrics.RUNTIME, name: CommonMetrics.RUNTIME,
@ -109,7 +116,6 @@ export function withMetrics<T extends DoormanLambdaContext, U extends BaseEvent>
console.log("[CommonHandler] attempting to push metrics..."); console.log("[CommonHandler] attempting to push metrics...");
try { try {
console.log(await getMetricFromRegistry<Summary>(metricsRegistry, CommonMetrics.RUNTIME).get());
await pushGateway.push({ await pushGateway.push({
jobName: functionName, jobName: functionName,
groupings: { groupings: {

2
packages/doorman-api/src/common/DoormanHandlerContext.ts
View File

@ -7,5 +7,7 @@ export enum Stage {
export interface DoormanLambdaContext extends EnvironmentVariables { export interface DoormanLambdaContext extends EnvironmentVariables {
PUSHGATEWAY_URL: string; PUSHGATEWAY_URL: string;
PUSHGATEWAY_USER: string;
PUSHGATEWAY_PW: string;
STAGE: string; STAGE: string;
}; };

2
packages/doorman-client/.env.example
View File

@ -7,3 +7,5 @@ AUTH_TOKEN=
# metrics # metrics
PUSHGATEWAY_URL=https://metrics.chromart.cc PUSHGATEWAY_URL=https://metrics.chromart.cc
STAGE=prod STAGE=prod
PUSHGATEWAY_USER=doorman
PUSHGATEWAY_PW=doormanmetrics