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

grafana: Fix logs dashboard for Grafana 8 #3484

Merged
merged 1 commit into from
Aug 5, 2021
Merged

grafana: Fix logs dashboard for Grafana 8 #3484

merged 1 commit into from
Aug 5, 2021

Conversation

JBWatenbergScality
Copy link
Contributor

Component:

grafana

Context:

On Grafana 8 the logs dashboard was broken and displayed the following message :

Templating init failed Cannot read property 'value' of undefined

This is due to a missing current section in the dashboard template.

Summary:

This PR add the missing section.

@JBWatenbergScality JBWatenbergScality requested a review from a team as a code owner August 5, 2021 09:12
@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

Hello jbwatenbergscality,

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 Aug 5, 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:

@JBWatenbergScality JBWatenbergScality changed the base branch from development/2.11 to development/2.10 August 5, 2021 09:16
@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

Integration data created

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

The following branches will NOT be impacted:

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

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

bert-e commented Aug 5, 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:

gdemonet
gdemonet suggested changes Aug 5, 2021
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

Just an alignment issue 😉 I didn't test yet, but I guess you did?

charts/logs-dashboard.json Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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:

The following reviewers are expecting changes from the author, or must review again:

@JBWatenbergScality
grafana: Fix logs dashboard for Grafana 8
a17ece0 
On Grafana 8 the logs dashboard was broken and displayed the following message :

```
Templating init failed Cannot read property 'value' of undefined
```

This is due to a missing `current` section in the dashboard template. This commit add the missing section.
@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

History mismatch

Merge commit #3d082214ae52c7811050800fb98afe9e5a92d850 on the integration branch
w/2.11/bugfix/grafana-logs-dashboard is merging a branch which is neither the current
branch bugfix/grafana-logs-dashboard nor the development branch
development/2.11.

It is likely due to a rebase of the branch bugfix/grafana-logs-dashboard 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.

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

History mismatch

Merge commit #3d082214ae52c7811050800fb98afe9e5a92d850 on the integration branch
w/2.11/bugfix/grafana-logs-dashboard is merging a branch which is neither the current
branch bugfix/grafana-logs-dashboard nor the development branch
development/2.11.

It is likely due to a rebase of the branch bugfix/grafana-logs-dashboard 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.

The following options are set: approve

@JBWatenbergScality
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

Integration data created

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

The following branches will NOT be impacted:

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

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

bert-e commented Aug 5, 2021

Build failed

The build for commit did not succeed in branch bugfix/grafana-logs-dashboard.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 2021

Build failed

The build for commit did not succeed in branch w/2.11/bugfix/grafana-logs-dashboard.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 5, 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.10

  • ✔️ development/2.11

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • 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 Aug 5, 2021

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

  • ✔️ development/2.10

  • ✔️ development/2.11

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • 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 jbwatenbergscality.

@bert-e bert-e merged commit c59c3cb into development/2.10 Aug 5, 2021
@bert-e bert-e deleted the bugfix/grafana-logs-dashboard branch August 5, 2021 19:59
gdemonet added a commit that referenced this pull request Aug 5, 2021
@gdemonet
changelog: Update for 2.10.1 release
60f8cb3 
Refs: #3469
Refs: #3477
Refs: #3481
Refs: #3479
Refs: #3484
Refs: #3483
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.

None yet
3 participants
@JBWatenbergScality @bert-e @gdemonet