FIX: Localhost check replaced with IP and now should work

garmin-grafana/.env.example

@@ -13,12 +13,3 @@ GARMINCONNECT_PASSWORD=your_garmin_password_base64_encoded
 GARMINCONNECT_TOKENS=./garminconnect-tokens
 PATH_TO_INFLUXDB_DATA=./influxdb_data
 PATH_TO_GRAFANA_DATA=./grafana_data
-
-# Advanced Configuration
-GARMINCONNECT_IS_CN=False
-# USER_TIMEZONE=Europe/Paris
-# FETCH_SELECTION=daily_avg,sleep,steps,heartrate,stress
-# KEEP_FIT_FILES=False
-# ALWAYS_PROCESS_FIT_FILES=False
-# MANUAL_START_DATE=2024-01-01
-# MANUAL_END_DATE=2024-01-31

garmin-grafana/README.md

@@ -11,82 +11,14 @@ This directory contains the configuration for a set of services that fetches dat
 ## How to start
 
 1.  Create a `.env` file based on the `.env.example` file.
-2.  Set the `GARMINCONNECT_EMAIL` and `GARMINCONNECT_PASSWORD` (Base64 encoded) variables in the `.env` file.
+2.  Set the `GARMINCONNECT_EMAIL` and `GARMINCONNECT_PASSWORD` variables in the `.env` file.
-3.  **If you have 2FA enabled:** You must authenticate manually once to generate the session tokens.
+3.  Run `docker-compose up -d` to start the application.
-    ```bash
-    docker-compose run --rm garmin-fetch-data
-    ```
-    Enter your 2FA code when prompted. The tokens will be saved to the `./garminconnect_tokens` folder.
 
-    > **Server Console (Komodo/Portainer) - Robust Method:**
+## Setup
-    > The fetcher requires a database connection to start. Use the provided [`server-token-setup.yaml`](./server-token-setup.yaml) file.
-    >
-    > 1. Copy `server-token-setup.yaml` to your server.
-    > 2. **Important:** Ensure the target folder exists and is writable by the container user (UID 1000):
-    >    ```bash
-    >    sudo mkdir -p /opt/docker/garmin-grafana/tokens
-    >    sudo chown -R 1000:1000 /opt/docker/garmin-grafana/tokens
-    >    ```
-    > 3. Run:
-    >    ```bash
-    >    docker-compose -f server-token-setup.yaml run --rm setup-fetcher
-    >    ```
-    > The script will interactively prompt you for your **Garmin Email**, **Password (Plain Text)**, and **2FA Code**.
-    > The tokens will be generated in `/opt/docker/garmin-grafana/tokens` (as defined in the yaml).
-    >
-    > Finally, in Komodo/Portainer, set the environment variable `GARMINCONNECT_TOKENS=/opt/docker/garmin-grafana/tokens`.
 
-4.  Run `docker-compose up -d` to start the application.
+After starting the application, you can access the Grafana web interface at [http://localhost:3000](http://localhost:3000) and log in with the default credentials:
-
-## Setup & Access
-
-After starting the application, you can access the Grafana web interface at [http://localhost:3000](http://localhost:3000).
 
 -   **User**: `admin`
 -   **Password**: `admin`
 
-## Setup Data Source
+You can then configure a new data source for InfluxDB and create dashboards to visualize your Garmin Connect data.
-
-Before importing the dashboard, you must connect Grafana to InfluxDB.
-
-1.  Go to **Connections -> Data Sources -> Add data source**.
-2.  Select **InfluxDB**.
-3.  Configure with these settings:
-    -   **Query Language**: `InfluxQL` (default)
-    -   **URL**: `http://influxdb:8086`
-    -   **Database**: `GarminStats`
-    -   **User**: `influxdb_user`
-    -   **Password**: `influxdb_secret_password` (or whatever you set in `.env` for `INFLUXDB_PASSWORD`)
-    -   **HTTP Method**: `GET`
-4.  Click **Save & Test**. You should see "Data source is working".
-
-## Setup Dashboard
-
-You need to manually import the dashboard into Grafana to visualize your data.
-
-**Method 1: Import via ID (Recommended)**
-1.  Go to Grafana (`http://localhost:3000`).
-2.  Navigate to **Dashboards -> New -> Import**.
-3.  Enter the Dashboard ID: `23245` and click **Load**.
-4.  Select your InfluxDB data source and click **Import**.
-
-**Method 2: Import via JSON File**
-1.  Download the dashboard JSON file:
-    [Garmin-Grafana-Dashboard.json](https://raw.githubusercontent.com/arpanghosh8453/garmin-grafana/main/Grafana_Dashboard/Garmin-Grafana-Dashboard.json)
-2.  Go to Grafana -> **Dashboards -> New -> Import**.
-3.  Upload the downloaded JSON file.
-4.  Select your InfluxDB data source and click **Import**.
-
-## Historical Data Download (Bulk Import)
-
-To download old history **without modifying your configuration files**, use the `docker-compose run` command with the `-e` flag. This starts a temporary container just for this task.
-
-```bash
-docker-compose run --rm -e MANUAL_START_DATE=2025-01-01 garmin-fetch-data
-```
-
-**Options:**
--   `MANUAL_END_DATE=YYYY-MM-DD`: Optional end date (defaults to today).
--   `FETCH_SELECTION=...`: Limit what data is fetched (e.g., `activity,sleep`).
-
-*Note: Garmin archives intraday data older than 6 months, so very old detailed data (HR, sleep stages) might be missing unless manually refreshed in the Garmin Connect app.*

garmin-grafana/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
       influxdb:
         condition: service_healthy
     volumes:
-      - ${GARMINCONNECT_TOKENS}:/home/appuser/.garminconnect # Local folder for tokens
+      - garminconnect_tokens:/home/appuser/.garminconnect # persisted tokens storage (named volume)
     environment:
       - INFLUXDB_HOST=influxdb
       - INFLUXDB_PORT=8086
@@ -18,13 +18,6 @@ services:
       - LOG_LEVEL=INFO
       - GARMINCONNECT_EMAIL=${GARMINCONNECT_EMAIL}
       - GARMINCONNECT_BASE64_PASSWORD=${GARMINCONNECT_PASSWORD} # (must be base64 encoded)
-      - GARMINCONNECT_IS_CN=False
-      # - USER_TIMEZONE=Europe/Paris # Optional: Override automatic timezone detection
-      # - FETCH_SELECTION=daily_avg,sleep,steps,heartrate,stress # Optional: Select specific data to fetch
-      # - KEEP_FIT_FILES=False
-      # - ALWAYS_PROCESS_FIT_FILES=False
-      # - MANUAL_START_DATE=2023-01-01 # For bulk import: set date and run with docker-compose run ...
-      # - MANUAL_END_DATE=2023-01-31   # For bulk import: defaults to today if unset
     networks:
       - garmin-grafana-net
 
@@ -32,7 +25,7 @@ services:
     restart: unless-stopped
     container_name: influxdb
     hostname: influxdb
-    image: influxdb:1.8
+    image: influxdb:latest
     environment:
       - INFLUXDB_DB=GarminStats
       - INFLUXDB_USER=influxdb_user
@@ -41,9 +34,9 @@ services:
     ports:
       - '8086:8086'
     volumes:
-      - influxdb_data:/var/lib/influxdb
+     - influxdb_data:/var/lib/influxdb
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8086/ping" ]
+      test: ["CMD", "curl", "-f", "http://localhost:8086/ping"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -63,7 +56,7 @@ services:
     ports:
       - '3000:3000'
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:3000/api/health" ]
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -75,6 +68,8 @@ networks:
     driver: bridge
 
 volumes:
+  garminconnect_tokens:
+    name: garminconnect_tokens
   influxdb_data:
     name: influxdb_data
   grafana_data:

garmin-grafana/server-token-setup.yaml

@@ -1,15 +0,0 @@
-services:
-  setup-fetcher:
-    image: thisisarpanghosh/garmin-fetch-data:latest
-    depends_on:
-      - temp-influxdb
-    volumes:
-      - /opt/docker/garmin-grafana/tokens:/home/appuser/.garminconnect
-    environment:
-      - INFLUXDB_HOST=temp-influxdb
-      - INFLUXDB_PORT=8086
-      - INFLUXDB_DATABASE=GarminStats
-  temp-influxdb:
-    image: influxdb:1.8
-    environment:
-      - INFLUXDB_DB=GarminStats

semaphore-ui/docker-compose.yml

@@ -0,0 +1,17 @@
+services:
+    semaphore:
+        ports:
+            - 3030:3000
+        image: semaphoreui/semaphore:v2.16.18
+        environment:
+            SEMAPHORE_DB_DIALECT: sqlite
+            SEMAPHORE_ADMIN: ${ADMIN_USER}
+            SEMAPHORE_ADMIN_PASSWORD: ${ADMIN_PASS}
+            SEMAPHORE_ADMIN_NAME: ${ADMIN_NAME}
+            SEMAPHORE_ADMIN_EMAIL: ${ADMIN_EMAIL}
+        volumes:       
+            - semaphore-data:/var/lib/semaphore
+            - semaphore-config:/etc/semaphore  
+volumes:
+  semaphore-data:
+  semaphore-config:

siyuan/.env.example

@@ -1,6 +0,0 @@
-# SiYuan Note Configuration
-SIYUAN_ACCESS_CODE=changeme123
-SIYUAN_PORT=6800
-SIYUAN_DATA_DIR=/mnt/media/siyuan
-# Timezone
-TZ=Etc/UTC

siyuan/docker-compose.yaml

@@ -1,12 +0,0 @@
-services:
-  siyuan:
-    image: b3log/siyuan
-    container_name: siyuan
-    command: [ "--workspace=/siyuan/workspace", "--accessAuthCode=${SIYUAN_ACCESS_CODE}" ]
-    ports:
-      - "${SIYUAN_PORT:-6806}:6806"
-    volumes:
-      - "${SIYUAN_DATA_DIR}:/siyuan/workspace"
-    restart: unless-stopped
-    environment:
-      - TZ=${TZ}