Merge branch 'cloud-barista:master' into master

Author: MZC-CSC

api-runtime/common-runtime/SystemStatsHandler.go

@@ -14,15 +14,14 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"net/http"
 	"os"
 
-	"github.com/chyeh/pubip"
-
 	cblogger "github.com/cloud-barista/cb-log"
 	cr "github.com/cloud-barista/cb-spider/api-runtime/common-runtime"
 	aw "github.com/cloud-barista/cb-spider/api-runtime/rest-runtime/admin-web"
@@ -33,7 +32,7 @@ import (
 	// REST API (echo)
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/labstack/gommon/log"
+	lblog "github.com/labstack/gommon/log"
 
 	// echo-swagger middleware
 	_ "github.com/cloud-barista/cb-spider/api"
@@ -105,7 +104,7 @@ func getServerIPorName(env string) string {
 	hostEnv := os.Getenv(env) // SERVER_ADDRESS or SERVICE_ADDRESS
 
 	if hostEnv == "" {
-		return getPublicIP()
+		return "localhost"
 	}
 
 	// "1.2.3.4" or "localhost"
@@ -115,26 +114,12 @@ func getServerIPorName(env string) string {
 
 	strs := strings.Split(hostEnv, ":")
 	if strs[0] == "" { // ":31024"
-		return getPublicIP()
+		return "localhost"
 	} else { // "1.2.3.4:31024" or "localhost:31024"
 		return strs[0]
 	}
 }
 
-func getPublicIP() string {
-	ip, err := pubip.Get()
-	if err != nil {
-		cblog.Error(err)
-		hostName, err := os.Hostname()
-		if err != nil {
-			cblog.Error(err)
-		}
-		return hostName
-	}
-
-	return ip.String()
-}
-
 func getServerPort(env string) string {
 	// default REST Service Port
 	servicePort := ":1024"
@@ -201,6 +186,10 @@ func RunServer() {
 		{"GET", "/ping", healthCheck},
 		{"GET", "/readyz", healthCheck},
 
+		//----------SystemStatsInfo Handler
+		{"GET", "/sysstats/system", FetchSystemInfo},
+		{"GET", "/sysstats/usage", FetchResourceUsage},
+
 		//----------CloudOS
 		{"GET", "/cloudos", ListCloudOS},
 
@@ -527,6 +516,8 @@ func RunServer() {
 
 		{"GET", "/adminweb/spiderinfo", aw.SpiderInfo},
 
+		{"GET", "/adminweb/sysstats", aw.SystemStatsInfoPage},
+
 		{"GET", "/adminweb/vpc/:ConnectConfig", aw.VPCSubnetManagement},
 		{"GET", "/adminweb/vpcmgmt/:ConnectConfig", aw.VPCMgmt},
 		{"GET", "/adminweb/securitygroup/:ConnectConfig", aw.SecurityGroupManagement},
@@ -571,7 +562,7 @@ func RunServer() {
 
 func RunTLSServer(certFile, keyFile, caCertFile string, port int) {
 	e := echo.New()
-	e.Logger.SetLevel(log.ERROR) // Set logging level to ERROR only
+	e.Logger.SetLevel(lblog.ERROR) // Set logging level to ERROR only
 
 	// Recovery middleware for handling panics
 	e.Use(middleware.Recover())
@@ -694,18 +685,24 @@ func ApiServer(routes []route) {
 
 	spiderBanner()
 
-	if err := e.Start(cr.ServerPort); err != nil {
-		cblog.Fatalf("Failed to start the server: %v", err)
+	httpServerPort := cr.ServerPort
+        if cr.ServerIPorName == "localhost" || cr.ServerIPorName == "127.0.0.1" {
+                // Bind to localhost only (127.0.0.1), external clients cannot connect
+                httpServerPort = cr.ServerIPorName + cr.ServerPort
+        }
+
+        server := &http.Server{
+                Addr: httpServerPort,
+		//ReadTimeout:    6000 * time.Second, // Increase the maximum duration of reading the entire request
+		//WriteTimeout:   6000 * time.Second, // Increase the maximum duration of writing the entire response
+		//IdleTimeout:    6000 * time.Second, // Increase the maximum duration of idle keep-alive connections
+		MaxHeaderBytes: 500 * 1024 * 1024, // Increase the maximum header size allowed by the server
+		ErrorLog:       log.New(os.Stderr, "HTTP SERVER ERROR: ", log.LstdFlags),
 	}
 
-}
-
-// ================ API Info
-func apiInfo(c echo.Context) error {
-	cblog.Info("call apiInfo()")
-
-	apiInfo := "api info"
-	return c.String(http.StatusOK, apiInfo)
+	if err := e.StartServer(server); err != nil {
+		cblog.Fatalf("Failed to start the server: %v", err)
+	}
 }
 
 // ================ Endpoint Info

api-runtime/rest-runtime/CBSpiderRuntime.go

@@ -0,0 +1,128 @@
+// The CB-Spider is a sub-Framework of the Cloud-Barista Multi-Cloud Project.
+// The CB-Spider Mission is to connect all the clouds with a single interface.
+//
+//      * Cloud-Barista: https://github.com/cloud-barista
+
+package restruntime
+
+import (
+	"bytes"
+	"io"
+	"net/http"
+	"os"
+
+	cmrt "github.com/cloud-barista/cb-spider/api-runtime/common-runtime"
+	"github.com/labstack/echo/v4"
+)
+
+// FetchSystemInfo godoc
+// @ID fetch-system-info
+// @Summary Fetch System Information
+// @Description Retrieve system information such as hostname, platform, CPU, memory, and disk.
+// @Description Use query parameter 'mode=text' to get the output in text format instead of JSON.
+// @Tags [Utility]
+// @Accept json
+// @Produce json,text/plain
+// @Param mode query string false "Output format: set to 'text' for text output (default is JSON)" Enums(text)
+// @Success 200 {object} cmrt.SystemInfo "System Information in JSON or text format based on 'mode' parameter"
+// @Failure 500 {object} SimpleMsg "Internal Server Error"
+// @Router /sysstats/system [get]
+func FetchSystemInfo(c echo.Context) error {
+	cblog.Info("call FetchSystemInfo()")
+
+	// Get system information
+	result, err := cmrt.FetchSystemInfo()
+	if err != nil {
+		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+	}
+
+	// Check output mode (text or json)
+	mode := c.QueryParam("mode")
+
+	// If text mode, output as text format
+	if mode == "text" {
+		// Create buffer for console output
+		var buffer bytes.Buffer
+
+		// Redirect output to buffer
+		oldStdout := os.Stdout
+		r, w, _ := os.Pipe()
+		os.Stdout = w
+
+		// Output as text format
+		cmrt.DisplaySystemInfo(&result)
+
+		// Close pipe
+		w.Close()
+		os.Stdout = oldStdout
+
+		// Read to buffer
+		io.Copy(&buffer, r)
+
+		// Respond with text format
+		c.Response().Header().Set(echo.HeaderContentType, "text/plain; charset=UTF-8")
+		return c.String(http.StatusOK, buffer.String())
+	}
+
+	// Default response in JSON format
+	return c.JSON(http.StatusOK, result)
+}
+
+// FetchResourceUsage godoc
+// @ID fetch-resource-usage
+// @Summary Fetch Resource Usage Information
+// @Description Retrieve resource usage information such as CPU, memory, disk I/O, and network I/O.
+// @Description Use query parameter 'mode=text' to get the output in text format instead of JSON.
+// @Tags [Utility]
+// @Accept json
+// @Produce json,text/plain
+// @Param mode query string false "Output format: set to 'text' for text output (default is JSON)" Enums(text)
+// @Success 200 {object} cmrt.ResourceUsage "Resource Usage Information in JSON or text format based on 'mode' parameter"
+// @Failure 500 {object} SimpleMsg "Internal Server Error"
+// @Router /sysstats/usage [get]
+func FetchResourceUsage(c echo.Context) error {
+	cblog.Info("call FetchResourceUsage()")
+
+	// Get resource usage information
+	resourceUsage, err := cmrt.FetchResourceUsage()
+	if err != nil {
+		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+	}
+
+	// Check output mode (text or json)
+	mode := c.QueryParam("mode")
+
+	// If text mode, output as text format
+	if mode == "text" {
+		// Also get system info to get TotalMemory for display
+		sysInfo, err := cmrt.FetchSystemInfo()
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
+		}
+
+		// Create buffer for console output
+		var buffer bytes.Buffer
+
+		// Redirect output to buffer
+		oldStdout := os.Stdout
+		r, w, _ := os.Pipe()
+		os.Stdout = w
+
+		// Output as text format
+		cmrt.DisplayResourceUsage(sysInfo.TotalMemory, &resourceUsage)
+
+		// Close pipe
+		w.Close()
+		os.Stdout = oldStdout
+
+		// Read to buffer
+		io.Copy(&buffer, r)
+
+		// Respond with text format
+		c.Response().Header().Set(echo.HeaderContentType, "text/plain; charset=UTF-8")
+		return c.String(http.StatusOK, buffer.String())
+	}
+
+	// Default response in JSON format
+	return c.JSON(http.StatusOK, resourceUsage)
+}