Skip to content

Commit bebc7e4

Browse files
anuthanpavel-blagodov
authored andcommitted
MB-48306 [BP] Make clusterEncryptionLevel available on pools/default
Squash of below 3 changes, MB-47768: Make clusterEncryptionLevel available on pools/default Reviewed-on: http://review.couchbase.org/c/ns_server/+/158833 MB-47974: pools/default needs effective clusterEncryptionLevel Reviewed-on: http://review.couchbase.org/c/ns_server/+/159503 remove unnecessary fun Reviewed-on: http://review.couchbase.org/c/ns_server/+/159504 Change-Id: I9a1e392dc9699c2fa72227e189d5c2fa8099706f Reviewed-on: http://review.couchbase.org/c/ns_server/+/160784 Tested-by: Build Bot <[email protected]> Well-Formed: Restriction Checker Reviewed-by: Steve Watanabe <[email protected]>
1 parent 1d9be4d commit bebc7e4

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

src/menelaus_web_pools.erl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
239239
<<"/pools/default/serverGroups?v=",
240240
(list_to_binary(integer_to_list(GroupsV)))/binary>>},
241241
{clusterName, list_to_binary(get_cluster_name())},
242+
{clusterEncryptionLevel,
243+
misc:get_effective_cluster_encryption_level(Config)},
242244
{balanced, ns_cluster_membership:is_balanced()},
243245
menelaus_web_node:build_memory_quota_info(Config),
244246
build_ui_params(InfoLevel, Config),

src/misc.erl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,15 @@ get_cluster_encryption_level() ->
14741474
end,
14751475
ns_config:search(ns_config:latest(), cluster_encryption_level, Default).
14761476

1477+
-spec get_effective_cluster_encryption_level(term()) -> none | control | all.
1478+
get_effective_cluster_encryption_level(Config) ->
1479+
case is_cluster_encryption_fully_enabled() of
1480+
true ->
1481+
ns_config:search(Config, cluster_encryption_level, control);
1482+
false ->
1483+
none
1484+
end.
1485+
14771486
-spec should_cluster_data_be_encrypted() -> true | false.
14781487
should_cluster_data_be_encrypted() ->
14791488
get_cluster_encryption_level() =:= all.

0 commit comments

Comments
 (0)