mirror of
https://github.com/coollabsio/coolify.git
synced 2026-10-07 22:45:27 -04:00
Andras BacsaiandClaude Opus 5.5
510a2d838b
Traffic analytics now covers every resource on both proxies:
- Caddy: Compose applications and services get access-log labels. The
log_append key is {uuid}-{service}, the same key Sentinel reads from
Traefik router names.
- A resource owns the Sentinel key {uuid} and every key that starts
with {uuid}-. Application pages and the traffic card now merge all
keys, so Compose applications and previews show data on Traefik too.
- Global analytics: the leaderboard groups the keys of one resource
into one row, lists services, and never names keys of other teams.
- New service analytics page (project.service.analytics) with the same
view and authorization as the application page.
- Switching the proxy type restarts Sentinel when analytics is on, so
it reads the new log path. Sentinel gets no traffic mount when the
proxy has no analytics support.
- Caddy servers show a note that resources log only after a redeploy.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
50 lines
3.0 KiB
PHP
50 lines
3.0 KiB
PHP
<?php
|
|
|
|
it('adds no traffic labels to caddy sites when disabled', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), is_traffic_analytics_enabled: false);
|
|
expect($labels->filter(fn ($l) => str_contains($l, 'log_append'))->isEmpty())->toBeTrue();
|
|
});
|
|
|
|
it('stamps coolify_app_id and JSON access log on each caddy site when enabled', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), is_traffic_analytics_enabled: true, supports_log_append: true);
|
|
expect($labels->contains('caddy_0.log_append=coolify_app_id app-uuid'))->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.output=file /traffic/access.log'))->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.format=json'))->toBeTrue();
|
|
});
|
|
|
|
it('keeps the JSON access log but omits log_append when caddy does not support it', function () {
|
|
// caddy-docker-proxy 2.8 runs Caddy 2.7.6, which rejects the whole Caddyfile for log_append.
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), is_traffic_analytics_enabled: true);
|
|
expect($labels->filter(fn ($l) => str_contains($l, 'log_append'))->isEmpty())->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.output=file /traffic/access.log'))->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.format=json'))->toBeTrue();
|
|
});
|
|
|
|
it('emits lumberjack roll directives on each caddy site when enabled', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), is_traffic_analytics_enabled: true);
|
|
expect($labels->contains('caddy_0.log.output.roll_size=20MiB'))->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.output.roll_keep=5'))->toBeTrue();
|
|
expect($labels->contains('caddy_0.log.output.roll_keep_for=168h'))->toBeTrue();
|
|
});
|
|
|
|
it('omits lumberjack roll directives when disabled', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), is_traffic_analytics_enabled: false);
|
|
expect($labels->filter(fn ($l) => str_contains($l, 'roll_'))->isEmpty())->toBeTrue();
|
|
});
|
|
|
|
it('keys a compose service like its Traefik router', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', 'app-uuid', collect(['https://example.com']), service_name: 'web.app', is_traffic_analytics_enabled: true, supports_log_append: true);
|
|
$key = 'app-uuid-'.traefikSafeServiceNameSegment('web.app');
|
|
|
|
expect($key)->toMatch('/^[A-Za-z0-9-]+$/')
|
|
->and($labels->contains("caddy_0.log_append=coolify_app_id {$key}"))->toBeTrue()
|
|
->and($labels->contains('caddy_0.log.output=file /traffic/access.log'))->toBeTrue();
|
|
});
|
|
|
|
it('keeps only safe characters in the caddy traffic key', function () {
|
|
$labels = fqdnLabelsForCaddy('coolify', "app uuid\n{x}", collect(['https://example.com']), is_traffic_analytics_enabled: true, supports_log_append: true);
|
|
|
|
expect($labels->first(fn ($label) => str_contains($label, 'log_append')))
|
|
->toBe('caddy_0.log_append=coolify_app_id app-uuid-x-');
|
|
});
|