Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

device-metrics: create timeseries per-device with device_uuid tag #88

Merged
merged 1 commit into from
Oct 21, 2019
Merged

device-metrics: create timeseries per-device with device_uuid tag #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ export const apiFactory = (serviceId: number) => {
`AUTH FAIL: API Authentication failed for ${req.body.username}`,
);
metrics.inc(Metrics.AuthFailures);
metrics.inc(Metrics.AuthFailuresByUuid, undefined, {
device_uuid: req.body.common_name,
});
return res.sendStatus(401);
}
})
Expand Down
28 changes: 27 additions & 1 deletion src/utils/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ export const enum Metrics {
SessionRxBitrate = 'vpn_session_avg_rx_bitrate',
SessionTxBitrate = 'vpn_session_avg_tx_bitrate',
RxBytes = 'vpn_rx_bytes_total',
RxBytesByUuid = 'vpn_rx_bytes_by_uuid_total',
TxBytes = 'vpn_tx_bytes_total',
TxBytesByUuid = 'vpn_tx_bytes_by_uuid_total',
OnlineDevices = 'vpn_online_devices',
TotalDevices = 'vpn_devices_total',
AuthFailures = 'vpn_auth_failures_total',

AuthFailuresByUuid = 'vpn_auth_failures_by_uuid_total',
ActiveTunnels = 'vpn_proxy_active_tunnels',
TotalTunnels = 'vpn_proxy_total_tunnels',
}
Expand All @@ -26,10 +28,34 @@ export const describeMetrics = () => {
'vpn device auth failures since restart',
);
metrics.counter(Metrics.AuthFailures, 0);
metrics.describe(
Metrics.AuthFailuresByUuid,
'vpn device auth failures since restart',
{
labelNames: ['device_uuid'],
},
);
metrics.counter(Metrics.AuthFailuresByUuid, 0);
metrics.describe(Metrics.RxBytes, 'total rx bytes across all vpn sessions');
metrics.counter(Metrics.RxBytes, 0);
metrics.describe(
Metrics.RxBytesByUuid,
'total rx bytes across all vpn sessions',
{
labelNames: ['device_uuid'],
},
);
metrics.counter(Metrics.RxBytesByUuid, 0);
metrics.describe(Metrics.TxBytes, 'total tx bytes across all vpn sessions');
metrics.counter(Metrics.TxBytes, 0);
metrics.describe(
Metrics.TxBytesByUuid,
'total tx bytes across all vpn sessions',
{
labelNames: ['device_uuid'],
},
);
metrics.counter(Metrics.TxBytesByUuid, 0);
const min = 60;
const hour = 60 * min;
const day = 24 * hour;
Expand Down
2 changes: 2 additions & 0 deletions src/vpn-worker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ const worker = (instanceId: number, serviceId: number) => {
const txDelta = data.bytes_sent - clientCache[clientId].bytes_sent;
const timeDelta = process.hrtime()[0] - clientCache[clientId].ts;
metrics.inc(Metrics.RxBytes, rxDelta);
metrics.inc(Metrics.RxBytesByUuid, rxDelta, { device_uuid: uuid });
metrics.inc(Metrics.TxBytes, txDelta);
metrics.inc(Metrics.TxBytesByUuid, txDelta, { device_uuid: uuid });
if (timeDelta > 0 && process.send != null) {
process.send({
type: 'bitrate',
Expand Down