@yarkivaev/scada 2.3.114 → 2.3.116

package/README.md

@@ -269,6 +269,30 @@ Opaque operation `kind` strings and generic ports (`latestForMachine`, list/upse
 | Export ports `Query` / `Stream` / `Sink` / `Job` | Export jobs + destination adapters |
 | ClickHouse + PG adapters | Plant wiring (`sokolPlant` / `edgePlant`) |
 
+### Stream transport ownership
+
+`@yarkivaev/source-to-sink` owns reusable Node.js sources, sinks and transport
+lifecycle: serial input, Modbus polling,
+MQTT/STOMP messaging, AMQP consumption and confirmed publishing, and serialized
+periodic ticks. SCADA composes these primitives with generic codecs, domain ports
+and persistence adapters. Plant packages supply source mappings, payload formats,
+queries, routing and plant-specific behavior.
+
+The SCADA AMQP telemetry, MQTT relay and operation-sync pipelines use
+`amqpSource`. It acknowledges after collector acceptance, requeues failures by
+default, and avoids settling explicitly acknowledged or rejected deliveries twice.
+Shutdown cancels consumption, drains accepted work and settlements, then closes
+the channel and connection. Reconnect and restart wait for that drain.
+`durableConsume` remains a compatibility facade over the shared AMQP session.
+Collectors that batch records acknowledge acceptance into that collector; this is
+not a guarantee that a later batch has already reached persistent storage.
+
+`intervalSource` schedules operator-cache synchronization, stale-open-segment
+sweeps, silent-stream reconciliation, PostgreSQL metric streams and the shared
+ClickHouse stream hub. Polls do not overlap; metric streams await subscribers
+before advancing their cursors. HTTP keepalive timers and domain coalescing
+windows remain owned by their respective adapters and domain policies.
+
 Depend on a pinned version (`"@yarkivaev/scada": "…#v2.3.46"`), not a local path, in downstream packages.
 
 ## CI/CD
@@ -286,3 +310,88 @@ The scada chart declares the queue and applies an ingest-only dead-letter policy
 without changing existing queue arguments. The profile `env` is passed to both
 site-server and supervisor-sink. DLQ records retain the original body and RabbitMQ
 `x-death` metadata for inspection and deliberate replay; they are not auto-expired.
+
+### Deploy a node with named processes
+
+A profile can expose deployment coordinates in `target`, set
+`apps.scada.site.enabled` and `apps.scada.sink.enabled` independently, and
+provide RabbitMQ chart settings in `modules.message_bus.chart`. The
+`releases(document, cluster)` projection returns the target and chart values.
+The default profile still renders the existing site and sink.
+
+`subscriptions(expandedDocument, sourceId)` returns the outgoing server
+subscriptions as `{ from, to, name, api? }`. It combines sender `fan_out` and
+receiver `fan_in` declarations, keeping each expanded stream path and any
+explicit service selected by the receiver. Declaring the same subscription on
+both sides produces a single row.
+
+Use `collectorProcesses(machines, describe, project)` to derive workloads from
+the selected server's source rows. For each row, `describe(row)` returns a
+process name, command and optional environment and resources. Rows with the
+same name must describe the same process. `project(descriptor, rows)` converts
+its sources into adapter-specific environment variables and host devices. Process
+order follows the first occurrence of each name in the source rows.
+The packaged `charts/scada` chart renders the resulting `processes` as
+named Deployments. A configured broker claim name selects a standalone PVC.
+The default storage mode uses StatefulSet claim templates.
+
+`executeRelease(plan, action)` renders the chart or runs check, diff, adopt
+and apply against the explicitly supplied Kubernetes context and namespace.
+During `adopt`, the legacy client-side manager migrates the resources first.
+The release's server-side manager then applies the same rendered manifest before
+the executor waits for the workloads. This restores declared fields that a
+legacy three-way merge can drop, such as an environment entry whose name was
+duplicated in the old last-applied annotation. Each apply gets its own server
+dry-run. `check-adoption` previews the client-side phase only. The server-side
+phase must run against the migrated state. An ownership conflict stops adoption
+before rollout waits and the afterReady hook. Resolve the field ownership and
+rerun `apply` after the client-side migration has completed.
+A caller can supply prerequisites, rollout resources and an afterReady hook.
+The RabbitMQ definitions builder and management reconciler are exported as
+`@yarkivaev/scada/rabbitmq/definitions` and `@yarkivaev/scada/rabbitmq/reconcile`.
+The caller supplies the vhost, connection settings and ownership policy for
+retired routes. Reconciliation retains stored queues.
+
+### Collect multiple OPC UA endpoints
+
+`@yarkivaev/scada/opcua` exports `opcuaConnections(connections, publish, options)`
+and `validateConnections(connections)`. The same entry point exports
+`opcuaSource(connections, collector, options)` for source-to-sink composition;
+the collector accepts `{ channel, value }`. SCADA owns the OPC UA runtime and
+its `node-opcua` dependency; source-to-sink contains no OPC UA implementation.
+Offline deployment planners should import
+`validateConnections` from `@yarkivaev/scada/opcua/config`; this entry point never
+loads the network library or its startup diagnostics. Each connection has a unique `url`,
+positive `publishMs` and `heartbeatMs`, and `channels` with explicit, unique
+`nodeId` values. Additional channel metadata is opaque to this library.
+
+```js
+import opcuaConnections from '@yarkivaev/scada/opcua';
+
+const collector = opcuaConnections([
+    { url: 'opc.tcp://192.0.2.10:4840', publishMs: 100, heartbeatMs: 1000,
+        channels: [{ nodeId: 'ns=1;s=temperature', topic: 'line/temperature' }] }
+], (channel, value) => publish(channel.topic, value));
+await collector.start();
+// On process shutdown:
+await collector.stop();
+```
+
+Each endpoint owns its client, session and subscription. An unavailable endpoint
+retries independently while others continue. Start schedules these workers; it
+does not wait for every server to be available. Samples are delivered only with
+Good quality, both on change and through serialized fresh heartbeat reads.
+The caller owns value conversion, routing, timestamps and destination transport.
+Options `retryMs`, `connectTimeoutMs` and `requestTimeoutMs` bound retry timing and
+network requests; `onError(error, connection)` receives connection diagnostics.
+Do not replicate a collector with the same sources to distribute load: assign
+disjoint source sets to separate instances instead.
+
+A release can replace old collectors using
+`retirements: [{ workload: 'deployment/old-reader', selector: 'app=old-reader' }]`.
+For apply/adopt, the executor validates the new manifests first, foreground-deletes
+only these explicit Deployments, and verifies that no selected old pods remain
+before applying the replacement. This trades a collection gap for no overlap.
+The caller must bind each selector to its old Deployment; no namespace-wide prune
+is performed. Render/check/diff do not delete anything. An optional process `image`
+overrides the release image, so unrelated collectors can retain their pinned runtime.

package/charts/scada/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: scada
 description: Generic SCADA site — site-server, supervisor-sink, collectors, Postgres, RabbitMQ, optional ClickHouse
 type: application
-version: 0.2.4
-appVersion: "2.3.114"
+version: 0.3.0
+appVersion: "2.3.115"

package/charts/scada/templates/_helpers.tpl

@@ -1,3 +1,7 @@
+{{- define "scada.prefix" -}}
+{{- default .Release.Name .Values.prefix -}}
+{{- end }}
+
 {{- define "scada.labels" -}}
 app.kubernetes.io/name: scada
 app.kubernetes.io/instance: {{ .Release.Name }}
@@ -69,7 +73,7 @@ volumeMode: Filesystem
 {{- end }}
 {{- if .Values.rabbitmq.enabled }}
 - name: STOMP_URL
-  value: {{ printf "stomp://%s-rabbitmq:61613" .Release.Name | quote }}
+  value: {{ printf "stomp://%s-rabbitmq:61613" (include "scada.prefix" .) | quote }}
 - name: STOMP_LOGIN
   value: guest
 - name: STOMP_PASSCODE
@@ -77,12 +81,16 @@ volumeMode: Filesystem
 - name: STOMP_HOST
   value: /
 - name: AMQP_URL
-  value: {{ printf "amqp://guest:guest@%s-rabbitmq:5672" .Release.Name | quote }}
+  value: {{ printf "amqp://guest:guest@%s-rabbitmq:5672" (include "scada.prefix" .) | quote }}
 {{- end }}
 {{- if .Values.clickhouse.enabled }}
 - name: CLICKHOUSE_HOST
-  value: {{ printf "%s-clickhouse" .Release.Name | quote }}
+  value: {{ printf "%s-clickhouse" (include "scada.prefix" .) | quote }}
 - name: CLICKHOUSE_URL
-  value: {{ printf "http://%s-clickhouse:8123" .Release.Name | quote }}
+  value: {{ printf "http://%s-clickhouse:8123" (include "scada.prefix" .) | quote }}
 {{- end }}
 {{- end }}
+
+{{- define "scada.brokerConfigName" -}}
+{{- default (printf "%s-rabbitmq" (include "scada.prefix" .)) .Values.rabbitmq.configName -}}
+{{- end }}

package/charts/scada/templates/clickhouse.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-clickhouse
+  name: {{ include "scada.prefix" . }}-clickhouse
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
@@ -24,13 +24,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Release.Name }}-clickhouse
+  name: {{ include "scada.prefix" . }}-clickhouse
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
     app: clickhouse
 spec:
-  serviceName: {{ .Release.Name }}-clickhouse
+  serviceName: {{ include "scada.prefix" . }}-clickhouse
   replicas: 1
   selector:
     matchLabels:

package/charts/scada/templates/collector.yaml

@@ -53,7 +53,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ $.Release.Name }}-collector-{{ $slug }}
+  name: {{ include "scada.prefix" $ }}-collector-{{ $slug }}
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "scada.labels" $ | nindent 4 }}
@@ -97,7 +97,7 @@ spec:
               value: {{ $maps | toJson | quote }}
             {{- if $.Values.rabbitmq.enabled }}
             - name: MQTT_URL
-              value: {{ printf "mqtt://%s-rabbitmq:1883" $.Release.Name | quote }}
+              value: {{ printf "mqtt://%s-rabbitmq:1883" (include "scada.prefix" $) | quote }}
             {{- end }}
           resources:
             {{- toYaml $.Values.resources | nindent 12 }}

package/charts/scada/templates/namespace.yaml

@@ -0,0 +1,6 @@
+{{- if .Values.createNamespace }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Release.Namespace }}
+{{- end }}

package/charts/scada/templates/postgres.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-postgres
+  name: {{ include "scada.prefix" . }}-postgres
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
@@ -18,13 +18,13 @@ spec:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Release.Name }}-postgres
+  name: {{ include "scada.prefix" . }}-postgres
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
     app: postgres
 spec:
-  serviceName: {{ .Release.Name }}-postgres
+  serviceName: {{ include "scada.prefix" . }}-postgres
   replicas: 1
   selector:
     matchLabels:

package/charts/scada/templates/processes.yaml

@@ -0,0 +1,88 @@
+{{- $names := dict }}
+{{- $devices := dict }}
+{{- range .Values.processes }}
+{{- $name := required "process name is required" .name }}
+{{- if hasKey $names $name }}
+{{- fail (printf "duplicate process name %s" $name) }}
+{{- end }}
+{{- $_ := set $names $name true }}
+{{- range .hostDevices }}
+{{- if hasKey $devices . }}
+{{- fail (printf "processes %s and %s both claim %s" $name (get $devices .) .) }}
+{{- end }}
+{{- $_ := set $devices . $name }}
+{{- end }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "scada.prefix" $ }}-{{ $name }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    {{- include "scada.labels" $ | nindent 4 }}
+    app: {{ $name }}
+    {{- with $.Values.workloadLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+    rollingUpdate: null
+  selector:
+    matchLabels:
+      {{- include "scada.match" (dict "app" $name "ctx" $) | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "scada.labels" $ | nindent 8 }}
+        app: {{ $name }}
+        {{- with $.Values.workloadLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- if and $.Values.rabbitmq.enabled $.Values.rabbitmq.rolloutOnConfigChange }}
+      annotations:
+        checksum/broker: {{ include (print $.Template.BasePath "/rabbitmq-config.yaml") $ | sha256sum }}
+      {{- end }}
+    spec:
+      {{- with $.Values.pullSecret }}
+      imagePullSecrets:
+        - name: {{ . }}
+      {{- end }}
+      {{- with .podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ $name }}
+          image: {{ required "process image is required" (default $.Values.image .image) | quote }}
+          imagePullPolicy: IfNotPresent
+          command: {{ required "process command is required" .command | toJson }}
+          {{- if .hostDevices }}
+          securityContext:
+            privileged: true
+          volumeMounts:
+            {{- range $index, $path := .hostDevices }}
+            - name: serial-{{ add1 $index }}
+              mountPath: {{ $path | quote }}
+            {{- end }}
+          {{- end }}
+          {{- with .env }}
+          env:
+            {{- range $key, $value := . }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
+          {{- end }}
+          resources:
+            {{- toYaml (default $.Values.resources .resources) | nindent 12 }}
+      {{- with .hostDevices }}
+      volumes:
+        {{- range $index, $path := . }}
+        - name: serial-{{ add1 $index }}
+          hostPath:
+            path: {{ $path | quote }}
+            type: CharDevice
+        {{- end }}
+      {{- end }}
+{{- end }}

package/charts/scada/templates/rabbitmq-config.yaml

@@ -0,0 +1,91 @@
+{{- if .Values.rabbitmq.enabled }}
+{{- $ingest := list -}}
+{{- $outgoing := list -}}
+{{- range .Values.collectors }}
+{{- if .path }}
+{{- $ingest = append $ingest (include "scada.routingKey" .path | trim) -}}
+{{- end }}
+{{- end }}
+{{- range $item := concat (.Values.buses | default (list)) (.Values.bus | default (list)) }}
+{{- range $name := ($item.names | default (list)) }}
+{{- $routed := include "scada.routingKey" $name | trim -}}
+{{- $ingest = append $ingest $routed -}}
+{{- $outgoing = append $outgoing $routed -}}
+{{- end }}
+{{- end }}
+{{- $outgoing = $outgoing | uniq -}}
+{{- if $ingest }}
+{{- $ingest = $ingest | uniq -}}
+{{- else }}
+{{- $ingest = list "#" -}}
+{{- end }}
+{{- $exchange := list
+  (dict "name" "scada.alerts" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
+  (dict "name" "scada.segments" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
+  (dict "name" "scada.telemetry" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
+  (dict "name" "scada.operations" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
+  (dict "name" "scada.user_decisions" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
+-}}
+{{- $queue := list
+  (dict "name" "scada.segments.ingest" "vhost" "/" "durable" true "auto_delete" false)
+  (dict "name" "scada.telemetry.ingest" "vhost" "/" "durable" true "auto_delete" false)
+  (dict "name" "scada.operations.ingest" "vhost" "/" "durable" true "auto_delete" false)
+  (dict "name" "scada.user_decisions" "vhost" "/" "durable" true "auto_delete" false)
+-}}
+{{- if $outgoing }}
+{{- $queue = append $queue (dict "name" "scada.telemetry.outbox" "vhost" "/" "durable" true "auto_delete" false) -}}
+{{- end }}
+{{- $policies := list -}}
+{{- with .Values.rabbitmq.deadLetter }}
+{{- $queue = append $queue (dict "name" .queue "vhost" "/" "durable" true "auto_delete" false) -}}
+{{- $policies = append $policies (dict "name" "ingest-dlq" "vhost" "/" "pattern" "^scada\\.(segments|operations|telemetry)\\.ingest$" "apply-to" "queues" "priority" 10 "definition" (dict "dead-letter-exchange" "" "dead-letter-routing-key" .queue)) -}}
+{{- end }}
+{{- $binding := list -}}
+{{- range $key := $ingest }}
+{{- $binding = append $binding (dict "source" "scada.telemetry" "vhost" "/" "destination" "scada.telemetry.ingest" "destination_type" "queue" "routing_key" $key) -}}
+{{- end }}
+{{- range $pair := (list
+  (dict "source" "scada.operations" "destination" "scada.operations.ingest")
+  (dict "source" "scada.segments" "destination" "scada.segments.ingest")
+  (dict "source" "scada.user_decisions" "destination" "scada.user_decisions")) }}
+{{- $binding = append $binding (dict "source" $pair.source "vhost" "/" "destination" $pair.destination "destination_type" "queue" "routing_key" "#") -}}
+{{- end }}
+{{- range $key := $outgoing }}
+{{- $binding = append $binding (dict "source" "scada.telemetry" "vhost" "/" "destination" "scada.telemetry.outbox" "destination_type" "queue" "routing_key" $key) -}}
+{{- end }}
+{{- $definitions := dict
+  "vhosts" (list (dict "name" "/"))
+  "users" (list (dict "name" "guest" "password" "guest" "tags" (list "administrator")))
+  "permissions" (list (dict "user" "guest" "vhost" "/" "configure" ".*" "write" ".*" "read" ".*"))
+  "exchanges" $exchange
+  "queues" $queue
+  "policies" $policies
+  "bindings" $binding
+-}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "scada.brokerConfigName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "scada.labels" . | nindent 4 }}
+    app: rabbitmq
+data:
+  enabled_plugins: |
+    [{{ join ", " .Values.rabbitmq.plugins }}].
+  rabbitmq.conf: |
+    load_definitions = /etc/rabbitmq/definitions.json
+    mqtt.listeners.tcp.default = 1883
+    mqtt.allow_anonymous = true
+    mqtt.vhost = /
+    mqtt.exchange = scada.telemetry
+    {{- range $key, $value := .Values.rabbitmq.extraConfig }}
+    {{ $key }} = {{ $value }}
+    {{- end }}
+  definitions.json: |
+{{- if ne .Values.rabbitmq.definitions nil }}
+{{ .Values.rabbitmq.definitions | toPrettyJson | nindent 4 }}
+{{- else }}
+{{ $definitions | toPrettyJson | nindent 4 }}
+{{- end }}
+{{- end }}

package/charts/scada/templates/rabbitmq.yaml

@@ -1,91 +1,8 @@
 {{- if .Values.rabbitmq.enabled }}
-{{- $ingest := list -}}
-{{- $outgoing := list -}}
-{{- range .Values.collectors }}
-{{- if .path }}
-{{- $ingest = append $ingest (include "scada.routingKey" .path | trim) -}}
-{{- end }}
-{{- end }}
-{{- range $item := concat (.Values.buses | default (list)) (.Values.bus | default (list)) }}
-{{- range $name := ($item.names | default (list)) }}
-{{- $routed := include "scada.routingKey" $name | trim -}}
-{{- $ingest = append $ingest $routed -}}
-{{- $outgoing = append $outgoing $routed -}}
-{{- end }}
-{{- end }}
-{{- $outgoing = $outgoing | uniq -}}
-{{- if $ingest }}
-{{- $ingest = $ingest | uniq -}}
-{{- else }}
-{{- $ingest = list "#" -}}
-{{- end }}
-{{- $exchange := list
-  (dict "name" "scada.alerts" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
-  (dict "name" "scada.segments" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
-  (dict "name" "scada.telemetry" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
-  (dict "name" "scada.operations" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
-  (dict "name" "scada.user_decisions" "vhost" "/" "type" "topic" "durable" true "auto_delete" false)
--}}
-{{- $queue := list
-  (dict "name" "scada.segments.ingest" "vhost" "/" "durable" true "auto_delete" false)
-  (dict "name" "scada.telemetry.ingest" "vhost" "/" "durable" true "auto_delete" false)
-  (dict "name" "scada.operations.ingest" "vhost" "/" "durable" true "auto_delete" false)
-  (dict "name" "scada.user_decisions" "vhost" "/" "durable" true "auto_delete" false)
--}}
-{{- if $outgoing }}
-{{- $queue = append $queue (dict "name" "scada.telemetry.outbox" "vhost" "/" "durable" true "auto_delete" false) -}}
-{{- end }}
-{{- $policies := list -}}
-{{- with .Values.rabbitmq.deadLetter }}
-{{- $queue = append $queue (dict "name" .queue "vhost" "/" "durable" true "auto_delete" false) -}}
-{{- $policies = append $policies (dict "name" "ingest-dlq" "vhost" "/" "pattern" "^scada\\.(segments|operations|telemetry)\\.ingest$" "apply-to" "queues" "priority" 10 "definition" (dict "dead-letter-exchange" "" "dead-letter-routing-key" .queue)) -}}
-{{- end }}
-{{- $binding := list -}}
-{{- range $key := $ingest }}
-{{- $binding = append $binding (dict "source" "scada.telemetry" "vhost" "/" "destination" "scada.telemetry.ingest" "destination_type" "queue" "routing_key" $key) -}}
-{{- end }}
-{{- range $pair := (list
-  (dict "source" "scada.operations" "destination" "scada.operations.ingest")
-  (dict "source" "scada.segments" "destination" "scada.segments.ingest")
-  (dict "source" "scada.user_decisions" "destination" "scada.user_decisions")) }}
-{{- $binding = append $binding (dict "source" $pair.source "vhost" "/" "destination" $pair.destination "destination_type" "queue" "routing_key" "#") -}}
-{{- end }}
-{{- range $key := $outgoing }}
-{{- $binding = append $binding (dict "source" "scada.telemetry" "vhost" "/" "destination" "scada.telemetry.outbox" "destination_type" "queue" "routing_key" $key) -}}
-{{- end }}
-{{- $definitions := dict
-  "vhosts" (list (dict "name" "/"))
-  "users" (list (dict "name" "guest" "password" "guest" "tags" (list "administrator")))
-  "permissions" (list (dict "user" "guest" "vhost" "/" "configure" ".*" "write" ".*" "read" ".*"))
-  "exchanges" $exchange
-  "queues" $queue
-  "policies" $policies
-  "bindings" $binding
--}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-rabbitmq
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "scada.labels" . | nindent 4 }}
-    app: rabbitmq
-data:
-  enabled_plugins: |
-    [rabbitmq_stomp, rabbitmq_mqtt, rabbitmq_management].
-  rabbitmq.conf: |
-    load_definitions = /etc/rabbitmq/definitions.json
-    mqtt.listeners.tcp.default = 1883
-    mqtt.allow_anonymous = true
-    mqtt.vhost = /
-    mqtt.exchange = scada.telemetry
-  definitions.json: |
-{{ $definitions | toPrettyJson | nindent 4 }}
----
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-rabbitmq
+  name: {{ include "scada.prefix" . }}-rabbitmq
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
@@ -94,46 +11,30 @@ spec:
   {{- $svc := .Values.rabbitmq.service | default dict }}
   type: {{ $svc.type | default "ClusterIP" }}
   ports:
-    - name: amqp
-      port: 5672
-      targetPort: amqp
-      {{- with $svc.nodePorts }}
-      {{- if .amqp }}
-      nodePort: {{ .amqp }}
-      {{- end }}
-      {{- end }}
-    - name: mqtt
-      port: 1883
-      targetPort: mqtt
-    - name: stomp
-      port: 61613
-      targetPort: stomp
-      {{- with $svc.nodePorts }}
-      {{- if .stomp }}
-      nodePort: {{ .stomp }}
-      {{- end }}
-      {{- end }}
-    - name: management
-      port: 15672
-      targetPort: management
-      {{- with $svc.nodePorts }}
-      {{- if .management }}
-      nodePort: {{ .management }}
-      {{- end }}
+    {{- range $entry := list (dict "name" "amqp" "port" 5672) (dict "name" "mqtt" "port" 1883) (dict "name" "stomp" "port" 61613) (dict "name" "management" "port" 15672) }}
+    - name: {{ $entry.name }}
+      port: {{ $entry.port }}
+      targetPort: {{ ternary $entry.port $entry.name ($svc.numericTargetPorts | default false) }}
+      {{- with get ($svc.nodePorts | default dict) $entry.name }}
+      nodePort: {{ . }}
       {{- end }}
+    {{- end }}
   selector:
     {{- include "scada.match" (dict "app" "rabbitmq" "ctx" .) | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Release.Name }}-rabbitmq
+  name: {{ include "scada.prefix" . }}-rabbitmq
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scada.labels" . | nindent 4 }}
     app: rabbitmq
+    {{- with .Values.workloadLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
-  serviceName: {{ .Release.Name }}-rabbitmq
+  serviceName: {{ include "scada.prefix" . }}-rabbitmq
   replicas: 1
   selector:
     matchLabels:
@@ -143,10 +44,24 @@ spec:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
         {{- include "scada.match" (dict "app" "rabbitmq" "ctx" .) | nindent 8 }}
+        {{- with .Values.workloadLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- if .Values.rabbitmq.rolloutOnConfigChange }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/rabbitmq-config.yaml") . | sha256sum }}
+      {{- end }}
     spec:
+      {{- with .Values.pullSecret }}
+      imagePullSecrets:
+        - name: {{ . }}
+      {{- end }}
       containers:
         - name: rabbitmq
           image: {{ .Values.rabbitmq.image | quote }}
+          {{- with .Values.rabbitmq.imagePullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
           ports:
             - name: amqp
               containerPort: 5672
@@ -156,6 +71,18 @@ spec:
               containerPort: 61613
             - name: management
               containerPort: 15672
+          {{- with .Values.rabbitmq.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.rabbitmq.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.rabbitmq.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: config
               mountPath: /etc/rabbitmq/enabled_plugins
@@ -171,10 +98,24 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: {{ .Release.Name }}-rabbitmq
+            name: {{ include "scada.brokerConfigName" . }}
+      {{- with .Values.rabbitmq.claimName }}
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ . }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ . }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  {{- include "scada.claim" (dict "size" $.Values.rabbitmq.storage "class" $.Values.rabbitmq.storageClass) | nindent 2 }}
+      {{- else }}
   volumeClaimTemplates:
     - metadata:
         name: data
       spec:
         {{- include "scada.claim" (dict "size" .Values.rabbitmq.storage "class" .Values.rabbitmq.storageClass) | nindent 8 }}
 {{- end }}
+{{- end }}