diff --git a/src/main/java/ru/ldeloff/servermonitorbot/service/command/mdadm/MdadmStatusCommand.java b/src/main/java/ru/ldeloff/servermonitorbot/service/command/mdadm/MdadmStatusCommand.java index 0a65bcb..0aca9f9 100644 --- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/mdadm/MdadmStatusCommand.java +++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/mdadm/MdadmStatusCommand.java @@ -84,6 +84,7 @@ public class MdadmStatusCommand extends CommandTemplate { private List parseHddState(Command result) { List names = new ArrayList<>(); + names.add("Number Name State"); String[] lines = result.getResponse().split("\n"); @@ -100,7 +101,7 @@ public class MdadmStatusCommand extends CommandTemplate { } else { List elements = Arrays.stream(line.split(" ")) .filter(x -> !Objects.equals(x, "")).toList(); - names.add("Number Name State"); + names.add(elements.get(0) + ", " + elements.get(6) + ", " + elements.get(4) + " " diff --git a/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java b/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java index 5941b51..15004cb 100644 --- a/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java +++ b/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java @@ -26,14 +26,17 @@ public class TelegramBotKeyboard implements UiFormer { ArrayList keyboardRows = new ArrayList<>(); - KeyboardRow keyboardRow = new KeyboardRow(); - keyboardRows.add(keyboardRow); + KeyboardRow keyboardRow1 = new KeyboardRow(); + keyboardRows.add(keyboardRow1); - keyboardRow.add(new KeyboardButton(STATUS)); - keyboardRow.add(new KeyboardButton(UNAME)); - keyboardRow.add(new KeyboardButton(CPU_TEMP)); - keyboardRow.add(new KeyboardButton(HDD_TEMP)); - keyboardRow.add(new KeyboardButton(MDADM)); + keyboardRow1.add(new KeyboardButton(STATUS)); + keyboardRow1.add(new KeyboardButton(UNAME)); + keyboardRow1.add(new KeyboardButton(CPU_TEMP)); + keyboardRow1.add(new KeyboardButton(HDD_TEMP)); + + KeyboardRow keyboardRow2 = new KeyboardRow(); + keyboardRows.add(keyboardRow2); + keyboardRow2.add(new KeyboardButton(MDADM)); replyKeyboardMarkup.setKeyboard(keyboardRows); message.setReplyMarkup(replyKeyboardMarkup);