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

Bump grafana version to 7.3.5 #3006

Merged
merged 2 commits into from
Jan 4, 2021
Merged

Bump grafana version to 7.3.5 #3006

merged 2 commits into from
Jan 4, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'monitoring'

Context:

#2998

Summary:

  • Do not build our own grafana image as it's no longer needed
  • Bump grafana version to 7.3.5

Fixes: #2998

@TeddyAndrieux
Revert "build: Add custom grafana build image with plugins installed"
c8871eb 
No longer needed with newer grafana image

This reverts commit 08825e9.
@TeddyAndrieux TeddyAndrieux requested a review from a team January 4, 2021 16:34
@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2021

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 Jan 4, 2021

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
build,salt,charts: Bump grafana image to 7.3.5
8bf0566 
Current grafana version embedded in the chart contains a bug
(grafana/grafana#28621, fixed in 7.3.1) to
fix this override the grafana version to the latest available 7.3.5.

Re-render the salt sls 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 \
  > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
```

Fixes: #2998
@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/GH-2998-error-when-one-query-return-empty-in-grafana branch from c9b18d6 to 8bf0566 Compare January 4, 2021 16:38
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2021

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

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
  • development/2.5
  • development/2.6

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 Jan 4, 2021

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

  • ✔️ development/2.7

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
  • development/2.5
  • development/2.6

Please check the status of the associated issue GH-2998.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 8bf0566 into development/2.7 Jan 4, 2021
@bert-e bert-e deleted the bugfix/GH-2998-error-when-one-query-return-empty-in-grafana branch January 4, 2021 18:56
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.

Log Dashboard not functioning properly
3 participants
@TeddyAndrieux @bert-e @gdemonet