Update Terraform linode to v2

Keep the AGH logs cleaner

ansible/main.yml

@@ -44,6 +44,7 @@
       become: true
       vars:
         docker_install_compose_plugin: "{{ ansible_os_family == 'Debian' }}"
+        docker_install_compose: "{{ ansible_os_family == 'Debian' }}"
         docker_users:
           - "{{ me.user }}"
     - docker_cleanup

ansible/roles/prometheus/files/prometheus/docker-compose.yml

@@ -1,12 +1,5 @@
 version: "2.3"
 
-x-blackbox: &blackbox
-  image: prom/blackbox-exporter:latest
-  restart: unless-stopped
-  user: "{{ docker_user.id }}"
-  volumes:
-    - ./blackbox.yml:/etc/blackbox_exporter/config.yml:ro
-
 services:
   prometheus:
     image: prom/prometheus:latest
@@ -23,14 +16,11 @@ services:
       - "{{ pve_hosts.forrest.ip }}:9090:9090"
 
   blackbox:
-    <<: *blackbox
-
-  blackbox-external:
-    <<: *blackbox
-    # Don't use my internal DNS servers
-    dns:
-      - 9.9.9.9
-      - 149.112.112.112
+    image: prom/blackbox-exporter:latest
+    restart: unless-stopped
+    user: "{{ docker_user.id }}"
+    volumes:
+      - ./blackbox.yml:/etc/blackbox_exporter/config.yml:ro
 
   alertmanager:
     image: prom/alertmanager:latest

ansible/roles/prometheus/files/prometheus/prometheus.yml

@@ -41,48 +41,6 @@ scrape_configs:
     static_configs:
       - targets: ["{{ pve_hosts.homeassistant.ip }}:8123"]
 
-  - job_name: blackbox_http_external
-    scrape_interval: 1m
-    metrics_path: /probe
-    params:
-      module: [http]
-    static_configs:
-      - targets:
-          - https://0rng.one
-          - https://auth.jakehoward.tech/-/health/ready/
-          - https://bin.theorangeone.net
-          - https://git.theorangeone.net/api/healthz
-          - https://grafana.jakehoward.tech/api/health
-          - https://headscale.jakehoward.tech/health
-          - https://homeassistant.jakehoward.tech
-          - https://intersect.jakehoward.tech
-          - https://mastodon.theorangeone.net/health
-          - https://matrix.jakehoward.tech:8448/_matrix/federation/v1/version
-          - https://matrix.jakehoward.tech/_matrix/federation/v1/version
-          - https://media.jakehoward.tech
-          - https://minio.jakehoward.tech/minio/health/live
-          - https://notes.theorangeone.net
-          - https://ntfy.jakehoward.tech/v1/health
-          - https://plausible.theorangeone.net
-          - https://recipes.jakehoward.tech
-          - https://s3.jakehoward.tech/minio/health/live
-          - https://tasks.jakehoward.tech/health
-          - https://theorangeone.net
-          - https://tt-rss.jakehoward.tech
-          - https://vaultwarden.jakehoward.tech/alive
-          - https://whoami-cdn.theorangeone.net
-          - https://whoami.theorangeone.net
-    relabel_configs:
-      - source_labels: [__address__]
-        target_label: __param_target
-      - source_labels: [__param_target]
-        target_label: instance
-      - target_label: __address__
-        replacement: blackbox-external:9115
-      - source_labels: [instance]
-        regex: https?://([^/]+)/?.*
-        target_label: hostname
-
   - job_name: blackbox_icmp
     scrape_interval: 10m
     metrics_path: /probe
@@ -115,7 +73,7 @@ scrape_configs:
       - source_labels: [__param_target]
         target_label: instance
       - target_label: __address__
-        replacement: blackbox-external:9115
+        replacement: blackbox:9115
 
   - job_name: blackbox_healthcheck
     scrape_interval: 10m
@@ -167,3 +125,19 @@ scrape_configs:
       - source_labels: [__name__]
         regex: go_.+
         action: drop
+
+  - job_name: uptime_kuma
+    basic_auth:
+      username: ""
+      password: "{{ vault_uptime_kuma_token }}"
+    metrics_path: /metrics
+    static_configs:
+      - targets:
+          - uptime.jakehoward.tech
+    metric_relabel_configs:
+      - source_labels: [__name__]
+        regex: nodejs_.+
+        action: drop
+      - source_labels: [__name__]
+        regex: process_.+
+        action: drop

ansible/roles/prometheus/vars/vault.yml

@@ -1,52 +1,55 @@
 $ANSIBLE_VAULT;1.1;AES256
-36623535313964653161353330663436356239613837653837393939373034353031646535333535
-6439313832316239616233306632373934616134616466380a316361363263373938636161666535
-31613461333637373732626233623434316335353964353433643635653566613933393361336139
-3864373963396264320a376634346331373762313733323961386566646338633936303631303566
-66616534326430653266396635353932623661363533356537636662636537656434363562646230
-30613831336561376639393466373739373138313931333163353061633465623362666564313631
-66623235353531613737643937613430323934376433393836346339626137616561313062663234
-63363736326439623661376132613136383465393761653236663631613339653066356436653630
-66623865303735616335373231643233386639323838353534613337316161633765396234366533
-33616631663530643764373937346262633734366339303837393737666665363465333239343933
-35613962396534336232623833303034643639323931633966396439383463396261313862626335
-31323434613838353961336136613966636635646632393839663664376632373834313265643338
-30663132633362323831313231333164643665386535323231646262656631383631393539616639
-34343563353064303833383236626136666264316236316537333965313162616637323966363335
-32353936663162316564306337353861396634353935353935306135343665316262643831396537
-61393266383538666563363261646534636632303332343662636631316663343930303766623638
-35376565343638316339623061396536643636313966383633346231633631353032356661386132
-66623439336338616666626431303635373833666137326234653161336434346133636261363662
-39313732303736386137656664303365363234336265643064306562643435633838373864353862
-33366635333630373162656630666232333563623066333461653963363961623435646631373561
-64643738346138366566303233326663383835386132663034313461383161616164636332396332
-37663131386135393833373461663432666264363065666630646164633134303439663435616235
-35656234313761376532306264393637653433623863383830323935316332383338623134323366
-31336665386137323132363962363335623635336131373930353635353663333366363266303138
-35626262613261636561373730626635303836623561643436646430653365663432323938393863
-63633331663462323163646237386262376337313330323036613434383165616530643362616131
-63616562353964316634646434653138333266646633616631653663663838306163616633643234
-61333230373237613436343662363434303766383336376232353066313231666330613761643366
-36326638326439653966643430313366376661633636366565393461623438323366373333663633
-61633763623631333665363333646433656166633364303836623566333336343761613435353138
-37366165613263653564386334303030623333646164303662363065333831376334656537613130
-33373864663237383064653461616165653834393063663332643235316139333539623463343161
-38636564626466633631393938653066373764663935353763626133623762306164383831663061
-34333065326666373337663931313763383739383763333235333939376133363236643136346233
-62643833376631643036613963643939333133343036613332313866373032646332363231313139
-61373365653665343066636162356336373833393363373866343436323639623435383831363335
-30333033326638363930613030356664333233633339666366643062353634333161343838666231
-32346332663538653937623136653438636463323463376263303962353562313833373937303066
-65303037323030653434313164393766633134306435633263363335636561356264376665363639
-35613731373437386566663266656266343639326334303239613862353963323436633836383766
-35323930633039396535616265643234303639393035363865643236623838333337626135343665
-36373038666332376663333565623362303631663830336131343438353764653831633433363436
-36333839303433623966363561313564303037393165383732323763353232653564346138666438
-30653836626139356133346538616135313034633966373036303461393562363336386633626365
-33393565643730383634346238356462313435366538636234656237613864656165656439363061
-32626235323362333239373631383830653035383164646364343461376562636564343063353139
-61306535333466653937303635353962376162376431336563316130343530636431623537633332
-65373333376338353930316561636530343062653964323463653632653332376432343237656465
-63333437613064313438353134333566303033313339323162643061363836643931343135396130
-32623435653533326563616263323938343332306362383034663139653965626231336637383939
-313534343431303739396263303737303365
+33643431356363646630383866316263343363653765613339633264643432646531623637643938
+6536623536306263633239616234646636383635623532620a613333623433333566353135393233
+62343564363234626563353031656430633335376464303633376336636132383936343265303665
+3234636332313763340a326632303834633338333866313831616533393061336137613036393235
+62343864316530646639363161626463643435353864373332323330623337666234386463626266
+66353137303466353234373332666638303862393135666664616565666534633133376166646234
+38643631366131396231343964656262636466653731333839643739313237383765646437353862
+62323032313738636266616366333034363037343232373063363934306339663165346366396165
+61303436393231393533653535383534386432383736613034313333336236643938393661323435
+37326536643366323862633962316366316233643962303961613038316330643662636262316238
+34666463353662663231373061643438386664373863666463653332326238616264393736326336
+33646166356437653833343234653032636239386339383638333339346264646634613234663832
+38636631386336633465623966653630353734316566626666376566376436373936636338373131
+65646562356238396161323266316331623531353061346666633531663362646238653662393765
+38636136386534366434333431626430303962366637316562383439653666306630656137633664
+61326635643336623139306331323538366536613266613834326435656336623630326266643935
+36356538343765616235353932613932333934623465633238353733633332353736326137653063
+35666330653239306230323063383234373335366466626234336536366466626266376466346239
+34623133643962656236666563663161623361383032336138626334653961353030666237396331
+33613631346433376462356333623333643537656433643331353938303263656563633234376366
+65653237366333323737323438613335333537343139653632323032313964313030663136313734
+35353237316133306664636138376664343638356530336137323665626665336136343235373234
+64353161393735356562396533396462356162333937616339336466616232666565613037626235
+32313232646237663837353934323365333961306266663033353861346662383235386339313465
+65623138376264343462636130303231626663313565343961616438356236373833363038626463
+61333532313938636237613839643230646337323035336231383032323235633731343066663133
+63653036383736623733653438333039393565643334396265616134353163646161396564633561
+35663832373466316439646238356566333733343237343564326437356335316161633739343930
+66666563623038386632363036646230333233303439616165303162636364386662633039316237
+35633437643231336533626461656564303663633461643236626134643430656464346237356363
+32346531386439613830343532636164396432626264623134666637653665343866643139326339
+30346165663666313436393466353463303139393465373433663336313366643435363163316539
+30353836383432343164633563643131396438353838313138623531643533306138323765613335
+39373533393166643236376462613439653466383966376161316538636635383035333663643333
+61393036356330653663376635643539366139313132383665383932656131346364666532383433
+61626665396531316665396663653763333164623631376636386234633636373636323233336263
+38333965346563363030396330303063313563643665353064356462666339396330396333363335
+61633131383562303137386265313330336137353730626563653666316531363661613865326566
+64613333633966333064383762306634323335353638646130366534386636363332373266393839
+66636532303563393563633762366665616631656639643763366331336237663532303631313836
+30373966616334633562353030373462373131666439666662393536323066643264616565306537
+36396439363636613636386662623337643631646461653965663239313363636362333931656364
+36653663663534623638356636653534393239336663353530346662396634383430333133313739
+36333265653866306464646361323163363134643732303337333137653434643432643034366661
+38656631366132613863626363613334656462363834323162383634616532633861663232326362
+61373765306231626137363934643761316338363431626666363437373061366439306361396366
+62383239316330636534303063333937336136346161633061656439353932373930633766383463
+38353538353737613434316563386533373663613434653761356238633438383532316639343431
+32353161633036333730386164393166633762386637653736616262383064333864363136353534
+66643362313539333030663331313165353936663861616336306636633035323230653039313363
+37393137636431313164346561353334613331663361383835643732663139373162363636316365
+64376366643537643531333462346166653432313331316366396530633035616337396461393863
+62343465316235663366616637393734343638626230623932663666323961643633383462646334
+3034366430643531366664326330323639306631656462646238

ansible/roles/uptime_kuma/files/docker-compose.yml

@@ -2,11 +2,14 @@ version: "2.3"
 
 services:
   uptime-kuma:
-    image: louislam/uptime-kuma:1.23.11-alpine
+    image: louislam/uptime-kuma:1.23.13-alpine
     environment:
       - TZ={{ timezone }}
       - PUID={{ docker_user.id }}
       - PGID={{ docker_user.id }}
+    dns:
+      - 9.9.9.9
+      - 149.112.112.112
     ports:
       - "{{ pve_hosts.forrest.ip }}:3001:3001"
     volumes:

terraform/.terraform.lock.hcl

@@ -137,38 +137,60 @@ provider "registry.terraform.io/hashicorp/local" {
   ]
 }
 
-provider "registry.terraform.io/linode/linode" {
-  version     = "2.20.0"
-  constraints = "2.20.0"
+provider "registry.terraform.io/hetznercloud/hcloud" {
+  version     = "1.46.1"
+  constraints = "1.46.1"
   hashes = [
-    "h1:6/o4LoVz52eWw2yxa1/Vhi8iBUoo9jK7HDBuTcaX30Y=",
-    "h1:8LYKyN2DlXn1qmkY1XhodyM3GHzMZKt7F8ev1agQcVk=",
-    "h1:8jkWRVdYws+9xfIwtvAjId6opsqF68gWvkan0UNmW9o=",
-    "h1:Flghk8gw63R42l9cbMtChRmU3n74WvqNXwh+pKuqhFw=",
-    "h1:OreqQcttXFzLkp/4ozOeLnrbJjUoUrlcVcTqh9uorSI=",
-    "h1:PYIu5UNRhiVNZfSFKmUztA2ayh92V54iLfoEPsZubcI=",
-    "h1:QXruhT9Ah4tjRpfexy3+o3vGsXVZcGvkuzZsyrK4P4c=",
-    "h1:UUXMr/o7UQfbhKdUW9dAfAOfbC1Y3cwOZZORGfMZc24=",
-    "h1:aZ9UaS3BabFgwpZMkaRfaveJ4Uw+NRhJJDiQ2Yl/CWA=",
-    "h1:eZiXmPJ4gVsgAckjNDkpL9Voj4RPbfXXTBeVgxTLD/s=",
-    "h1:fZdu/J4nChpOTXbnMzii9Y0lHZdPK+OKw2gQYHGGzNU=",
-    "h1:k5B51NjPFG4tNoSwVy8e/5mJYlxBTJWi1t9uIOAm8JY=",
-    "h1:nIy2MvYWgydmsXlnuUV2QG9PK+j0GVbePcxev6AyVd0=",
-    "h1:rcbkGtAPQDQenU1oaG+E0lyUKrvR73X9Xva7E1lDW0Q=",
-    "zh:116ab7c6096172745ba91b2ec46bb7a43647f6b674ed241087cb26db3361483c",
-    "zh:1e35f3747586440473387a5730c0f68bf068810ca561b35dde8f2c0bebd2278d",
-    "zh:290e342a9fa19747a82ac364967e82b979a50504c6f9dbcb9ddf926de2f4c4f7",
-    "zh:58caa5475f63d7f3920117e81b3da2943f20bf16a23d48ce01a5eacd7bd18ced",
-    "zh:5a0e923da975a83d10d0810afb0b329f617866bcfeac15a21d89b44816882f97",
-    "zh:786292479f7ec5568c78bded3ea5410d3adff4df5023b5ea65ce338814de357d",
-    "zh:9d89c5828fd7733e38b5181b7df294802c46e1b639482ec0ea028b7dbbbcd5ad",
-    "zh:9f5ba60b6d99dcab3a3ab3ac65ac96baa23640a1c1cdeeb6682ca5bbac74127d",
-    "zh:a408871c74e759dbacba6719db167152cf2dd4d02c98a34990b20d58d13f91b3",
-    "zh:a97a0e0f760369d0a6ce44e5adb0c1d8c5a81912a864eea926d7bf78f6e53744",
-    "zh:acc1ada03a0df90ebbd6110d16637d56ec7340f4695702a592e7ef6b90094c7a",
-    "zh:b231b766cf81ac8d6237dfa95802497400a1997c0498036629b159818cb4680d",
-    "zh:c9930f4768636418660f81e5fa4edd422ad8e92ad3e418c026448cfb12d236e7",
-    "zh:cf4ea823de02a00cf57b9f51ac483c0ce0b0e450aeb3014722e57e602dc147ef",
+    "h1:cDJWhw9W+qj4ner9QX/+FBB6YvK9pnTVOugSAM+ejcM=",
+    "zh:0d8fb959c331b7cd9a13800198d65f61c604221b2fb05e0681c9cd432a6e2242",
+    "zh:31ab652fb504bff3fdee0de8e06cb4c7d08805f4d3e8430dac6a4ee8a52b949f",
+    "zh:493770ce314fc4f7b9536da077b217aa5af77b1d8c969639a257fda3dbd3e38b",
+    "zh:4c25ee2977d359db15c044a8bfeb00f64ca94a6bdea00774307768a9bad97996",
+    "zh:605c8e776cb69b1928c516ab1a9be9ea793c9405f038f224de5586db4983e621",
+    "zh:8c9b966a881f177199738253003dc1ee4944034598be4dfbb5465f6d28349c66",
+    "zh:8e6ec6e0f0572222f5a2d5748948c229a426408418c6500707711b1ae82fff1c",
+    "zh:a63e3ac7f84f0ad0c27399fb2ae4469570d9b216bbc06a89edeca6ff569f0ea0",
+    "zh:b03e6050ce2054665d824a02fcbe450cdfad29c082cf1d8adb29f8c138023457",
+    "zh:b40e03710694792cff0eb5ca3f7dc80ff0befd2957b0af3b248d36a4ac77293e",
+    "zh:bbd264b083a3f5e80a90c02ea3ec377231d030f4d9035bb0f1627f3b09504b00",
+    "zh:de2b119e4c39b3454199c34f4ce0fd60af11bd9012c46e2c907db53fd5969278",
+    "zh:e845750317897e45ab68e71326a43a7f143e0b5312aa9eba4fec907a3800a7f2",
+    "zh:eebc0085e7fa25d4eaf4e47be00dd7f64259f725ed86581d0acef8b8fde31b49",
+  ]
+}
+
+provider "registry.terraform.io/linode/linode" {
+  version     = "2.20.1"
+  constraints = "2.20.1"
+  hashes = [
+    "h1:7p4iDJTarkyXZYmjh+Bal/UFLw/oELzgJpx9XwRFmSE=",
+    "h1:COeC3EkSuiASpAYN1Ubmst3qutUSAmLgA9zIvXxGKpk=",
+    "h1:Gumc5fItCSjn+rsUaVQ6ArMOpes0ttrG63l8Y/frtTA=",
+    "h1:HV4kCVvqdpP2ZJcDXetKmxnQVd1s4STCRjQkYIoWHco=",
+    "h1:KRTZYsCFg9lMVU+STdk91Onk2CyulCkufx1Ac55dChk=",
+    "h1:RMHvaX9kAixj96MIob0LQJdT0hC5XbSIzpuCbOvUr6w=",
+    "h1:SeG2bcPbgeD165cQonr7fpoZ5297NaFWegPHhla5YIU=",
+    "h1:V75g1RFlRmYFd6dQ+bDtvkFFcNGFQWYuhe54b79QRfY=",
+    "h1:WcGUr+FmD+ZF9Or148MGrTUtKGtKTCdfQ26c6xm1Dss=",
+    "h1:gM/JywzjT4xs1gNPWHkIf/NH2QAzmCXF02V0de102tE=",
+    "h1:k+VjnSUy0+8Qm73S80aoZvWflDaZ86K00qYF9meWQxI=",
+    "h1:l8le5faiTGAyI1rjnYsGWRaUxYcR3YFKmYwXe+6ZxGo=",
+    "h1:n3baXqErlIEebTgdCCg0rRLONGaENaC1GGxIuNrioZk=",
+    "h1:yhuxvTRNWEaQQV3z+RUGTHFPZlpnIDmsHVqYUvZd25g=",
+    "zh:054980b490aa16672b8ba730dd526a2916689da916257e651b33381d213dad5f",
+    "zh:0f56d828091a4cba36b193b513fdadf2193576fa5662f2a4777f352f63d0f0d9",
+    "zh:224746afb272516e8ed3cf69c4328ad2027cd4802eeb4ddbd8df13d230cd7ac3",
+    "zh:38956a662f4e3db4ab193274687029c1ddbdac85ad0e3f82bf09f46be76df41e",
+    "zh:39f907a07753cc7f255e726eb7dc546a7075992b6ffe26d6c6d054ea58c27d2c",
+    "zh:3cc0f71b81364b0a0020108687b5b6c9c7099549780b208b32fdd6e1a7e2f21c",
+    "zh:4ab870bce54d63ec54e7ce5d6b9de5410a3cf3a9d6897438f7cfd130c00f2a32",
+    "zh:97633bc74138072e775d2df6f0e50b28b299fe9202077ed21e67885bfc1c2434",
+    "zh:9954055d8fc78ba458d95c2426751df74db571948128717cc6a5a96a341b47fc",
+    "zh:a7a784337029cf610983eada894aceb4aced0d1e0fd220e4a617fb38e6cf86a0",
+    "zh:b6a2ea2a8b6fbd587592eafc8e7148c39241d409bcc74337fbe916f7f342b09b",
+    "zh:caebd102ea4f1cfbacf22e41738772d07ed236b946e1f4948f0f0412a90163d0",
+    "zh:cb02f495cde9089bb95e8fcb970948de23cca17ce7a68d2df88e6241d19a5d9c",
+    "zh:fca4a42c05e6a78a455f38f5129a9f67993b04ab0f1cb54abd7e31bef614c85d",
   ]
 }
 

terraform/terraform.tf

@@ -14,7 +14,7 @@ terraform {
     }
     linode = {
       source  = "linode/linode"
-      version = "2.20.0"
+      version = "2.20.1"
     }
     gandi = {
       source  = "go-gandi/gandi"
@@ -24,5 +24,9 @@ terraform {
       source  = "Backblaze/b2"
       version = "0.8.9"
     }
+    hetzner = {
+      source = "hetznercloud/hcloud"
+      version = "1.46.1"
+    }
   }
 }

terraform/variables.tf

@@ -25,3 +25,7 @@ variable "backblaze_application_key" {
 variable "backblaze_application_key_id" {
   sensitive = true
 }
+
+variable "hetzner_token" {
+  sensitive = true
+}