mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-09 22:13:18 +09:00
myasnikovdaniil
13e202a53e
## What this PR does Manual backport of #3800 to `release-1.6`. The automated backport, #4609, stopped on a conflict in `packages/system/monitoring-rd/cozyrds/monitoring.yaml` and pushed the markers as its only commit, so it would ship conflict markers in the ApplicationDefinition if merged. That file is generated, and its schema and `keysOrder` lines already differ between main and 1.6 for reasons unrelated to this change. Everything else applies unchanged. I kept the `release-1.6` version of the file and ran `make generate` in `packages/extra/monitoring` with cozyvalues-gen 1.6.0. The README and `values.schema.json` came out identical to the cherry-picked ones, and the regenerated schema adds exactly the eight `alerta.alerts.email` properties that #3800 adds on main, with nothing removed. Verified on this branch: `helm unittest` passes 164 tests in 8 suites for `packages/system/monitoring`, both new email suites included, and 9 tests for `packages/extra/monitoring`. The file set and line counts match #3800. Close #4609 in favour of this one, or tell me to take a different route and I will. ### Screenshots Not a UI change. ### Downstream repositories Same walk as #3800: `packages/extra/monitoring` gains values fields, its reference page on the website regenerates from `README.md` on the next stable tag, and the Terraform provider does not model the monitoring service. No package is added or renamed, and no CRD, tooling or node contract is touched. - [x] No downstream repository is affected by this change - [ ] [cozystack/website](https://github.com/cozystack/website) - follow-up: - [ ] [cozystack/terraform-provider-cozystack](https://github.com/cozystack/terraform-provider-cozystack) - follow-up: - [ ] [cozystack/ansible-cozystack](https://github.com/cozystack/ansible-cozystack) - follow-up: - [ ] [cozystack/ccp](https://github.com/cozystack/ccp) - follow-up: - [ ] [cozystack/talm](https://github.com/cozystack/talm) - follow-up: - [ ] [cozystack/cozyhr](https://github.com/cozystack/cozyhr) - follow-up: - [ ] [cozystack/cozy-proxy](https://github.com/cozystack/cozy-proxy) - follow-up: - [ ] [cozystack/cozystack-telemetry-server](https://github.com/cozystack/cozystack-telemetry-server) - follow-up: - [ ] [cozystack/external-apps-example](https://github.com/cozystack/external-apps-example) - follow-up: - [ ] [cozystack/examples](https://github.com/cozystack/examples) - follow-up: - [ ] [cozystack/community](https://github.com/cozystack/community) - follow-up: ### Release note ```release-note feat(monitoring): add optional email alerting through alerta.alerts.email, with configurable severity and alert-name selection and an SMTP password read from the fixed Secret alertmanager-email-password ```