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

salt: Add datasource in grafana for Loki #2727

Merged
merged 1 commit into from
Aug 13, 2020
Merged

salt: Add datasource in grafana for Loki #2727

merged 1 commit into from
Aug 13, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented Aug 10, 2020 •
edited
Loading

Component:

'salt', 'logging'

Context:

#2683

Summary:

Add a new datasource in grafana for Loki

NOTE: Wait for #2722 to be merged first

Fixes: #2683

@TeddyAndrieux TeddyAndrieux requested a review from a team August 10, 2020 14:34
Base automatically changed from improvement/2682-deploy-loki to development/2.6 August 12, 2020 14:26
@bert-e bert-e dismissed alexandre-allard’s stale review August 12, 2020 14:26

The base branch was changed.

@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2020

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 Aug 12, 2020

Conflict

There is a conflict between your branch improvement/GH-2683-add-Loki-datasource and the
destination branch development/2.6.

Please resolve the conflict on the feature branch (improvement/GH-2683-add-Loki-datasource).

 $ git fetch
 $ git checkout origin/improvement/GH-2683-add-Loki-datasource
 $ git merge origin/development/2.6
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/GH-2683-add-Loki-datasource

@TeddyAndrieux
salt: Add datasource in grafana for Loki
0592880 
Add a new ConfigMap creation for prometheus-operator to create the new
datasource in grafana for Loki

Fixes: #2683
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/GH-2683-add-Loki-datasource branch from e97a549 to 0592880 Compare August 12, 2020 19:45
@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2020

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 Aug 12, 2020

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 options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 13, 2020

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

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 13, 2020

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

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

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

Goodbye teddyandrieux.

@bert-e bert-e merged commit 77f0a84 into development/2.6 Aug 13, 2020
@bert-e bert-e deleted the improvement/GH-2683-add-Loki-datasource branch August 13, 2020 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandre-allard alexandre-allard alexandre-allard 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.

Deploy Grafana datasource for Loki
3 participants
@TeddyAndrieux @bert-e @alexandre-allard