Merge remote-tracking branch 'upstream/main' into 2025/add/fluentd

Author: mrnicegyu11

services/logging/scripts/alerts.template.yaml

@@ -116,40 +116,6 @@
     grace_period_ms: 0
     backlog_size: 99
   alert: true
-- title: "${MACHINE_FQDN}: Unhandled python exceptions or errors"
-  description: "${MACHINE_FQDN}: Unhandled python exceptions or errors"
-  priority: 3
-  config:
-    query: >
-      (message:"Traceback (most recent call last):" OR (ERROR AND NOT container_name:/monitoring.*/)) AND NOT container_name:/.*logging_graylog.*/'
-    query_parameters: []
-    search_within_ms: 86400000
-    execute_every_ms: 86400000
-    event_limit: 1000
-    group_by: []
-    series: []
-    conditions: {}
-    type: aggregation-v1
-  field_spec:
-    source:
-      data_type: string
-      providers:
-      - type: template-v1
-        template: "${source.source}"
-        require_values: false
-    container_name:
-      data_type: string
-      providers:
-      - type: template-v1
-        template: "${source.container_name}"
-        require_values: false
-  key_spec:
-    - source
-    - container_name
-  notification_settings:
-    grace_period_ms: 0
-    backlog_size:
-  alert: true
 - title: "${MACHINE_FQDN}: Payments service errors or warnings"
   description: "${MACHINE_FQDN}: Payments service errors or warnings"
   priority: 2

services/monitoring/prometheus/prometheus-simcore.yml

@@ -58,7 +58,7 @@ scrape_configs:
           - "tasks.staging_director"
           - "tasks.master_director"
         type: "A"
-        port: 8080
+        port: 8000
       - names:
           - "tasks.production_director-v2"
           - "tasks.staging_director-v2"

services/simcore/docker-compose.yml.j2

@@ -92,7 +92,7 @@ services:
         # NOTE: apiserver does not need sslheader since there is no socket.io
         - traefik.http.routers.${SWARM_STACK_NAME}_api-server.middlewares=${SWARM_STACK_NAME}_gzip@swarm
         - traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.service=${SWARM_STACK_NAME}_api-server
-        - traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.rule=PathPrefix(`/dev/`)
+        - traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.rule=PathPrefix(`/dev/`) || PathPrefix(`/doc/`) || PathPrefix(`/doc`)
         - traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.entrypoints=simcore_api
         - traefik.http.routers.${SWARM_STACK_NAME}_apiserver_swagger.priority=6
       update_config:
@@ -227,7 +227,7 @@ services:
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.service=${SWARM_STACK_NAME}_webserver
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.middlewares=${SWARM_STACK_NAME}_gzip@swarm, ${SWARM_STACK_NAME_NO_HYPHEN}_sslheader
-        - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.rule=PathPrefix(`/dev/`)
+        - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.rule=PathPrefix(`/dev/`) || PathPrefix(`/doc/`) || PathPrefix(`/doc`)
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.entrypoints=http
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_swagger.priority=6
         - traefik.http.middlewares.${SWARM_STACK_NAME_NO_HYPHEN}_webserver_swagger_auth.basicauth.users=${TRAEFIK_USER}:${TRAEFIK_PASSWORD}
@@ -770,7 +770,7 @@ services:
         - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.tls=true
         - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.middlewares=ops_gzip@swarm, ops_sslheader@swarm, ops_ratelimit@swarm
         - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.service=${SWARM_STACK_NAME}_simcore_http
-        - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.rule=((${DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL}) && PathPrefix(`/`)) || ( (PathPrefix(`/dashboard`) || PathPrefix(`/api`) ) && Host(`traefikdashboard.${MACHINE_FQDN}`))
+        - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.rule=((${DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL}) && PathPrefix(`/`)) || ( (PathPrefix(`/dashboard`) || PathPrefix(`/api`) || PathPrefix(`/doc`) ) && Host(`traefikdashboard.${MACHINE_FQDN}`))
         - traefik.http.routers.${SWARM_STACK_NAME}_simcore_http.priority=3
         # oSparc publicAPI
         - traefik.http.routers.${SWARM_STACK_NAME}_simcore_api.rule=(${DEPLOYMENT_API_DOMAIN_CAPTURE_TRAEFIK_RULE}) && PathPrefix(`/`)