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.

Sign up for GitHub

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

Jump to bottom

[v24.1.x] [CORE-7152] Admin: Introduce endpoint #23761

Merged
merged 8 commits into from
Oct 17, 2024
Merged

[v24.1.x] [CORE-7152] Admin: Introduce endpoint #23761

merged 8 commits into from
Oct 17, 2024

Conversation

oleiman
Copy link
Member

@oleiman oleiman commented Oct 11, 2024 •
edited
Loading

Backport of PR #23314

Closes #23760

@oleiman oleiman added this to the v24.1.x-next milestone Oct 11, 2024
@oleiman oleiman added the kind/backport PRs targeting a stable branch label Oct 11, 2024
@oleiman oleiman marked this pull request as ready for review October 11, 2024 21:33
@oleiman oleiman self-assigned this Oct 11, 2024
@oleiman
Copy link
Member Author

oleiman commented Oct 11, 2024 •
edited
Loading

Merge conflicts were all unrelated code (and bazel bits) missing from the release branch. No changes to the backported code. spoke to soon, missing a commit from upstream to preserve history, no fips mode or core balancing on this branch.

@oleiman oleiman force-pushed the vbotbuildovich/backport-23314-v24.1.x-583 branch 3 times, most recently from e0ebb47 to c03e172 Compare October 12, 2024 05:30
@oleiman oleiman requested review from a team, michael-redpanda and pgellert and removed request for a team October 13, 2024 23:32
@oleiman
Copy link
Member Author

oleiman commented Oct 13, 2024

@michael-redpanda @pgellert - Context: Matt & Rogger were asking after this in service of the rpk nag. Pretty messy, but it is done. If I've screwed anything up, I'll probably vote to abandon the backport on general principle.

michael-redpanda
michael-redpanda approved these changes Oct 14, 2024
View reviewed changes
Copy link
Contributor

@michael-redpanda michael-redpanda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

pgellert
pgellert approved these changes Oct 16, 2024
View reviewed changes
Copy link
Contributor

@pgellert pgellert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgmt

@oleiman
Copy link
Member Author

oleiman commented Oct 16, 2024

/ci-repeat 1

michael-redpanda and others added 8 commits October 16, 2024 10:31
@michael-redpanda @oleiman
feature: Added license required check method
b078e47 
Added a method that returns true if the state of the node/cluster
requires the use of an enterprise license.

Signed-off-by: Michael Boquard <michael@redpanda.com>
(cherry picked from commit 9f4c46d)
@oleiman
features: Introduce enterprise_features
ba2cac4 
- features::license_required_feature

Enumeration of redpanda features that require an enterprise license.

- features::enterprise_feature_report

A thin wrapper around a couple of sets to account for the status of
enterprise features (usually based on cluster configs).

Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit bf972c0)

Conflicts:
  enterprise_features.{h,cc} - nonexistent features (fips, shard balancing)
@oleiman
c/feature_manager: Generate an enterprise features report
dc702a7 
Also refactor feature_manager::license_required_feature_enabled to
use the report rather than calculating feature status on its own.

Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit 067df42)

Conflicts:
  - feature_manager.cc - nonexistent features (fips, shard balancing)
  - feature_manager.cc - didn't need node config as a result
@oleiman
admin/api: Swagger for get_enterprise
ca1896d 
Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit 653d5a9)
@oleiman
admin: get_enterprise handler
9324c52 
Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit d6e33cd)
@oleiman
dt/admin: Add node param to list_roles
85d6986 
Useful for testing enterprise features, since a condition for
"RBAC enabled" is the presence of one or more non-default roles.

Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit 5fdc178)
@oleiman
dt/admin: Add get_enterprise
57a6f11 
Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit b5c06fa)
Conflicts:
  admin.py - lots of nonexistent code
@oleiman
dt/enterprise: Tests for enterprise features endpoint
ef43c87 
Includes scenarios both with and without a valid license loaded up.

Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
(cherry picked from commit ebfdd7f)
Conflict:
  enterprise_features_license_test.py - nonexistent features
@oleiman oleiman force-pushed the vbotbuildovich/backport-23314-v24.1.x-583 branch from c03e172 to ef43c87 Compare October 16, 2024 17:31
@oleiman
Copy link
Member Author

oleiman commented Oct 16, 2024

force push rebase to fix CI

@vbotbuildovich
Copy link
Collaborator

vbotbuildovich commented Oct 16, 2024 •
edited
Loading

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/56642#0192968b-38cc-4c61-9def-d959c118c7e0:

"rptest.tests.data_transforms_test.DataTransformsLoggingMetricsTest.test_manager_metrics_values"

non flaky failures in https://buildkite.com/redpanda/redpanda/builds/56642#0192968d-7f25-46e1-ac4e-56e6eb76927b:

"rptest.tests.archive_retention_test.CloudArchiveRetentionTest.test_delete.cloud_storage_type=CloudStorageType.S3.retention_type=retention.ms"

@vbotbuildovich
Copy link
Collaborator

vbotbuildovich commented Oct 16, 2024 •
edited
Loading

Retry command for Build#56642

please wait until all jobs are finished before running the slash command

/ci-repeat 1
tests/rptest/tests/data_transforms_test.py::DataTransformsLoggingMetricsTest.test_manager_metrics_values
tests/rptest/tests/archive_retention_test.py::CloudArchiveRetentionTest.test_delete@{"cloud_storage_type":1,"retention_type":"retention.ms"}

@oleiman
Copy link
Member Author

oleiman commented Oct 16, 2024

CI Failures:

  • build-debug - some consume timeout in a metrics test. unrelated
  • build-release - CloudArchiveRetentionTest.test_delete unrelated

@oleiman
Copy link
Member Author

oleiman commented Oct 16, 2024

/ci-repeat 1
skip-redpanda-build
skip-units
tests/rptest/tests/data_transforms_test.py::DataTransformsLoggingMetricsTest.test_manager_metrics_values
tests/rptest/tests/archive_retention_test.py::CloudArchiveRetentionTest.test_delete@{"cloud_storage_type":1,"retention_type":"retention.ms"}

@oleiman
Copy link
Member Author

oleiman commented Oct 17, 2024

More seemingly infra-related CI failures: build build

@oleiman
Copy link
Member Author

oleiman commented Oct 17, 2024

/ci-repeat 1

@oleiman oleiman merged commit 169ac87 into redpanda-data:v24.1.x Oct 17, 2024
18 checks passed
This was referenced Oct 21, 2024
Closed
Closed
@BenPope BenPope modified the milestones: v24.1.x-next, v24.1.18 Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michael-redpanda michael-redpanda michael-redpanda approved these changes

@pgellert pgellert pgellert approved these changes

Assignees

@oleiman oleiman

Labels
area/redpanda kind/backport PRs targeting a stable branch
Projects
None yet
Milestone
v24.1.18
Development

Successfully merging this pull request may close these issues.
5 participants
@oleiman @vbotbuildovich @pgellert @michael-redpanda @BenPope