demo

Makefile

@@ -6,6 +6,14 @@ build: clean
 run: 
 	bee run -gendoc=true -downdoc=true
 
+purge:
+	lsof -t -i:8090 | xargs kill | true
+
+run-dev:
+	bee generate routers && bee run -gendoc=true -downdoc=true -runmode=prod
+
+dev: purge run-dev
+
 debug:
 	bee run -downdebug -gendebug
 

README.md

@@ -6,6 +6,8 @@ To build :
 
     bee generate routers
     bee run -gendoc=true -downdoc=true
+OR 
+    make dev
 
 If default Swagger page is displayed instead of tyour api, change url in swagger/index.html file to :
 <>

conf/app.conf

@@ -1,5 +1,5 @@
 appname = oc-scheduler
-httpport = 8080
+httpport = 8090
 runmode = dev
 autorender = false
 copyrequestbody = true

controllers/loki.go

@@ -0,0 +1,82 @@
+package controllers
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+
+	"cloud.o-forge.io/core/oc-lib/config"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// Operations about workflow
+type LokiController struct {
+	beego.Controller
+}
+
+type LokiInfo struct {
+	Start string `json:"start"`
+	End   string `json:"end"`
+}
+
+// @Title GetLogs
+// @Description get logs
+// @Param	body		body 	models.compute	true		"The compute content"
+// @Success 200 {workspace} models.workspace
+// @router / [post]
+func (o *LokiController) GetLogs() {
+	path := "/loki/api/v1/query_range"
+	var resp map[string]interface{}
+	json.Unmarshal(o.Ctx.Input.CopyBody(100000), &resp)
+	if len(resp) > 0 {
+		start := fmt.Sprintf("%v", resp["start"])
+		if len(start) > 10 {
+			start = start[0:10]
+		}
+		end := fmt.Sprintf("%v", resp["end"])
+		if len(end) > 10 {
+			end = end[0:10]
+		}
+		query := []string{}
+		for k, v := range resp {
+			if k == "start" || k == "end" {
+				continue
+			}
+			query = append(query, fmt.Sprintf("%v=\"%v\"", k, v))
+		}
+		if len(query) == 0 || len(start) < 10 || len(end) < 10 {
+			o.Ctx.ResponseWriter.WriteHeader(403)
+			o.Data["json"] = map[string]string{"error": "Query error, missing data : start, end or query"}
+			o.ServeJSON()
+			return
+		}
+		path += "?query={" + strings.Join(query, ", ") + "}&start=" + start + "&end=" + end
+		resp, err := http.Get(config.GetConfig().LokiUrl + path) // CALL
+		fmt.Println(resp, path)
+		if err != nil {
+			o.Ctx.ResponseWriter.WriteHeader(422)
+			o.Data["json"] = map[string]string{"error": err.Error()}
+			o.ServeJSON()
+			return
+		}
+		defer resp.Body.Close()
+		body, _ := io.ReadAll(resp.Body)
+		var result map[string]interface{}
+		// Unmarshal: string → []byte → object
+		err = json.Unmarshal(body, &result)
+		if err != nil {
+			o.Ctx.ResponseWriter.WriteHeader(403)
+			o.Data["json"] = map[string]string{"error": err.Error()}
+			o.ServeJSON()
+			return
+		}
+		o.Data["json"] = result
+		o.ServeJSON()
+		return
+	}
+	o.Ctx.ResponseWriter.WriteHeader(403)
+	o.Data["json"] = map[string]string{"error": "Query error"}
+	o.ServeJSON()
+}

controllers/version.go

@@ -15,7 +15,10 @@ type VersionController struct {
 // @Success 200
 // @router / [get]
 func (c *VersionController) GetAll() {
-	c.Data["json"] = map[string]string{"version": "1"}
+	c.Data["json"] = map[string]string{
+		"service": "oc-scheduler",
+		"version": "1",
+	}
 	c.ServeJSON()
 }
 

controllers/workflow_sheduler.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 	"cloud.o-forge.io/core/oc-lib/dbs"
@@ -44,10 +43,11 @@ func (o *WorkflowSchedulerController) Schedule() {
 	req := oclib.NewRequest(collection, user, peerID, groups, caller)
 	resp.UUID = uuid.New().String()
 	sch, err := req.Schedule(id, resp)
-	fmt.Println("SCHEDULE", sch, err)
 	if err != nil {
-		for _, w := range sch.WorkflowExecution {
+		if sch != nil {
-			req.DeleteOne(w.GetID())
+			for _, w := range sch.WorkflowExecution {
+				req.DeleteOne(w.GetID())
+			}
 		}
 		o.Data["json"] = map[string]interface{}{
 			"data":  nil,
@@ -58,7 +58,7 @@ func (o *WorkflowSchedulerController) Schedule() {
 		return
 	}
 	o.Data["json"] = map[string]interface{}{
-		"data":  sch,
+		"data":  sch.WorkflowExecution,
 		"code":  code,
 		"error": e,
 	}

docker-compose.base.yml

@@ -1,33 +0,0 @@
-version: '3.4'
-
-services:
-  mongo:
-    image: 'mongo:latest'
-    networks: 
-      - catalog
-    ports:
-      - 27017:27017
-    container_name: mongo
-    volumes: 
-      - oc-catalog-data:/data/db
-      - oc-catalog-data:/data/configdb
-  
-  mongo-express:
-    image: "mongo-express:latest"
-    restart: always
-    depends_on: 
-      - mongo
-    networks: 
-      - catalog
-    ports:
-      - 8081:8081
-    environment:
-      - ME_CONFIG_BASICAUTH_USERNAME=test
-      - ME_CONFIG_BASICAUTH_PASSWORD=test
-
-volumes:
-  oc-catalog-data:
-
-networks: 
-  catalog:
-    # name: catalog

docker-compose.yml

@@ -8,16 +8,18 @@ services:
     labels:
         - "traefik.enable=true"
         - "traefik.http.routers.scheduler.entrypoints=web"
-        - "traefik.http.middlewares.auth.forwardauth.address=http://oc-auth:8080/oc/forward"
+        - "traefik.http.routers.scheduler.rule=PathPrefix(`/scheduler`)"
-        - "traefik.http.routers.workflow.rule=PathPrefix(/scheduler)"
+        - "traefik.http.middlewares.scheduler-rewrite.replacepathregex.regex=^/scheduler(.*)"
-        - "traefik.http.routers.scheduler.tls=false"
+        - "traefik.http.middlewares.scheduler-rewrite.replacepathregex.replacement=/oc$$1"
-        - "traefik.http.routers.scheduler.middlewares=auth"
+        - "traefik.http.routers.scheduler.middlewares=scheduler-rewrite"
+        - "traefik.http.services.scheduler.loadbalancer.server.port=8080"
+        - "traefik.http.middlewares.scheduler.forwardauth.address=http://oc-auth:8080/oc/forward"
     ports:
       - 8090:8080
     container_name: oc-scheduler
     networks: 
-      - catalog
+      - oc
 
 networks: 
-  catalog:
+  oc:
     external: true

docker_scheduler.json

@@ -1,5 +1,6 @@
 {
     "MONGO_URL":"mongodb://mongo:27017/", 
     "NATS_URL":"nats://nats:4222",
-    "MONGO_DATABASE":"DC_myDC"
+    "MONGO_DATABASE":"DC_myDC",
+    "LOKI_URL": "http://loki:3100"
 }

env.env

@@ -0,0 +1,4 @@
+KUBERNETES_SERVICE_HOST=192.168.1.169
+KUBE_CA="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_CERT="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
+KUBE_DATA="LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.4
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20250212130857-4833bcb7103e
+	cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7
 	github.com/beego/beego/v2 v2.3.4
 	github.com/google/uuid v1.6.0
 	github.com/smartystreets/goconvey v1.7.2

go.sum

@@ -1,5 +1,31 @@
 cloud.o-forge.io/core/oc-lib v0.0.0-20250212130857-4833bcb7103e h1:a4eVChOa20MFCCnSZr72h3n8P6E5IZdePJhYizUDMZs=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250212130857-4833bcb7103e/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b h1:HAb2h0011mE3QrHdOwJCua5w0r/BDOFLNb/557ZAzL0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250213093249-c53e25e69a7b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f h1:esLB0EAn8IuOChW35kcBrPaN80z4A4yYyz1mXT45GQo=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250217072519-cafadec1469f/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee h1:UIGIiE+O5LUrP18C8nrZxN1v6Lmzfdlv8pvHnSLKJz8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218080121-a098f0a672ee/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64 h1:dANQHoMCyp3uioCHnUOpLFiG/UO+biyPUoSelDNJ814=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218085355-6e6ed4ea2c64/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5 h1:EwoctMKdVG1PJHRcBcRKCxgdAxy+TV1T617vxIZwkio=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218092508-b771b5d25ee5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4 h1:7om8VD4ZivHA2BKBwvqM98/a7D+MTwppd2FloNBg1Y4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218101140-6bf058ab5ca4/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1 h1:on0zLtHo1Jj6FvQ/wuJCc/sxfBfgrd2qTFknpDh3wQM=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218113916-04f7537066c1/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5 h1:DP/XYrxSOc5ORMGvVNqTvFjxLF4cymUW/d3HIZXKDEk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218115549-81d3406305c5/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0 h1:3EsRmeTz6OWHJETrPObctnGF8WgZtXHfwL2cjyHcfOk=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250218130229-7c30633bded0/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861 h1:XqTFKSZ8hXGCJbuu/SBwakpftevg1AKV7hDI50cXNUg=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219075511-241c6a5a0861/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754 h1:7J5EUe/iNS6cT6KVDklpgGH7ak30iEFgWJDEPF6wik4=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b h1:DhRqJdw2VePaYVlsh8OUA3zl+76Q0FWwGu+a+3aOf6s=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 h1:fh6SzBPenzIxufIIzExtx4jEE4OhFposqn3EbHFr92Q=
+cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/beego/beego/v2 v2.3.4 h1:HurQEOGIEhLlPFCTR6ZDuQkybrUl2Ag2i6CdVD2rGiI=
 github.com/beego/beego/v2 v2.3.4/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=

main.go

@@ -24,7 +24,7 @@ func main() {
 		o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"),
 		o.GetStringDefault("MONGO_DATABASE", "DC_myDC"),
 		o.GetStringDefault("NATS_URL", "nats://localhost:4222"),
-		o.GetStringDefault("LOKI_URL", ""),
+		o.GetStringDefault("LOKI_URL", "loki://localhost:3100"),
 		o.GetStringDefault("LOG_LEVEL", "info"),
 	)
 

routers/commentsRouter.go

@@ -7,6 +7,15 @@ import (
 
 func init() {
 
+    beego.GlobalControllerRouter["oc-scheduler/controllers:LokiController"] = append(beego.GlobalControllerRouter["oc-scheduler/controllers:LokiController"],
+        beego.ControllerComments{
+            Method: "GetLogs",
+            Router: `/`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["oc-scheduler/controllers:VersionController"] = append(beego.GlobalControllerRouter["oc-scheduler/controllers:VersionController"],
         beego.ControllerComments{
             Method: "GetAll",

routers/router.go

@@ -18,6 +18,11 @@ func init() {
 		beego.NSInclude(
 			&controllers.WorkflowSchedulerController{},
 		),
+		beego.NSNamespace("/loki",
+			beego.NSInclude(
+				&controllers.LokiController{},
+			),
+		),
 		beego.NSNamespace("/execution",
 			beego.NSInclude(
 				&controllers.WorkflowExecutionController{},

scheduler.json

@@ -1,5 +1,6 @@
 {
-    "port":8080,
+    "port":8090,
     "MONGO_URL":"mongodb://localhost:27017/", 
-    "MONGO_DATABASE":"DC_myDC"
+    "MONGO_DATABASE":"DC_myDC",
+    "LOKI_URL": "http://localhost:3100"
 }

swagger/swagger.json

@@ -125,6 +125,31 @@
                 }
             }
         },
+        "/loki/": {
+            "post": {
+                "tags": [
+                    "loki"
+                ],
+                "description": "get logs\n\u003cbr\u003e",
+                "operationId": "LokiController.GetLogs",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "The compute content",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.compute"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{workspace} models.workspace"
+                    }
+                }
+            }
+        },
         "/version/": {
             "get": {
                 "tags": [
@@ -250,6 +275,10 @@
             "name": "oc-scheduler/controllersWorkflowSchedulerController",
             "description": "Operations about workflow\n"
         },
+        {
+            "name": "loki",
+            "description": "Operations about workflow\n"
+        },
         {
             "name": "execution",
             "description": "Operations about workflow\n"

swagger/swagger.yml

@@ -154,6 +154,24 @@ paths:
       responses:
         "200":
           description: '{workspace} models.workspace'
+  /loki/:
+    post:
+      tags:
+      - loki
+      description: |-
+        get logs
+        <br>
+      operationId: LokiController.GetLogs
+      parameters:
+      - in: body
+        name: body
+        description: The compute content
+        required: true
+        schema:
+          $ref: '#/definitions/models.compute'
+      responses:
+        "200":
+          description: '{workspace} models.workspace'
   /version/:
     get:
       tags:
@@ -184,6 +202,9 @@ tags:
 - name: oc-scheduler/controllersWorkflowSchedulerController
   description: |
     Operations about workflow
+- name: loki
+  description: |
+    Operations about workflow
 - name: execution
   description: |
     Operations about workflow