Merge branch 'fix/docker-dev-serverhistorian-stale-keys'

This commit is contained in:
Joseph Doherty
2026-07-09 06:07:34 -04:00
+24 -12
View File
@@ -168,12 +168,18 @@ services:
Security__Ldap__GroupToRole__WriteTune: "WriteTune" Security__Ldap__GroupToRole__WriteTune: "WriteTune"
Security__Ldap__GroupToRole__WriteConfigure: "WriteConfigure" Security__Ldap__GroupToRole__WriteConfigure: "WriteConfigure"
Security__Ldap__GroupToRole__AlarmAck: "AlarmAck" Security__Ldap__GroupToRole__AlarmAck: "AlarmAck"
# A2 live-verify: server-side HistoryRead against the Wonderware sidecar on the WW Historian VM. # Server-side HistoryRead via the ZB.MOM.WW.HistorianGateway sidecar. DISABLED by default: the
# SharedSecret injected via env at `docker compose up` (never committed). Port = the sidecar's TCP listen port. # docker-dev rig has no historian gateway to point at, and the historian-gateway cutover retired the
ServerHistorian__Enabled: "true" # old Wonderware Host/Port/SharedSecret keys — the code now reads ServerHistorian__Endpoint and builds
ServerHistorian__Host: "10.100.0.48" # a Uri from it, so Enabled=true with an empty Endpoint crashes the Host at startup
ServerHistorian__Port: "32569" # (HistorianGatewayClientAdapter.Create -> UriFormatException "The URI is empty").
ServerHistorian__SharedSecret: "${OTOPCUA_HISTORIAN_SECRET:-}" # To enable: OTOPCUA_HISTORIAN_ENABLED=true + OTOPCUA_HISTORIAN_ENDPOINT=https://<host>:5222, and
# export ServerHistorian__ApiKey=histgw_<id>_<secret> at `docker compose up` (never commit the key).
ServerHistorian__Enabled: "${OTOPCUA_HISTORIAN_ENABLED:-false}"
ServerHistorian__Endpoint: "${OTOPCUA_HISTORIAN_ENDPOINT:-}"
ServerHistorian__ApiKey: "${ServerHistorian__ApiKey:-}"
ServerHistorian__UseTls: "true"
ServerHistorian__AllowUntrustedServerCertificate: "true"
# Pin EF Core + ASP.NET Core to Warning so the per-poll Deployment SELECT / # Pin EF Core + ASP.NET Core to Warning so the per-poll Deployment SELECT /
# "Executed DbCommand" Information|Debug lines stop flooding the Serilog # "Executed DbCommand" Information|Debug lines stop flooding the Serilog
# pipeline and starving the Akka cluster heartbeat thread. The host logs via # pipeline and starving the Akka cluster heartbeat thread. The host logs via
@@ -221,12 +227,18 @@ services:
Security__Ldap__GroupToRole__WriteTune: "WriteTune" Security__Ldap__GroupToRole__WriteTune: "WriteTune"
Security__Ldap__GroupToRole__WriteConfigure: "WriteConfigure" Security__Ldap__GroupToRole__WriteConfigure: "WriteConfigure"
Security__Ldap__GroupToRole__AlarmAck: "AlarmAck" Security__Ldap__GroupToRole__AlarmAck: "AlarmAck"
# A2 live-verify: server-side HistoryRead against the Wonderware sidecar on the WW Historian VM. # Server-side HistoryRead via the ZB.MOM.WW.HistorianGateway sidecar. DISABLED by default: the
# SharedSecret injected via env at `docker compose up` (never committed). Port = the sidecar's TCP listen port. # docker-dev rig has no historian gateway to point at, and the historian-gateway cutover retired the
ServerHistorian__Enabled: "true" # old Wonderware Host/Port/SharedSecret keys — the code now reads ServerHistorian__Endpoint and builds
ServerHistorian__Host: "10.100.0.48" # a Uri from it, so Enabled=true with an empty Endpoint crashes the Host at startup
ServerHistorian__Port: "32569" # (HistorianGatewayClientAdapter.Create -> UriFormatException "The URI is empty").
ServerHistorian__SharedSecret: "${OTOPCUA_HISTORIAN_SECRET:-}" # To enable: OTOPCUA_HISTORIAN_ENABLED=true + OTOPCUA_HISTORIAN_ENDPOINT=https://<host>:5222, and
# export ServerHistorian__ApiKey=histgw_<id>_<secret> at `docker compose up` (never commit the key).
ServerHistorian__Enabled: "${OTOPCUA_HISTORIAN_ENABLED:-false}"
ServerHistorian__Endpoint: "${OTOPCUA_HISTORIAN_ENDPOINT:-}"
ServerHistorian__ApiKey: "${ServerHistorian__ApiKey:-}"
ServerHistorian__UseTls: "true"
ServerHistorian__AllowUntrustedServerCertificate: "true"
# Quiet EF/AspNetCore SQL flood — see central-1 (Serilog override). mem_limit/ # Quiet EF/AspNetCore SQL flood — see central-1 (Serilog override). mem_limit/
# mem_reservation are inherited from the *otopcua-host anchor. # mem_reservation are inherited from the *otopcua-host anchor.
Serilog__MinimumLevel__Override__Microsoft.EntityFrameworkCore: "Warning" Serilog__MinimumLevel__Override__Microsoft.EntityFrameworkCore: "Warning"