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

Make it possible to set some node-specific metadata using tags (backport #12702) #12703

Merged
merged 3 commits into from
Nov 12, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 11, 2024

Similar to #12699 but node specific.

Proposed Changes

Config node tags in config file. Store as application setting and expose them via /api/overview and rabbitmqctl status command.

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.


This is an automatic backport of pull request #12702 done by [Mergify](https://mergify.com).

SimonUnge and others added 2 commits November 11, 2024 23:35
… command

(cherry picked from commit 3d35416)

# Conflicts:
#	deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
…eleased 4.0.x nodes

In a mixed cluster environment,
'rabbitmq-diagnostics status' can hit a node
that does not return any node tags.

Be more defensive and handle such cases
by simply displaying "(none)" for such
values.

(cherry picked from commit 94c8f01)
Copy link
Author

mergify bot commented Nov 11, 2024

Cherry-pick of 3d35416 has failed:

On branch mergify/bp/v4.0.x/pr-12702
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 3d35416635.
  (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:   deps/rabbit/priv/schema/rabbit.schema
	modified:   deps/rabbit/src/rabbit.erl
	modified:   deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/status_command.ex
	modified:   deps/rabbitmq_management/src/rabbit_mgmt_wm_overview.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

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

@michaelklishin michaelklishin added this to the 4.0.4 milestone Nov 12, 2024
@michaelklishin michaelklishin merged commit 91adf70 into v4.0.x Nov 12, 2024
245 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12702 branch November 12, 2024 02:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants