Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-01-14 08:45:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
nora 2024-08-08 12:24:14 +02:00
parent 13118bcebb
commit e887bbf737
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
newinfra/nix/apps/uptime/uptime.json
View file

@ -12,11 +12,11 @@
},
{
"name": "docker.nilstrieb.dev",
"url": "https://docker.nilstrieb.dev"
"url": "https://docker.noratrieb.dev"
},
{
"name": "vps1.nilstrieb.dev",
"url": "https://vps1.nilstrieb.dev"
"url": "https://vps1.infra.noratrieb.dev"
},
{
"name": "vps2.nilstrieb.dev",

17
newinfra/nix/modules/default/default.nix
View file

@ -58,16 +58,27 @@
{
job_name = "journal";
journal = {
max_age = "12h";
max_age = "24h";
labels = {
job = "systemd-journal";
node = name;
};
};
relabel_configs = [{
relabel_configs = [
{
source_labels = [ "__journal__systemd_unit" ];
target_label = "unit";
}];
}
{
source_labels = [ "__journal__hostname" ];
target_label = "host";
}
{
source_labels = [ "__journal_priority_keyword" ];
target_label = "severity";
regex = "(.+)";
}
];
}
];
};

9
newinfra/nix/modules/prometheus/default.nix
View file

@ -98,7 +98,7 @@
systemd.services.loki.serviceConfig.EnvironmentFile = config.age.secrets.loki_env.path;
services.loki = {
enable = true;
extraFlags = [ "-config.expand-env=true" ];
extraFlags = [ "-config.expand-env=true" /*"-print-config-stderr"*/ ];
configuration = {
auth_enabled = false;
server = {
@ -132,8 +132,13 @@
cache_location = "/var/lib/loki/cache";
};
aws = {
s3 = "s3://\${ACCESS_KEY}:\${SECRET_KEY}@http://127.0.0.1:3900/loki";
access_key_id = "\${ACCESS_KEY}";
secret_access_key = "\${SECRET_KEY}";
endpoint = "127.0.0.1:3900";
s3forcepathstyle = true;
region = "garage";
insecure = true;
s3 = "s3://\${ACCESS_KEY}:\${SECRET_KEY}@127.0.0.1:3900/loki";
};
};
};

BIN
secrets/registry/htpasswd
View file

Binary file not shown.