diff --git a/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc b/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc index ce2ea648b5..ef75c37195 100644 --- a/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc +++ b/modules/deploy/pages/redpanda/kubernetes/k-production-readiness.adoc @@ -166,7 +166,7 @@ Decommissioning is used to permanently remove a broker from the cluster, such as .Input [,bash] ---- -kubectl exec -n -c redpanda -- rpk redpanda admin brokers list -X user= -X pass= -X sasl.mechanism= +kubectl exec -n -c redpanda -- rpk cluster info -b --detailed -X user= -X pass= -X sasl.mechanism= ---- .Output @@ -216,7 +216,7 @@ Check that Redpanda is running the https://github.com/redpanda-data/redpanda/rel .Input [,bash] ---- -kubectl exec -n -c redpanda -- rpk redpanda admin brokers list -X user= -X pass= -X sasl.mechanism= +kubectl exec -n -c redpanda -- rpk cluster info -b --detailed -X user= -X pass= -X sasl.mechanism= ---- .Output diff --git a/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc b/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc index 552f47182f..889c3b3c2a 100644 --- a/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc +++ b/modules/deploy/pages/redpanda/manual/production/production-readiness.adoc @@ -538,7 +538,7 @@ Check that no brokers are in a decommissioned state. .Input [source,bash] ---- -rpk redpanda admin brokers list +rpk cluster info -b --detailed ---- .Output diff --git a/modules/get-started/pages/admin-addresses.adoc b/modules/get-started/pages/admin-addresses.adoc index 15325a735e..debefd13b3 100644 --- a/modules/get-started/pages/admin-addresses.adoc +++ b/modules/get-started/pages/admin-addresses.adoc @@ -26,7 +26,7 @@ The following table shows which `rpk` commands require the `-X admin.hosts` or ` | `rpk cluster` (all except `rpk cluster info` and `rpk cluster metadata`) | `-X admin.hosts` -| `rpk redpanda admin` +| `rpk redpanda admin` (deprecated in 26.2, see xref:upgrade:deprecated/index.adoc[Deprecated Features]) | `--hosts` |=== diff --git a/modules/get-started/pages/release-notes/redpanda.adoc b/modules/get-started/pages/release-notes/redpanda.adoc index 57d00d7aa6..4a367c6658 100644 --- a/modules/get-started/pages/release-notes/redpanda.adoc +++ b/modules/get-started/pages/release-notes/redpanda.adoc @@ -37,6 +37,12 @@ You can now keep a feature-release upgrade open, soak testing the new version wi See xref:upgrade:deferred-finalization.adoc[Defer Upgrade Finalization] and xref:manage:disaster-recovery/shadowing/upgrade.adoc[Upgrade Clusters in a Shadowing Topology]. +== Simplified cluster administration commands: `rpk redpanda admin` deprecated + +Cluster administration moves fully under `rpk cluster`: broker decommissioning, recommissioning, logger control, and per-broker configuration and partition listings now live alongside the other cluster commands, and `rpk cluster info -b --detailed` reports broker membership, liveness, and versions. The `rpk redpanda admin` command tree is deprecated and hidden from help output. The old commands still work and print a pointer to their replacements, but they are planned for removal in a future major release. + +See xref:upgrade:deprecated/index.adoc[Deprecated Features] for the full command migration table. + == Tiered Storage v2 Tiered Storage is now available in two versions. Tiered Storage v2 (`tiered_v2`) adds full compaction support for topics stored in object storage: compaction runs on the data in object storage rather than on local data only, eventually retains only the latest value for each key across the entire partition, and removes tombstone records after the retention period configured by `delete.retention.ms`. Topics using Tiered Storage v2 can also be converted to and from Cloud Topics. diff --git a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc index 61d7fe03ed..fddd468a6d 100644 --- a/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc +++ b/modules/manage/pages/cluster-maintenance/decommission-brokers.adoc @@ -185,7 +185,7 @@ To determine the number of cores that are available across the remaining brokers [,bash] ---- -rpk redpanda admin brokers list +rpk cluster info -b --detailed ---- .Example output @@ -234,20 +234,19 @@ rpk cluster info \ + [,bash] ---- -rpk redpanda admin brokers decommission \ - --hosts : \ - --force +rpk cluster brokers decommission \ + -X admin.hosts=: ---- + -NOTE: The `--force` flag is required only if the broker is not running. +NOTE: If the broker is not running, add the `--skip-liveness-check` flag. Without this flag, the command fails when it cannot verify the version of the offline broker. + -If you see `Success, broker has been decommissioned!`, the broker is decommissioned. Otherwise, the decommissioning process is still in progress. You can monitor the decommissioning status to follow its progress. +The command returns `Success, broker decommission started.` when the cluster accepts the request. Decommissioning continues in the background while partitions move off the broker. You can monitor the decommissioning status to follow its progress. . Monitor the decommissioning status: + [,bash] ---- -rpk redpanda admin brokers decommission-status \ +rpk cluster brokers decommission-status \ -X admin.hosts=: ---- + @@ -268,5 +267,6 @@ If these steps do not allow the decommissioning process to complete, enable `TRA include::shared:partial$suggested-reading.adoc[] -* xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk-redpanda-admin-brokers-decommission`] +// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page. +* `rpk cluster brokers decommission` * https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^] diff --git a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc index 894ef9c110..ae06002332 100644 --- a/modules/manage/pages/kubernetes/k-decommission-brokers.adoc +++ b/modules/manage/pages/kubernetes/k-decommission-brokers.adoc @@ -197,7 +197,7 @@ Next, determine the number of cores that are available across the remaining brok [,bash] ---- -rpk redpanda admin brokers list +rpk cluster info -b --detailed ---- .Example output @@ -297,22 +297,22 @@ NOTE: When scaling in a cluster, you cannot choose which broker is removed. Redp + ```bash kubectl --namespace exec -ti -c -- \ - rpk redpanda admin brokers decommission + rpk cluster brokers decommission ``` + This message is displayed before the decommission process is complete. + ```bash -Success, broker has been decommissioned! +Success, broker decommission started. Use 'rpk cluster brokers decommission-status ' to monitor data movement. ``` + -TIP: If the broker is not running, use the `--force` flag. +TIP: If the broker is not running, use the `--skip-liveness-check` flag. . Monitor the decommissioning status: + ```bash kubectl --namespace exec -ti -c -- \ - rpk redpanda admin brokers decommission-status + rpk cluster brokers decommission-status ``` + The output uses cached cluster health data that is refreshed every 10 seconds. When the completion column for all rows is 100%, the broker is decommissioned. @@ -737,6 +737,7 @@ include::shared:partial$suggested-reading.adoc[] - xref:manage:kubernetes/k-node-pools.adoc[Node Pools] -- xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk-redpanda-admin-brokers-decommission`] +// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page. +- `rpk cluster brokers decommission` - https://redpanda.com/blog/raft-protocol-reconfiguration-solution[Engineering a more robust Raft group reconfiguration^] diff --git a/modules/manage/pages/kubernetes/k-node-pools.adoc b/modules/manage/pages/kubernetes/k-node-pools.adoc index a56074de75..a8b38cc6bd 100644 --- a/modules/manage/pages/kubernetes/k-node-pools.adoc +++ b/modules/manage/pages/kubernetes/k-node-pools.adoc @@ -428,7 +428,7 @@ Monitor the decommission progress: [source,bash] ---- -rpk redpanda admin brokers list +rpk cluster info -b --detailed ---- Wait until only the Redpanda CR-managed brokers remain. diff --git a/modules/manage/pages/kubernetes/k-nodewatcher.adoc b/modules/manage/pages/kubernetes/k-nodewatcher.adoc index 67ed8e278c..25ece18a9e 100644 --- a/modules/manage/pages/kubernetes/k-nodewatcher.adoc +++ b/modules/manage/pages/kubernetes/k-nodewatcher.adoc @@ -176,4 +176,5 @@ kubectl get persistentvolume --namespace After the PVCUnbinder has finished, xref:manage:kubernetes/k-decommission-brokers.adoc[decommission the broker] that was removed from the node. This is necessary to prevent a potential loss of quorum and ensure cluster stability. -NOTE: Make sure to use the `--force` flag when decommissioning the broker with xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk redpanda admin brokers decommission`]. This flag is required when the broker is no longer running. +// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page. +NOTE: Make sure to use the `--skip-liveness-check` flag when decommissioning the broker with `rpk cluster brokers decommission`. This flag is required when the broker is no longer running. diff --git a/modules/manage/pages/kubernetes/k-rolling-restart.adoc b/modules/manage/pages/kubernetes/k-rolling-restart.adoc index a895701006..7d7e6f47d1 100644 --- a/modules/manage/pages/kubernetes/k-rolling-restart.adoc +++ b/modules/manage/pages/kubernetes/k-rolling-restart.adoc @@ -124,7 +124,7 @@ To view additional information about your brokers, run: ```bash kubectl exec --namespace -c redpanda -- \ - rpk redpanda admin brokers list + rpk cluster info -b --detailed ``` include::shared:partial$suggested-reading.adoc[] diff --git a/modules/manage/pages/use-admin-api.adoc b/modules/manage/pages/use-admin-api.adoc index 15eb523481..cfb78508b1 100644 --- a/modules/manage/pages/use-admin-api.adoc +++ b/modules/manage/pages/use-admin-api.adoc @@ -64,11 +64,12 @@ curl \ rpk:: + -- -For Linux deployments only, run xref:reference:rpk/rpk-redpanda/rpk-redpanda-admin-brokers-decommission.adoc[`rpk redpanda admin brokers decommission`]: +// TODO(DOC-2121): Add an xref when the 26.2 rpk regen adds the rpk-cluster-brokers-decommission page. +For Linux deployments only, run `rpk cluster brokers decommission`: [,bash] ---- -rpk redpanda admin brokers decommission +rpk cluster brokers decommission ---- -- ==== diff --git a/modules/manage/partials/gbac-dp.adoc b/modules/manage/partials/gbac-dp.adoc index 6808dd2ff2..f94f33daf4 100644 --- a/modules/manage/partials/gbac-dp.adoc +++ b/modules/manage/partials/gbac-dp.adoc @@ -417,7 +417,7 @@ rpk cluster config get nested_group_behavior + [,bash] ---- -rpk redpanda admin config log-level set security --level debug +rpk cluster loggers set security --level debug ---- + This helps diagnose incorrect claim paths, missing groups, or token content issues. The debug level reverts automatically after the expiry period (default: 300 seconds). diff --git a/modules/troubleshoot/partials/cluster-diagnostics.adoc b/modules/troubleshoot/partials/cluster-diagnostics.adoc index cd748929cd..940f5ae041 100644 --- a/modules/troubleshoot/partials/cluster-diagnostics.adoc +++ b/modules/troubleshoot/partials/cluster-diagnostics.adoc @@ -155,7 +155,8 @@ After applying these changes, verify the log level by <