MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put metrics on separate port

This commit is contained in:
Radon Rosborough 2022-01-23 16:00:44 -08:00
parent 3aba7c4394
commit 71dcd62af4
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -62,13 +62,17 @@ endif
VOLUME_MOUNT ?= $(PWD) VOLUME_MOUNT ?= $(PWD)
# http
P1 ?= 6119 P1 ?= 6119
# https
P2 ?= 6120 P2 ?= 6120
# metrics
P3 ?= 6121
ifneq (,$(EE)) ifneq (,$(EE))
SHELL_PORTS := -p 0.0.0.0:$(P1):6119 -p 0.0.0.0:$(P2):6120 SHELL_PORTS := -p 0.0.0.0:$(P1):6119 -p 0.0.0.0:$(P2):6120 -p 0.0.0.0:$(P3):6121
else ifneq (,$(E)) else ifneq (,$(E))
SHELL_PORTS := -p 127.0.0.1:$(P1):6119 -p 127.0.0.1:$(P2):6120 SHELL_PORTS := -p 127.0.0.1:$(P1):6119 -p 127.0.0.1:$(P2):6120 -p 127.0.0.1:$(P3):6121
else else
SHELL_PORTS := SHELL_PORTS :=
endif endif

16
backend/server.js
View File

@ -15,6 +15,7 @@ import { log, privilegedTeardown } from "./util.js";
const host = process.env.HOST || "localhost"; const host = process.env.HOST || "localhost";
const port = parseInt(process.env.PORT || "") || 6119; const port = parseInt(process.env.PORT || "") || 6119;
const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120; const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120;
const metricsPort = parseInt(process.env.METRICS_PORT || "") || 6121;
const useTLS = process.env.TLS ? true : false; const useTLS = process.env.TLS ? true : false;
const analyticsTag = (process.env.ANALYTICS_TAG || "").replace( const analyticsTag = (process.env.ANALYTICS_TAG || "").replace(
/^'(.+)'$/, /^'(.+)'$/,
@ -23,17 +24,18 @@ const analyticsTag = (process.env.ANALYTICS_TAG || "").replace(
promClient.collectDefaultMetrics(); promClient.collectDefaultMetrics();
const metricsApp = express();
metricsApp.get("/metrics", async (_, res) => {
res.contentType("text/plain; version=0.0.4");
res.send(await promClient.register.metrics());
});
const langs = await langsPromise; const langs = await langsPromise;
const app = express(); const app = express();
app.set("query parser", (qs) => new URLSearchParams(qs)); app.set("query parser", (qs) => new URLSearchParams(qs));
app.set("view engine", "ejs"); app.set("view engine", "ejs");
app.get("/metrics", async (_, res) => {
res.contentType("text/plain; version=0.0.4");
res.send(await promClient.register.metrics());
});
app.get("/", (_, res) => { app.get("/", (_, res) => {
if (Object.keys(langs).length > 0) { if (Object.keys(langs).length > 0) {
res.render(path.resolve("frontend/pages/index"), { res.render(path.resolve("frontend/pages/index"), {
@ -148,3 +150,7 @@ if (useTLS) {
console.log(`Listening on http://${host}:${port}`) console.log(`Listening on http://${host}:${port}`)
); );
} }
metricsApp.listen(metricsPort, host, () =>
console.log(`Listening on http://${host}:${metricsPort}/metrics`)
);

1
docker/runtime/Dockerfile
View File

@ -10,4 +10,5 @@ WORKDIR /src
CMD ["bash"] CMD ["bash"]
EXPOSE 6119 EXPOSE 6119
EXPOSE 6120 EXPOSE 6120
EXPOSE 6121
ENV HOST=0.0.0.0 ENV HOST=0.0.0.0