Skip to content

fix(helm): sync chart with Docker Compose (3.7.0, scrape labels, SYNC.md)#244

Open
ps48 wants to merge 2 commits into
opensearch-project:mainfrom
ps48:fix/helm-sync-with-docker-compose
Open

fix(helm): sync chart with Docker Compose (3.7.0, scrape labels, SYNC.md)#244
ps48 wants to merge 2 commits into
opensearch-project:mainfrom
ps48:fix/helm-sync-with-docker-compose

Conversation

@ps48
Copy link
Copy Markdown
Member

@ps48 ps48 commented May 12, 2026

Description

Resolves configuration drift between the Helm chart and Docker Compose deployments up through commit 367d855 (Dashboards icon side nav v2).

  • Bump OpenSearch / Dashboards images to 3.7.0 from the opensearchstaging repo (3.7.0 is pre-release and not yet on opensearchproject); bump Chart.yaml appVersion to 3.7.0
  • Harden OTel Collector: add insecure_skip_verify: true on the otlp/opensearch exporter and telemetry.logs.level: info
  • Add missing OpenSearch Dashboards settings: opensearch.pingTimeout, opensearch_security.multitenancy.tenants.preferred, vis_type_vega.enableExternalUrls, server.compression.enabled, server.cors, csp.warnLegacyBrowsers, opensearchDashboards.enableIconSideNav, and the logging block
  • Add Prometheus extraFlags: web.enable-lifecycle and enable-feature=exemplar-storage
  • Add service / component static labels to the otel-collector, opensearch, and data-prepper Prometheus scrape jobs for parity with docker-compose/prometheus/prometheus.yml
  • New charts/observability-stack/SYNC.md documenting the last-synced Compose commit (367d855), what stays in sync vs. what is intentionally different, and a 6-step SOP for AI agents and contributors to detect and fix drift; README points to it

Cortex / Alertmanager / alerting from #226 (85a64ca) is intentionally out of scope and will be synced in a separate follow-up PR. The SYNC.md checkpoint at 367d855 ensures the drift SOP will surface that work as still pending.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

….md)

Signed-off-by: ps48 <pshenoy36@gmail.com>
endpoint: "{{ .Release.Name }}-data-prepper:21890"
tls:
insecure: true
insecure_skip_verify: true
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to add a warning in readme that production stacks should verify tls?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated: 3bcab3f

3. Did a pipeline change in `docker-compose/data-prepper/pipelines.template.yaml`? → Update `templates/data-prepper-pipeline-secret.yaml`
4. Did a Prometheus config change in `docker-compose/prometheus/prometheus.yml`? → Update the `prometheus:` section in `values.yaml`
5. Did a Dashboards setting change in `docker-compose/opensearch-dashboards/opensearch_dashboards.template.yml`? → Update the `opensearch-dashboards.config` block in `values.yaml`
6. Did a new service get added to `docker-compose.yml`? → May need a new template in `templates/`
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do we keep this instruction list up to date when adding new services

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, may be I can add one line to discover new services

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated: 3bcab3f

Signed-off-by: ps48 <pshenoy36@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants