diff --git a/release-charts/mixingx-agent-unit/templates/_helpers.tpl b/release-charts/mixingx-agent-unit/templates/_helpers.tpl index 3c49a67..466cb79 100644 --- a/release-charts/mixingx-agent-unit/templates/_helpers.tpl +++ b/release-charts/mixingx-agent-unit/templates/_helpers.tpl @@ -69,6 +69,11 @@ AGENT_SERVICE_ID: "{{ $serviceId }}" {{- 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 41f65d6..d2cc361 100644 --- a/release-charts/mixingx-agent-unit/values.yaml +++ b/release-charts/mixingx-agent-unit/values.yaml @@ -65,3 +65,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-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 <