Add Alertmanager conf as a customizable service configuration #2289

Ebaneck · 2020-03-05T15:46:13Z

Component:

'salt', 'charts', 'prometheus-operator'

Context:

Summary:

Template and store alertmanager.yaml as a service configuration in a MetalK8s cluster making it possible that users can customize and add new alert channels.

Acceptance criteria:

Closes: #2262

bert-e · 2020-03-05T15:46:50Z

Hello ebaneck,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2020-03-05T15:46:57Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration into
development/2.5
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-03-05T15:46:59Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2020-03-05T15:53:21Z

History mismatch

Merge commit #7d2bb4340427d3e8cea92d37a1d64e2400901df9 on the integration branch
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration is merging a branch which is neither the current
branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration nor the development branch
development/2.6.

It is likely due to a rebase of the branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

salt/metalk8s/addons/prometheus-operator/deployed/alertmanager-configuration-secret.sls

charts/prometheus-operator.yaml

buildchain/buildchain/salt_tree.py

bert-e · 2020-03-06T06:14:25Z

History mismatch

Merge commit #efc718c8ad4153070b3d93a9426cfb3073f63a36 on the integration branch
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration is merging a branch which is neither the current
branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration nor the development branch
development/2.6.

It is likely due to a rebase of the branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

This commit adds Alertmanager notification configurations as a customizable service configuration in MetalK8s using default values read from `metalk8s-alertmanager-config` ConfigMap

Ebaneck · 2020-03-06T08:13:16Z

/reset

bert-e · 2020-03-06T08:13:24Z

Reset complete

I have successfully deleted this pull request's integration branches.

salt/metalk8s/addons/prometheus-operator/deployed/alertmanager-configuration-secret.sls

bert-e · 2020-03-06T08:13:32Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration into
development/2.5
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-03-06T08:13:33Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

We need to be able to have control over the Alertmanager configurations which is deployed as a secret using the prometheus-operator charts. Using the charts, the Alertmanager config is directly base64 encoded as such jinja substitution during the yaml dump is not possible. This commit adds a salt sls file that creates the Alertmanager secret

Using the helm template engine with Alertmanager secret (Alertmanager.yaml) does not seem to work as expected because the templated variables are directly base64 encoded instead of being replaced during the yaml dump. We resolve this by disabling the creation of the default secret for Alertmanager then create a new secret with default values making it possible for users to edit this configuration setting. This chart is finally rendered using: ./charts/render.py prometheus-operator --namespace metalk8s-monitoring charts/prometheus-operator.yaml --service-config grafana metalk8s-grafana-config --service-config prometheus metalk8s-prometheus-config --service-config alertmanager metalk8s-alertmanager-config charts/prometheus-operator/ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls Closes: #2262

bert-e · 2020-03-06T09:56:13Z

History mismatch

Merge commit #029e884fcf184597d1f68bc47ccd189cc070e3bf on the integration branch
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration is merging a branch which is neither the current
branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration nor the development branch
development/2.6.

It is likely due to a rebase of the branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux

LGTM

Ebaneck · 2020-03-06T10:02:41Z

/reset

bert-e · 2020-03-06T10:02:50Z

Reset complete

I have successfully deleted this pull request's integration branches.

Ebaneck · 2020-03-06T10:02:53Z

/approve

bert-e · 2020-03-06T10:02:58Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration into
development/2.5
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-03-06T10:03:00Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2020-03-06T11:06:02Z

Build failed

The build for commit did not succeed in branch w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration.

The following options are set: approve

bert-e · 2020-03-06T11:37:23Z

Build failed

The build for commit did not succeed in branch feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration.

The following options are set: approve

bert-e · 2020-03-06T12:39:35Z

Build failed

The build for commit did not succeed in branch w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration.

The following options are set: approve

Ebaneck · 2020-03-08T22:02:48Z

/reset

bert-e · 2020-03-08T22:02:55Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

bert-e · 2020-03-08T22:03:04Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration into
development/2.5
w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

bert-e · 2020-03-08T22:23:19Z

Build failed

The build for commit did not succeed in branch w/2.6/feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration.

The following options are set: approve

TeddyAndrieux · 2020-03-09T11:25:55Z

/help

bert-e · 2020-03-09T11:25:57Z

Help page

The following options and commands are available at this time.

Options

name	description	privileged	authored
➡️ create_pull_requests	Allow the creation of integration pull requests.
➡️ bypass_author_approval	Bypass the pull request author's approval	⭐
➡️ bypass_commit_size	Bypass the check on the size of the changeset `TBA`	⭐
➡️ unanimity	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
➡️ bypass_incompatible_branch	Bypass the check on the source branch prefix	⭐
➡️ bypass_build_status	Bypass the build and test status	⭐
➡️ approve	Instruct Bert-E that the author has approved the pull request.		✍️
➡️ after_pull_request	Wait for the given pull request id to be merged before continuing with the current one.
➡️ wait	Instruct Bert-E not to run until further notice.
➡️ bypass_jira_check	Bypass the Jira issue check	⭐
➡️ no_octopus	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
➡️ bypass_leader_approval	Bypass the pull request leaders' approval	⭐
➡️ bypass_peer_approval	Bypass the pull request peers' approval	⭐

Commands

name	description	privileged
➡️ reset	Try to remove integration branches unless there are commits on them which do not appear on the source branch.
➡️ help	Print Bert-E's manual in the pull request.
➡️ build	Re-start a fresh build `TBA`
➡️ force_reset	Delete integration branches & pull requests, and restart merge process from the beginning.
➡️ retry	Re-start a fresh build `TBA`
➡️ status	Print Bert-E's current status in the pull request `TBA`
➡️ clear	Remove all comments from Bert-E from the history `TBA`

The following options are set: approve

TeddyAndrieux · 2020-03-09T11:26:10Z

/bypass_build_status

bert-e · 2020-03-09T11:26:21Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.5
✔️ development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: bypass_build_status, approve

bert-e · 2020-03-09T11:31:20Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.5
✔️ development/2.6

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

Please check the status of the associated issue None.

Goodbye ebaneck.

Ebaneck requested review from TeddyAndrieux and a team March 5, 2020 15:46

Ebaneck force-pushed the feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration branch from 7d2bb43 to 0ba4ebd Compare March 5, 2020 15:53

TeddyAndrieux reviewed Mar 5, 2020

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/alertmanager-configuration-secret.sls Outdated Show resolved Hide resolved

charts/prometheus-operator.yaml Outdated Show resolved Hide resolved

slaperche-scality reviewed Mar 5, 2020

View reviewed changes

buildchain/buildchain/salt_tree.py Outdated Show resolved Hide resolved

Ebaneck force-pushed the feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration branch from 0ba4ebd to 0b7add7 Compare March 6, 2020 06:14

salt: Add Alertmanager notification configurations as service config

a7eadf9

This commit adds Alertmanager notification configurations as a customizable service configuration in MetalK8s using default values read from `metalk8s-alertmanager-config` ConfigMap

TeddyAndrieux reviewed Mar 6, 2020

View reviewed changes

salt/metalk8s/addons/prometheus-operator/deployed/alertmanager-configuration-secret.sls Show resolved Hide resolved

Ebaneck changed the title ~~WIP: add Alertmanager conf as a customizable service configuration~~ Add Alertmanager conf as a customizable service configuration Mar 6, 2020

Ebaneck marked this pull request as ready for review March 6, 2020 08:40

TeddyAndrieux previously approved these changes Mar 6, 2020

View reviewed changes

Ebaneck added 2 commits March 6, 2020 10:46

Ebaneck dismissed TeddyAndrieux’s stale review via 26238d2 March 6, 2020 09:56

Ebaneck force-pushed the feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration branch from 0b7add7 to 26238d2 Compare March 6, 2020 09:56

Ebaneck requested a review from TeddyAndrieux March 6, 2020 09:57

TeddyAndrieux approved these changes Mar 6, 2020

View reviewed changes

bert-e merged commit 26238d2 into development/2.5 Mar 9, 2020

bert-e deleted the feature/2262-add-Alertmanager-notification-configuration-as-a-service-configuration branch March 9, 2020 11:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Alertmanager conf as a customizable service configuration #2289

Add Alertmanager conf as a customizable service configuration #2289

Ebaneck commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 6, 2020

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

TeddyAndrieux left a comment

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

Ebaneck commented Mar 8, 2020

bert-e commented Mar 8, 2020

bert-e commented Mar 8, 2020

bert-e commented Mar 8, 2020

TeddyAndrieux commented Mar 9, 2020

bert-e commented Mar 9, 2020

TeddyAndrieux commented Mar 9, 2020

bert-e commented Mar 9, 2020

bert-e commented Mar 9, 2020

Add Alertmanager conf as a customizable service configuration #2289

Add Alertmanager conf as a customizable service configuration #2289

Conversation

Ebaneck commented Mar 5, 2020

bert-e commented Mar 5, 2020

Hello ebaneck,

bert-e commented Mar 5, 2020

Integration data created

bert-e commented Mar 5, 2020

Waiting for approval

bert-e commented Mar 5, 2020

History mismatch

bert-e commented Mar 6, 2020

History mismatch

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

Reset complete

bert-e commented Mar 6, 2020

Integration data created

bert-e commented Mar 6, 2020

Waiting for approval

bert-e commented Mar 6, 2020

History mismatch

TeddyAndrieux left a comment

Choose a reason for hiding this comment

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

Reset complete

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

Integration data created

bert-e commented Mar 6, 2020

Waiting for approval

bert-e commented Mar 6, 2020

Build failed

bert-e commented Mar 6, 2020

Build failed

bert-e commented Mar 6, 2020

Build failed

Ebaneck commented Mar 8, 2020

bert-e commented Mar 8, 2020

Reset complete

bert-e commented Mar 8, 2020

Integration data created

bert-e commented Mar 8, 2020

Build failed

TeddyAndrieux commented Mar 9, 2020

bert-e commented Mar 9, 2020

Help page

Options

Commands

TeddyAndrieux commented Mar 9, 2020

bert-e commented Mar 9, 2020

In the queue

bert-e commented Mar 9, 2020