Refactor and enhance mb3r-stack integration bundle

- Updated Makefile to include new smoke and end-to-end test targets for generic and OpenTelemetry scenarios.
- Revised README to reflect changes in the integration bundle, including new chart name and installation instructions.
- Introduced `mb3r-stack` Helm chart with configuration for Bering and Sheaft, including deployment and service templates.
- Added collector snippets and Prometheus scrape configurations for better observability.
- Updated compatibility and stack manifest files to align with the new bundle structure and naming conventions.
- Removed the OpenTelemetry demo documentation in favor of a more generic getting started guide.

Author: a-a-k

Makefile

@@ -1,16 +1,25 @@
 PYTHON ?= python
 
-.PHONY: lint validate smoke-otel-demo package-assets chart-package release-dry-run stack-manifest
+.PHONY: lint validate smoke-generic e2e-generic smoke-otel-demo e2e-otel-demo package-assets chart-package release-dry-run stack-manifest
 
 lint:
 	$(PYTHON) scripts/tasks.py lint
 
 validate:
 	$(PYTHON) scripts/tasks.py validate
 
+smoke-generic:
+	$(PYTHON) scripts/tasks.py smoke-generic
+
+e2e-generic:
+	$(PYTHON) scripts/tasks.py e2e-generic
+
 smoke-otel-demo:
 	$(PYTHON) scripts/tasks.py smoke-otel-demo
 
+e2e-otel-demo:
+	$(PYTHON) scripts/tasks.py e2e-otel-demo
+
 package-assets:
 	$(PYTHON) scripts/tasks.py package-assets
 

README.md

@@ -5,16 +5,16 @@
 It is not a third core engine and it does not vendor Bering or Sheaft source code. This repository sits above the upstream products and owns the bundle layer:
 
 - stack-level compatibility metadata
-- OCI-distributed Helm installation for the addon bundle
-- OpenTelemetry collector integration overlays
+- OCI-distributed Helm installation for the generic stack bundle
+- OTLP and artifact handoff integration helpers
 - versioned dashboards and observability examples
 - reusable CI adapters for GitHub, GitLab, and Jenkins
 
 ## What This Repo Releases
 
 A stack release publishes:
 
-- an OCI-publishable Helm chart: `mb3r-otel-addon`
+- an OCI-publishable Helm chart: `mb3r-stack`
 - a packaged asset archive with `collector/`, `dashboards/`, and `examples/`
 - `stack-manifest.json`
 - `compatibility-matrix.json`
@@ -37,9 +37,10 @@ Current bundle candidate pins published upstream artifacts explicitly: Bering `0
 
 - `charts/` Helm bundle chart source.
 - `compat/` stack manifest and machine-readable compatibility matrix.
-- `collector/` OpenTelemetry collector snippets and overlays.
+- `collector/` generic OTLP/collector snippets.
 - `dashboards/` versioned Grafana dashboard JSON.
-- `examples/` example values files and CI consumer examples.
+- `examples/profiles/` reusable profile-specific values and optional collector patches.
+- `examples/` also contains CI consumer examples.
 - `ci/github/` GitHub adapter docs and notes.
 - `ci/gitlab/` GitLab adapter docs; catalog-compatible components live in top-level `templates/`.
 - `ci/jenkins/` Jenkins Shared Library base path.
@@ -62,6 +63,10 @@ Primary local entrypoints:
 ```bash
 make lint
 make validate
+make smoke-generic
+make e2e-generic
+make smoke-otel-demo
+make e2e-otel-demo
 make stack-manifest
 make chart-package
 make package-assets
@@ -72,12 +77,13 @@ Direct Python equivalents are also available:
 
 ```bash
 python scripts/tasks.py validate
+python scripts/tasks.py e2e-generic
 python scripts/tasks.py release-dry-run
 ```
 
 ## Compatibility Notes
 
-The compatibility files in `compat/` are the source of truth for stack-level assertions. The current `0.1.0` bundle is recorded as a `candidate` integration statement backed by upstream release manifests and Sheaft's published compatibility manifest, not as a broader verified operations guarantee.
+The compatibility files in `compat/` are the source of truth for stack-level assertions. The current `0.1.0` bundle is recorded as a `candidate` integration statement backed by upstream release manifests and Sheaft's published compatibility manifest, not as a broader verified operations guarantee. OpenTelemetry Demo remains one example profile and one acceptance scenario, not the design center of the core bundle.
 
 ## License
 

RELEASING.md

@@ -8,7 +8,7 @@ The canonical source of truth is the local `dist/` payload plus `dist/release-ma
 
 Each stack release is expected to publish:
 
-- `mb3r-otel-addon-<version>.tgz`
+- `mb3r-stack-<version>.tgz`
 - `mb3r-assets-<version>.tgz`
 - `stack-manifest.json`
 - `compatibility-matrix.json`
@@ -52,7 +52,7 @@ GitHub release automation consumes those scripts to:
 The chart is intended to be pushed with Helm to an OCI registry:
 
 ```bash
-helm push dist/charts/mb3r-otel-addon-<version>.tgz oci://<registry>/<namespace>/charts
+helm push dist/charts/mb3r-stack-<version>.tgz oci://<registry>/<namespace>/charts
 ```
 
 Local dry runs do not require Helm, but CI installs Helm and performs `helm lint` plus OCI publication on release tags.

VERSIONING.md

@@ -6,7 +6,7 @@
 
 The `mb3r-stack` version covers:
 
-- the `mb3r-otel-addon` chart version
+- the `mb3r-stack` chart version
 - the stack manifest contract
 - the compatibility matrix format and assertions
 - the packaged collector, dashboard, and example asset packs

charts/mb3r-otel-addon/Chart.yaml charts/mb3r-stack/Chart.yamlcharts/mb3r-otel-addon/Chart.yaml renamed to charts/mb3r-stack/Chart.yaml

@@ -1,12 +1,13 @@
 apiVersion: v2
-name: mb3r-otel-addon
-description: Integration bundle that wires upstream Bering and Sheaft releases into an existing OpenTelemetry-enabled Kubernetes environment.
+name: mb3r-stack
+description: Generic integration bundle that wires upstream Bering and Sheaft into OTLP-based or artifact-based Kubernetes environments.
 type: application
 version: 0.1.0
 appVersion: "0.1.0"
 keywords:
   - mb3r
-  - otel
+  - otlp
+  - artifacts
   - observability
   - bering
   - sheaft

…3r-otel-addon/files/sheaft-analysis.yaml …ts/mb3r-stack/files/sheaft-analysis.yamlcharts/mb3r-otel-addon/files/sheaft-analysis.yaml renamed to charts/mb3r-stack/files/sheaft-analysis.yaml charts/mb3r-otel-addon/files/sheaft-analysis.yaml renamed to charts/mb3r-stack/files/sheaft-analysis.yaml

@@ -7,12 +7,12 @@ mb3r-stack installs integration-layer assets only.
 
 {{- if and .Values.collector.snippets.enabled (or .Values.collector.targetEndpoint .Values.bering.enabled) }}
 Collector snippets ConfigMap:
-  {{ default (printf "%s-collector-snippets" (include "mb3r-otel-addon.fullname" .)) .Values.collector.snippets.name }}
+  {{ default (printf "%s-collector-snippets" (include "mb3r-stack.fullname" .)) .Values.collector.snippets.name }}
 {{- else }}
 Collector snippets are disabled.
 {{- end }}
 
 {{- if .Values.grafanaDashboards.enabled }}
 Grafana provider hook ConfigMap:
-  {{ include "mb3r-otel-addon.fullname" . }}-grafana-provider
+  {{ include "mb3r-stack.fullname" . }}-grafana-provider
 {{- end }}

…arts/mb3r-otel-addon/templates/NOTES.txt charts/mb3r-stack/templates/NOTES.txtcharts/mb3r-otel-addon/templates/NOTES.txt renamed to charts/mb3r-stack/templates/NOTES.txt charts/mb3r-otel-addon/templates/NOTES.txt renamed to charts/mb3r-stack/templates/NOTES.txt

@@ -1,17 +1,17 @@
-{{- define "mb3r-otel-addon.name" -}}
+{{- define "mb3r-stack.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.fullname" -}}
+{{- define "mb3r-stack.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Release.Name (include "mb3r-otel-addon.name" .) | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name (include "mb3r-stack.name" .) | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.labels" -}}
-app.kubernetes.io/name: {{ include "mb3r-otel-addon.name" . }}
+{{- define "mb3r-stack.labels" -}}
+app.kubernetes.io/name: {{ include "mb3r-stack.name" . }}
 helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -20,12 +20,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "mb3r-otel-addon.name" . }}
+{{- define "mb3r-stack.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "mb3r-stack.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.resolveImage" -}}
+{{- define "mb3r-stack.resolveImage" -}}
 {{- $root := .root -}}
 {{- $image := .image -}}
 {{- $registry := coalesce $image.registry $root.Values.global.imageRegistry -}}
@@ -45,51 +45,67 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.beringConfigMapName" -}}
+{{- define "mb3r-stack.beringConfigMapName" -}}
 {{- if .Values.bering.config.existingConfigMap -}}
 {{- .Values.bering.config.existingConfigMap -}}
 {{- else -}}
-{{- printf "%s-bering-config" (include "mb3r-otel-addon.fullname" .) -}}
+{{- printf "%s-bering-config" (include "mb3r-stack.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.sheaftConfigMapName" -}}
+{{- define "mb3r-stack.sheaftConfigMapName" -}}
 {{- if .Values.sheaft.config.existingConfigMap -}}
 {{- .Values.sheaft.config.existingConfigMap -}}
 {{- else -}}
-{{- printf "%s-sheaft-config" (include "mb3r-otel-addon.fullname" .) -}}
+{{- printf "%s-sheaft-config" (include "mb3r-stack.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.artifactPVCName" -}}
-{{- printf "%s-artifacts" (include "mb3r-otel-addon.fullname" .) -}}
+{{- define "mb3r-stack.artifactPVCName" -}}
+{{- printf "%s-artifacts" (include "mb3r-stack.fullname" .) -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.artifactVolumeSource" -}}
+{{- define "mb3r-stack.artifactVolumeSource" -}}
 {{- if eq .Values.artifacts.volume.type "persistentVolumeClaim" -}}
 persistentVolumeClaim:
-  claimName: {{ default (include "mb3r-otel-addon.artifactPVCName" .) .Values.artifacts.volume.existingClaim }}
+  claimName: {{ default (include "mb3r-stack.artifactPVCName" .) .Values.artifacts.volume.existingClaim }}
 {{- else -}}
 emptyDir: {}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.beringHttpListenAddress" -}}
+{{- define "mb3r-stack.beringHttpListenAddress" -}}
 {{- default (printf ":%v" (.Values.bering.service.ports.http.targetPort | int)) .Values.bering.config.server.listenAddress -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.beringGrpcListenAddress" -}}
+{{- define "mb3r-stack.beringGrpcListenAddress" -}}
 {{- if .Values.bering.service.ports.grpc.enabled -}}
 {{- default (printf ":%v" (.Values.bering.service.ports.grpc.targetPort | int)) .Values.bering.config.server.grpcListenAddress -}}
 {{- else -}}
 {{- default "" .Values.bering.config.server.grpcListenAddress -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "mb3r-otel-addon.beringEndpoint" -}}
+{{- define "mb3r-stack.beringServiceName" -}}
+{{- printf "%s-bering" (include "mb3r-stack.fullname" .) -}}
+{{- end -}}
+
+{{- define "mb3r-stack.sheaftServiceName" -}}
+{{- printf "%s-sheaft" (include "mb3r-stack.fullname" .) -}}
+{{- end -}}
+
+{{- define "mb3r-stack.beringPublicServiceName" -}}
+{{- default (include "mb3r-stack.beringServiceName" .) .Values.bering.service.publicName -}}
+{{- end -}}
+
+{{- define "mb3r-stack.sheaftPublicServiceName" -}}
+{{- default (include "mb3r-stack.sheaftServiceName" .) .Values.sheaft.service.publicName -}}
+{{- end -}}
+
+{{- define "mb3r-stack.beringEndpoint" -}}
 {{- if .Values.collector.targetEndpoint -}}
 {{ .Values.collector.targetEndpoint }}
 {{- else -}}
-{{ printf "http://%s-bering:%v" (include "mb3r-otel-addon.fullname" .) (.Values.bering.service.ports.http.port | int) }}
+{{ printf "http://%s:%v" (include "mb3r-stack.beringPublicServiceName" .) (.Values.bering.service.ports.http.port | int) }}
 {{- end -}}
 {{- end -}}

…s/mb3r-otel-addon/templates/_helpers.tpl charts/mb3r-stack/templates/_helpers.tplcharts/mb3r-otel-addon/templates/_helpers.tpl renamed to charts/mb3r-stack/templates/_helpers.tpl charts/mb3r-otel-addon/templates/_helpers.tpl renamed to charts/mb3r-stack/templates/_helpers.tpl

@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "mb3r-otel-addon.artifactPVCName" . }}
+  name: {{ include "mb3r-stack.artifactPVCName" . }}
   labels:
-    {{- include "mb3r-otel-addon.labels" . | nindent 4 }}
+    {{- include "mb3r-stack.labels" . | nindent 4 }}
 spec:
   accessModes:
     {{- toYaml .Values.artifacts.volume.accessModes | nindent 4 }}

…r-otel-addon/templates/artifact-pvc.yaml …s/mb3r-stack/templates/artifact-pvc.yamlcharts/mb3r-otel-addon/templates/artifact-pvc.yaml renamed to charts/mb3r-stack/templates/artifact-pvc.yaml charts/mb3r-otel-addon/templates/artifact-pvc.yaml renamed to charts/mb3r-stack/templates/artifact-pvc.yaml

@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "mb3r-otel-addon.beringConfigMapName" . }}
+  name: {{ include "mb3r-stack.beringConfigMapName" . }}
   labels:
-    {{- include "mb3r-otel-addon.labels" . | nindent 4 }}
+    {{- include "mb3r-stack.labels" . | nindent 4 }}
     app.kubernetes.io/component: bering
 data:
   {{ .Values.bering.config.fileName }}: |
     server:
-      listen_address: {{ include "mb3r-otel-addon.beringHttpListenAddress" . | quote }}
-      grpc_listen_address: {{ include "mb3r-otel-addon.beringGrpcListenAddress" . | quote }}
+      listen_address: {{ include "mb3r-stack.beringHttpListenAddress" . | quote }}
+      grpc_listen_address: {{ include "mb3r-stack.beringGrpcListenAddress" . | quote }}
       max_request_bytes: {{ .Values.bering.config.server.maxRequestBytes | int }}
     runtime:
       flush_interval: {{ .Values.bering.config.runtime.flushInterval | quote }}