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.

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

salt: Disable loki grafana dashboard if disabled #4464

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

ezekiel-alexrod
Copy link
Contributor

No description provided.

@ezekiel-alexrod ezekiel-alexrod requested a review from a team as a code owner October 28, 2024 11:12
@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2024

Hello ezekiel-alexrod,

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.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 28, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@ezekiel-alexrod ezekiel-alexrod force-pushed the bugfix/dashboard-loki-if-disabled branch 2 times, most recently from 7512421 to 899b6e5 Compare October 28, 2024 16:21
@ezekiel-alexrod ezekiel-alexrod changed the base branch from development/127.0 to development/128.0 October 28, 2024 16:21
@ezekiel-alexrod ezekiel-alexrod force-pushed the bugfix/dashboard-loki-if-disabled branch 5 times, most recently from 8a179b2 to 80e310f Compare October 30, 2024 09:01
@ezekiel-alexrod ezekiel-alexrod force-pushed the bugfix/dashboard-loki-if-disabled branch 4 times, most recently from 5378543 to 1cb8864 Compare November 7, 2024 08:17
@ezekiel-alexrod ezekiel-alexrod force-pushed the bugfix/dashboard-loki-if-disabled branch from 1cb8864 to 75ed313 Compare November 7, 2024 10:35
@ezekiel-alexrod
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Nov 7, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/129.0/bugfix/dashboard-loki-if-disabled with contents from bugfix/dashboard-loki-if-disabled
and development/129.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/129.0/bugfix/dashboard-loki-if-disabled origin/development/129.0
 $ git merge origin/bugfix/dashboard-loki-if-disabled
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/129.0/bugfix/dashboard-loki-if-disabled

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Nov 7, 2024

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

@ezekiel-alexrod
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 7, 2024

Build failed

The build for commit did not succeed in branch w/129.0/bugfix/dashboard-loki-if-disabled.

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Nov 8, 2024

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/128.0

  • ✔️ development/129.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Nov 8, 2024

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

  • ✔️ development/128.0

  • ✔️ development/129.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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 ezekiel-alexrod.

@bert-e bert-e merged commit 75ed313 into development/128.0 Nov 8, 2024
68 of 72 checks passed
@bert-e bert-e deleted the bugfix/dashboard-loki-if-disabled branch November 8, 2024 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants