fix: pgAdmin nur intern erreichbar (kein öffentlicher Traefik-Zugang)

Zugriff nur noch per SSH-Tunnel, nicht mehr über stwwetter.fuerst-stuttgart.de/pgadmin

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

api/main.py

@@ -270,11 +270,16 @@ async def get_weather_statistics(
                 AVG(pressure) as avg_pressure,
                 AVG(wind_speed * 1.60934) as avg_wind_speed,
                 MAX(wind_gust * 1.60934) as max_wind_gust,
-                SUM(rain) as total_rain,
+                (SELECT COALESCE(SUM(daily_max), 0) FROM (
+                    SELECT MAX(rain) as daily_max
+                    FROM weather_data
+                    WHERE datetime >= NOW() - make_interval(hours => %s)
+                    GROUP BY DATE(datetime)
+                ) sub) as total_rain,
                 COUNT(*) as data_points
             FROM weather_data
             WHERE datetime >= NOW() - make_interval(hours => %s)
-        """, (hours,))
+        """, (hours, hours))
         result = cursor.fetchone()
         
         if not result or result['data_points'] == 0:
@@ -300,7 +305,7 @@ async def get_daily_statistics(
                 AVG(pressure) as avg_pressure,
                 AVG(wind_speed * 1.60934) as avg_wind_speed,
                 MAX(wind_gust * 1.60934) as max_wind_gust,
-                SUM(rain) as total_rain,
+                MAX(rain) as total_rain,
                 COUNT(*) as data_points
             FROM weather_data
             WHERE datetime >= NOW() - make_interval(days => %s)
@@ -429,7 +434,7 @@ async def get_daily_aggregated_data(
                     MAX(wind_gust * 1.60934)::float as wind_gust,
                     (array_agg(datetime ORDER BY wind_gust DESC NULLS LAST))[1] as max_wind_gust_time,
                     AVG(wind_dir)::float as wind_dir,
-                    SUM(rain)::float as total_rain
+                    MAX(rain)::float as total_rain
                 FROM weather_data
                 WHERE datetime >= NOW() - make_interval(days => %s)
                 GROUP BY date_trunc('day', datetime)
@@ -469,7 +474,7 @@ async def get_daily_with_minmax_data(
                 MAX(wind_gust * 1.60934)::float as wind_gust,
                 (array_agg(datetime ORDER BY wind_gust DESC NULLS LAST))[1] as max_wind_gust_time,
                 AVG(wind_dir)::float as wind_dir,
-                SUM(rain)::float as total_rain
+                MAX(rain)::float as total_rain
             FROM weather_data
             WHERE datetime >= NOW() - make_interval(days => %s)
             GROUP BY date_trunc('day', datetime)
@@ -490,7 +495,7 @@ async def get_daily_rain_data(
         cursor.execute("""
             SELECT
                 date_trunc('day', datetime) as date,
-                SUM(rain) as total_rain
+                MAX(rain) as total_rain
             FROM weather_data
             WHERE datetime >= NOW() - make_interval(days => %s)
             GROUP BY date_trunc('day', datetime)
@@ -511,21 +516,25 @@ async def get_weekly_rain_data(
         # Bei 365 Tagen: alle verfügbaren Daten zurückgeben
         if days >= 365:
             cursor.execute("""
-                SELECT 
+                SELECT week_start, SUM(daily_max) as total_rain
-                    date_trunc('week', datetime) as week_start,
+                FROM (
-                    SUM(rain) as total_rain
+                    SELECT date_trunc('week', datetime) as week_start, MAX(rain) as daily_max
-                FROM weather_data
+                    FROM weather_data
-                GROUP BY date_trunc('week', datetime)
+                    GROUP BY date_trunc('week', datetime), DATE(datetime)
+                ) sub
+                GROUP BY week_start
                 ORDER BY week_start ASC
             """)
         else:
             cursor.execute("""
-                SELECT 
+                SELECT week_start, SUM(daily_max) as total_rain
-                    date_trunc('week', datetime) as week_start,
+                FROM (
-                    SUM(rain) as total_rain
+                    SELECT date_trunc('week', datetime) as week_start, MAX(rain) as daily_max
-                FROM weather_data
+                    FROM weather_data
-                WHERE datetime >= NOW() - make_interval(days => %s)
+                    WHERE datetime >= NOW() - make_interval(days => %s)
-                GROUP BY date_trunc('week', datetime)
+                    GROUP BY date_trunc('week', datetime), DATE(datetime)
+                ) sub
+                GROUP BY week_start
                 ORDER BY week_start ASC
             """, (days,))
         results = cursor.fetchall()
@@ -596,7 +605,7 @@ async def get_daily_aggregated_range(
                 MAX(wind_gust * 1.60934)::float as wind_gust,
                 (array_agg(datetime ORDER BY wind_gust DESC NULLS LAST))[1] as max_wind_gust_time,
                 AVG(wind_dir)::float as wind_dir,
-                SUM(rain)::float as total_rain
+                MAX(rain)::float as total_rain
             FROM weather_data
             WHERE datetime BETWEEN %s AND %s
             GROUP BY date_trunc('day', datetime)

docker-compose.prod.yml

@@ -92,6 +92,23 @@ services:
       - "traefik.http.routers.wetterstation.tls.certresolver=letsencrypt"
       - "traefik.http.services.wetterstation.loadbalancer.server.port=80"
 
+  pgadmin:
+    image: dpage/pgadmin4:latest
+    container_name: wetterstation_pgadmin_prod
+    restart: unless-stopped
+    environment:
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_EMAIL}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
+      PGADMIN_CONFIG_SERVER_MODE: 'True'
+    volumes:
+      - pgadmin_data:/var/lib/pgadmin
+    depends_on:
+      - postgres
+    networks:
+      - internal
+    labels:
+      - "traefik.enable=false"
+
   monitor:
     image: docker.citysensor.de/wetterstation-monitor:latest
     container_name: wetterstation_monitor_prod
@@ -102,6 +119,8 @@ services:
 volumes:
   postgres_data:
     name: wetterstation_postgres_data_prod
+  pgadmin_data:
+    name: wetterstation_pgadmin_data_prod
 
 networks:
   internal:

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wetterstation-frontend",
   "private": true,
-  "version": "1.5.6",
+  "version": "1.5.7",
   "type": "module",
   "scripts": {
     "dev": "vite",