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

[CORE 8273] Adjust license warning text to include trial license links #24261

Merged
merged 7 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
c/feature_manager: Switch license strings
Signed-off-by: Ben Pope <ben@redpanda.com>
  • Loading branch information
BenPope committed Nov 25, 2024
commit 32c2577ac81206062005cccc9294a4f6aafb5d9a
3 changes: 3 additions & 0 deletions src/v/cluster/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,9 @@ redpanda_cc_library(
"types.h",
"version.h",
],
implementation_deps = [
"//src/v/features:enterprise_feature_messages",
],
include_prefix = "cluster",
visibility = ["//visibility:public"],
deps = [
Expand Down
21 changes: 7 additions & 14 deletions src/v/cluster/feature_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "config/node_config.h"
#include "config/types.h"
#include "config/validators.h"
#include "features/enterprise_feature_messages.h"
#include "features/feature_state.h"
#include "features/feature_table.h"
#include "model/timeout_clock.h"
Expand Down Expand Up @@ -304,12 +305,9 @@ ss::future<> feature_manager::maybe_log_license_check_info() {
if (_feature_table.local().should_sanction()) {
vlog(
clusterlog.warn,
"A Redpanda Enterprise Edition license is required to use "
"enterprise features: ([{}]). Enter an active license key (for "
"example, rpk cluster license set <key>). To request a license, "
"see https://redpanda.com/license-request. For more information, "
"see https://docs.redpanda.com/current/get-started/licenses.",
fmt::join(enterprise_features.enabled(), ", "));
"{}",
features::enterprise_error_message::license_nag(
enterprise_features.enabled()));
}
}
}
Expand Down Expand Up @@ -363,14 +361,9 @@ void feature_manager::verify_enterprise_license() {
fallback_license ? " (detected fallback license)" : "");

if (enterprise_features.any() && license_missing_or_expired) {
throw std::runtime_error{fmt::format(
"A Redpanda Enterprise Edition license is required to use enterprise "
"features: ([{}]). To add your license, downgrade this broker to the "
"pre-upgrade version, and enter the active license key (for example, "
"rpk cluster license set). To request a license, see "
"https://redpanda.com/license-request. For more information, see "
"https://docs.redpanda.com/current/get-started/licenses.",
fmt::join(enterprise_features.enabled(), ", "))};
throw std::runtime_error{
features::enterprise_error_message::upgrade_failure(
enterprise_features.enabled())};
}

_verified_enterprise_license.signal();
Expand Down
2 changes: 1 addition & 1 deletion tests/rptest/services/redpanda.py
Original file line number Diff line number Diff line change
Expand Up @@ -2477,7 +2477,7 @@ def copy_from_pod(params):

class RedpandaService(RedpandaServiceBase):

ENTERPRISE_LICENSE_NAG = "license is required to use enterprise features"
ENTERPRISE_LICENSE_NAG = "A Redpanda Enterprise Edition license is required"

nodes: list[ClusterNode]

Expand Down