-
Notifications
You must be signed in to change notification settings - Fork 210
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
Add health checks for rabbitmq #1345
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e38e259
Add healthcheck for analytics rabbitmq vhost
a2cdaeb
Make dev env work without /etc/timezone
jaym cef307e
Refactor chef_wm_rabbitmq_management to be able to deal with multiple…
jaym d1b8796
Add ping for chef_index that checks rabbitmq
jaym eb01196
Add aliveness tests
jaym 2c280f0
Add oc_chef_action:ping() tests
a686770
Add ping test for chef_index
e4efcdf
Save pool name as part of process state
e287601
Rename rabbitmq_management_service to rabbitmq_actions_management_ser…
96b687d
Added release notes for RabbitMQ checks in the `_status` endpoint
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -127,6 +127,10 @@ | |
data_collector, | ||
<% end %> | ||
oc_chef_authz, | ||
<% if node['private_chef']['dark_launch']['actions'] && node['private_chef']['rabbitmq']['management_enabled'] %> | ||
oc_chef_action, | ||
<% end %> | ||
chef_index, | ||
chef_sql, | ||
chef_<%= node['private_chef']['opscode-erchef']['search_provider'] %> | ||
]}, | ||
|
@@ -139,7 +143,7 @@ | |
{user, "<%= @node['private_chef']['rabbitmq']['management_user'] %>"}, | ||
{port, <%= @node['private_chef']['rabbitmq']['management_port'] %>}, | ||
% rabbitmq management http connection pool | ||
{rabbitmq_management_service, [ | ||
{rabbitmq_actions_management_service, [ | ||
<% if node['private_chef']['fips_enabled'] -%> | ||
%% See note about Bookshelf | ||
{root_url, "http://<%= @actions_vip %>:<%= @node['private_chef']['rabbitmq']['management_port'] %>/api"}, | ||
|
@@ -227,6 +231,25 @@ | |
{max_age, <%= @solr_http_max_age %>}, | ||
{max_connection_duration, <%= @solr_http_max_connection_duration %>}, | ||
{ibrowse_options, <%= @solr_ibrowse_options %>} | ||
]}, | ||
{rabbitmq_index_management_service, [ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is a bit of a shame that in the common case (actions & index rabbitmq being the same) that we are going to have 2 pools of HTTP connections. However, since thy can be different, I think this is cleanest for now. |
||
{enabled, <%= @node['private_chef']['rabbitmq']['management_enabled'] %>}, | ||
{user, "<%= @node['private_chef']['rabbitmq']['management_user'] %>"}, | ||
<% if node['private_chef']['fips_enabled'] -%> | ||
{root_url, "http://<%= node['private_chef']['rabbitmq']['vip'] %>:<%= @node['private_chef']['rabbitmq']['management_port'] %>/api"}, | ||
<% else -%> | ||
{root_url, "https://<%= node['private_chef']['rabbitmq']['vip'] %>:<%= @node['private_chef']['rabbitmq']['management_port'] %>/api"}, | ||
<% end %> | ||
{timeout, <%= @node['private_chef']['rabbitmq']['rabbit_mgmt_timeout'] %>}, | ||
{init_count, <%= @node['private_chef']['rabbitmq']['rabbit_mgmt_http_init_count'] %>}, | ||
{max_count, <%= @node['private_chef']['rabbitmq']['rabbit_mgmt_http_max_count'] %>}, | ||
{cull_interval, {<%= @node['private_chef']['rabbitmq']['rabbit_mgmt_http_cull_interval'] %>, sec}}, | ||
{max_age, {<%= @node['private_chef']['rabbitmq']['rabbit_mgmt_http_max_age'] %>, sec}}, | ||
{max_connection_duration, {<%= @node['private_chef']['rabbitmq']['rabbit_mgmt_http_max_connection_duration'] %>, sec}}, | ||
|
||
{ibrowse_options, [ | ||
<%= @node['private_chef']['rabbitmq']['rabbit_mgmt_ibrowse_options'] %> | ||
]} | ||
]} | ||
]}, | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,8 @@ | |
kernel, | ||
stdlib, | ||
gen_bunny, | ||
ibrowse | ||
ibrowse, | ||
chef_secrets | ||
]}, | ||
{env, []} | ||
]}. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These calls are expensive, any way we could combine this with the one below?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I checked the docs, it does not look like i can pass a regex for vhost
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:( OK.