localhorst/LocationHub
SHA256
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

use db wifi_location as metric source

Browse Source
This commit is contained in:
Hendrik Schutter 2025-01-14 21:03:44 +01:00
parent e8154d1e13
commit 8a4eadefcb
4 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/controller/metricsController.ts
View File

@ -1,12 +1,10 @@
import express, { Request, Response } from "express"; import express, { Request, Response } from "express";
import { container } from "tsyringe"; import { container } from "tsyringe";
import { Counter, Gauge, collectDefaultMetrics, register } from "prom-client"; import { Counter, Gauge, collectDefaultMetrics, register } from "prom-client";
import { MetricsService } from "../services/metricsService";
import { LocationService } from "../services/locationService"; import { LocationService } from "../services/locationService";
import { WifiLocationService } from "../services/wifiLocationService"; import { WifiLocationService } from "../services/wifiLocationService";
const router = express.Router(); const router = express.Router();
const metricsService = container.resolve(MetricsService);
const locationService = container.resolve(LocationService); const locationService = container.resolve(LocationService);
const wifiLocationService = container.resolve(WifiLocationService); const wifiLocationService = container.resolve(WifiLocationService);
@ -24,21 +22,28 @@ const requestCounter = new Counter({
const locationsTotal = new Gauge({ const locationsTotal = new Gauge({
name: `${prefix}locations_total`, name: `${prefix}locations_total`,
help: "Total number of location entries in database", help: "Total number of location entries in database",
labelNames: ["database"], labelNames: ["database"],
}); });
const wifiLocationTotal = new Gauge({ const wifiLocationTotal = new Gauge({
name: `${prefix}wifi_locations_total`, name: `${prefix}wifi_locations_total`,
help: "Total number of wifi location entries in database", help: "Total number of wifi location entries in database",
labelNames: ["database"], labelNames: ["database"],
}); });
const wigleApiRequest = new Gauge({ const wifiLocationNotResolvable = new Gauge({
name: `${prefix}wigle_api_requests_total`, name: `${prefix}wifi_locations_not_resolvable`,
help: "Total number of wifi location entries in database", help: "Unresolved number of wifi location entries in database",
labelNames: ["wigle"], labelNames: ["database"],
}); });
const wifiLocationRequestLimitExceeded = new Gauge({
name: `${prefix}wifi_locations_request_limit_exceeded`,
help: "Unresolved number of wifi location because request limit exceeded entries in database",
labelNames: ["database"],
});
// Define the metrics endpoint // Define the metrics endpoint
router.get("/", async (req: Request, res: Response) => { router.get("/", async (req: Request, res: Response) => {
try { try {
@ -46,7 +51,8 @@ router.get("/", async (req: Request, res: Response) => {
locationsTotal.set((await locationService.getAllLocations()).length); locationsTotal.set((await locationService.getAllLocations()).length);
wifiLocationTotal.set((await wifiLocationService.getAllWifiLocations()).length); wifiLocationTotal.set((await wifiLocationService.getAllWifiLocations()).length);
wigleApiRequest.set(metricsService.getWigleApiNumberOfRequests()); wifiLocationNotResolvable.set((await wifiLocationService.getAllWifiLocationsByNotResolvable).length);
wifiLocationRequestLimitExceeded.set((await wifiLocationService.getAllWifiLocationsByRequestLimitExceeded).length);
// Increment the counter with labels // Increment the counter with labels
requestCounter.inc({ method: req.method, route: req.route.path, status: 200 }); requestCounter.inc({ method: req.method, route: req.route.path, status: 200 });

6
server/src/proxy/wigle.ts
View File

@ -1,8 +1,3 @@
import { container } from "tsyringe";
import { MetricsService } from "../services/metricsService";
const metricsService = container.resolve(MetricsService);
interface WigleApiResonse { interface WigleApiResonse {
response?: WifiLocationResponse, response?: WifiLocationResponse,
status_code: number, status_code: number,
@ -52,7 +47,6 @@ interface Result {
export const getLocationForWifi = async ( export const getLocationForWifi = async (
mac: string mac: string
): Promise<WigleApiResonse | undefined> => { ): Promise<WigleApiResonse | undefined> => {
metricsService.incWigleApiNumberOfRequests();
try { try {
const url = `${process.env.WIGLE_BASE_URL!}${process.env const url = `${process.env.WIGLE_BASE_URL!}${process.env
.WIGLE_NETWORK_SEARCH!}?netid=${encodeURIComponent(mac)}`; .WIGLE_NETWORK_SEARCH!}?netid=${encodeURIComponent(mac)}`;

23
server/src/services/metricsService.ts
View File

@ -1,23 +0,0 @@
import { inject, injectable } from "tsyringe";
@injectable()
export class MetricsService {
private wigleApiNumberOfRequests: number;
constructor() {
this.wigleApiNumberOfRequests = 0; // Initialize the variable
}
// Method to increment the request count
public incWigleApiNumberOfRequests() {
console.log("inc")
this.wigleApiNumberOfRequests += 1; // Increment the number of requests
console.log(this.wigleApiNumberOfRequests)
}
// Method to get the current request count
public getWigleApiNumberOfRequests() {
console.log("get: " + this.wigleApiNumberOfRequests)
return this.wigleApiNumberOfRequests;
}
}

12
server/src/services/wifiLocationService.ts
View File

@ -29,6 +29,18 @@ export class WifiLocationService {
}); });
} }
public async getAllWifiLocationsByNotResolvable() {
return this.repository.findAll({
where: { location_not_resolvable: true },
});
}
public async getAllWifiLocationsByRequestLimitExceeded() {
return this.repository.findAll({
where: { request_limit_exceeded: true },
});
}
public async getWifiLocationByMac(mac: string) { public async getWifiLocationByMac(mac: string) {
let wifiLocation = await this.repository.findById(mac); let wifiLocation = await this.repository.findById(mac);