From 8b7dc1132710b18186ab3653add68819668d6ecd Mon Sep 17 00:00:00 2001 From: Ben Martin Date: Sun, 4 Aug 2024 11:05:15 +0000 Subject: [PATCH] feat: update logging configuration for dummy, uptime, and media-centre modules --- modules/coder/jobspec.json | 200 ++++++++++++++++-------------- modules/dummy/jobspec.json | 10 +- modules/media-centre/jobspec.json | 10 +- modules/uptime/jobspec.json | 10 +- 4 files changed, 134 insertions(+), 96 deletions(-) diff --git a/modules/coder/jobspec.json b/modules/coder/jobspec.json index b6b9dfa..5865f10 100644 --- a/modules/coder/jobspec.json +++ b/modules/coder/jobspec.json @@ -1,97 +1,111 @@ { - "Job": { - "ID": "coder", - "Name": "Coder", - "TaskGroups": [ - { - "Name": "Coder", - "Tasks": [ - { - "Driver": "docker", - "Name": "coder", - "Count": 1, - "Config": { - "image": "ghcr.io/coder/coder:latest", - "ports": [ - "web" - ], - "volumes": [ - "/var/run/docker.sock:/var/run/docker.sock" - ], - "group_add": [ - "998" - ] - }, - "Env": { - "CODER_PG_CONNECTION_URL": "postgresql://coder:reu2zeeth9BeeWai9ohl1tierea6ooze@${NOMAD_ADDR_database}/coder?sslmode=disable", - "CODER_HTTP_ADDRESS": "0.0.0.0:7080", - "CODER_ACCESS_URL": "https://coder.brmartin.co.uk" - }, - "Resources": { - "CPU": 1000, - "MemoryMB": 1024 - } - }, - { - "Driver": "docker", - "Name": "database", - "Count": 1, - "Lifecycle": { - "Hook": "prestart", - "Sidecar": true - }, - "Config": { - "image": "postgres:16", - "ports": [ - "database" - ], - "mounts": [ - { - "type": "volume", - "target": "/var/lib/postgresql/data", - "source": "coder-data" - } - ] - }, - "Env": { - "POSTGRES_USER": "coder", - "POSTGRES_PASSWORD": "reu2zeeth9BeeWai9ohl1tierea6ooze", - "POSTGRES_DB": "coder" - } - } - ], - "Services": [ - { - "Name": "coder", - "Provider": "nomad", - "PortLabel": "web", - "Tags": [ - "traefik.enable=true", - "traefik.http.routers.coder.entrypoints=websecure", - "traefik.http.routers.coder.rule=Host(`coder.brmartin.co.uk`)" - ] - }, - { - "Name": "database", - "Provider": "nomad", - "PortLabel": "database" - } - ], - "Networks": [ - { - "DynamicPorts": [ - { - "Label": "web", - "To": 7080 - }, - { - "Label": "database", - "To": 5432 - } - ] - } - ] + "ID": "coder", + "Name": "Coder", + "TaskGroups": [ + { + "Name": "Coder", + "Tasks": [ + { + "Driver": "docker", + "Name": "coder", + "Count": 1, + "Config": { + "image": "ghcr.io/coder/coder:latest", + "ports": [ + "web" + ], + "volumes": [ + "/var/run/docker.sock:/var/run/docker.sock" + ], + "group_add": [ + "998" + ], + "logging": { + "type": "elastic/elastic-logging-plugin:8.14.3", + "config": { + "hosts": "http://localhost:9200", + "user": "docker_writer", + "password": "oi*YWZSP_Ukd0y+pQ7EB" + } } - ] + }, + "Env": { + "CODER_PG_CONNECTION_URL": "postgresql://coder:reu2zeeth9BeeWai9ohl1tierea6ooze@${NOMAD_ADDR_database}/coder?sslmode=disable", + "CODER_HTTP_ADDRESS": "0.0.0.0:7080", + "CODER_ACCESS_URL": "https://coder.brmartin.co.uk" + }, + "Resources": { + "CPU": 1000, + "MemoryMB": 1024 + } + }, + { + "Driver": "docker", + "Name": "database", + "Count": 1, + "Lifecycle": { + "Hook": "prestart", + "Sidecar": true + }, + "Config": { + "image": "postgres:16", + "ports": [ + "database" + ], + "mounts": [ + { + "type": "volume", + "target": "/var/lib/postgresql/data", + "source": "coder-data" + } + ], + "logging": { + "type": "elastic/elastic-logging-plugin:8.14.3", + "config": { + "hosts": "http://localhost:9200", + "user": "docker_writer", + "password": "oi*YWZSP_Ukd0y+pQ7EB" + } + } + }, + "Env": { + "POSTGRES_USER": "coder", + "POSTGRES_PASSWORD": "reu2zeeth9BeeWai9ohl1tierea6ooze", + "POSTGRES_DB": "coder" + } + } + ], + "Services": [ + { + "Name": "coder", + "Provider": "nomad", + "PortLabel": "web", + "Tags": [ + "traefik.enable=true", + "traefik.http.routers.coder.entrypoints=websecure", + "traefik.http.routers.coder.rule=Host(`coder.brmartin.co.uk`)" + ] + }, + { + "Name": "database", + "Provider": "nomad", + "PortLabel": "database" + } + ], + "Networks": [ + { + "DynamicPorts": [ + { + "Label": "web", + "To": 7080 + }, + { + "Label": "database", + "To": 5432 + } + ] + } + ] } + ] } \ No newline at end of file diff --git a/modules/dummy/jobspec.json b/modules/dummy/jobspec.json index ba1f007..b8e8013 100644 --- a/modules/dummy/jobspec.json +++ b/modules/dummy/jobspec.json @@ -21,7 +21,15 @@ ], "ports": [ "www" - ] + ], + "logging": { + "type": "elastic/elastic-logging-plugin:8.14.3", + "config": { + "hosts": "http://localhost:9200", + "user": "docker_writer", + "password": "oi*YWZSP_Ukd0y+pQ7EB" + } + } }, "Templates": [ { diff --git a/modules/media-centre/jobspec.json b/modules/media-centre/jobspec.json index 7011f97..f7094b5 100644 --- a/modules/media-centre/jobspec.json +++ b/modules/media-centre/jobspec.json @@ -36,7 +36,15 @@ "target": "/config", "source": "jellyfin-config" } - ] + ], + "logging": { + "type": "elastic/elastic-logging-plugin:8.14.3", + "config": { + "hosts": "http://localhost:9200", + "user": "docker_writer", + "password": "oi*YWZSP_Ukd0y+pQ7EB" + } + } }, "Env": { "TZ": "Europe/London", diff --git a/modules/uptime/jobspec.json b/modules/uptime/jobspec.json index 6faa539..4a22a0c 100644 --- a/modules/uptime/jobspec.json +++ b/modules/uptime/jobspec.json @@ -27,7 +27,15 @@ ], "extra_hosts": [ "host.docker.internal:host-gateway" - ] + ], + "logging": { + "type": "elastic/elastic-logging-plugin:8.14.3", + "config": { + "hosts": "http://localhost:9200", + "user": "docker_writer", + "password": "oi*YWZSP_Ukd0y+pQ7EB" + } + } }, "Resources": { "CPU": 500,