github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Fix totalCostInUSD calculation and update Otel Collector port

Browse Source
This commit is contained in:
Simon Larsen
2023-12-30 13:32:41 +00:00
parent 018d3b7fcd
commit 2d2f2b0521
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CommonServer/Types/Billing/MeteredPlan/TelemetryMeteredPlan.ts
View File

@@ -49,10 +49,10 @@ export default class TelemetryMeteredPlan extends ServerMeteredPlan {
for (const usageBilling of usageBillings) {
if (
usageBilling?.totalCostInUSD &&
usageBilling?.totalCostInUSD > 0
usageBilling?.totalCostInUSD?.value &&
usageBilling?.totalCostInUSD.value > 0
) {
totalCostInUSD += usageBilling.totalCostInUSD;
totalCostInUSD += usageBilling.totalCostInUSD.value;
}
}

2
Nginx/default.conf.template
View File

@@ -33,7 +33,7 @@ upstream workers {
upstream opentelemetry-collector {
server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_PORT} weight=10 max_fails=3 fail_timeout=30s;
server ${SERVER_OTEL_COLLECTOR_HOSTNAME}:${OTEL_COLLECTOR_HTTP_PORT} weight=10 max_fails=3 fail_timeout=30s;
}
# Otel Collector