Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

charts,salt: Make node-exporter only listening on node IP #3725

Merged
merged 1 commit into from
Mar 16, 2022
Merged

charts,salt: Make node-exporter only listening on node IP #3725

merged 1 commit into from
Mar 16, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

NOTE: Node IP is set to Control Plane IP

Fixes: #2166

@TeddyAndrieux
charts,salt: Make node-exporter only listening on node IP
3015c80 
NOTE: Node IP is set to Control Plane IP

Re-render the salt state using:
```
./charts/render.py prometheus-operator \
  charts/kube-prometheus-stack.yaml \
  charts/kube-prometheus-stack/ \
  --namespace metalk8s-monitoring \
  --service-config grafana \
  metalk8s-grafana-config \
  metalk8s/addons/prometheus-operator/config/grafana.yaml \
  metalk8s-monitoring \
  --service-config prometheus \
  metalk8s-prometheus-config \
  metalk8s/addons/prometheus-operator/config/prometheus.yaml \
  metalk8s-monitoring \
  --service-config alertmanager \
  metalk8s-alertmanager-config \
  metalk8s/addons/prometheus-operator/config/alertmanager.yaml \
  metalk8s-monitoring \
  --service-config dex \
  metalk8s-dex-config \
  metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \
  --drop-prometheus-rules charts/drop-prometheus-rules.yaml \
  --patch 'PrometheusRule,metalk8s-monitoring,prometheus-operator-kubernetes-system-kubelet,spec:groups:0:rules:1:for,"5m"' \
  > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
```

Fixes: #2166
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner March 16, 2022 15:24
@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2022

Hello teddyandrieux,

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
Copy link
Contributor

bert-e commented Mar 16, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/improvement/do-no-longer-listen-on-all-ips with contents from improvement/do-no-longer-listen-on-all-ips
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/improvement/do-no-longer-listen-on-all-ips origin/development/123.0
 $ git merge origin/improvement/do-no-longer-listen-on-all-ips
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/improvement/do-no-longer-listen-on-all-ips

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2022

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:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2022

Build failed

The build for commit did not succeed in branch w/123.0/improvement/do-no-longer-listen-on-all-ips.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2022

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.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2022

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

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 3015c80 into development/2.11 Mar 16, 2022
@bert-e bert-e deleted the improvement/do-no-longer-listen-on-all-ips branch March 16, 2022 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet