Hedgehog_server
/
ServerMonitorBot
3
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

fix
Hedgehog_server_CI/ServerMonitorBot/pipeline/pr-master Build queued... Details

feature/task-11-mdadm_status
L_DelOff 2023-11-22 20:48:51 +03:00
parent 187e20ad9d
commit 62a473000a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ru/ldeloff/servermonitorbot/service/command/mdadm/MdadmStatusCommand.java
View File

@ -84,6 +84,7 @@ public class MdadmStatusCommand extends CommandTemplate {
private List<String> parseHddState(Command result) { private List<String> parseHddState(Command result) {
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();
names.add("Number Name State");
String[] lines = result.getResponse().split("\n"); String[] lines = result.getResponse().split("\n");
@ -100,7 +101,7 @@ public class MdadmStatusCommand extends CommandTemplate {
} else { } else {
List<String> elements = Arrays.stream(line.split(" ")) List<String> elements = Arrays.stream(line.split(" "))
.filter(x -> !Objects.equals(x, "")).toList(); .filter(x -> !Objects.equals(x, "")).toList();
names.add("Number Name State");
names.add(elements.get(0) + ", " names.add(elements.get(0) + ", "
+ elements.get(6) + ", " + elements.get(6) + ", "
+ elements.get(4) + " " + elements.get(4) + " "

17
src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java
View File

@ -26,14 +26,17 @@ public class TelegramBotKeyboard implements UiFormer {
ArrayList<KeyboardRow> keyboardRows = new ArrayList<>(); ArrayList<KeyboardRow> keyboardRows = new ArrayList<>();
KeyboardRow keyboardRow = new KeyboardRow(); KeyboardRow keyboardRow1 = new KeyboardRow();
keyboardRows.add(keyboardRow); keyboardRows.add(keyboardRow1);
keyboardRow.add(new KeyboardButton(STATUS)); keyboardRow1.add(new KeyboardButton(STATUS));
keyboardRow.add(new KeyboardButton(UNAME)); keyboardRow1.add(new KeyboardButton(UNAME));
keyboardRow.add(new KeyboardButton(CPU_TEMP)); keyboardRow1.add(new KeyboardButton(CPU_TEMP));
keyboardRow.add(new KeyboardButton(HDD_TEMP)); keyboardRow1.add(new KeyboardButton(HDD_TEMP));
keyboardRow.add(new KeyboardButton(MDADM));
KeyboardRow keyboardRow2 = new KeyboardRow();
keyboardRows.add(keyboardRow2);
keyboardRow2.add(new KeyboardButton(MDADM));
replyKeyboardMarkup.setKeyboard(keyboardRows); replyKeyboardMarkup.setKeyboard(keyboardRows);
message.setReplyMarkup(replyKeyboardMarkup); message.setReplyMarkup(replyKeyboardMarkup);