PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FEATURE (monitorings): Get rid of monitoring
Rostislav Duginfcc894d1f54a
diff --git a/backend/cmd/main.go b/backend/cmd/main.goindex ae100d5d..ef09ac96 100644--- a/backend/cmd/main.go+++ b/backend/cmd/main.go@@ -20,8 +20,6 @@ import ("postgresus-backend/internal/features/disk"healthcheck_attempt "postgresus-backend/internal/features/healthcheck/attempt"healthcheck_config "postgresus-backend/internal/features/healthcheck/config"- postgres_monitoring_metrics "postgresus-backend/internal/features/monitoring/postgres/metrics"- postgres_monitoring_settings "postgresus-backend/internal/features/monitoring/postgres/settings""postgresus-backend/internal/features/notifiers""postgresus-backend/internal/features/restores""postgresus-backend/internal/features/storages"@@ -160,8 +158,6 @@ func setUpRoutes(r *gin.Engine) {healthcheckAttemptController := healthcheck_attempt.GetHealthcheckAttemptController()diskController := disk.GetDiskController()backupConfigController := backups_config.GetBackupConfigController()- postgresMonitoringSettingsController := postgres_monitoring_settings.GetPostgresMonitoringSettingsController()- postgresMonitoringMetricsController := postgres_monitoring_metrics.GetPostgresMonitoringMetricsController()downdetectContoller.RegisterRoutes(v1)userController.RegisterRoutes(v1)@@ -175,15 +171,12 @@ func setUpRoutes(r *gin.Engine) {healthcheckConfigController.RegisterRoutes(v1)healthcheckAttemptController.RegisterRoutes(v1)backupConfigController.RegisterRoutes(v1)- postgresMonitoringSettingsController.RegisterRoutes(v1)- postgresMonitoringMetricsController.RegisterRoutes(v1)}func setUpDependencies() {backups.SetupDependencies()restores.SetupDependencies()healthcheck_config.SetupDependencies()- postgres_monitoring_settings.SetupDependencies()}func runBackgroundTasks(log *slog.Logger) {@@ -205,10 +198,6 @@ func runBackgroundTasks(log *slog.Logger) {go runWithPanicLogging(log, "healthcheck attempt background service", func() {healthcheck_attempt.GetHealthcheckAttemptBackgroundService().Run()})-- go runWithPanicLogging(log, "postgres monitoring metrics background service", func() {- postgres_monitoring_metrics.GetPostgresMonitoringMetricsBackgroundService().Run()- })}func runWithPanicLogging(log *slog.Logger, serviceName string, fn func()) {diff --git a/backend/internal/features/monitoring/postgres/collectors/db_monitoring_service.go b/backend/internal/features/monitoring/postgres/collectors/db_monitoring_service.godeleted file mode 100644index 02b8c050..00000000--- a/backend/internal/features/monitoring/postgres/collectors/db_monitoring_service.go+++ /dev/null@@ -1,292 +0,0 @@-package postgres_monitoring_collectors--import (- "context"- "fmt"- "log/slog"- "postgresus-backend/internal/config"- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/features/databases/databases/postgresql"- postgres_monitoring_metrics "postgresus-backend/internal/features/monitoring/postgres/metrics"- postgres_monitoring_settings "postgresus-backend/internal/features/monitoring/postgres/settings"- "sync"- "sync/atomic"- "time"-- "github.com/google/uuid"- "github.com/jackc/pgx/v5"-)--type DbMonitoringBackgroundService struct {- databaseService *databases.DatabaseService- monitoringSettingsService *postgres_monitoring_settings.PostgresMonitoringSettingsService- metricsService *postgres_monitoring_metrics.PostgresMonitoringMetricService- logger *slog.Logger- isRunning int32- lastRunTimes map[uuid.UUID]time.Time- lastRunTimesMutex sync.RWMutex-}--func (s *DbMonitoringBackgroundService) Run() {- for {- if config.IsShouldShutdown() {- s.logger.Info("stopping background monitoring tasks")- return- }-- s.processMonitoringTasks()- time.Sleep(1 * time.Second)- }-}--func (s *DbMonitoringBackgroundService) processMonitoringTasks() {- if !atomic.CompareAndSwapInt32(&s.isRunning, 0, 1) {- s.logger.Warn("skipping background task execution, previous task still running")- return- }- defer atomic.StoreInt32(&s.isRunning, 0)-- dbsWithEnabledDbMonitoring, err := s.monitoringSettingsService.GetAllDbsWithEnabledDbMonitoring()- if err != nil {- s.logger.Error("failed to get all databases with enabled db monitoring", "error", err)- return- }-- for _, dbSettings := range dbsWithEnabledDbMonitoring {- s.processDatabase(&dbSettings)- }-}--func (s *DbMonitoringBackgroundService) processDatabase(- settings *postgres_monitoring_settings.PostgresMonitoringSettings,-) {- db, err := s.databaseService.GetDatabaseByID(settings.DatabaseID)- if err != nil {- s.logger.Error("failed to get database by id", "error", err)- return- }-- if db.Type != databases.DatabaseTypePostgres {- return- }-- if !s.isReadyForNextRun(settings) {- return- }-- err = s.collectAndSaveMetrics(db, settings)- if err != nil {- s.logger.Error("failed to collect and save metrics", "error", err)- return- }-- s.updateLastRunTime(db)-}--func (s *DbMonitoringBackgroundService) collectAndSaveMetrics(- db *databases.Database,- settings *postgres_monitoring_settings.PostgresMonitoringSettings,-) error {- if db.Postgresql == nil {- return nil- }-- s.logger.Debug("collecting metrics for database", "database_id", db.ID)-- ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)- defer cancel()-- conn, err := s.connectToDatabase(ctx, db)- if err != nil {- return fmt.Errorf("failed to connect to database: %w", err)- }-- if conn == nil {- return nil- }-- defer func() {- if closeErr := conn.Close(ctx); closeErr != nil {- s.logger.Error("Failed to close connection", "error", closeErr)- }- }()-- var metrics []postgres_monitoring_metrics.PostgresMonitoringMetric- now := time.Now().UTC()-- if settings.IsDbResourcesMonitoringEnabled {- dbMetrics, err := s.collectDatabaseResourceMetrics(ctx, conn, db.ID, now)- if err != nil {- s.logger.Error("failed to collect database resource metrics", "error", err)- } else {- metrics = append(metrics, dbMetrics...)- }- }-- if len(metrics) > 0 {- if err := s.metricsService.Insert(metrics); err != nil {- return fmt.Errorf("failed to insert metrics: %w", err)- }- s.logger.Debug(- "successfully collected and saved metrics",- "count",- len(metrics),- "database_id",- db.ID,- )- }-- return nil-}--func (s *DbMonitoringBackgroundService) isReadyForNextRun(- settings *postgres_monitoring_settings.PostgresMonitoringSettings,-) bool {- s.lastRunTimesMutex.RLock()- defer s.lastRunTimesMutex.RUnlock()-- if s.lastRunTimes == nil {- return true- }-- lastRun, exists := s.lastRunTimes[settings.DatabaseID]- if !exists {- return true- }-- return time.Since(lastRun) >= time.Duration(settings.MonitoringIntervalSeconds)*time.Second-}--func (s *DbMonitoringBackgroundService) updateLastRunTime(db *databases.Database) {- s.lastRunTimesMutex.Lock()- defer s.lastRunTimesMutex.Unlock()-- if s.lastRunTimes == nil {- s.lastRunTimes = make(map[uuid.UUID]time.Time)- }- s.lastRunTimes[db.ID] = time.Now().UTC()-}--func (s *DbMonitoringBackgroundService) connectToDatabase(- ctx context.Context,- db *databases.Database,-) (*pgx.Conn, error) {- if db.Postgresql == nil {- return nil, nil- }-- if db.Postgresql.Database == nil || *db.Postgresql.Database == "" {- return nil, nil- }-- connStr := s.buildConnectionString(db.Postgresql)- return pgx.Connect(ctx, connStr)-}--func (s *DbMonitoringBackgroundService) buildConnectionString(- pg *postgresql.PostgresqlDatabase,-) string {- sslMode := "disable"- if pg.IsHttps {- sslMode = "require"- }-- return fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s",- pg.Host,- pg.Port,- pg.Username,- pg.Password,- *pg.Database,- sslMode,- )-}--func (s *DbMonitoringBackgroundService) collectDatabaseResourceMetrics(- ctx context.Context,- conn *pgx.Conn,- databaseID uuid.UUID,- timestamp time.Time,-) ([]postgres_monitoring_metrics.PostgresMonitoringMetric, error) {- var metrics []postgres_monitoring_metrics.PostgresMonitoringMetric-- // Collect I/O statistics- ioMetrics, err := s.collectIOMetrics(ctx, conn, databaseID, timestamp)- if err != nil {- s.logger.Warn("failed to collect I/O metrics", "error", err)- } else {- metrics = append(metrics, ioMetrics...)- }-- // Collect memory usage (approximation based on buffer usage)- ramMetric, err := s.collectRAMUsageMetric(ctx, conn, databaseID, timestamp)- if err != nil {- s.logger.Warn("failed to collect RAM usage metric", "error", err)- } else {- metrics = append(metrics, ramMetric)- }-- return metrics, nil-}--func (s *DbMonitoringBackgroundService) collectIOMetrics(- ctx context.Context,- conn *pgx.Conn,- databaseID uuid.UUID,- timestamp time.Time,-) ([]postgres_monitoring_metrics.PostgresMonitoringMetric, error) {- var blocksRead, blocksHit int64- query := `- SELECT- COALESCE(SUM(blks_read), 0) as total_reads,- COALESCE(SUM(blks_hit), 0) as total_hits- FROM pg_stat_database- WHERE datname = current_database()- `-- err := conn.QueryRow(ctx, query).Scan(&blocksRead, &blocksHit)- if err != nil {- return nil, err- }-- // Calculate I/O activity as total blocks accessed (PostgreSQL block size is typically 8KB)- const pgBlockSize = 8192 // 8KB- totalIOBytes := float64((blocksRead + blocksHit) * pgBlockSize)-- return []postgres_monitoring_metrics.PostgresMonitoringMetric{- {- DatabaseID: databaseID,- Metric: postgres_monitoring_metrics.MetricsTypeDbIO,- ValueType: postgres_monitoring_metrics.MetricsValueTypeByte,- Value: totalIOBytes,- CreatedAt: timestamp,- },- }, nil-}--func (s *DbMonitoringBackgroundService) collectRAMUsageMetric(- ctx context.Context,- conn *pgx.Conn,- databaseID uuid.UUID,- timestamp time.Time,-) (postgres_monitoring_metrics.PostgresMonitoringMetric, error) {- var sharedBuffers int64- query := `- SELECT- COALESCE(SUM(blks_hit), 0) * 8192 as buffer_usage- FROM pg_stat_database- WHERE datname = current_database()- `-- err := conn.QueryRow(ctx, query).Scan(&sharedBuffers)- if err != nil {- return postgres_monitoring_metrics.PostgresMonitoringMetric{}, err- }-- return postgres_monitoring_metrics.PostgresMonitoringMetric{- DatabaseID: databaseID,- Metric: postgres_monitoring_metrics.MetricsTypeDbRAM,- ValueType: postgres_monitoring_metrics.MetricsValueTypeByte,- Value: float64(sharedBuffers),- CreatedAt: timestamp,- }, nil-}diff --git a/backend/internal/features/monitoring/postgres/collectors/di.go b/backend/internal/features/monitoring/postgres/collectors/di.godeleted file mode 100644index e0221ef9..00000000--- a/backend/internal/features/monitoring/postgres/collectors/di.go+++ /dev/null@@ -1,23 +0,0 @@-package postgres_monitoring_collectors--import (- "postgresus-backend/internal/features/databases"- postgres_monitoring_metrics "postgresus-backend/internal/features/monitoring/postgres/metrics"- postgres_monitoring_settings "postgresus-backend/internal/features/monitoring/postgres/settings"- "postgresus-backend/internal/util/logger"- "sync"-)--var dbMonitoringBackgroundService = &DbMonitoringBackgroundService{- databases.GetDatabaseService(),- postgres_monitoring_settings.GetPostgresMonitoringSettingsService(),- postgres_monitoring_metrics.GetPostgresMonitoringMetricsService(),- logger.GetLogger(),- 0,- nil,- sync.RWMutex{},-}--func GetDbMonitoringBackgroundService() *DbMonitoringBackgroundService {- return dbMonitoringBackgroundService-}diff --git a/backend/internal/features/monitoring/postgres/metrics/background_service.go b/backend/internal/features/monitoring/postgres/metrics/background_service.godeleted file mode 100644index 11ce69e5..00000000--- a/backend/internal/features/monitoring/postgres/metrics/background_service.go+++ /dev/null@@ -1,33 +0,0 @@-package postgres_monitoring_metrics--import (- "postgresus-backend/internal/config"- "postgresus-backend/internal/util/logger"- "time"-)--var log = logger.GetLogger()--type PostgresMonitoringMetricsBackgroundService struct {- metricsRepository *PostgresMonitoringMetricRepository-}--func (s *PostgresMonitoringMetricsBackgroundService) Run() {- for {- if config.IsShouldShutdown() {- return- }-- s.RemoveOldMetrics()-- time.Sleep(5 * time.Minute)- }-}--func (s *PostgresMonitoringMetricsBackgroundService) RemoveOldMetrics() {- monthAgo := time.Now().UTC().Add(-3 * 30 * 24 * time.Hour)-- if err := s.metricsRepository.RemoveOlderThan(monthAgo); err != nil {- log.Error("Failed to remove old metrics", "error", err)- }-}diff --git a/backend/internal/features/monitoring/postgres/metrics/controller.go b/backend/internal/features/monitoring/postgres/metrics/controller.godeleted file mode 100644index 40c939e0..00000000--- a/backend/internal/features/monitoring/postgres/metrics/controller.go+++ /dev/null@@ -1,62 +0,0 @@-package postgres_monitoring_metrics--import (- "net/http"- "postgresus-backend/internal/features/users"-- "github.com/gin-gonic/gin"-)--type PostgresMonitoringMetricsController struct {- metricsService *PostgresMonitoringMetricService- userService *users.UserService-}--func (c *PostgresMonitoringMetricsController) RegisterRoutes(router *gin.RouterGroup) {- router.POST("/postgres-monitoring-metrics/get", c.GetMetrics)-}--// GetMetrics-// @Summary Get postgres monitoring metrics-// @Description Get postgres monitoring metrics for a database within a time range-// @Tags postgres-monitoring-metrics-// @Accept json-// @Produce json-// @Param request body GetMetricsRequest true "Metrics request data"-// @Success 200 {object} []PostgresMonitoringMetric-// @Failure 400-// @Failure 401-// @Router /postgres-monitoring-metrics/get [post]-func (c *PostgresMonitoringMetricsController) GetMetrics(ctx *gin.Context) {- var requestDTO GetMetricsRequest- if err := ctx.ShouldBindJSON(&requestDTO); err != nil {- ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})- return- }-- authorizationHeader := ctx.GetHeader("Authorization")- if authorizationHeader == "" {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "authorization header is required"})- return- }-- user, err := c.userService.GetUserFromToken(authorizationHeader)- if err != nil {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})- return- }-- metrics, err := c.metricsService.GetMetrics(- user,- requestDTO.DatabaseID,- requestDTO.MetricType,- requestDTO.From,- requestDTO.To,- )- if err != nil {- ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})- return- }-- ctx.JSON(http.StatusOK, metrics)-}diff --git a/backend/internal/features/monitoring/postgres/metrics/di.go b/backend/internal/features/monitoring/postgres/metrics/di.godeleted file mode 100644index a883fe7e..00000000--- a/backend/internal/features/monitoring/postgres/metrics/di.go+++ /dev/null@@ -1,35 +0,0 @@-package postgres_monitoring_metrics--import (- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/features/users"-)--var metricsRepository = &PostgresMonitoringMetricRepository{}-var metricsService = &PostgresMonitoringMetricService{- metricsRepository,- databases.GetDatabaseService(),-}-var metricsController = &PostgresMonitoringMetricsController{- metricsService,- users.GetUserService(),-}-var metricsBackgroundService = &PostgresMonitoringMetricsBackgroundService{- metricsRepository,-}--func GetPostgresMonitoringMetricsController() *PostgresMonitoringMetricsController {- return metricsController-}--func GetPostgresMonitoringMetricsService() *PostgresMonitoringMetricService {- return metricsService-}--func GetPostgresMonitoringMetricsRepository() *PostgresMonitoringMetricRepository {- return metricsRepository-}--func GetPostgresMonitoringMetricsBackgroundService() *PostgresMonitoringMetricsBackgroundService {- return metricsBackgroundService-}diff --git a/backend/internal/features/monitoring/postgres/metrics/dto.go b/backend/internal/features/monitoring/postgres/metrics/dto.godeleted file mode 100644index cc2d22b5..00000000--- a/backend/internal/features/monitoring/postgres/metrics/dto.go+++ /dev/null@@ -1,14 +0,0 @@-package postgres_monitoring_metrics--import (- "time"-- "github.com/google/uuid"-)--type GetMetricsRequest struct {- DatabaseID uuid.UUID `json:"databaseId" binding:"required"`- MetricType PostgresMonitoringMetricType `json:"metricType"`- From time.Time `json:"from" binding:"required"`- To time.Time `json:"to" binding:"required"`-}diff --git a/backend/internal/features/monitoring/postgres/metrics/enums.go b/backend/internal/features/monitoring/postgres/metrics/enums.godeleted file mode 100644index 3d9a0068..00000000--- a/backend/internal/features/monitoring/postgres/metrics/enums.go+++ /dev/null@@ -1,16 +0,0 @@-package postgres_monitoring_metrics--type PostgresMonitoringMetricType string--const (- // db resources (don't need extensions)- MetricsTypeDbRAM PostgresMonitoringMetricType = "DB_RAM_USAGE"- MetricsTypeDbIO PostgresMonitoringMetricType = "DB_IO_USAGE"-)--type PostgresMonitoringMetricValueType string--const (- MetricsValueTypeByte PostgresMonitoringMetricValueType = "BYTE"- MetricsValueTypePercent PostgresMonitoringMetricValueType = "PERCENT"-)diff --git a/backend/internal/features/monitoring/postgres/metrics/model.go b/backend/internal/features/monitoring/postgres/metrics/model.godeleted file mode 100644index d1350540..00000000--- a/backend/internal/features/monitoring/postgres/metrics/model.go+++ /dev/null@@ -1,20 +0,0 @@-package postgres_monitoring_metrics--import (- "time"-- "github.com/google/uuid"-)--type PostgresMonitoringMetric struct {- ID uuid.UUID `json:"id" gorm:"column:id;primaryKey;type:uuid;default:gen_random_uuid()"`- DatabaseID uuid.UUID `json:"databaseId" gorm:"column:database_id;not null;type:uuid"`- Metric PostgresMonitoringMetricType `json:"metric" gorm:"column:metric;not null"`- ValueType PostgresMonitoringMetricValueType `json:"valueType" gorm:"column:value_type;not null"`- Value float64 `json:"value" gorm:"column:value;not null"`- CreatedAt time.Time `json:"createdAt" gorm:"column:created_at;not null"`-}--func (p *PostgresMonitoringMetric) TableName() string {- return "postgres_monitoring_metrics"-}diff --git a/backend/internal/features/monitoring/postgres/metrics/repository.go b/backend/internal/features/monitoring/postgres/metrics/repository.godeleted file mode 100644index 1540547e..00000000--- a/backend/internal/features/monitoring/postgres/metrics/repository.go+++ /dev/null@@ -1,45 +0,0 @@-package postgres_monitoring_metrics--import (- "postgresus-backend/internal/storage"- "time"-- "github.com/google/uuid"-)--type PostgresMonitoringMetricRepository struct{}--func (r *PostgresMonitoringMetricRepository) Insert(metrics []PostgresMonitoringMetric) error {- return storage.GetDb().Create(&metrics).Error-}--func (r *PostgresMonitoringMetricRepository) GetByMetrics(- databaseID uuid.UUID,- metricType PostgresMonitoringMetricType,- from time.Time,- to time.Time,-) ([]PostgresMonitoringMetric, error) {- var metrics []PostgresMonitoringMetric-- query := storage.GetDb().- Where("database_id = ?", databaseID).- Where("created_at >= ?", from).- Where("created_at <= ?", to).- Where("metric = ?", metricType)-- if err := query.- Order("created_at DESC").- Find(&metrics).Error; err != nil {- return nil, err- }-- return metrics, nil-}--func (r *PostgresMonitoringMetricRepository) RemoveOlderThan(- olderThan time.Time,-) error {- return storage.GetDb().- Where("created_at < ?", olderThan).- Delete(&PostgresMonitoringMetric{}).Error-}diff --git a/backend/internal/features/monitoring/postgres/metrics/service.go b/backend/internal/features/monitoring/postgres/metrics/service.godeleted file mode 100644index ba148de5..00000000--- a/backend/internal/features/monitoring/postgres/metrics/service.go+++ /dev/null@@ -1,42 +0,0 @@-package postgres_monitoring_metrics--import (- "errors"- "postgresus-backend/internal/features/databases"- users_models "postgresus-backend/internal/features/users/models"- "time"-- "github.com/google/uuid"-)--type PostgresMonitoringMetricService struct {- metricsRepository *PostgresMonitoringMetricRepository- databaseService *databases.DatabaseService-}--func (s *PostgresMonitoringMetricService) Insert(metrics []PostgresMonitoringMetric) error {- if len(metrics) == 0 {- return nil- }-- return s.metricsRepository.Insert(metrics)-}--func (s *PostgresMonitoringMetricService) GetMetrics(- user *users_models.User,- databaseID uuid.UUID,- metricType PostgresMonitoringMetricType,- from time.Time,- to time.Time,-) ([]PostgresMonitoringMetric, error) {- database, err := s.databaseService.GetDatabaseByID(databaseID)- if err != nil {- return nil, err- }-- if database.UserID != user.ID {- return nil, errors.New("database not found")- }-- return s.metricsRepository.GetByMetrics(databaseID, metricType, from, to)-}diff --git a/backend/internal/features/monitoring/postgres/metrics/service_test.go b/backend/internal/features/monitoring/postgres/metrics/service_test.godeleted file mode 100644index 0fdfe50b..00000000--- a/backend/internal/features/monitoring/postgres/metrics/service_test.go+++ /dev/null@@ -1,227 +0,0 @@-package postgres_monitoring_metrics--import (- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/features/notifiers"- "postgresus-backend/internal/features/storages"- "postgresus-backend/internal/features/users"- users_models "postgresus-backend/internal/features/users/models"- "testing"- "time"-- "github.com/google/uuid"- "github.com/stretchr/testify/assert"-)--// Helper function to get a proper users_models.User for testing-func getTestUserModel() *users_models.User {- signInResponse := users.GetTestUser()-- // Get the user service to retrieve the full user model- userService := users.GetUserService()- user, err := userService.GetFirstUser()- if err != nil {- panic(err)- }-- // Verify we got the right user- if user.ID != signInResponse.UserID {- panic("user ID mismatch")- }-- return user-}--func Test_GetMetrics_MetricsReturned(t *testing.T) {- // Setup test data- testUser := getTestUserModel()- testUserResponse := users.GetTestUser()- storage := storages.CreateTestStorage(testUserResponse.UserID)- notifier := notifiers.CreateTestNotifier(testUserResponse.UserID)- database := databases.CreateTestDatabase(testUserResponse.UserID, storage, notifier)-- defer storages.RemoveTestStorage(storage.ID)- defer notifiers.RemoveTestNotifier(notifier)- defer databases.RemoveTestDatabase(database)-- // Get service and repository- service := GetPostgresMonitoringMetricsService()- repository := GetPostgresMonitoringMetricsRepository()-- // Create test metrics- now := time.Now().UTC()- testMetrics := []PostgresMonitoringMetric{- {- DatabaseID: database.ID,- Metric: MetricsTypeDbRAM,- ValueType: MetricsValueTypeByte,- Value: 1024000,- CreatedAt: now.Add(-2 * time.Hour),- },- {- DatabaseID: database.ID,- Metric: MetricsTypeDbRAM,- ValueType: MetricsValueTypeByte,- Value: 2048000,- CreatedAt: now.Add(-1 * time.Hour),- },- }-- // Insert test metrics- err := repository.Insert(testMetrics)- assert.NoError(t, err)-- // Test getting DB RAM metrics- from := now.Add(-3 * time.Hour)- to := now-- metrics, err := service.GetMetrics(testUser, database.ID, MetricsTypeDbRAM, from, to)- assert.NoError(t, err)- assert.Len(t, metrics, 2)-- // Verify metrics are ordered by created_at DESC- assert.True(t, metrics[0].CreatedAt.After(metrics[1].CreatedAt))- assert.Equal(t, float64(2048000), metrics[0].Value)- assert.Equal(t, float64(1024000), metrics[1].Value)- assert.Equal(t, MetricsTypeDbRAM, metrics[0].Metric)- assert.Equal(t, MetricsValueTypeByte, metrics[0].ValueType)-- // Test access control - create another user and test they can't access this database- anotherUser := &users_models.User{- ID: uuid.New(),- }-- _, err = service.GetMetrics(anotherUser, database.ID, MetricsTypeDbRAM, from, to)- assert.Error(t, err)- assert.Contains(t, err.Error(), "database not found")-- // Test with non-existent database- nonExistentDbID := uuid.New()- _, err = service.GetMetrics(testUser, nonExistentDbID, MetricsTypeDbRAM, from, to)- assert.Error(t, err)-}--func Test_GetMetricsWithPagination_PaginationWorks(t *testing.T) {- // Setup test data- testUser := getTestUserModel()- testUserResponse := users.GetTestUser()- storage := storages.CreateTestStorage(testUserResponse.UserID)- notifier := notifiers.CreateTestNotifier(testUserResponse.UserID)- database := databases.CreateTestDatabase(testUserResponse.UserID, storage, notifier)-- defer storages.RemoveTestStorage(storage.ID)- defer notifiers.RemoveTestNotifier(notifier)- defer databases.RemoveTestDatabase(database)-- // Get repository and service- repository := GetPostgresMonitoringMetricsRepository()- service := GetPostgresMonitoringMetricsService()-- // Create many test metrics for pagination testing- now := time.Now().UTC()- testMetrics := []PostgresMonitoringMetric{}-- for i := 0; i < 25; i++ {- testMetrics = append(testMetrics, PostgresMonitoringMetric{- DatabaseID: database.ID,- Metric: MetricsTypeDbRAM,- ValueType: MetricsValueTypeByte,- Value: float64(1000000 + i*100000),- CreatedAt: now.Add(-time.Duration(i) * time.Minute),- })- }-- // Insert test metrics- err := repository.Insert(testMetrics)- assert.NoError(t, err)-- // Test getting all metrics via service (should return all 25)- from := now.Add(-30 * time.Minute)- to := now-- allMetrics, err := service.GetMetrics(testUser, database.ID, MetricsTypeDbRAM, from, to)- assert.NoError(t, err)- assert.Len(t, allMetrics, 25)-- // Verify they are ordered by created_at DESC (most recent first)- for i := 0; i < len(allMetrics)-1; i++ {- assert.True(t, allMetrics[i].CreatedAt.After(allMetrics[i+1].CreatedAt) ||- allMetrics[i].CreatedAt.Equal(allMetrics[i+1].CreatedAt))- }-- // Note: Since the current repository doesn't have pagination methods,- // this test demonstrates the need for pagination but tests current behavior.- // TODO: Add GetByMetricsWithLimit method to repository and update service- t.Logf("All metrics count: %d (pagination methods should be added)", len(allMetrics))-}--func Test_GetMetricsWithFilterByType_FilterWorks(t *testing.T) {- // Setup test data- testUser := getTestUserModel()- testUserResponse := users.GetTestUser()- storage := storages.CreateTestStorage(testUserResponse.UserID)- notifier := notifiers.CreateTestNotifier(testUserResponse.UserID)- database := databases.CreateTestDatabase(testUserResponse.UserID, storage, notifier)-- defer storages.RemoveTestStorage(storage.ID)- defer notifiers.RemoveTestNotifier(notifier)- defer databases.RemoveTestDatabase(database)-- // Get service and repository- service := GetPostgresMonitoringMetricsService()- repository := GetPostgresMonitoringMetricsRepository()-- // Create test metrics of different types- now := time.Now().UTC()- testMetrics := []PostgresMonitoringMetric{- // DB RAM metrics- {- DatabaseID: database.ID,- Metric: MetricsTypeDbRAM,- ValueType: MetricsValueTypeByte,- Value: 1024000,- CreatedAt: now.Add(-2 * time.Hour),- },- {- DatabaseID: database.ID,- Metric: MetricsTypeDbRAM,- ValueType: MetricsValueTypeByte,- Value: 2048000,- CreatedAt: now.Add(-1 * time.Hour),- },- }-- // Insert test metrics- err := repository.Insert(testMetrics)- assert.NoError(t, err)-- from := now.Add(-3 * time.Hour)- to := now-- // Test filtering by DB RAM type- ramMetrics, err := service.GetMetrics(testUser, database.ID, MetricsTypeDbRAM, from, to)- assert.NoError(t, err)- assert.Len(t, ramMetrics, 2)- for _, metric := range ramMetrics {- assert.Equal(t, MetricsTypeDbRAM, metric.Metric)- assert.Equal(t, MetricsValueTypeByte, metric.ValueType)- }-- // Test filtering by non-existent metric type (should return empty)- ioMetrics, err := service.GetMetrics(testUser, database.ID, MetricsTypeDbIO, from, to)- assert.NoError(t, err)- assert.Len(t, ioMetrics, 0)-- // Test time filtering - get only recent metrics (last hour)- recentFrom := now.Add(-1 * time.Hour)- recentRamMetrics, err := service.GetMetrics(- testUser,- database.ID,- MetricsTypeDbRAM,- recentFrom,- to,- )- assert.NoError(t, err)- assert.Len(t, recentRamMetrics, 1) // Only the metric from 1 hour ago- assert.Equal(t, float64(2048000), recentRamMetrics[0].Value)-}diff --git a/backend/internal/features/monitoring/postgres/settings/controller.go b/backend/internal/features/monitoring/postgres/settings/controller.godeleted file mode 100644index 989756e1..00000000--- a/backend/internal/features/monitoring/postgres/settings/controller.go+++ /dev/null@@ -1,97 +0,0 @@-package postgres_monitoring_settings--import (- "net/http"- "postgresus-backend/internal/features/users"-- "github.com/gin-gonic/gin"- "github.com/google/uuid"-)--type PostgresMonitoringSettingsController struct {- postgresMonitoringSettingsService *PostgresMonitoringSettingsService- userService *users.UserService-}--func (c *PostgresMonitoringSettingsController) RegisterRoutes(router *gin.RouterGroup) {- router.POST("/postgres-monitoring-settings/save", c.SaveSettings)- router.GET("/postgres-monitoring-settings/database/:id", c.GetSettingsByDbID)-}--// SaveSettings-// @Summary Save postgres monitoring settings-// @Description Save or update postgres monitoring settings for a database-// @Tags postgres-monitoring-settings-// @Accept json-// @Produce json-// @Param request body PostgresMonitoringSettings true "Postgres monitoring settings data"-// @Success 200 {object} PostgresMonitoringSettings-// @Failure 400-// @Failure 401-// @Router /postgres-monitoring-settings/save [post]-func (c *PostgresMonitoringSettingsController) SaveSettings(ctx *gin.Context) {- var requestDTO PostgresMonitoringSettings- if err := ctx.ShouldBindJSON(&requestDTO); err != nil {- ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})- return- }-- authorizationHeader := ctx.GetHeader("Authorization")- if authorizationHeader == "" {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "authorization header is required"})- return- }-- user, err := c.userService.GetUserFromToken(authorizationHeader)- if err != nil {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})- return- }-- err = c.postgresMonitoringSettingsService.Save(user, &requestDTO)- if err != nil {- ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})- return- }-- ctx.JSON(http.StatusOK, requestDTO)-}--// GetSettingsByDbID-// @Summary Get postgres monitoring settings by database ID-// @Description Get postgres monitoring settings for a specific database-// @Tags postgres-monitoring-settings-// @Produce json-// @Param id path string true "Database ID"-// @Success 200 {object} PostgresMonitoringSettings-// @Failure 400-// @Failure 401-// @Failure 404-// @Router /postgres-monitoring-settings/database/{id} [get]-func (c *PostgresMonitoringSettingsController) GetSettingsByDbID(ctx *gin.Context) {- dbID := ctx.Param("id")- if dbID == "" {- ctx.JSON(http.StatusBadRequest, gin.H{"error": "database ID is required"})- return- }-- authorizationHeader := ctx.GetHeader("Authorization")- if authorizationHeader == "" {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "authorization header is required"})- return- }-- user, err := c.userService.GetUserFromToken(authorizationHeader)- if err != nil {- ctx.JSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})- return- }-- settings, err := c.postgresMonitoringSettingsService.GetByDbID(user, uuid.MustParse(dbID))- if err != nil {- ctx.JSON(http.StatusNotFound, gin.H{"error": "postgres monitoring settings not found"})- return- }-- ctx.JSON(http.StatusOK, settings)-}diff --git a/backend/internal/features/monitoring/postgres/settings/di.go b/backend/internal/features/monitoring/postgres/settings/di.godeleted file mode 100644index 1508dd5b..00000000--- a/backend/internal/features/monitoring/postgres/settings/di.go+++ /dev/null@@ -1,32 +0,0 @@-package postgres_monitoring_settings--import (- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/features/users"-)--var postgresMonitoringSettingsRepository = &PostgresMonitoringSettingsRepository{}-var postgresMonitoringSettingsService = &PostgresMonitoringSettingsService{- databases.GetDatabaseService(),- postgresMonitoringSettingsRepository,-}-var postgresMonitoringSettingsController = &PostgresMonitoringSettingsController{- postgresMonitoringSettingsService,- users.GetUserService(),-}--func GetPostgresMonitoringSettingsController() *PostgresMonitoringSettingsController {- return postgresMonitoringSettingsController-}--func GetPostgresMonitoringSettingsService() *PostgresMonitoringSettingsService {- return postgresMonitoringSettingsService-}--func GetPostgresMonitoringSettingsRepository() *PostgresMonitoringSettingsRepository {- return postgresMonitoringSettingsRepository-}--func SetupDependencies() {- databases.GetDatabaseService().AddDbCreationListener(postgresMonitoringSettingsService)-}diff --git a/backend/internal/features/monitoring/postgres/settings/model.go b/backend/internal/features/monitoring/postgres/settings/model.godeleted file mode 100644index 45e0b407..00000000--- a/backend/internal/features/monitoring/postgres/settings/model.go+++ /dev/null@@ -1,72 +0,0 @@-package postgres_monitoring_settings--import (- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/util/tools"- "strings"-- "github.com/google/uuid"- "gorm.io/gorm"-)--type PostgresMonitoringSettings struct {- DatabaseID uuid.UUID `json:"databaseId" gorm:"primaryKey;column:database_id;not null"`- Database *databases.Database `json:"database" gorm:"foreignKey:DatabaseID"`-- IsDbResourcesMonitoringEnabled bool `json:"isDbResourcesMonitoringEnabled" gorm:"column:is_db_resources_monitoring_enabled;not null"`- MonitoringIntervalSeconds int64 `json:"monitoringIntervalSeconds" gorm:"column:monitoring_interval_seconds;not null"`-- InstalledExtensions []tools.PostgresqlExtension `json:"installedExtensions" gorm:"-"`- InstalledExtensionsRaw string `json:"-" gorm:"column:installed_extensions_raw"`-}--func (p *PostgresMonitoringSettings) TableName() string {- return "postgres_monitoring_settings"-}--func (p *PostgresMonitoringSettings) AfterFind(tx *gorm.DB) error {- if p.InstalledExtensionsRaw != "" {- rawExtensions := strings.Split(p.InstalledExtensionsRaw, ",")-- p.InstalledExtensions = make([]tools.PostgresqlExtension, len(rawExtensions))-- for i, ext := range rawExtensions {- p.InstalledExtensions[i] = tools.PostgresqlExtension(ext)- }- } else {- p.InstalledExtensions = []tools.PostgresqlExtension{}- }-- return nil-}--func (p *PostgresMonitoringSettings) BeforeSave(tx *gorm.DB) error {- extensions := make([]string, len(p.InstalledExtensions))-- for i, ext := range p.InstalledExtensions {- extensions[i] = string(ext)- }-- p.InstalledExtensionsRaw = strings.Join(extensions, ",")-- return nil-}--func (p *PostgresMonitoringSettings) AddInstalledExtensions(- extensions []tools.PostgresqlExtension,-) {- for _, ext := range extensions {- exists := false-- for _, existing := range p.InstalledExtensions {- if existing == ext {- exists = true- break- }- }-- if !exists {- p.InstalledExtensions = append(p.InstalledExtensions, ext)- }- }-}diff --git a/backend/internal/features/monitoring/postgres/settings/repository.go b/backend/internal/features/monitoring/postgres/settings/repository.godeleted file mode 100644index 838ec741..00000000--- a/backend/internal/features/monitoring/postgres/settings/repository.go+++ /dev/null@@ -1,65 +0,0 @@-package postgres_monitoring_settings--import (- "errors"- "postgresus-backend/internal/storage"-- "github.com/google/uuid"- "gorm.io/gorm"-)--type PostgresMonitoringSettingsRepository struct{}--func (r *PostgresMonitoringSettingsRepository) Save(settings *PostgresMonitoringSettings) error {- return storage.GetDb().Save(settings).Error-}--func (r *PostgresMonitoringSettingsRepository) GetByDbID(- dbID uuid.UUID,-) (*PostgresMonitoringSettings, error) {- var settings PostgresMonitoringSettings-- if err := storage.- GetDb().- Where("database_id = ?", dbID).- First(&settings).Error; err != nil {- return nil, err- }-- return &settings, nil-}--func (r *PostgresMonitoringSettingsRepository) GetByDbIDWithRelations(- dbID uuid.UUID,-) (*PostgresMonitoringSettings, error) {- var settings PostgresMonitoringSettings-- if err := storage.- GetDb().- Preload("Database").- Where("database_id = ?", dbID).- First(&settings).Error; err != nil {- if errors.Is(err, gorm.ErrRecordNotFound) {- return nil, nil- }-- return nil, err- }-- return &settings, nil-}--func (r *PostgresMonitoringSettingsRepository) GetAllDbsWithEnabledDbMonitoring() (- []PostgresMonitoringSettings, error,-) {- var settings []PostgresMonitoringSettings-- if err := storage.- GetDb().- Where("is_db_resources_monitoring_enabled = ?", true).- Find(&settings).Error; err != nil {- return nil, err- }-- return settings, nil-}diff --git a/backend/internal/features/monitoring/postgres/settings/service.go b/backend/internal/features/monitoring/postgres/settings/service.godeleted file mode 100644index 61ce01c7..00000000--- a/backend/internal/features/monitoring/postgres/settings/service.go+++ /dev/null@@ -1,92 +0,0 @@-package postgres_monitoring_settings--import (- "errors"- "postgresus-backend/internal/features/databases"- users_models "postgresus-backend/internal/features/users/models"- "postgresus-backend/internal/util/logger"-- "github.com/google/uuid"-)--var log = logger.GetLogger()--type PostgresMonitoringSettingsService struct {- databaseService *databases.DatabaseService- postgresMonitoringSettingsRepository *PostgresMonitoringSettingsRepository-}--func (s *PostgresMonitoringSettingsService) OnDatabaseCreated(dbID uuid.UUID) {- db, err := s.databaseService.GetDatabaseByID(dbID)- if err != nil {- return- }-- if db.Type != databases.DatabaseTypePostgres {- return- }-- settings := &PostgresMonitoringSettings{- DatabaseID: dbID,- IsDbResourcesMonitoringEnabled: true,- MonitoringIntervalSeconds: 60,- }-- err = s.postgresMonitoringSettingsRepository.Save(settings)- if err != nil {- log.Error("failed to save postgres monitoring settings", "error", err)- }-}--func (s *PostgresMonitoringSettingsService) Save(- user *users_models.User,- settings *PostgresMonitoringSettings,-) error {- db, err := s.databaseService.GetDatabaseByID(settings.DatabaseID)- if err != nil {- return err- }-- if db.UserID != user.ID {- return errors.New("user does not have access to this database")- }-- return s.postgresMonitoringSettingsRepository.Save(settings)-}--func (s *PostgresMonitoringSettingsService) GetByDbID(- user *users_models.User,- dbID uuid.UUID,-) (*PostgresMonitoringSettings, error) {- dbSettings, err := s.postgresMonitoringSettingsRepository.GetByDbIDWithRelations(dbID)- if err != nil {- return nil, err- }-- if dbSettings == nil {- s.OnDatabaseCreated(dbID)-- dbSettings, err := s.postgresMonitoringSettingsRepository.GetByDbIDWithRelations(dbID)- if err != nil {- return nil, err- }-- if dbSettings == nil {- return nil, errors.New("postgres monitoring settings not found")- }-- return s.GetByDbID(user, dbID)- }-- if dbSettings.Database.UserID != user.ID {- return nil, errors.New("user does not have access to this database")- }-- return dbSettings, nil-}--func (s *PostgresMonitoringSettingsService) GetAllDbsWithEnabledDbMonitoring() (- []PostgresMonitoringSettings, error,-) {- return s.postgresMonitoringSettingsRepository.GetAllDbsWithEnabledDbMonitoring()-}diff --git a/backend/internal/features/monitoring/postgres/settings/service_test.go b/backend/internal/features/monitoring/postgres/settings/service_test.godeleted file mode 100644index c9924d75..00000000--- a/backend/internal/features/monitoring/postgres/settings/service_test.go+++ /dev/null@@ -1,108 +0,0 @@-package postgres_monitoring_settings--import (- "postgresus-backend/internal/features/databases"- "postgresus-backend/internal/features/notifiers"- "postgresus-backend/internal/features/storages"- "postgresus-backend/internal/features/users"- users_models "postgresus-backend/internal/features/users/models"- "testing"-- "github.com/google/uuid"- "github.com/stretchr/testify/assert"-)--// Helper function to get a proper users_models.User for testing-func getTestUserModel() *users_models.User {- signInResponse := users.GetTestUser()-- // Get the user service to retrieve the full user model- userService := users.GetUserService()- user, err := userService.GetFirstUser()- if err != nil {- panic(err)- }-- // Verify we got the right user- if user.ID != signInResponse.UserID {- panic("user ID mismatch")- }-- return user-}--func Test_DatabaseCreated_SettingsCreated(t *testing.T) {- // Get or create a test user- testUserResponse := users.GetTestUser()- storage := storages.CreateTestStorage(testUserResponse.UserID)- notifier := notifiers.CreateTestNotifier(testUserResponse.UserID)- database := databases.CreateTestDatabase(testUserResponse.UserID, storage, notifier)-- defer storages.RemoveTestStorage(storage.ID)- defer notifiers.RemoveTestNotifier(notifier)- defer databases.RemoveTestDatabase(database)-- // Get the monitoring settings service- service := GetPostgresMonitoringSettingsService()-- // Execute - trigger the database creation event- service.OnDatabaseCreated(database.ID)-- // Verify settings were created by attempting to retrieve them- // Note: Since we can't easily mock the extension installation without major changes,- // we focus on testing the settings creation and default values logic- settingsRepo := GetPostgresMonitoringSettingsRepository()- settings, err := settingsRepo.GetByDbID(database.ID)- assert.NoError(t, err)- assert.NotNil(t, settings)-- // Verify default settings values- assert.Equal(t, database.ID, settings.DatabaseID)- assert.Equal(t, int64(60), settings.MonitoringIntervalSeconds)- assert.True(t, settings.IsDbResourcesMonitoringEnabled) // Always enabled-}--func Test_GetSettingsByDbID_SettingsReturned(t *testing.T) {- // Get or create a test user- testUser := getTestUserModel()- testUserResponse := users.GetTestUser()- storage := storages.CreateTestStorage(testUserResponse.UserID)- notifier := notifiers.CreateTestNotifier(testUserResponse.UserID)- database := databases.CreateTestDatabase(testUserResponse.UserID, storage, notifier)-- defer storages.RemoveTestStorage(storage.ID)- defer notifiers.RemoveTestNotifier(notifier)- defer databases.RemoveTestDatabase(database)-- service := GetPostgresMonitoringSettingsService()-- // Test 1: Get settings that don't exist yet - should auto-create them- settings, err := service.GetByDbID(testUser, database.ID)- assert.NoError(t, err)- assert.NotNil(t, settings)- assert.Equal(t, database.ID, settings.DatabaseID)- assert.Equal(t, int64(60), settings.MonitoringIntervalSeconds)- assert.True(t, settings.IsDbResourcesMonitoringEnabled) // Always enabled-- // Test 2: Get settings that already exist- existingSettings, err := service.GetByDbID(testUser, database.ID)- assert.NoError(t, err)- assert.NotNil(t, existingSettings)- assert.Equal(t, settings.DatabaseID, existingSettings.DatabaseID)- assert.Equal(t, settings.MonitoringIntervalSeconds, existingSettings.MonitoringIntervalSeconds)-- // Test 3: Access control - create another user and test they can't access this database- anotherUser := &users_models.User{- ID: uuid.New(),- // Other fields can be empty for this test- }-- _, err = service.GetByDbID(anotherUser, database.ID)- assert.Error(t, err)- assert.Contains(t, err.Error(), "user does not have access to this database")-- // Test 4: Try to get settings for non-existent database- nonExistentDbID := uuid.New()- _, err = service.GetByDbID(testUser, nonExistentDbID)- assert.Error(t, err) // Should fail because database doesn't exist-}diff --git a/frontend/src/entity/monitoring/index.ts b/frontend/src/entity/monitoring/index.tsdeleted file mode 100644index 504eea38..00000000--- a/frontend/src/entity/monitoring/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from './metrics';-export * from './settings';diff --git a/frontend/src/entity/monitoring/metrics/api/metricsApi.ts b/frontend/src/entity/monitoring/metrics/api/metricsApi.tsdeleted file mode 100644index 72bdf337..00000000--- a/frontend/src/entity/monitoring/metrics/api/metricsApi.ts+++ /dev/null@@ -1,16 +0,0 @@-import { getApplicationServer } from '../../../../constants';-import RequestOptions from '../../../../shared/api/RequestOptions';-import { apiHelper } from '../../../../shared/api/apiHelper';-import type { GetMetricsRequest } from '../model/GetMetricsRequest';-import type { PostgresMonitoringMetric } from '../model/PostgresMonitoringMetric';--export const metricsApi = {- async getMetrics(request: GetMetricsRequest): Promise<PostgresMonitoringMetric[]> {- const requestOptions: RequestOptions = new RequestOptions();- requestOptions.setBody(JSON.stringify(request));- return apiHelper.fetchPostJson<PostgresMonitoringMetric[]>(- `${getApplicationServer()}/api/v1/postgres-monitoring-metrics/get`,- requestOptions,- );- },-};diff --git a/frontend/src/entity/monitoring/metrics/index.ts b/frontend/src/entity/monitoring/metrics/index.tsdeleted file mode 100644index d197bfba..00000000--- a/frontend/src/entity/monitoring/metrics/index.ts+++ /dev/null@@ -1,5 +0,0 @@-export { metricsApi } from './api/metricsApi';-export type { PostgresMonitoringMetric } from './model/PostgresMonitoringMetric';-export type { GetMetricsRequest } from './model/GetMetricsRequest';-export { PostgresMonitoringMetricType } from './model/PostgresMonitoringMetricType';-export { PostgresMonitoringMetricValueType } from './model/PostgresMonitoringMetricValueType';diff --git a/frontend/src/entity/monitoring/metrics/model/GetMetricsRequest.ts b/frontend/src/entity/monitoring/metrics/model/GetMetricsRequest.tsdeleted file mode 100644index 237d736c..00000000--- a/frontend/src/entity/monitoring/metrics/model/GetMetricsRequest.ts+++ /dev/null@@ -1,8 +0,0 @@-import type { PostgresMonitoringMetricType } from './PostgresMonitoringMetricType';--export interface GetMetricsRequest {- databaseId: string;- metricType: PostgresMonitoringMetricType;- from: string;- to: string;-}diff --git a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetric.ts b/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetric.tsdeleted file mode 100644index 503baa74..00000000--- a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetric.ts+++ /dev/null@@ -1,11 +0,0 @@-import type { PostgresMonitoringMetricType } from './PostgresMonitoringMetricType';-import type { PostgresMonitoringMetricValueType } from './PostgresMonitoringMetricValueType';--export interface PostgresMonitoringMetric {- id: string;- databaseId: string;- metric: PostgresMonitoringMetricType;- valueType: PostgresMonitoringMetricValueType;- value: number;- createdAt: string;-}diff --git a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricType.ts b/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricType.tsdeleted file mode 100644index f19e95a4..00000000--- a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricType.ts+++ /dev/null@@ -1,4 +0,0 @@-export enum PostgresMonitoringMetricType {- DB_RAM_USAGE = 'DB_RAM_USAGE',- DB_IO_USAGE = 'DB_IO_USAGE',-}diff --git a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricValueType.ts b/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricValueType.tsdeleted file mode 100644index 86859897..00000000--- a/frontend/src/entity/monitoring/metrics/model/PostgresMonitoringMetricValueType.ts+++ /dev/null@@ -1,4 +0,0 @@-export enum PostgresMonitoringMetricValueType {- BYTE = 'BYTE',- PERCENT = 'PERCENT',-}diff --git a/frontend/src/entity/monitoring/settings/api/monitoringSettingsApi.ts b/frontend/src/entity/monitoring/settings/api/monitoringSettingsApi.tsdeleted file mode 100644index 740db18b..00000000--- a/frontend/src/entity/monitoring/settings/api/monitoringSettingsApi.ts+++ /dev/null@@ -1,24 +0,0 @@-import { getApplicationServer } from '../../../../constants';-import RequestOptions from '../../../../shared/api/RequestOptions';-import { apiHelper } from '../../../../shared/api/apiHelper';-import type { PostgresMonitoringSettings } from '../model/PostgresMonitoringSettings';--export const monitoringSettingsApi = {- async saveSettings(settings: PostgresMonitoringSettings) {- const requestOptions: RequestOptions = new RequestOptions();- requestOptions.setBody(JSON.stringify(settings));- return apiHelper.fetchPostJson<PostgresMonitoringSettings>(- `${getApplicationServer()}/api/v1/postgres-monitoring-settings/save`,- requestOptions,- );- },-- async getSettingsByDbID(databaseId: string) {- const requestOptions: RequestOptions = new RequestOptions();- return apiHelper.fetchGetJson<PostgresMonitoringSettings>(- `${getApplicationServer()}/api/v1/postgres-monitoring-settings/database/${databaseId}`,- requestOptions,- true,- );- },-};diff --git a/frontend/src/entity/monitoring/settings/index.ts b/frontend/src/entity/monitoring/settings/index.tsdeleted file mode 100644index 921c74d6..00000000--- a/frontend/src/entity/monitoring/settings/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export { monitoringSettingsApi } from './api/monitoringSettingsApi';-export type { PostgresMonitoringSettings } from './model/PostgresMonitoringSettings';-export { PostgresqlExtension } from './model/PostgresqlExtension';diff --git a/frontend/src/entity/monitoring/settings/model/PostgresMonitoringSettings.ts b/frontend/src/entity/monitoring/settings/model/PostgresMonitoringSettings.tsdeleted file mode 100644index ed182e1a..00000000--- a/frontend/src/entity/monitoring/settings/model/PostgresMonitoringSettings.ts+++ /dev/null@@ -1,13 +0,0 @@-import type { Database } from '../../../databases';-import { PostgresqlExtension } from './PostgresqlExtension';--export interface PostgresMonitoringSettings {- databaseId: string;- database?: Database;-- isDbResourcesMonitoringEnabled: boolean;- monitoringIntervalSeconds: number;-- installedExtensions: PostgresqlExtension[];- installedExtensionsRaw?: string;-}diff --git a/frontend/src/entity/monitoring/settings/model/PostgresqlExtension.ts b/frontend/src/entity/monitoring/settings/model/PostgresqlExtension.tsdeleted file mode 100644index 2fe2e7dc..00000000--- a/frontend/src/entity/monitoring/settings/model/PostgresqlExtension.ts+++ /dev/null@@ -1,4 +0,0 @@-export enum PostgresqlExtension {- PG_PROCTAB = 'pg_proctab',- PG_STAT_STATEMENTS = 'pg_stat_statements',-}diff --git a/frontend/src/features/databases/ui/DatabaseComponent.tsx b/frontend/src/features/databases/ui/DatabaseComponent.tsxindex 2fd4dac3..c5cb6aff 100644--- a/frontend/src/features/databases/ui/DatabaseComponent.tsx+++ b/frontend/src/features/databases/ui/DatabaseComponent.tsx@@ -5,7 +5,6 @@ import { useEffect } from 'react';import { type Database, databaseApi } from '../../../entity/databases';import { BackupsComponent } from '../../backups';import { HealthckeckAttemptsComponent } from '../../healthcheck';-import { MetricsComponent } from '../../monitoring/metrics';import { DatabaseConfigComponent } from './DatabaseConfigComponent';interface Props {@@ -74,7 +73,6 @@ export const DatabaseComponent = ({<BackupsComponent database={database} /></>)}- {currentTab === 'metrics' && <MetricsComponent databaseId={database.id} />}</div>);};diff --git a/frontend/src/features/monitoring/metrics/index.ts b/frontend/src/features/monitoring/metrics/index.tsdeleted file mode 100644index 6b22a272..00000000--- a/frontend/src/features/monitoring/metrics/index.ts+++ /dev/null@@ -1 +0,0 @@-export { MetricsComponent } from './ui/MetricsComponent';diff --git a/frontend/src/features/monitoring/metrics/ui/MetricsComponent.tsx b/frontend/src/features/monitoring/metrics/ui/MetricsComponent.tsxdeleted file mode 100644index be219616..00000000--- a/frontend/src/features/monitoring/metrics/ui/MetricsComponent.tsx+++ /dev/null@@ -1,245 +0,0 @@-import { InfoCircleOutlined } from '@ant-design/icons';-import { Button, Spin } from 'antd';-import dayjs from 'dayjs';-import { useEffect, useState } from 'react';-import {- CartesianGrid,- Line,- LineChart,- ResponsiveContainer,- Tooltip,- XAxis,- YAxis,-} from 'recharts';--import type { GetMetricsRequest, PostgresMonitoringMetric } from '../../../../entity/monitoring';-import { PostgresMonitoringMetricType, metricsApi } from '../../../../entity/monitoring';--interface Props {- databaseId: string;-}--type Period = '1H' | '24H' | '7D' | '1M';--interface ChartDataPoint {- timestamp: string;- displayTime: string;- ramUsage?: number;- ioUsage?: number;-}--const formatBytes = (bytes: number): string => {- const units = ['B', 'KB', 'MB', 'GB', 'TB'];- let size = bytes;- let unitIndex = 0;-- while (size >= 1024 && unitIndex < units.length - 1) {- size /= 1024;- unitIndex++;- }-- return `${size.toFixed(1)} ${units[unitIndex]}`;-};--const getDateRange = (period: Period) => {- const now = dayjs();- let from: dayjs.Dayjs;-- switch (period) {- case '1H':- from = now.subtract(1, 'hour');- break;- case '24H':- from = now.subtract(24, 'hours');- break;- case '7D':- from = now.subtract(7, 'days');- break;- case '1M':- from = now.subtract(1, 'month');- break;- default:- from = now.subtract(24, 'hours');- }-- return {- from: from.toISOString(),- to: now.toISOString(),- };-};--const getDisplayTime = (timestamp: string, period: Period): string => {- const date = dayjs(timestamp);-- switch (period) {- case '1H':- return date.format('HH:mm');- case '24H':- return date.format('HH:mm');- case '7D':- return date.format('MM/DD HH:mm');- case '1M':- return date.format('MM/DD');- default:- return date.format('HH:mm');- }-};--export const MetricsComponent = ({ databaseId }: Props) => {- const [selectedPeriod, setSelectedPeriod] = useState<Period>('24H');- const [isLoading, setIsLoading] = useState(false);- const [ramData, setRamData] = useState<PostgresMonitoringMetric[]>([]);- const [ioData, setIoData] = useState<PostgresMonitoringMetric[]>([]);-- const loadMetrics = async (period: Period) => {- setIsLoading(true);-- try {- const { from, to } = getDateRange(period);-- const [ramMetrics, ioMetrics] = await Promise.all([- metricsApi.getMetrics({- databaseId,- metricType: PostgresMonitoringMetricType.DB_RAM_USAGE,- from,- to,- } as GetMetricsRequest),- metricsApi.getMetrics({- databaseId,- metricType: PostgresMonitoringMetricType.DB_IO_USAGE,- from,- to,- } as GetMetricsRequest),- ]);-- setRamData(ramMetrics);- setIoData(ioMetrics);- } catch (error) {- alert((error as Error).message);- } finally {- setIsLoading(false);- }- };-- useEffect(() => {- loadMetrics(selectedPeriod);- }, [databaseId, selectedPeriod]);-- const prepareChartData = (): ChartDataPoint[] => {- // Create a map for easier lookup- const ramMap = new Map(ramData.map((item) => [item.createdAt, item.value]));- const ioMap = new Map(ioData.map((item) => [item.createdAt, item.value]));-- // Get all unique timestamps and sort them- const allTimestamps = Array.from(- new Set([...ramData.map((d) => d.createdAt), ...ioData.map((d) => d.createdAt)]),- ).sort();-- return allTimestamps.map((timestamp) => ({- timestamp,- displayTime: getDisplayTime(timestamp, selectedPeriod),- ramUsage: ramMap.get(timestamp),- ioUsage: ioMap.get(timestamp),- }));- };-- const chartData = prepareChartData();-- const periodButtons: Period[] = ['1H', '24H', '7D', '1M'];-- if (isLoading) {- return (- <div className="flex justify-center p-8">- <Spin size="large" />- </div>- );- }-- return (- <div className="w-full rounded-tr-md rounded-br-md rounded-bl-md bg-white p-5 shadow">- <div className="mb-6">- <h3 className="mb-4 text-lg font-bold">Database Metrics</h3>-- <div className="mb-4 rounded-md border border-yellow-300 bg-yellow-50 p-3 text-sm text-yellow-800">- <div className="flex items-center">- <InfoCircleOutlined className="mr-2 text-yellow-600" />- This feature is in development. Do not consider it as production ready.- </div>- </div>-- <div className="flex gap-2">- {periodButtons.map((period) => (- <Button- key={period}- type={selectedPeriod === period ? 'primary' : 'default'}- onClick={() => setSelectedPeriod(period)}- size="small"- >- {period}- </Button>- ))}- </div>- </div>-- <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">- {/* RAM Usage Chart */}- <div>- <h4 className="mb-3 text-base font-semibold">RAM Usage (cumulative)</h4>- <div style={{ width: '100%', height: '300px' }}>- <ResponsiveContainer width="100%" height="100%">- <LineChart data={chartData} margin={{ top: 10, right: 30, left: 20, bottom: 5 }}>- <CartesianGrid strokeDasharray="3 3" stroke="#f0f0f0" />- <XAxis dataKey="displayTime" tick={{ fontSize: 12 }} stroke="#666" />- <YAxis tickFormatter={formatBytes} tick={{ fontSize: 12 }} stroke="#666" />- <Tooltip- formatter={(value: number) => [formatBytes(value), 'RAM Usage']}- labelStyle={{ color: '#666' }}- />- <Line- type="monotone"- dataKey="ramUsage"- stroke="#1890ff"- strokeWidth={2}- dot={{ fill: '#1890ff', strokeWidth: 2, r: 3 }}- connectNulls={false}- />- </LineChart>- </ResponsiveContainer>- </div>- </div>-- {/* IO Usage Chart */}- <div>- <h4 className="mb-3 text-base font-semibold">IO Usage (cumulative)</h4>- <div style={{ width: '100%', height: '300px' }}>- <ResponsiveContainer width="100%" height="100%">- <LineChart data={chartData} margin={{ top: 10, right: 30, left: 20, bottom: 5 }}>- <CartesianGrid strokeDasharray="3 3" stroke="#f0f0f0" />- <XAxis dataKey="displayTime" tick={{ fontSize: 12 }} stroke="#666" />- <YAxis tickFormatter={formatBytes} tick={{ fontSize: 12 }} stroke="#666" />- <Tooltip- formatter={(value: number) => [formatBytes(value), 'IO Usage']}- labelStyle={{ color: '#666' }}- />- <Line- type="monotone"- dataKey="ioUsage"- stroke="#52c41a"- strokeWidth={2}- dot={{ fill: '#52c41a', strokeWidth: 2, r: 3 }}- connectNulls={false}- />- </LineChart>- </ResponsiveContainer>- </div>- </div>- </div>-- {chartData.length === 0 && (- <div className="mt-6 text-center text-gray-500">- No metrics data available for the selected period- </div>- )}- </div>- );-};diff --git a/frontend/src/features/monitoring/settings/index.ts b/frontend/src/features/monitoring/settings/index.tsdeleted file mode 100644index 76dece2c..00000000--- a/frontend/src/features/monitoring/settings/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export { ShowMonitoringSettingsComponent } from './ui/ShowMonitoringSettingsComponent';-export { EditMonitoringSettingsComponent } from './ui/EditMonitoringSettingsComponent';diff --git a/frontend/src/features/monitoring/settings/ui/EditMonitoringSettingsComponent.tsx b/frontend/src/features/monitoring/settings/ui/EditMonitoringSettingsComponent.tsxdeleted file mode 100644index d54d5a93..00000000--- a/frontend/src/features/monitoring/settings/ui/EditMonitoringSettingsComponent.tsx+++ /dev/null@@ -1,122 +0,0 @@-import { InfoCircleOutlined } from '@ant-design/icons';-import { Button, Select, Spin, Switch, Tooltip } from 'antd';-import { useEffect, useState } from 'react';--import type { Database } from '../../../../entity/databases';-import type { PostgresMonitoringSettings } from '../../../../entity/monitoring/settings';-import { monitoringSettingsApi } from '../../../../entity/monitoring/settings';--interface Props {- database: Database;-- onCancel: () => void;- onSaved: (monitoringSettings: PostgresMonitoringSettings) => void;-}--const intervalOptions = [- { label: '15 seconds', value: 15 },- { label: '30 seconds', value: 30 },- { label: '1 minute', value: 60 },- { label: '2 minutes', value: 120 },- { label: '5 minutes', value: 300 },- { label: '10 minutes', value: 600 },- { label: '15 minutes', value: 900 },- { label: '30 minutes', value: 1800 },- { label: '1 hour', value: 3600 },-];--export const EditMonitoringSettingsComponent = ({ database, onCancel, onSaved }: Props) => {- const [monitoringSettings, setMonitoringSettings] = useState<PostgresMonitoringSettings>();- const [isUnsaved, setIsUnsaved] = useState(false);- const [isSaving, setIsSaving] = useState(false);-- const updateSettings = (patch: Partial<PostgresMonitoringSettings>) => {- setMonitoringSettings((prev) => (prev ? { ...prev, ...patch } : prev));- setIsUnsaved(true);- };-- const saveSettings = async () => {- if (!monitoringSettings) return;-- setIsSaving(true);-- try {- await monitoringSettingsApi.saveSettings(monitoringSettings);- setIsUnsaved(false);- onSaved(monitoringSettings);- } catch (e) {- alert((e as Error).message);- }-- setIsSaving(false);- };-- useEffect(() => {- monitoringSettingsApi- .getSettingsByDbID(database.id)- .then((res) => {- setMonitoringSettings(res);- setIsUnsaved(false);- setIsSaving(false);- })- .catch((e) => {- alert((e as Error).message);- });- }, [database]);-- if (!monitoringSettings) return <Spin size="small" />;-- const isAllFieldsValid = true; // All fields have defaults, so always valid-- return (- <div>- <div className="mb-1 flex w-full items-center">- <div className="min-w-[200px]">Database resources monitoring</div>- <Switch- checked={monitoringSettings.isDbResourcesMonitoringEnabled}- onChange={(checked) => updateSettings({ isDbResourcesMonitoringEnabled: checked })}- size="small"- />- <Tooltip- className="cursor-pointer"- title="Monitor database-specific metrics like connections, locks, buffer cache hit ratio, and transaction statistics."- >- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />- </Tooltip>- </div>-- <div className="mt-4 mb-1 flex w-full items-center">- <div className="min-w-[200px]">Monitoring interval</div>- <Select- value={monitoringSettings.monitoringIntervalSeconds}- onChange={(v) => updateSettings({ monitoringIntervalSeconds: v })}- size="small"- className="max-w-[200px] grow"- options={intervalOptions}- />- <Tooltip- className="cursor-pointer"- title="How often to collect monitoring metrics. Lower intervals provide more detailed data but use more resources."- >- <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />- </Tooltip>- </div>-- <div className="mt-5 flex">- <Button danger ghost className="mr-1" onClick={onCancel}>- Cancel- </Button>-- <Button- type="primary"- className="mr-5 ml-auto"- onClick={saveSettings}- loading={isSaving}- disabled={!isUnsaved || !isAllFieldsValid}- >- Save- </Button>- </div>- </div>- );-};diff --git a/frontend/src/features/monitoring/settings/ui/ShowMonitoringSettingsComponent.tsx b/frontend/src/features/monitoring/settings/ui/ShowMonitoringSettingsComponent.tsxdeleted file mode 100644index 8241840b..00000000--- a/frontend/src/features/monitoring/settings/ui/ShowMonitoringSettingsComponent.tsx+++ /dev/null@@ -1,54 +0,0 @@-import { Switch } from 'antd';-import { useEffect, useState } from 'react';--import type { Database } from '../../../../entity/databases';-import type { PostgresMonitoringSettings } from '../../../../entity/monitoring/settings';-import { monitoringSettingsApi } from '../../../../entity/monitoring/settings';--interface Props {- database: Database;-}--const intervalLabels = {- 15: '15 seconds',- 30: '30 seconds',- 60: '1 minute',- 120: '2 minutes',- 300: '5 minutes',- 600: '10 minutes',- 900: '15 minutes',- 1800: '30 minutes',- 3600: '1 hour',-};--export const ShowMonitoringSettingsComponent = ({ database }: Props) => {- const [monitoringSettings, setMonitoringSettings] = useState<PostgresMonitoringSettings>();-- useEffect(() => {- if (database.id) {- monitoringSettingsApi.getSettingsByDbID(database.id).then((res) => {- setMonitoringSettings(res);- });- }- }, [database]);-- if (!monitoringSettings) return <div />;-- return (- <div>- <div className="mb-1 flex w-full items-center">- <div className="min-w-[200px]">Database resources monitoring</div>- <Switch checked={monitoringSettings.isDbResourcesMonitoringEnabled} disabled size="small" />- </div>-- <div className="mb-1 flex w-full items-center">- <div className="min-w-[200px]">Monitoring interval</div>- <div>- {intervalLabels[- monitoringSettings.monitoringIntervalSeconds as keyof typeof intervalLabels- ] || `${monitoringSettings.monitoringIntervalSeconds} seconds`}- </div>- </div>- </div>- );-};