rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

send new vars to logdrain

Browse source
This commit is contained in:
Vahor 2024-08-27 18:28:59 +02:00
parent 49a53236b0
commit eb22155dcc
No known key found for this signature in database
11 changed files with 80 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Actions/Database/StartClickhouse.php
View file

@ -85,6 +85,7 @@ public function handle(StandaloneClickhouse $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartDragonfly.php
View file

@ -85,6 +85,7 @@ public function handle(StandaloneDragonfly $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartKeydb.php
View file

@ -84,6 +84,7 @@ public function handle(StandaloneKeydb $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartMariadb.php
View file

@ -79,6 +79,7 @@ public function handle(StandaloneMariadb $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartMongodb.php
View file

@ -87,6 +87,7 @@ public function handle(StandaloneMongodb $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartMysql.php
View file

@ -79,6 +79,7 @@ public function handle(StandaloneMysql $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartPostgresql.php
View file

@ -87,6 +87,7 @@ public function handle(StandalonePostgresql $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

1
app/Actions/Database/StartRedis.php
View file

@ -88,6 +88,7 @@ public function handle(StandaloneRedis $database)
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

11
app/Actions/Server/InstallLogDrain.php
View file

@ -40,6 +40,7 @@ public function handle(Server $server)
Name forward Name forward
Buffer_Chunk_Size 1M Buffer_Chunk_Size 1M
Buffer_Max_Size 6M Buffer_Max_Size 6M
Tag docker.*
[FILTER] [FILTER]
Name grep Name grep
Match * Match *
@ -48,6 +49,10 @@ public function handle(Server $server)
Name modify Name modify
Match * Match *
Set server_name {$server->name} Set server_name {$server->name}
Rename COOLIFY_APP_NAME coolify.app_name
Rename COOLIFY_PROJECT_NAME coolify.project_name
Rename COOLIFY_SERVER_IP coolify.server_ip
Rename COOLIFY_ENVIRONMENT_NAME coolify.environment_name
[OUTPUT] [OUTPUT]
Name nrlogs Name nrlogs
Match * Match *
@ -71,6 +76,7 @@ public function handle(Server $server)
tag ${HIGHLIGHT_PROJECT_ID} tag ${HIGHLIGHT_PROJECT_ID}
Buffer_Chunk_Size 1M Buffer_Chunk_Size 1M
Buffer_Max_Size 6M Buffer_Max_Size 6M
Tag docker.*
[OUTPUT] [OUTPUT]
Name forward Name forward
Match * Match *
@ -91,6 +97,7 @@ public function handle(Server $server)
Name forward Name forward
Buffer_Chunk_Size 1M Buffer_Chunk_Size 1M
Buffer_Max_Size 6M Buffer_Max_Size 6M
Tag docker.*
[FILTER] [FILTER]
Name grep Name grep
Match * Match *
@ -99,6 +106,10 @@ public function handle(Server $server)
Name modify Name modify
Match * Match *
Set server_name {$server->name} Set server_name {$server->name}
Rename COOLIFY_APP_NAME coolify.app_name
Rename COOLIFY_PROJECT_NAME coolify.project_name
Rename COOLIFY_SERVER_IP coolify.server_ip
Rename COOLIFY_ENVIRONMENT_NAME coolify.environment_name
[OUTPUT] [OUTPUT]
Name http Name http
Match * Match *

1
app/Jobs/ApplicationDeploymentJob.php
View file

@ -1756,6 +1756,7 @@ private function generate_compose_file()
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]; ];
} }

3
bootstrap/helpers/shared.php
View file

@ -2056,6 +2056,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]); ]);
} }
@ -2083,7 +2084,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
updateCompose($savedService); updateCompose($savedService);
return $service; return $service;
}); });
$envs_from_coolify = $resource->environment_variables()->get(); $envs_from_coolify = $resource->environment_variables()->get();
@ -2820,6 +2820,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
'fluentd-address' => 'tcp://127.0.0.1:24224', 'fluentd-address' => 'tcp://127.0.0.1:24224',
'fluentd-async' => 'true', 'fluentd-async' => 'true',
'fluentd-sub-second-precision' => 'true', 'fluentd-sub-second-precision' => 'true',
'env' => 'COOLIFY_APP_NAME,COOLIFY_PROJECT_NAME,COOLIFY_SERVER_IP,COOLIFY_ENVIRONMENT_NAME',
], ],
]); ]);
} }