@emeryld/obs-stack 0.2.1 → 0.2.2

package/README.md

@@ -17,7 +17,7 @@ A Docker Compose bundle that wires Grafana, Tempo, Loki, and an OpenTelemetry Co
    ```bash
    pnpm --filter @emeryld/obs-stack obs-stack up
    ```
-   The CLI now runs `docker compose` from the workspace root so that the compose file's workspace-relative bindings (for example, `./packages/obs-stack/grafana/provisioning`) always point at the versioned files. If you run `docker compose` yourself, do it from the workspace root or add `--project-directory packages/obs-stack` so Grafana can read `grafana/provisioning/dashboards/files` instead of logging `stat /etc/grafana/provisioning/dashboards/files: no such file or directory`.
+   The CLI sets `OBS_STACK_DIR` to the `packages/obs-stack` directory so every `docker compose` run sees the Grafana provisioning and config files no matter where you invoke the command. If you manage the stack by calling `docker compose` directly, either run the command from `packages/obs-stack` or set `OBS_STACK_DIR` (for example `OBS_STACK_DIR=packages/obs-stack docker compose up`) so the bind mounts keep pointing at `grafana/provisioning/dashboards/files`.
 5. Inspect the endpoints reported by the CLI:
    ```bash
    pnpm --filter @emeryld/obs-stack obs-stack urls
@@ -125,7 +125,7 @@ Edit the JSON in `grafana/provisioning/dashboards/files/` (or export updates fro
 ## Troubleshooting
 
 - **Ports already in use**: edit `packages/obs-stack/.env` (or your local override), then run `pnpm --filter @emeryld/obs-stack obs-stack reset` to recreate the stack with the new settings.
-- **Grafana dashboards missing**: make sure the CLI (or any manual `docker compose` command) starts from the workspace root so the `./packages/obs-stack/grafana/provisioning` bind mounts the expected files. Running Compose from another directory mounts an empty folder and Grafana will keep printing `stat /etc/grafana/provisioning/dashboards/files: no such file or directory`; after you fix the working directory, restart the stack with `obs-stack reset`.
+- **Grafana dashboards missing**: ensure the `OBS_STACK_DIR` environment variable points at `packages/obs-stack` (the CLI sets it automatically) so Grafana sees `grafana/provisioning/dashboards/files`. Running `docker compose` without `OBS_STACK_DIR` from another directory binds an empty host path and Grafana keeps logging `stat /etc/grafana/provisioning/dashboards/files: no such file or directory`; once the variable points at the stack, restart with `obs-stack reset`.
 - **Collector fails to start**: make sure the collector can resolve `tempo` and `loki`. The CLI always runs Compose inside the package directory so no host networking is required.
 - **`docker compose` not on PATH**: install Docker Desktop (Mac/Windows) or Docker Engine with the Compose plugin (Linux) so both `docker` and `docker compose` can run.
 

package/bin/obs-stack.js

@@ -6,7 +6,6 @@ const dotenv = require('dotenv');
 const startObsStackMenu = require('./obs-stack-menu');
 
 const ROOT = path.resolve(__dirname, '..');
-const WORKSPACE_ROOT = path.resolve(ROOT, '..', '..');
 const ROOT_ENV_PATH = path.join(ROOT, '.env');
 
 function loadEnvFile(envPath, options = {}) {
@@ -58,12 +57,14 @@ function ensureDocker() {
   }
 }
 
+const COMPOSE_ENV = { ...process.env, OBS_STACK_DIR: ROOT };
+
 function spawnCompose(args, options = {}) {
   ensureDocker();
-  const child = spawn('docker', ['compose', '--project-directory', WORKSPACE_ROOT, '-f', COMPOSE_FILE, ...args], {
-    cwd: WORKSPACE_ROOT,
+  const child = spawn('docker', ['compose', '-f', COMPOSE_FILE, ...args], {
+    cwd: ROOT,
     stdio: options.stdio ?? 'inherit',
-    env: process.env
+    env: COMPOSE_ENV
   });
   return child;
 }
@@ -80,10 +81,10 @@ function runCompose(args) {
 
 function streamCompose(args) {
   ensureDocker();
-  const child = spawn('docker', ['compose', '--project-directory', WORKSPACE_ROOT, '-f', COMPOSE_FILE, ...args], {
-    cwd: WORKSPACE_ROOT,
+  const child = spawn('docker', ['compose', '-f', COMPOSE_FILE, ...args], {
+    cwd: ROOT,
     stdio: 'inherit',
-    env: process.env
+    env: COMPOSE_ENV
   });
   child.on('error', (error) => {
     fail(`docker compose failed: ${error.message}`);

package/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       GF_AUTH_ANONYMOUS_ENABLED: "true"
     volumes:
       - grafana-data:/var/lib/grafana
-      - ./packages/obs-stack/grafana/provisioning:/etc/grafana/provisioning
+      - ${OBS_STACK_DIR:-.}/grafana/provisioning:/etc/grafana/provisioning
     depends_on:
       - loki
       - tempo
@@ -23,7 +23,7 @@ services:
     command:
       - "-config.file=/etc/tempo/local-config.yaml"
     volumes:
-      - ./packages/obs-stack/configs/tempo.yaml:/etc/tempo/local-config.yaml:ro
+      - ${OBS_STACK_DIR:-.}/configs/tempo.yaml:/etc/tempo/local-config.yaml:ro
       - tempo-data:/var/tempo
     restart: unless-stopped
 
@@ -35,7 +35,7 @@ services:
     command:
       - "-config.file=/etc/loki/local-config.yaml"
     volumes:
-      - ./packages/obs-stack/configs/loki.yaml:/etc/loki/local-config.yaml:ro
+      - ${OBS_STACK_DIR:-.}/configs/loki.yaml:/etc/loki/local-config.yaml:ro
       - loki-data:/var/loki
     restart: unless-stopped
 
@@ -48,7 +48,7 @@ services:
     command:
       - "--config=/etc/otel-collector/otel-collector.yaml"
     volumes:
-      - ./packages/obs-stack/configs/otel-collector.yaml:/etc/otel-collector/otel-collector.yaml:ro
+      - ${OBS_STACK_DIR:-.}/configs/otel-collector.yaml:/etc/otel-collector/otel-collector.yaml:ro
     depends_on:
       - tempo
       - loki

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emeryld/obs-stack",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Docker Compose-based Grafana + Tempo + Loki + OpenTelemetry Collector stack",
   "type": "commonjs",
   "bin": {