grafana: its directories are placed, its admin password is a file, and it runs the build in use

The module stated /var/lib/grafana-module and /services/grafana/data, a
layout no definition may carry (ADR 0112). State and data are now placed
directories; the admin secret lives beside the broker account under the
mesh's own state.

The admin password reached grafana through an env-file. Grafana honours
GF_SECURITY_ADMIN_PASSWORD__FILE, so it is now a 0400 file owned by the
image's user (472) and mounted, and "secrets-in-environment" is gone
(ADR 0086).

The runtime sidecar was given no credential at all - its config file was
"{}", so GrafanaClient.fromEnv threw and the tools and the alert watcher
did nothing. It now carries user/password from the same secret, and it
calls grafana on the machine port the mesh assigned (${port:3000}) rather
than a literal 3000.

Image pinned to the 13.2.2 build ace's predecessor runs; the old pin was
13.2.1, older than the data it would open.

Verified: catalogue tests with MESH_CATALOGUE pointing here; a throwaway
container of the pinned image with the file-mounted secret answers
/api/health and authenticates admin with the file's value (default
admin/admin refused); restarted over the same data with a different file
value, the original password still holds - so a migrated instance's
password must be accepted, not minted; data owned by another uid fails to
start, so a moved data directory must be chowned to 472.

modules/grafana/module.json

@@ -5,7 +5,7 @@
     "alert.firing"
   ],
   "own-secrets": {
-    "admin": "/var/lib/grafana-module/admin.secret",
+    "admin": "/var/lib/mesh/grafana/admin",
     "broker": "/var/lib/mesh/grafana/broker"
   },
   "capabilities": [
@@ -30,45 +30,45 @@
     {
       "id": "state",
       "type": "directory",
-      "path": "/var/lib/grafana-module",
-      "mode": "0700"
+      "mode": "0700",
+      "place": "."
     },
     {
       "id": "data",
       "type": "directory",
-      "path": "/services/grafana/data",
       "mode": "0700",
       "owner": "472:472"
     },
     {
-      "id": "server-env",
+      "id": "admin-secret",
       "type": "file",
-      "path": "/var/lib/grafana-module/server.env",
-      "mode": "0600",
-      "content": "GF_SECURITY_ADMIN_PASSWORD=${secret:admin}\n"
+      "path": "${dir:state}/admin.secret",
+      "mode": "0400",
+      "owner": "472:472",
+      "content": "${secret:admin}"
     },
     {
       "id": "server",
       "type": "container",
       "name": "grafana",
-      "image": "grafana/grafana@sha256:f772d434e8fab0049deb2b1b30abd43342bcfca1537614aa8d36080232cf4283",
+      "image": "grafana/grafana@sha256:ac461fb352abc50da10a51c7d02462e9c05488f11f53f14b3ad79a8145f638a0",
       "ports": [
         "3000"
       ],
       "volumes": [
-        "/services/grafana/data:/var/lib/grafana"
+        "${dir:data}:/var/lib/grafana",
+        "${dir:state}/admin.secret:/run/secrets/admin:ro"
       ],
-      "env-file": [
-        "/var/lib/grafana-module/server.env"
-      ],
-      "secrets-in-environment": "grafana honours GF_SECURITY_ADMIN_PASSWORD__FILE; convertible, awaiting a bed that exercises the admin password (assigned-grafana serves tools only)"
+      "env": {
+        "GF_SECURITY_ADMIN_PASSWORD__FILE": "/run/secrets/admin"
+      }
     },
     {
       "id": "runtime-config",
       "type": "file",
       "path": "/var/lib/mesh/grafana/config.json",
       "mode": "0600",
-      "content": "{}\n",
+      "content": "{\n  \"user\": \"admin\",\n  \"password\": \"${secret:admin}\"\n}\n",
       "merge": "json"
     },
     {
@@ -82,7 +82,7 @@
       ],
       "env": {
         "MESH_BROKER_FILE": "/run/secrets/broker",
-        "MESH_GRAFANA_URL": "http://127.0.0.1:3000",
+        "MESH_GRAFANA_URL": "http://127.0.0.1:${port:3000}",
         "MESH_GRAFANA_CONFIG_FILE": "/run/config/config.json"
       },
       "restart-on": [
@@ -101,7 +101,7 @@
     }
   },
   "binds": {
-    "route": "/var/lib/mesh/grafana/route.json"
+    "route": "${dir:state}/route.json"
   },
   "build": {
     "on": [

modules/kometa/module.json

@@ -1,66 +0,0 @@
-{
-  "module": "kometa",
-  "version": "1",
-  "capabilities": [
-    "container-runtime"
-  ],
-  "requires": [
-    "plex-api",
-    "secret"
-  ],
-  "binds": {
-    "plex-api": "${dir:state}/plex-api.json"
-  },
-  "secrets": {
-    "plex-api": "${dir:state}/plex-api.secret",
-    "secret": {
-      "tmdb": "${dir:state}/tmdb.secret"
-    }
-  },
-  "resources": [
-    {
-      "id": "state",
-      "type": "directory",
-      "mode": "0700",
-      "place": "."
-    },
-    {
-      "id": "config",
-      "type": "directory",
-      "mode": "0700"
-    },
-    {
-      "id": "settings",
-      "type": "file",
-      "path": "${dir:state}/config.yml",
-      "mode": "0600",
-      "merge": "json",
-      "content": "{\n  \"plex\": {\n    \"url\": \"${bound:plex-api:scheme}://${bound:plex-api:at}:${bound:plex-api:port}\",\n    \"token\": \"${secret:plex-api}\",\n    \"timeout\": 60,\n    \"clean_bundles\": false,\n    \"empty_trash\": false,\n    \"optimize\": false,\n    \"verify_ssl\": null,\n    \"db_cache\": null\n  },\n  \"tmdb\": {\n    \"apikey\": \"${secret:tmdb}\",\n    \"language\": \"en\",\n    \"cache_expiration\": 60,\n    \"region\": null\n  },\n  \"settings\": {\n    \"cache\": true,\n    \"cache_expiration\": 60,\n    \"asset_directory\": \"config/assets\",\n    \"sync_mode\": \"append\",\n    \"minimum_items\": 1,\n    \"delete_below_minimum\": false,\n    \"run_again_delay\": 2,\n    \"show_missing\": false,\n    \"save_report\": false,\n    \"run_order\": [\n      \"operations\",\n      \"metadata\",\n      \"collections\",\n      \"overlays\"\n    ],\n    \"asset_folders\": true,\n    \"asset_depth\": 0,\n    \"create_asset_folders\": false,\n    \"prioritize_assets\": false,\n    \"dimensional_asset_rename\": false,\n    \"download_url_assets\": false,\n    \"show_missing_assets\": true,\n    \"show_missing_season_assets\": false,\n    \"show_missing_episode_assets\": false,\n    \"show_asset_not_needed\": true,\n    \"default_collection_order\": null,\n    \"item_refresh_delay\": 0,\n    \"delete_not_scheduled\": false,\n    \"missing_only_released\": false,\n    \"only_filter_missing\": false,\n    \"show_unmanaged\": true,\n    \"show_unconfigured\": true,\n    \"show_filtered\": false,\n    \"show_unfiltered\": false,\n    \"show_options\": false,\n    \"tvdb_language\": \"default\",\n    \"ignore_ids\": null,\n    \"ignore_imdb_ids\": null,\n    \"playlist_sync_to_users\": null,\n    \"playlist_exclude_users\": null,\n    \"playlist_report\": true,\n    \"custom_repo\": null,\n    \"overlay_artwork_filetype\": \"webp_lossy\",\n    \"overlay_artwork_quality\": 90,\n    \"auto_sort_hubs\": null,\n    \"verify_ssl\": true\n  },\n  \"libraries\": {}\n}\n"
-    },
-    {
-      "id": "net",
-      "type": "network",
-      "name": "kometa"
-    },
-    {
-      "id": "run",
-      "type": "container",
-      "name": "kometa",
-      "image": "kometateam/kometa@sha256:6c3971a4aaa928b045e5f22514196b6db7f9b2b186158ebfe3239f4b328dfb0a",
-      "network": "kometa",
-      "schedule": "0 3 * * *",
-      "args": [
-        "--run"
-      ],
-      "env": {
-        "TZ": "Etc/UTC",
-        "KOMETA_NO_MISSING": "true",
-        "KOMETA_READ_ONLY_CONFIG": "true"
-      },
-      "volumes": [
-        "${dir:config}:/config",
-        "${dir:state}/config.yml:/config/config.yml:ro"
-      ]
-    }
-  ]
-}