Skip to content

e2e: add manifest fields to enable Prometheus on nodes (backport #313)#384

Merged
hvanz merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-313
Feb 27, 2023
Merged

e2e: add manifest fields to enable Prometheus on nodes (backport #313)#384
hvanz merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-313

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 24, 2023

This is an automatic backport of pull request #313 done by Mergify.
Cherry-pick of a95a1df has failed:

On branch mergify/bp/v0.37.x/pr-313
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit a95a1dfec.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e/pkg/infra/docker/docker.go
	modified:   test/e2e/pkg/manifest.go
	modified:   test/e2e/runner/setup.go
	modified:   test/e2e/runner/start.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/pkg/testnet.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Add Prometheus and PrometheusListenAddr flags

* Add Prometheus flag at root level, for all nodes

* Add comment

* Add PrometheusProxyPort; remove PrometheusListenAddr

* Update startup log message

* Update startup log message

* Don't print the whole line in docker template

* Remove flag from ManifestNode

* Do not generate PrometheusProxyPort if config is disabled

(cherry picked from commit a95a1df)

# Conflicts:
#	test/e2e/pkg/testnet.go
@mergify mergify bot requested a review from a team as a code owner February 24, 2023 14:01
@mergify mergify bot added the conflicts label Feb 24, 2023
@hvanz hvanz self-assigned this Feb 27, 2023
@hvanz hvanz merged commit d26bdfe into v0.37.x Feb 27, 2023
@hvanz hvanz deleted the mergify/bp/v0.37.x/pr-313 branch February 27, 2023 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant