Merge pull request 'fix' (#44) from feature/task-43 into master

Reviewed-on: #44

Dockerfile

@@ -0,0 +1,11 @@
+# Используем официальный образ OpenJDK 17 как базовый образ
+FROM openjdk:17
+
+# Установка рабочей директории внутри контейнера
+WORKDIR /app
+
+# Копируем JAR-файл приложения из локальной директории внутрь контейнера
+COPY ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar
+
+# Команда для запуска Spring Boot приложения при старте контейнера
+CMD ["java", "-jar", "app.jar"]

Jenkinsfile_CD

@@ -0,0 +1,71 @@
+pipeline {
+    agent {
+        docker {
+            image 'maven:3.9.5-eclipse-temurin-17'
+            args '-v /root/.m2:/root/.m2'
+        }
+    }
+
+    environment {
+       SSH_HOST = credentials('ROCK_PI_5_SSH_HOST')
+       SSH_PORT = credentials('ROCK_PI_5_SSH_PORT')
+       SSH_USER = credentials('ROCK_PI_5_SSH_USER')
+       SSH_PASS = credentials('ROCK_PI_5_SSH_PASS')
+       PATH_TO_DEV_FOLDER = credentials('SERVERMONITORBOT_PATH_TO_DEV_FOLDER')
+       IMAGE_NAME = 'servermonitorbot'
+       IMAGE_VERSION = 'latest'
+    }
+
+    stages {
+        stage('Init container') {
+            steps {
+                sh 'apt-get update && apt-get install -y sshpass openssh-client'
+            }
+        }
+        stage('Build') {
+            steps {
+                withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) {
+                   sh "cp -f \$application_yaml src/main/resources/application.yml"
+                }
+                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
+            }
+        }
+        stage('Stop container') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker compose down'
+                """
+            }
+        }
+        stage('Remove old image') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image rm -f ${IMAGE_NAME}-app:${IMAGE_VERSION} || true'
+                """
+            }
+        }
+        stage('Deploy') {
+            steps {
+                script {
+                    sh """
+                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'mkdir -p ${PATH_TO_DEV_FOLDER}'
+                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'rm -f ${PATH_TO_DEV_FOLDER}/{*.*}'
+                        sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
+                        sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
+                        sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
+                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build --no-cache -t ${IMAGE_NAME}:${IMAGE_VERSION} .'
+                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker compose up -d'
+                    """
+                }
+            }
+        }
+        stage('Remove useless images') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune --all --force'
+                """
+            }
+        }
+    }
+}
+

Jenkinsfile_CI

@@ -0,0 +1,15 @@
+pipeline {
+    agent {
+        docker {
+            image 'maven:3.9.5-eclipse-temurin-17'
+            args '-v /root/.m2:/root/.m2'
+        }
+    }
+    stages {
+        stage('Build') {
+            steps {
+                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
+            }
+        }
+    }
+}

docker-compose.yml

@@ -0,0 +1,6 @@
+version: '3'
+services:
+  app:
+    build:
+      context: .
+    restart: always

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.2</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>ru.ldeloff</groupId>
@@ -15,13 +15,13 @@
     <description>ServerMonitorBot</description>
     <properties>
         <java.version>17</java.version>
+        <start-class>ru.ldeloff.servermonitorbot.ServerMonitorBotApplication</start-class>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -40,15 +40,13 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.7.0</version>
+            <version>6.9.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
             <version>0.1.55</version>
         </dependency>
-
-
     </dependencies>
 
     <build>
@@ -64,6 +62,13 @@
                         </exclude>
                     </excludes>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

src/main/java/ru/ldeloff/servermonitorbot/ServerMonitorBotApplication.java

@@ -3,10 +3,12 @@ package ru.ldeloff.servermonitorbot;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import ru.ldeloff.servermonitorbot.config.SshConfig;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import ru.ldeloff.servermonitorbot.model.server.SshServers;
 
 @SpringBootApplication
-@EnableConfigurationProperties(SshConfig.class)
+@EnableScheduling
+@EnableConfigurationProperties(SshServers.class)
 public class ServerMonitorBotApplication {
 
     public static void main(String[] args) {

src/main/java/ru/ldeloff/servermonitorbot/commands/CommandTemplate.java

@@ -0,0 +1,149 @@
+package ru.ldeloff.servermonitorbot.commands;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.user.Role;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@RequiredArgsConstructor
+public abstract class CommandTemplate {
+
+    private final UpdateUtil updateUtil;
+    private final ServerListButtons serverListButtons;
+    public final SshService sshService;
+    private final MessagingService messagingService;
+    @Getter
+    @Setter
+    private List<Role> expectedRole = List.of(Role.ADMIN);
+    @Getter
+    @Setter
+    private String name;
+
+    public boolean execute(Update update) {
+        if (!isExecute(update)) {
+            return false;
+        }
+
+        User user = updateUtil.getUser(update);
+        String message = updateUtil.getMessage(update);
+        SendMessage answer = new SendMessage();
+        answer.setChatId(user.getTelegramId());
+        answer.setText(message);
+
+        if (!updateUtil.roleChecker(update, expectedRole)) {
+            logNotAuth(user, message);
+            messagingService.send(actionForNotAuth(user, answer));
+            return true;
+        }
+
+        String type = checkTypeCommand(update);
+        switch (type) {
+            case "aggregate":
+                logSuccess(user, message);
+                messagingService.send(executeAggregate(user, answer));
+                return true;
+            case "command":
+                logSuccess(user, message);
+                messagingService.send(executeCommand(user, answer));
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    // Методы для проверки команды
+    private boolean isExecute(Update update) {
+        if (update.hasMessage()) {
+            if (update.getMessage().hasText()) {
+                String messageText = update.getMessage().getText();
+                if (Objects.equals(messageText, name)) {
+                    log.debug("Команда {} будет выполнена", messageText);
+                    return true;
+                }
+            }
+        } else if (update.hasCallbackQuery()) {
+            String [] tags = update.getCallbackQuery().getData().split(":");
+            if (tags.length > 1) {
+                if (Objects.equals(tags[0], name)) {
+                    log.debug("Команда {} будет выполнена", tags[0]);
+                    return true;
+                }
+            } else {
+                log.debug("Команда не будет выполнена");
+                return false;
+            }
+        }
+        log.debug("Команда не будет выполнена");
+        return false;
+    }
+    private String checkTypeCommand(Update update) {
+        if (update.hasMessage()) {
+            if (update.getMessage().hasText()) {
+                return "aggregate";
+            }
+        } else if (update.hasCallbackQuery()) {
+            String [] tags = update.getCallbackQuery().getData().split(":");
+            if (tags.length > 1) {
+                return "command";
+            } else {
+                return "error";
+            }
+        }
+        return "error";
+    }
+
+
+    // Методы при верных условиях
+    void logSuccess(User user, String message) {
+        log.info("Получена команда '{}' от {} ({}). OK", message, user.getLogin(), user.getTelegramId());
+    }
+
+    public SendMessage executeAggregate(User user, SendMessage message) {
+        return serverListButtons.uiForm(message);
+    }
+
+    SendMessage executeCommand(User user, SendMessage message) {
+        String [] tags = Arrays.stream(message.getText().split(":"))
+                .map(String::trim)
+                .toArray(String[]::new);
+
+        if (tags[1].equals("all")) {
+            message.setText(executeCommandAllHost());
+        } else {
+            message.setText(Objects.requireNonNull(executeCommandSpecificHost(tags[1])));
+        }
+        return message;
+    }
+    private String executeCommandAllHost() {
+        List<SshServer> servers = sshService.getHealthSshServers();
+        StringBuilder response = new StringBuilder();
+        servers.forEach(server -> response.append(executeCommandSpecificHost(server.getName())).append("\n"));
+        return response.toString();
+    }
+    public abstract String executeCommandSpecificHost(String serverName);
+
+    // Методы при неверных условиях
+    void logNotAuth(User user, String message) {
+        log.warn("Получена команда '" + message + "' от " + user.getLogin()
+                + " (" + user.getTelegramId() + "). Нет прав");
+    }
+    private SendMessage actionForNotAuth(User user, SendMessage message) {
+        message.setText("У пользователя " + user.getLogin() + " (" + user.getTelegramId()
+                + ") недостаточно прав для выполнения этой команды");
+        return message;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/cpu/temp/service/CpuTemp.java

@@ -0,0 +1,49 @@
+package ru.ldeloff.servermonitorbot.commands.cpu.temp.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class CpuTemp extends CommandTemplate {
+
+    public CpuTemp(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        setName("CPU.temp");
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        try {
+            Optional<SshServer> server = sshService.getAllSshServers()
+                    .stream()
+                    .filter(x -> x.getName().equals(serverName))
+                    .findFirst();
+            if (server.isPresent()) {
+                SshCommand result = sshService.execute(new SshCommand("cat /sys/class/thermal/thermal_zone0/temp", 100, server.get()));
+                return server.get().getName() + ": \n" +
+                        (Objects.isNull(result.getResponse()) ? "ошибка при выполнении команды" :
+                                String.format("%.1f",
+                                        Double.parseDouble(result.getResponse().replaceAll("\n", ""))/1000))
+                        + "°C";
+            } else {
+                log.error("Ошибка при выполнении команды 'CPUtemp'. Искомый сервер ({}) не найден", serverName);
+                return null;
+            }
+        } catch (NumberFormatException e) {
+            log.error("Ошибка при выполнении команды 'CPUtemp'" ,e.getMessage());
+            return "Сервер " + serverName + " не поддерживает команду 'CPUtemp'";
+        }
+
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/hdd/mdadm/service/MdadmStatus.java

@@ -0,0 +1,87 @@
+package ru.ldeloff.servermonitorbot.commands.hdd.mdadm.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+import java.util.*;
+
+@Service
+@Slf4j
+public class MdadmStatus extends CommandTemplate {
+
+    public MdadmStatus(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        setName("MDADM");
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        Optional<SshServer> server = sshService.getAllSshServers()
+                .stream()
+                .filter(x -> x.getName().equals(serverName))
+                .findFirst();
+        if (server.isPresent()) {
+            // узнаю скок рейдов
+            SshCommand sshCommandRaid = sshService.execute(new SshCommand("mdadm --detail --scan", 500, server.get()));
+            List<String> raidNames = parseRaidNames(sshCommandRaid);
+            // Для каждого рейда надо выяснить статус
+            StringBuilder result = new StringBuilder();
+            raidNames.forEach(raid -> {
+                result.append(raid).append(":\n");
+                SshCommand sshCommandHdd = sshService.execute(new SshCommand("mdadm --detail " + raid, 500, server.get()));
+                List<String> hdds = parseHddState(sshCommandHdd);
+                hdds.forEach(hdd -> result.append(hdd).append("\n"));
+            });
+            return server.get().getName() + ": \n" + result;
+        } else {
+            log.error("Ошибка при выполнении команды 'mdadm'. Искомый сервер ({}) не найден", serverName);
+            return null;
+        }
+    }
+
+    private List<String> parseRaidNames(SshCommand result) {
+        List<String> names = new ArrayList<>();
+        Arrays.stream(result.getResponse().split("\n"))
+                .map(line -> line.split(" "))
+                .filter(lineArray -> lineArray.length >= 2)
+                .map(lineArray -> lineArray[1])
+                .forEach(names::add);
+        return names;
+    }
+
+    private List<String> parseHddState(SshCommand result) {
+        List<String> names = new ArrayList<>();
+        names.add("Number Name State");
+
+        String[] lines = result.getResponse().split("\n");
+
+        boolean foundHeader = false;
+
+        for (String line : lines) {
+            if (!foundHeader) {
+                if ( line.contains("Number") &&
+                        line.contains("Major") &&
+                        line.contains("Minor") &&
+                        line.contains("RaidDevice") )  {
+                    foundHeader = true;
+                }
+            } else {
+                List<String> elements = Arrays.stream(line.split(" "))
+                        .filter(x -> !Objects.equals(x, "")).toList();
+
+                names.add(elements.get(0) + ", "
+                        + elements.get(6) + ", "
+                        + elements.get(4) + " "
+                        + elements.get(5));
+            }
+        }
+        return names;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/hdd/temp/service/HddTemp.java

@@ -0,0 +1,39 @@
+package ru.ldeloff.servermonitorbot.commands.hdd.temp.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class HddTemp extends CommandTemplate {
+    public HddTemp(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        setName("HDD.temp");
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        Optional<SshServer> server = sshService.getAllSshServers()
+                .stream()
+                .filter(x -> x.getName().equals(serverName))
+                .findFirst();
+        if (server.isPresent()) {
+            SshCommand result = sshService.execute(new SshCommand("hddtemp /dev/sd*", 500, server.get()));
+            return server.get().getName() + ": \n" +
+                    (Objects.isNull(result.getResponse()) ? "ошибка при выполнении команды" : result.getResponse());
+        } else {
+            log.error("Ошибка при выполнении команды 'hddtemp'. Искомый сервер (" + serverName + ") не найден");
+            return null;
+        }
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/statuschecker/scheduler/CheckSessionStatusScheduler.java

@@ -0,0 +1,18 @@
+package ru.ldeloff.servermonitorbot.commands.statuschecker.scheduler;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.service.SshService;
+
+@Service
+@RequiredArgsConstructor
+public class CheckSessionStatusScheduler {
+
+    private final SshService sshService;
+
+    @Scheduled(fixedRateString = "${ssh.checkConnectionDelay}")
+    public void updateSessionStatusCheck() {
+        sshService.updateConnection();
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/statuschecker/service/CheckSessionStatus.java

@@ -0,0 +1,28 @@
+package ru.ldeloff.servermonitorbot.commands.statuschecker.service;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+@Service
+public class CheckSessionStatus extends CommandTemplate {
+
+    public CheckSessionStatus(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        setName("Статус");
+    }
+
+    public SendMessage executeAggregate(User user, SendMessage message) {
+        return super.sshService.getStatusSessions(message);
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        return null;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/commands/uname/service/Uname.java

@@ -0,0 +1,40 @@
+package ru.ldeloff.servermonitorbot.commands.uname.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.view.ServerListButtons;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class Uname extends CommandTemplate {
+
+    public Uname(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        setName("uname");
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        Optional<SshServer> server = sshService.getAllSshServers()
+                .stream()
+                .filter(x -> x.getName().equals(serverName))
+                .findFirst();
+        if (server.isPresent()) {
+            SshCommand result = sshService.execute(new SshCommand("uname -a", 100, server.get()));
+            return server.get().getName() + ": " +
+                    (Objects.isNull(result.getResponse()) ? "ошибка при выполнении команды" : result.getResponse());
+        } else {
+            log.error("Ошибка при выполнении команды 'uname'. Искомый сервер ({}) не найден", serverName);
+            return null;
+        }
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/config/SshConfig.java

@@ -1,21 +0,0 @@
-package ru.ldeloff.servermonitorbot.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import ru.ldeloff.servermonitorbot.model.SshServer;
-
-import java.util.List;
-
-@Configuration
-@ConfigurationProperties(prefix = "ssh")
-public class SshConfig {
-    private List<SshServer> servers;
-
-    public List<SshServer> getServers() {
-        return servers;
-    }
-
-    public void setServers(List<SshServer> servers) {
-        this.servers = servers;
-    }
-}

src/main/java/ru/ldeloff/servermonitorbot/config/UserConfig.java

@@ -0,0 +1,38 @@
+package ru.ldeloff.servermonitorbot.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.RoleService;
+
+import java.util.List;
+
+@Component
+@ConfigurationProperties(prefix = "bot")
+@Getter
+@Setter
+public class UserConfig {
+
+    private List<UserProperty> users;
+
+    @Autowired
+    private RoleService roleService;
+
+    @Getter
+    @Setter
+    public static class UserProperty {
+        private Long telegramId;
+        private String role;
+    }
+
+    public List<User> getUsers() {
+        return users.stream().map(user -> new User()
+                .setTelegramId(user.getTelegramId())
+                .setRole(roleService.findRoleByName(user.getRole()))
+        ).toList();
+    }
+
+}

src/main/java/ru/ldeloff/servermonitorbot/controller/TelegramBotController.java

@@ -0,0 +1,60 @@
+package ru.ldeloff.servermonitorbot.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.meta.api.objects.Message;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.TelegramBot;
+import ru.ldeloff.servermonitorbot.service.SshService;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.view.SwitchToMainMenu;
+
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class TelegramBotController extends TelegramLongPollingBot {
+
+    private final Map<String, CommandTemplate> commands;
+
+    private final TelegramBot telegramBot;
+    private final SwitchToMainMenu switchToMainMenu;
+    private final SshService sshService;
+
+
+    @Override
+    public void onUpdateReceived(Update update) {
+        boolean result = false;
+        for (Map.Entry<String, CommandTemplate> entry : commands.entrySet()) {
+            result = entry.getValue().execute(update);
+            if (result) {
+                break;
+            }
+        }
+        if (!result) {
+            Message message = update.getMessage();
+            if (message!=null) {
+                message.setText("Not found");
+            }
+            update.setMessage(message);
+            switchToMainMenu.execute(update);
+        }
+    }
+
+    @Override
+    public String getBotUsername() {
+        return telegramBot.getBotUsername();
+    }
+
+    @Override
+    public String getBotToken() {
+        return telegramBot.getBotToken();
+    }
+
+    @Override
+    public void onClosing() {
+        super.onClosing();
+        sshService.disconnectAllConnections();
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/init/AddUsers.java

@@ -0,0 +1,26 @@
+package ru.ldeloff.servermonitorbot.init;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import ru.ldeloff.servermonitorbot.config.UserConfig;
+import ru.ldeloff.servermonitorbot.service.UserService;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Order(2)
+public class AddUsers implements ApplicationRunner {
+
+    final UserConfig userConfig;
+    final UserService userService;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        userConfig.getUsers().forEach(userService::saveOrUpdateUser);
+        log.info("Загружены и обновлены пользователи");
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/init/ReloadNotification.java

@@ -0,0 +1,33 @@
+package ru.ldeloff.servermonitorbot.init;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.service.UserService;
+import ru.ldeloff.servermonitorbot.view.TelegramBotKeyboard;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Order(3)
+public class ReloadNotification implements ApplicationRunner {
+
+    private final TelegramBotKeyboard telegramBotKeyboard;
+    private final MessagingService messagingService;
+    private final UserService userService;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        userService.getAllUsers().forEach(user -> {
+            SendMessage sendMessage = new SendMessage();
+            sendMessage.setChatId(user.getTelegramId());
+            sendMessage.setText("Бот перезапущен");
+            messagingService.send(telegramBotKeyboard.uiForm(sendMessage));
+        });
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/init/SshConnect.java

@@ -1,20 +1,21 @@
 package ru.ldeloff.servermonitorbot.init;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import ru.ldeloff.servermonitorbot.service.SshService;
 
 @Component
+@RequiredArgsConstructor
+@Order(4)
 public class SshConnect implements ApplicationRunner {
+
     final SshService sshService;
 
-    public SshConnect(SshService sshService) {
-        this.sshService = sshService;
-    }
-
     @Override
-    public void run(ApplicationArguments args) throws Exception {
+    public void run(ApplicationArguments args) {
-        sshService.connectToAllServer();
+        sshService.updateConnection();
     }
 }

src/main/java/ru/ldeloff/servermonitorbot/init/StartBot.java

@@ -1,27 +1,24 @@
 package ru.ldeloff.servermonitorbot.init;
 
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
-import ru.ldeloff.servermonitorbot.model.TelegramBot;
+import ru.ldeloff.servermonitorbot.controller.TelegramBotController;
-import ru.ldeloff.servermonitorbot.service.TelegramBotService;
+
 
 @Slf4j
 @Component
-@NoArgsConstructor
+@RequiredArgsConstructor
+@Order(1)
 public class StartBot implements ApplicationRunner {
-    private TelegramBotService telegramBot;
+    private final TelegramBotController telegramBot;
-
-    @Autowired
-    public StartBot(TelegramBotService telegramBot) {
-        this.telegramBot = telegramBot;
-    }
 
     @Override
     public void run(ApplicationArguments args) {
@@ -30,7 +27,6 @@ public class StartBot implements ApplicationRunner {
             botsApi.registerBot(telegramBot);
             log.info("Бот запущен");
         } catch (TelegramApiException e) {
-            e.printStackTrace();
             log.error(e.getMessage());
         }
     }

src/main/java/ru/ldeloff/servermonitorbot/model/SshCommand.java

@@ -0,0 +1,26 @@
+package ru.ldeloff.servermonitorbot.model;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+
+@Getter
+@Setter
+public class SshCommand {
+    @NotNull
+    private String command;
+    @NotNull
+    @Min(100)
+    private int timeout;
+    @NotNull
+    private SshServer sshServer;
+    private String response;
+
+    public SshCommand(String command, int timeout, SshServer sshServer) {
+        this.command = command;
+        this.timeout = timeout;
+        this.sshServer = sshServer;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/model/server/ServerStatus.java

@@ -0,0 +1,7 @@
+package ru.ldeloff.servermonitorbot.model.server;
+
+public enum ServerStatus {
+    ONLINE,
+    OFFLINE,
+    CONNECTION_LOST
+}

src/main/java/ru/ldeloff/servermonitorbot/model/server/SshServer.java

@@ -1,4 +1,4 @@
-package ru.ldeloff.servermonitorbot.model;
+package ru.ldeloff.servermonitorbot.model.server;
 
 import com.jcraft.jsch.Session;
 import jakarta.validation.constraints.NotNull;
@@ -21,4 +21,5 @@ public class SshServer {
     @NotNull
     private String password;
     private Session session;
+    private ServerStatus status;
 }

src/main/java/ru/ldeloff/servermonitorbot/model/server/SshServers.java

@@ -0,0 +1,16 @@
+package ru.ldeloff.servermonitorbot.model.server;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+@Configuration
+@ConfigurationProperties(prefix = "ssh")
+@Getter
+@Setter
+public class SshServers {
+    private List<SshServer> servers;
+}

src/main/java/ru/ldeloff/servermonitorbot/model/user/Role.java

@@ -0,0 +1,7 @@
+package ru.ldeloff.servermonitorbot.model.user;
+
+public enum Role {
+    ADMIN,
+    USER,
+    ANONYMOUS
+}

src/main/java/ru/ldeloff/servermonitorbot/model/user/User.java

@@ -0,0 +1,12 @@
+package ru.ldeloff.servermonitorbot.model.user;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class User {
+    private Long telegramId;
+    private Role role;
+    private String login;
+}

src/main/java/ru/ldeloff/servermonitorbot/model/user/Users.java

@@ -0,0 +1,13 @@
+package ru.ldeloff.servermonitorbot.model.user;
+
+import lombok.Getter;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Component
+public class Users {
+    private final List<User> users = new ArrayList<>();
+}

src/main/java/ru/ldeloff/servermonitorbot/repository/SshRepository.java

@@ -0,0 +1,12 @@
+package ru.ldeloff.servermonitorbot.repository;
+
+import com.jcraft.jsch.JSchException;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+
+public interface SshRepository {
+
+    void connect(SshServer sshServer) throws JSchException;
+
+    void disconnect(SshServer sshServer);
+
+}

src/main/java/ru/ldeloff/servermonitorbot/repository/SshRepositoryImpl.java

@@ -0,0 +1,37 @@
+package ru.ldeloff.servermonitorbot.repository;
+
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Repository;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+
+@Repository
+@RequiredArgsConstructor
+public class SshRepositoryImpl implements SshRepository {
+
+    @Value("${ssh.timeout:5000}")
+    private int TIMEOUT;
+
+    @Override
+    public void connect(SshServer sshServer) throws JSchException {
+        Session session = new JSch().getSession(sshServer.getUser(),
+                sshServer.getHost(),
+                sshServer.getPort());
+        session.setPassword(sshServer.getPassword());
+        session.setConfig("StrictHostKeyChecking", "no");
+        session.setTimeout(TIMEOUT);
+
+        session.connect();
+
+        sshServer.setSession(session);
+    }
+
+    @Override
+    public void disconnect(SshServer sshServer) {
+        sshServer.getSession().disconnect();
+    }
+
+}

src/main/java/ru/ldeloff/servermonitorbot/service/MessagingService.java

@@ -0,0 +1,11 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+
+public interface MessagingService {
+    void sendMessageToAll(String message);
+
+    void sendMessageToAdmins(String message);
+
+    void send(SendMessage message);
+}

src/main/java/ru/ldeloff/servermonitorbot/service/MessagingServiceImpl.java

@@ -0,0 +1,48 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import ru.ldeloff.servermonitorbot.controller.TelegramBotController;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MessagingServiceImpl implements MessagingService {
+
+    private final UserService userService;
+    private final ApplicationContext applicationContext;
+
+    @Override
+    public void sendMessageToAll(String message) {
+        userService.getAllUsers().forEach(user -> {
+            SendMessage sendMessage = new SendMessage();
+            sendMessage.setChatId(user.getTelegramId());
+            sendMessage.setText(message);
+            send(sendMessage);
+        });
+    }
+
+    @Override
+    public void sendMessageToAdmins(String message) {
+        userService.getAllAdmins().forEach(user -> {
+            SendMessage sendMessage = new SendMessage();
+            sendMessage.setChatId(user.getTelegramId());
+            sendMessage.setText(message);
+            send(sendMessage);
+        });
+    }
+
+    @Override
+    public void send(SendMessage message) {
+        try {
+            applicationContext.getBean(TelegramBotController.class).execute(message);
+        } catch (TelegramApiException e) {
+            log.warn("Ошибка при отправке сообщения", e.getMessage());
+        }
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/service/RoleService.java

@@ -0,0 +1,7 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import ru.ldeloff.servermonitorbot.model.user.Role;
+
+public interface RoleService {
+    Role findRoleByName(String name);
+}

src/main/java/ru/ldeloff/servermonitorbot/service/RoleServiceImpl.java

@@ -0,0 +1,14 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.model.user.Role;
+
+@Service
+@RequiredArgsConstructor
+public class RoleServiceImpl implements RoleService {
+    @Override
+    public Role findRoleByName(String name) {
+        return Role.valueOf(name);
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/service/SshService.java

@@ -1,16 +1,25 @@
 package ru.ldeloff.servermonitorbot.service;
 
-import com.jcraft.jsch.JSchException;
+
-import com.jcraft.jsch.Session;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import ru.ldeloff.servermonitorbot.model.SshServer;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
 
 import java.util.List;
 
-
 public interface SshService {
-    void connectToAllServer();
+
-    Session connectToServer(SshServer sshServer) throws JSchException;
+    void updateConnection();
-    void disconnectSessions();
+
-    SendMessage getStatusSessions(Long chatId);
+    void disconnectAllConnections();
+
+    SendMessage getStatusSessions(SendMessage update);
+
+    List<SshServer> getAllSshServers();
+
+    List<SshServer> getHealthSshServers();
+
+    SshCommand execute(SshCommand sshCommand);
+
+    List<SshCommand> execute(List<SshCommand> sshCommands);
 }

src/main/java/ru/ldeloff/servermonitorbot/service/SshServiceImpl.java

@@ -1,76 +1,146 @@
 package ru.ldeloff.servermonitorbot.service;
 
-import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.ChannelExec;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import ru.ldeloff.servermonitorbot.config.SshConfig;
+import ru.ldeloff.servermonitorbot.model.server.ServerStatus;
-import ru.ldeloff.servermonitorbot.model.SshServer;
+import ru.ldeloff.servermonitorbot.model.server.SshServers;
+import ru.ldeloff.servermonitorbot.model.SshCommand;
+import ru.ldeloff.servermonitorbot.model.server.SshServer;
+import ru.ldeloff.servermonitorbot.repository.SshRepository;
 
+import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
-@Slf4j
 @Service
-public class SshServiceImpl implements SshService{
+@Slf4j
+@RequiredArgsConstructor
+public class SshServiceImpl implements SshService {
 
-    private final List<SshServer> sshServers;
+    private final SshServers sshServers;
-
+    private final SshRepository sshRepository;
-    @Autowired
+    private final MessagingService messagingService;
-    public SshServiceImpl(SshConfig sshConfig) {
-        this.sshServers = sshConfig.getServers();
-    }
-
-    private List<Session> sessions = new ArrayList<>();
 
     @Override
-    public void connectToAllServer() {
+    public void updateConnection() {
-        sshServers.forEach(sshServer -> {
+        sshServers.getServers().forEach(sshServer -> {
             try {
-                Session session = connectToServer(sshServer);
+                sshRepository.connect(sshServer);
-                sshServer.setSession(session);
+                updateServerStatus(sshServer, ServerStatus.ONLINE);
-                log.info("Успешно подключён к " + sshServer.getHost());
+                log.info("Успешно подключён к {}", sshServer.getHost());
-                sessions.add(session);
             } catch (JSchException e) {
-                log.warn("Не удалось соединиться с " + sshServer.getHost() + ": " + e.getMessage());
+                if (sshServer.getStatus() == null) {
+                    updateServerStatus(sshServer, ServerStatus.OFFLINE);
+                }
+                if (sshServer.getStatus() == ServerStatus.ONLINE) {
+                    updateServerStatus(sshServer, ServerStatus.CONNECTION_LOST);
+                }
+                log.warn("Не удалось соединиться с {}: {}", sshServer.getHost(), e.getMessage());
             }
         });
     }
 
     @Override
-    public Session connectToServer(SshServer sshServer) throws JSchException {
+    public void disconnectAllConnections() {
-        Session session = new JSch().getSession(sshServer.getUser(),
+        sshServers.getServers().forEach(sshRepository::disconnect);
-                sshServer.getHost(),
-                sshServer.getPort());
-        session.setPassword(sshServer.getPassword());
-        session.setConfig("StrictHostKeyChecking", "no");
-        session.connect();
-        return session;
     }
 
     @Override
-    public void disconnectSessions() {
+    public SendMessage getStatusSessions(SendMessage message) {
-        if (!sessions.isEmpty()) {
+        StringBuilder text = new StringBuilder("Статус соединения (может выполняться долго): \n");
-            sessions.forEach(Session::disconnect);
+        sshServers.getServers().forEach(server -> text.append(server.getName())
-            sessions.forEach(sessions::remove);
+                .append(": ")
-        }
+                .append(checkStatusServer(server))
-    }
+                .append("\n"));
-
+        message.setText(text.toString());
-    @Override
-    public SendMessage getStatusSessions(Long chatId) {
-        StringBuilder text = new StringBuilder("Статус соединения: \n");
-        sshServers.forEach(server -> {
-            text.append(server.getName())
-                    .append(": ")
-                    .append(server.getSession().isConnected() ? "OK" : "отключён")
-                    .append("\n");
-        });
-        SendMessage message = new SendMessage();
-        message.setText(String.valueOf(text));
-        message.setChatId(chatId);
         return message;
     }
+
+    private String checkStatusServer(SshServer server) {
+        if (Objects.isNull(server.getSession())) {
+            return "нет соединения";
+        }
+
+        if (server.getSession().isConnected()) {
+            return "OK";
+        } else {
+                return "потеряно соединение";
+        }
+
+    }
+
+    private boolean checkHealth(SshServer server) {
+        if (Objects.isNull(server.getSession())) {
+            return false;
+        }
+
+        return server.getSession().isConnected();
+    }
+
+    @Override
+    public List<SshServer> getAllSshServers() {
+        return sshServers.getServers();
+    }
+
+    @Override
+    public List<SshServer> getHealthSshServers() {
+        return sshServers.getServers().stream().filter(this::checkHealth).toList();
+    }
+
+    @Override
+    public SshCommand execute(SshCommand sshCommand) {
+        List<SshCommand> sshCommands = new ArrayList<>();
+        sshCommands.add(sshCommand);
+        return execute(sshCommands).get(0);
+    }
+
+    @Override
+    public List<SshCommand> execute(List<SshCommand> sshCommands) {
+        Session session = sshCommands.get(0).getSshServer().getSession(); // подразумевается, что в листе с командами сервер один и тот же
+        ChannelExec channel = null;
+        try {
+            channel = (ChannelExec) session.openChannel("exec");
+            ChannelExec finalChannel = channel;
+
+            sshCommands.forEach(command -> {
+                try {
+                    finalChannel.setCommand(command.getCommand());
+                    ByteArrayOutputStream responseStream = new ByteArrayOutputStream();
+                    finalChannel.setOutputStream(responseStream);
+                    finalChannel.connect();
+                    while (finalChannel.isConnected()) {
+                        Thread.sleep(command.getTimeout());
+                    }
+                    String responseString = new String(responseStream.toByteArray());
+                    command.setResponse(responseString);
+                } catch (JSchException | InterruptedException e) {
+                    log.warn(e.getMessage());
+                    throw new RuntimeException(e);
+                }
+            });
+        } catch (JSchException e) {
+            log.warn(e.getMessage());
+            throw new RuntimeException(e);
+        } finally {
+            if (channel != null) {
+                channel.disconnect();
+            }
+        }
+        return sshCommands;
+    }
+
+    public void updateServerStatus(SshServer server, ServerStatus newStatus) {
+        ServerStatus oldStatus = server.getStatus();
+        if (oldStatus != newStatus) {
+            server.setStatus(newStatus);
+            messagingService.sendMessageToAdmins("Server status changed for " + server.getName() +
+                    ": " + oldStatus + " -> " + newStatus);
+        }
+    }
 }

src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotService.java

@@ -1,92 +0,0 @@
-package ru.ldeloff.servermonitorbot.service;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.telegram.telegrambots.bots.TelegramLongPollingBot;
-import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import org.telegram.telegrambots.meta.api.objects.Update;
-import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
-import ru.ldeloff.servermonitorbot.model.TelegramBot;
-import ru.ldeloff.servermonitorbot.util.TelegramBotMenu;
-
-@Service
-@Slf4j
-public class TelegramBotService extends TelegramLongPollingBot {
-
-    final TelegramBot telegramBot;
-    final SshService sshService;
-    final TelegramBotMenu telegramBotMenu;
-
-
-    @Autowired
-    public TelegramBotService(TelegramBot telegramBot, SshService sshService, TelegramBotMenu telegramBotMenu) {
-        this.telegramBot = telegramBot;
-        this.sshService = sshService;
-        this.telegramBotMenu = telegramBotMenu;
-    }
-
-    @Override
-    public void onUpdateReceived(Update update) {
-        if (update.hasMessage()) {
-            if (update.getMessage().hasText()) {
-                SendMessage message = new SendMessage();
-                String messageText = update.getMessage().getText();
-                long chatId = update.getMessage().getChatId();
-                switch (messageText) {
-                    case "/start":
-                        message.setText("Привет: " + update.getMessage().getChat().getUserName());
-                        message.setChatId(chatId);
-                        message.setReplyMarkup(telegramBotMenu.initKeyboard());
-                        sendMessage(message);
-                        log.info("Получена команда /start");
-                        break;
-                    case "Статус":
-                        sendMessage(sshService.getStatusSessions(chatId));
-                        log.info("Получена команда 'Статус'");
-                        break;
-                    default:
-                        message.setText("unknown command:" + messageText);
-                        message.setChatId(chatId);
-                        message.setReplyMarkup(telegramBotMenu.initKeyboard());
-                        sendMessage(message);
-                        log.warn("Неизвестная команда:" + messageText);
-                }
-            }
-        } else if (update.hasCallbackQuery()) {
-            try {
-                SendMessage message = new SendMessage();
-                message.setText(update.getCallbackQuery().getData());
-                message.setChatId(update.getCallbackQuery().getMessage().getChatId());
-                execute(message);
-            } catch (TelegramApiException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void sendMessage(SendMessage message) {
-        try {
-            execute(message);
-        } catch (TelegramApiException e) {
-            e.printStackTrace();
-            log.warn(e.getMessage());
-        }
-    }
-
-    @Override
-    public String getBotUsername() {
-        return telegramBot.getBotUsername();
-    }
-
-    @Override
-    public String getBotToken() {
-        return telegramBot.getBotToken();
-    }
-
-    @Override
-    public void onClosing() {
-        super.onClosing();
-        sshService.disconnectSessions();
-    }
-}

src/main/java/ru/ldeloff/servermonitorbot/service/UserService.java

@@ -0,0 +1,16 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import ru.ldeloff.servermonitorbot.model.user.User;
+
+import java.util.List;
+
+public interface UserService {
+
+    void saveOrUpdateUser(User user);
+
+    User getByTelegramId(Long id);
+
+    List<User> getAllUsers();
+
+    List<User> getAllAdmins();
+}

src/main/java/ru/ldeloff/servermonitorbot/service/UserServiceImpl.java

@@ -0,0 +1,42 @@
+package ru.ldeloff.servermonitorbot.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.ldeloff.servermonitorbot.model.user.Role;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.model.user.Users;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class UserServiceImpl implements UserService {
+
+    private final Users users;
+
+    @Override
+    public void saveOrUpdateUser(User user) {
+        if (getByTelegramId(user.getTelegramId()) == null) {
+            users.getUsers().add(user);
+        }
+    }
+
+    @Override
+    public User getByTelegramId(Long telegramId) {
+        return users.getUsers().stream()
+                .filter(user -> user.getTelegramId().equals(telegramId))
+                .findFirst()
+                .orElse(null);
+    }
+
+    @Override
+    public List<User> getAllUsers() {return users.getUsers(); }
+
+    @Override
+    public List<User> getAllAdmins() {
+        return users.getUsers().stream().filter(user -> user.getRole().equals(Role.ADMIN)).toList();
+    }
+
+}

src/main/java/ru/ldeloff/servermonitorbot/util/TelegramBotMenu.java

@@ -1,61 +0,0 @@
-package ru.ldeloff.servermonitorbot.util;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
-import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
-import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton;
-import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton;
-import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@Component
-public class TelegramBotMenu {
-    private final String STATUS = "Статус";
-    public ReplyKeyboardMarkup initKeyboard()
-    {
-        //Создаем объект будущей клавиатуры и выставляем нужные настройки
-        ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
-        replyKeyboardMarkup.setResizeKeyboard(true); //подгоняем размер
-        replyKeyboardMarkup.setOneTimeKeyboard(false); //скрываем после использования
-
-        //Создаем список с рядами кнопок
-        ArrayList<KeyboardRow> keyboardRows = new ArrayList<>();
-        //Создаем один ряд кнопок и добавляем его в список
-        KeyboardRow keyboardRow = new KeyboardRow();
-        keyboardRows.add(keyboardRow);
-        //Добавляем одну кнопку с текстом "Просвяти" наш ряд
-        keyboardRow.add(new KeyboardButton(STATUS));
-        //добавляем лист с одним рядом кнопок в главный объект
-        replyKeyboardMarkup.setKeyboard(keyboardRows);
-        return replyKeyboardMarkup;
-    }
-
-    public SendMessage mainMenu(long chatId) {
-        SendMessage message = new SendMessage();
-        message.setChatId(chatId);
-        message.setText("Choose an option:");
-
-        InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();
-        List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
-
-        InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
-        inlineKeyboardButton.setText(STATUS);
-        inlineKeyboardButton.setCallbackData("Button \"" + STATUS + "\" has been pressed");
-
-        keyboardRow.add(inlineKeyboardButton);
-
-        List<List<InlineKeyboardButton>> keyboard = new ArrayList<>();
-        keyboard.add(keyboardRow);
-
-        inlineKeyboardMarkup.setKeyboard(keyboard);
-        message.setReplyMarkup(inlineKeyboardMarkup);
-
-        return message;
-    }
-}

src/main/java/ru/ldeloff/servermonitorbot/util/UpdateUtil.java

@@ -0,0 +1,51 @@
+package ru.ldeloff.servermonitorbot.util;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.user.Role;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.UserService;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class UpdateUtil {
+
+    private final UserService userService;
+
+    public User getUser(Update update) {
+        long id = -1L;
+        String login = null;
+        if (update.hasMessage()) {
+            id = update.getMessage().getChat().getId();
+            login = update.getMessage().getChat().getUserName();
+        } else if (update.hasCallbackQuery()) {
+            id = update.getCallbackQuery().getMessage().getChatId();
+            login = update.getCallbackQuery().getFrom().getUserName();
+        }
+        User user = userService.getByTelegramId(id);
+        if (user == null) {
+            user = new User();
+            user.setTelegramId(id);
+            user.setRole(Role.ANONYMOUS);
+        }
+        user.setLogin(login);
+        return user;
+    }
+
+    public String getMessage(Update update) {
+        if (update.hasMessage()) {
+            return update.getMessage().getText();
+        } else if (update.hasCallbackQuery()) {
+            return update.getCallbackQuery().getData();
+        }
+        return "";
+    }
+
+    public boolean roleChecker(Update update, List<Role> expectedRoles) {
+        User user = getUser(update);
+        return expectedRoles.contains(user.getRole());
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/view/FirstUseCommand.java

@@ -0,0 +1,33 @@
+package ru.ldeloff.servermonitorbot.view;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.SshService;
+
+@Service
+public class FirstUseCommand extends CommandTemplate {
+
+    private final TelegramBotKeyboard telegramBotKeyboard;
+
+    public FirstUseCommand(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, TelegramBotKeyboard telegramBotKeyboard, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        this.telegramBotKeyboard = telegramBotKeyboard;
+        setName("/start");
+    }
+
+
+    @Override
+    public SendMessage executeAggregate(User user, SendMessage message) {
+        message.setText("Добро пожаловать " + user.getLogin() + "!");
+        return telegramBotKeyboard.uiForm(message);
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        return null;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/view/ServerListButtons.java

@@ -0,0 +1,53 @@
+package ru.ldeloff.servermonitorbot.view;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton;
+import ru.ldeloff.servermonitorbot.service.SshService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Component
+@RequiredArgsConstructor
+public class ServerListButtons implements UiFormer {
+
+    private final SshService sshService;
+
+    @Override
+    public SendMessage uiForm(SendMessage message) {
+        List<List<InlineKeyboardButton>> keyboard = new ArrayList<>();
+        InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();
+
+        sshService.getAllSshServers().forEach(sshServer -> {
+            if (Objects.nonNull(sshServer.getSession())) {
+                if (sshServer.getSession().isConnected()) {
+                    List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
+                    InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
+                    inlineKeyboardButton.setText(sshServer.getName());
+                    inlineKeyboardButton.setCallbackData(message.getText() + ": " + sshServer.getName());
+                    keyboardRow.add(inlineKeyboardButton);
+                    keyboard.add(keyboardRow);
+                }
+            }
+        });
+
+        if (keyboard.size() > 1) {
+            List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
+            InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
+            inlineKeyboardButton.setText("Все сервера");
+            inlineKeyboardButton.setCallbackData(message.getText() + ": all");
+            keyboardRow.add(inlineKeyboardButton);
+            keyboard.add(keyboardRow);
+        }
+
+        inlineKeyboardMarkup.setKeyboard(keyboard);
+        message.setReplyMarkup(inlineKeyboardMarkup);
+        message.setText("Выполнить " + message.getText() + " для");
+
+        return message;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/view/SwitchToMainMenu.java

@@ -0,0 +1,37 @@
+package ru.ldeloff.servermonitorbot.view;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.MessagingService;
+import ru.ldeloff.servermonitorbot.util.UpdateUtil;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.SshService;
+
+@Service
+@Slf4j
+public class SwitchToMainMenu extends CommandTemplate {
+
+    private final TelegramBotKeyboard telegramBotKeyboard;
+
+    public SwitchToMainMenu(UpdateUtil updateUtil, ServerListButtons serverListButtons, SshService sshService, TelegramBotKeyboard telegramBotKeyboard, MessagingService messagingService) {
+        super(updateUtil, serverListButtons, sshService, messagingService);
+        this.telegramBotKeyboard = telegramBotKeyboard;
+        setName("Not found");
+    }
+
+    @Override
+    public String executeCommandSpecificHost(String serverName) {
+        return null;
+    }
+
+    @Override
+    public SendMessage executeAggregate(User user, SendMessage message) {
+        SendMessage answer = new SendMessage();
+        answer.setChatId(user.getTelegramId());
+        answer.setText("Неверная команда. Попробуем сначала.");
+        return telegramBotKeyboard.uiForm(answer);
+    }
+
+}

src/main/java/ru/ldeloff/servermonitorbot/view/TelegramBotKeyboard.java

@@ -0,0 +1,70 @@
+package ru.ldeloff.servermonitorbot.view;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardButton;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow;
+import ru.ldeloff.servermonitorbot.model.user.Role;
+import ru.ldeloff.servermonitorbot.model.user.User;
+import ru.ldeloff.servermonitorbot.service.UserService;
+import ru.ldeloff.servermonitorbot.commands.CommandTemplate;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static ru.ldeloff.servermonitorbot.model.user.Role.ADMIN;
+import static ru.ldeloff.servermonitorbot.model.user.Role.USER;
+
+@Component
+@RequiredArgsConstructor
+public class TelegramBotKeyboard implements UiFormer {
+
+    private final UserService userService;
+    private final ApplicationContext applicationContext;
+
+    @Override
+    public SendMessage uiForm(SendMessage message) {
+        ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
+        replyKeyboardMarkup.setResizeKeyboard(true);
+        replyKeyboardMarkup.setOneTimeKeyboard(false);
+
+        String chatId = message.getChatId();
+        User user = userService.getByTelegramId(Long.parseLong(chatId));
+
+        ArrayList<KeyboardRow> keyboardRows = formKeyboard(user);
+        replyKeyboardMarkup.setKeyboard(keyboardRows);
+        message.setReplyMarkup(replyKeyboardMarkup);
+        return message;
+    }
+
+    private ArrayList<KeyboardRow> formKeyboard(User user) {
+        Role role = user.getRole();
+        Map<String, CommandTemplate> commands = applicationContext.getBeansOfType(CommandTemplate.class);
+        commands.remove("firstUseCommand");
+        commands.remove("switchToMainMenu");
+
+        int buttonOnLine = 3;
+
+        ArrayList<KeyboardRow> keyboardRows = new ArrayList<>();
+        KeyboardRow keyboardRow = new KeyboardRow();
+
+        for (Map.Entry<String, CommandTemplate> entry : commands.entrySet()) {
+            if (entry.getValue().getExpectedRole().contains(role)) {
+                keyboardRow.add(new KeyboardButton(entry.getValue().getName()));
+            }
+            if (keyboardRow.size()>=buttonOnLine) {
+                keyboardRows.add(keyboardRow);
+                keyboardRow = new KeyboardRow();
+            }
+        }
+        if (!keyboardRow.isEmpty()) {
+            keyboardRows.add(keyboardRow);
+        }
+        return keyboardRows;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/view/UiFormer.java

@@ -0,0 +1,7 @@
+package ru.ldeloff.servermonitorbot.view;
+
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+
+public interface UiFormer {
+    SendMessage uiForm(SendMessage message);
+}

src/main/resources/application.yml

@@ -1,7 +1,15 @@
+spring:
+  application:
+    name: ServerMonitorBot
 bot:
   name: "ServerMonitorBot"
   token: "token"
+  users:
+    - telegramId: 123456789
+      role: admin
 ssh:
+  checkConnectionDelay: 300000
+  timeout: 5000
   servers:
     -
       name: "Server Name"
@@ -9,6 +17,12 @@ ssh:
       port: 22
       user: "user"
       password: "pass"
+    -
+      name: "Server Name 2"
+      host: "url 2"
+      port: 22
+      user: "user 2"
+      password: "pass 2"