From c3fbbb043472ff5308acdc207bee5ba5391482c2 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Thu, 20 Aug 2026 11:02:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(mixingx-audit):=20chart=20=E8=87=AA?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=87=8D=E5=81=9A(audit-db=20Postgres?= =?UTF-8?q?=E3=80=81audit-nanomq=E3=80=81audit-web;JWT=20=E6=94=B9=20SSO?= =?UTF-8?q?=20base=20URL;storage/retention=20=E5=8F=82=E6=95=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixingx-audit/templates/_helpers.tpl | 4 + .../mixingx-audit/templates/audit-db.yaml | 71 ++++++++++++++++++ .../mixingx-audit/templates/audit-nanomq.yaml | 73 +++++++++++++++++++ .../mixingx-audit/templates/audit-web.yaml | 56 ++++++++++++++ .../mixingx-audit/templates/audit.yaml | 19 ++--- release-charts/mixingx-audit/values.yaml | 19 +++-- 6 files changed, 225 insertions(+), 17 deletions(-) create mode 100644 release-charts/mixingx-audit/templates/audit-db.yaml create mode 100644 release-charts/mixingx-audit/templates/audit-nanomq.yaml create mode 100644 release-charts/mixingx-audit/templates/audit-web.yaml diff --git a/release-charts/mixingx-audit/templates/_helpers.tpl b/release-charts/mixingx-audit/templates/_helpers.tpl index 5c1c0a8..a9ae54e 100644 --- a/release-charts/mixingx-audit/templates/_helpers.tpl +++ b/release-charts/mixingx-audit/templates/_helpers.tpl @@ -1,3 +1,7 @@ +{{- define "mixingx-audit.storageClassName" -}} +{{- .Values.storage.className | default "local-path" -}} +{{- end -}} + {{- define "mixingx-audit.tierAffinity" -}} {{- $root := .root -}} {{- $role := .role -}} diff --git a/release-charts/mixingx-audit/templates/audit-db.yaml b/release-charts/mixingx-audit/templates/audit-db.yaml new file mode 100644 index 0000000..5952370 --- /dev/null +++ b/release-charts/mixingx-audit/templates/audit-db.yaml @@ -0,0 +1,71 @@ +{{- if .Values.audit.enabled }} +{{- $root := $ }} +--- +# ===== Audit 专属 PostgreSQL(ADR-0065:随 audit chart 发布,不进共享 infra) ===== +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ .Values.audit.database }}-postgres + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: {{ .Values.audit.database }}-postgres +spec: + serviceName: {{ .Values.audit.database }}-postgres-service + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/component: {{ .Values.audit.database }}-postgres + volumeClaimTemplates: + - metadata: + name: data + annotations: + helm.sh/resource-policy: keep + spec: + accessModes: ["ReadWriteOnce"] + storageClassName: {{ include "mixingx-audit.storageClassName" $root }} + resources: + requests: + storage: {{ .Values.audit.pgStorage | default "5Gi" }} + template: + metadata: + labels: + app.kubernetes.io/component: {{ .Values.audit.database }}-postgres + spec: +{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} + containers: + - name: postgres + image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} + imagePullPolicy: IfNotPresent + env: + - name: POSTGRES_PASSWORD + value: "{{ $root.Values.sharedInfra.postgres.password }}" + - name: POSTGRES_DB + value: "{{ .Values.audit.database }}" + - name: POSTGRES_USER + value: "{{ $root.Values.sharedInfra.postgres.username }}" + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + ports: + - name: tcp + containerPort: {{ $root.Values.sharedInfra.postgres.port }} + protocol: TCP + volumeMounts: + - name: data + mountPath: /var/lib/postgresql/data +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.audit.database }}-postgres-service + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: {{ .Values.audit.database }}-postgres +spec: + selector: + app.kubernetes.io/component: {{ .Values.audit.database }}-postgres + ports: + - name: tcp + port: {{ $root.Values.sharedInfra.postgres.port }} + targetPort: tcp + protocol: TCP +{{- end }} diff --git a/release-charts/mixingx-audit/templates/audit-nanomq.yaml b/release-charts/mixingx-audit/templates/audit-nanomq.yaml new file mode 100644 index 0000000..9c9b998 --- /dev/null +++ b/release-charts/mixingx-audit/templates/audit-nanomq.yaml @@ -0,0 +1,73 @@ +{{- if .Values.audit.enabled }} +{{- $root := $ }} +--- +# ===== 中心 Audit Broker(ADR-0048;ADR-0065:随 audit chart 发布) ===== +# 无状态 Deployment:ADR-0049 实时可丢语义,broker 不做消息持久化。 +# 不打 mixingx.io/role 标签 — 不参与 gateway 服务发现。 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: audit-nanomq + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: audit-nanomq +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/component: audit-nanomq + template: + metadata: + labels: + app.kubernetes.io/component: audit-nanomq + spec: +{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} + containers: + - name: nanomq + image: {{ .Values.audit.mqtt.image | default "emqx/nanomq:0.25.2-2" }} + imagePullPolicy: IfNotPresent + command: ["/bin/sh"] + args: + - "-c" + - | + cat > /etc/nanomq.conf < Date: Thu, 20 Aug 2026 11:02:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(sso/ultra/agent/edge):=20AuditMqttPubl?= =?UTF-8?q?isher=20=E6=B3=A8=E5=85=A5=E5=BC=80=E5=85=B3=20audit.publisher(?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=20NoOp,ADR-0048/0049)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release-charts/mixingx-agent-unit/templates/unit.yaml | 5 +++++ release-charts/mixingx-agent-unit/values.yaml | 8 ++++++++ release-charts/mixingx-edge-unit/templates/unit.yaml | 6 ++++++ release-charts/mixingx-edge-unit/values.yaml | 8 ++++++++ release-charts/mixingx-sso/templates/sso.yaml | 5 +++++ release-charts/mixingx-sso/values.yaml | 7 +++++++ release-charts/mixingx-ultra/templates/ultra.yaml | 5 +++++ release-charts/mixingx-ultra/values.yaml | 7 +++++++ 8 files changed, 51 insertions(+) diff --git a/release-charts/mixingx-agent-unit/templates/unit.yaml b/release-charts/mixingx-agent-unit/templates/unit.yaml index d043309..2f05912 100644 --- a/release-charts/mixingx-agent-unit/templates/unit.yaml +++ b/release-charts/mixingx-agent-unit/templates/unit.yaml @@ -100,6 +100,11 @@ data: {{- if .Values.phaseType }} AGENT_PHASE_TYPE: "{{ .Values.phaseType }}" {{- end }} + {{- if .Values.audit.publisher.enabled }} + AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" + AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "agent" }}" + AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" + {{- end }} OTEL_EXPORTER_OTLP_ENDPOINT: "{{ .Values.sharedInfra.otlp.endpoint }}" OTEL_EXPORTER_OTLP_PROTOCOL: "{{ .Values.sharedInfra.otlp.protocol }}" OTEL_SERVICE_NAME: "{{ $name }}" diff --git a/release-charts/mixingx-agent-unit/values.yaml b/release-charts/mixingx-agent-unit/values.yaml index 49901cf..8265d0b 100644 --- a/release-charts/mixingx-agent-unit/values.yaml +++ b/release-charts/mixingx-agent-unit/values.yaml @@ -60,3 +60,11 @@ mqttCredentials: [] # - credentialRef: "edge-demo-mqtt" # username: "edge-user" # password: "edge-pass" + +# Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 +# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 +# instanceId 默认取单元名(role-site,如 agent-demo-2)。 +audit: + publisher: + enabled: false + brokerUrl: "mqtt://audit-nanomq-service:1883" diff --git a/release-charts/mixingx-edge-unit/templates/unit.yaml b/release-charts/mixingx-edge-unit/templates/unit.yaml index 0dc7f36..772859b 100644 --- a/release-charts/mixingx-edge-unit/templates/unit.yaml +++ b/release-charts/mixingx-edge-unit/templates/unit.yaml @@ -141,6 +141,12 @@ data: Mqtt__BrokerPort: "{{ .Values.mqtt.port }}" Mqtt__Enabled: "true" {{- end }} + {{- if .Values.audit.publisher.enabled }} + AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" + AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "edge" }}" + AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default $name }}" + AuditMqttPublisher__NodeId: "{{ .Values.audit.publisher.nodeId | default $name }}" + {{- end }} --- apiVersion: v1 kind: Secret diff --git a/release-charts/mixingx-edge-unit/values.yaml b/release-charts/mixingx-edge-unit/values.yaml index aaef2a4..60a9c07 100644 --- a/release-charts/mixingx-edge-unit/values.yaml +++ b/release-charts/mixingx-edge-unit/values.yaml @@ -38,6 +38,14 @@ edgeSecrets: nodeName: "" nodeSelector: {} +# Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 +# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 +# instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。 +audit: + publisher: + enabled: false + brokerUrl: "mqtt://audit-nanomq-service:1883" + sharedInfra: redis: host: redis-service diff --git a/release-charts/mixingx-sso/templates/sso.yaml b/release-charts/mixingx-sso/templates/sso.yaml index 05acea6..aae2857 100644 --- a/release-charts/mixingx-sso/templates/sso.yaml +++ b/release-charts/mixingx-sso/templates/sso.yaml @@ -95,6 +95,11 @@ data: MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" services__gateway__http__0: "http://gateway-service:8080" {{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" + {{- if .Values.audit.publisher.enabled }} + AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" + AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "sso" }}" + AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default "sso" }}" + {{- end }} OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" OTEL_SERVICE_NAME: "{{ $name }}" diff --git a/release-charts/mixingx-sso/values.yaml b/release-charts/mixingx-sso/values.yaml index a90b8c5..eec3536 100644 --- a/release-charts/mixingx-sso/values.yaml +++ b/release-charts/mixingx-sso/values.yaml @@ -34,6 +34,13 @@ sso: description: "统一登录" webBasePath: /sso/ +# Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 +# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 +audit: + publisher: + enabled: false + brokerUrl: "mqtt://audit-nanomq-service:1883" + images: sso: repository: sso diff --git a/release-charts/mixingx-ultra/templates/ultra.yaml b/release-charts/mixingx-ultra/templates/ultra.yaml index b740df6..56d9c8c 100644 --- a/release-charts/mixingx-ultra/templates/ultra.yaml +++ b/release-charts/mixingx-ultra/templates/ultra.yaml @@ -100,6 +100,11 @@ data: MESSAGING_USERNAME: "{{ $root.Values.sharedInfra.rabbitmq.username }}" services__gateway__http__0: "http://gateway-service:8080" {{ upper $role }}_SERVICE_ID: "{{ $serviceId }}" + {{- if .Values.audit.publisher.enabled }} + AuditMqttPublisher__BrokerUrl: "{{ .Values.audit.publisher.brokerUrl }}" + AuditMqttPublisher__Service: "{{ .Values.audit.publisher.service | default "ultra" }}" + AuditMqttPublisher__InstanceId: "{{ .Values.audit.publisher.instanceId | default "ultra" }}" + {{- end }} OTEL_EXPORTER_OTLP_ENDPOINT: "{{ $root.Values.sharedInfra.otlp.endpoint }}" OTEL_EXPORTER_OTLP_PROTOCOL: "{{ $root.Values.sharedInfra.otlp.protocol }}" OTEL_SERVICE_NAME: "{{ $name }}" diff --git a/release-charts/mixingx-ultra/values.yaml b/release-charts/mixingx-ultra/values.yaml index ab51930..92d4688 100644 --- a/release-charts/mixingx-ultra/values.yaml +++ b/release-charts/mixingx-ultra/values.yaml @@ -41,3 +41,10 @@ ultra: replicas: 2 description: "Ultra 看板" webBasePath: /ultra/ + +# Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 +# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 +audit: + publisher: + enabled: false + brokerUrl: "mqtt://audit-nanomq-service:1883"