diff --git a/CHANGELOG.md b/CHANGELOG.md index ba16711a3..1740cac41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ -- Fixed issue where tabs remained open when navigating outside the Log Explorer scope to improve user experience. -- Fixed time filter issue where the date range was not applied correctly. -- Fixed incorrect query behavior when filtering incidents by ID. +-- Agent Services force update opening necessary ports ## New Features and Improvements diff --git a/aws/main.go b/aws/main.go index 453e87f67..9b0578fda 100644 --- a/aws/main.go +++ b/aws/main.go @@ -23,10 +23,6 @@ func main() { st := time.Now().Add(-600 * time.Second) for { - if err := utils.ConnectionChecker(configuration.URL_CHECK_CONNECTION); err != nil { - utils.Logger.ErrorF("Failed to establish connection: %v", err) - } - et := st.Add(299 * time.Second) moduleConfig, err := client.GetUTMConfig(enum.AWS_IAM_USER) if err != nil { diff --git a/aws/utils/check.go b/aws/utils/check.go deleted file mode 100644 index f7212deb0..000000000 --- a/aws/utils/check.go +++ /dev/null @@ -1,42 +0,0 @@ -package utils - -import ( - "fmt" - "net/http" - "time" -) - -func ConnectionChecker(url string) error { - checkConn := func() error { - if err := checkPanelConnection(url); err != nil { - return fmt.Errorf("connection failed: %v", err) - } - - return nil - } - - if err := Logger.InfiniteRetryIfXError(checkConn, "connection failed"); err != nil { - return err - } - - return nil -} - -func checkPanelConnection(url string) error { - client := &http.Client{ - Timeout: 30 * time.Second, - } - - req, err := http.NewRequest(http.MethodGet, url, nil) - if err != nil { - return err - } - - resp, err := client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - return nil -} diff --git a/bitdefender/configuration/config.go b/bitdefender/configuration/config.go index c5eaf7fd6..b0dfbb5a9 100644 --- a/bitdefender/configuration/config.go +++ b/bitdefender/configuration/config.go @@ -12,7 +12,6 @@ import ( "github.com/threatwinds/logger" "github.com/utmstack/UTMStack/bitdefender/constants" - "github.com/utmstack/UTMStack/bitdefender/utils" "github.com/utmstack/config-client-go/enum" "github.com/utmstack/config-client-go/types" @@ -37,10 +36,6 @@ func ConfigureModules(cnf *types.ConfigurationSection, mutex *sync.Mutex, h *log for { time.Sleep(delayCheckConfig) - if err := utils.ConnectionChecker(constants.URL_CHECK_CONNECTION, h); err != nil { - h.ErrorF("Failed to establish connection: %v", err) - } - tempModuleConfig, err := client.GetUTMConfig(enum.BITDEFENDER) if err != nil { if strings.Contains(err.Error(), "invalid character '<'") { diff --git a/bitdefender/utils/check.go b/bitdefender/utils/check.go deleted file mode 100644 index a39840a2f..000000000 --- a/bitdefender/utils/check.go +++ /dev/null @@ -1,43 +0,0 @@ -package utils - -import ( - "fmt" - "net/http" - "time" - - "github.com/threatwinds/logger" -) - -func ConnectionChecker(url string, h *logger.Logger) error { - checkConn := func() error { - if err := CheckConnection(url); err != nil { - return fmt.Errorf("connection failed: %v", err) - } - return nil - } - - if err := h.InfiniteRetryIfXError(checkConn, "connection failed"); err != nil { - return err - } - - return nil -} - -func CheckConnection(url string) error { - client := &http.Client{ - Timeout: 30 * time.Second, - } - - req, err := http.NewRequest(http.MethodGet, url, nil) - if err != nil { - return err - } - - resp, err := client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - return nil -} diff --git a/installer/docker.go b/installer/docker.go index 437d6d21a..fd1563b74 100644 --- a/installer/docker.go +++ b/installer/docker.go @@ -103,6 +103,13 @@ func PostInstallation() error { return err } + if err := utils.RunCmd("docker", "service", "update", "--force", "utmstack_agentmanager"); err != nil { + return err + } + if err := utils.RunCmd("docker", "service", "update", "--force", "utmstack_log-auth-proxy"); err != nil { + return err + } + fmt.Println("Restarting Stack [OK]") fmt.Println("Cleaning up Docker system") diff --git a/office365/main.go b/office365/main.go index d59c98304..2b0d7d271 100644 --- a/office365/main.go +++ b/office365/main.go @@ -23,10 +23,6 @@ func main() { st := time.Now().Add(-600 * time.Second) for { - if err := utils.ConnectionChecker(configuration.LoginUrl); err != nil { - utils.Logger.ErrorF("External connection failure detected: %v", err) - } - et := st.Add(299 * time.Second) startTime := st.UTC().Format("2006-01-02T15:04:05") endTime := et.UTC().Format("2006-01-02T15:04:05") diff --git a/office365/utils/check.go b/office365/utils/check.go deleted file mode 100644 index 5ab7c1ccd..000000000 --- a/office365/utils/check.go +++ /dev/null @@ -1,45 +0,0 @@ -package utils - -import ( - "context" - "fmt" - "net/http" - "time" -) - -const connectionTimeout = 5 * time.Second - -func ConnectionChecker(url string) error { - checkConn := func() error { - ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout) - defer cancel() - - if err := checkConnection(url, ctx); err != nil { - return fmt.Errorf("connection failed") - } - return nil - } - - if err := Logger.InfiniteRetryIfXError(checkConn, "connection failed"); err != nil { - return err - } - - return nil -} - -func checkConnection(url string, ctx context.Context) error { - client := &http.Client{} - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) - if err != nil { - return err - } - - resp, err := client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - return nil -} diff --git a/sophos/main.go b/sophos/main.go index 2fc387f04..9ecb81056 100644 --- a/sophos/main.go +++ b/sophos/main.go @@ -21,10 +21,6 @@ func main() { client := utmconf.NewUTMClient(intKey, "http://"+panelServ) for { - if err := utils.ConnectionChecker(configuration.CHECKCON); err != nil { - utils.Logger.ErrorF("External connection failure detected: %v", err) - } - moduleConfig, err := client.GetUTMConfig(enum.SOPHOS) if err != nil { if strings.Contains(err.Error(), "invalid character '<'") { diff --git a/sophos/utils/check.go b/sophos/utils/check.go deleted file mode 100644 index 5ab7c1ccd..000000000 --- a/sophos/utils/check.go +++ /dev/null @@ -1,45 +0,0 @@ -package utils - -import ( - "context" - "fmt" - "net/http" - "time" -) - -const connectionTimeout = 5 * time.Second - -func ConnectionChecker(url string) error { - checkConn := func() error { - ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout) - defer cancel() - - if err := checkConnection(url, ctx); err != nil { - return fmt.Errorf("connection failed") - } - return nil - } - - if err := Logger.InfiniteRetryIfXError(checkConn, "connection failed"); err != nil { - return err - } - - return nil -} - -func checkConnection(url string, ctx context.Context) error { - client := &http.Client{} - - req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil) - if err != nil { - return err - } - - resp, err := client.Do(req) - if err != nil { - return err - } - defer resp.Body.Close() - - return nil -}