misc

Dockerfile

@@ -1,5 +1,7 @@
 FROM golang:alpine AS deps
 
+ARG MONITORD_IMAGE
+
 WORKDIR /app
 COPY go.mod go.sum ./
 RUN sed -i '/replace/d' go.mod
@@ -19,7 +21,7 @@ COPY . .
 RUN go build
 
 #----------------------------------------------------------------------------------------------
-FROM oc-monitord:latest AS monitord
+FROM ${MONITORD_IMAGE:-oc-monitord}:latest AS monitord
 
 FROM scratch
 
@@ -32,7 +34,7 @@ COPY --from=builder /app/oc-schedulerd /usr/bin/oc-schedulerd
 
 COPY docker_schedulerd.json /etc/oc/schedulerd.json
 
-COPY argo_workflows .
+# COPY argo_workflows .
 
 EXPOSE 8080
 

Makefile

@@ -3,6 +3,9 @@
 build: clean
 	go build .
 
+build-monitord:
+	go build -o ../oc-monitord ../oc-monitord
+
 run:
 	./oc-schedulerd
 
@@ -10,7 +13,7 @@ clean:
 	rm -rf  oc-schedulerd
 
 docker:
-	DOCKER_BUILDKIT=1 docker build -t oc/oc-schedulerd:0.0.1 -f Dockerfile .
+	DOCKER_BUILDKIT=1 docker build -t oc/oc-schedulerd:0.0.1 --build-arg MONITORD_IMAGE=oc/oc-monitord -f Dockerfile . 
 	docker tag oc/oc-schedulerd:0.0.1 oc/oc-schedulerd:latest
 
 publish-kind:
@@ -21,4 +24,6 @@ publish-registry:
 
 all: docker publish-kind publish-registry
 
+dev: build-monitord build run
+
 .PHONY: build run clean docker publish-kind publish-registry

README.md

@@ -1,21 +1,34 @@
 # oc-scheduler
 
-OC-Scheduler retrieves the content of submitted workflows and prepare them to be executed. 
+oc-schedulerd is a daemon performing to actions at the same time :
+- subscribing to the local NATS instance' custom channels for message commanding either the scheduling or the removing of an execution.  
+- polling oc-catalog for scheduled executions 
 
-## Parsing 
+Depending on the environment it is running in, oc-schedulerd will either :
+- execute the oc-monitord binary
+- run an oc-monitord container 
 
-From a workflow's name we retrieve the xml graph associated and parse it in order to create the object representing each componant.
-Each object is linked to another, represented by a links object with the two object IDs has attributes.
+## Parameters
 
-TODO : 
-- [x] Retrieve the user input's for each component.
+oc-schedulerd uses json files to load its configuration. The template for this configuration file is below
 
-## Organising 
+```json
+{
+    "LOKI_URL" : "http://[IP/URL]:3100",
+    "MONGO_URL":"mongodb://[IP/URL]:27017/", 
+    "NATS_URL":"nats://[IP/URL]:4222",
+    "MONGO_DATABASE":"",
+    "MONITORD_PATH": "",
+    "KUBERNETES_SERVICE_HOST" : "[IP/URL]",
+    "MONITOR_MODE": "",
+    "KUBE_CA": "",
+    "KUBE_CERT": "",
+    "KUBE_DATA": ""
+}
+```
 
-TODO : 
-- [ ] create an argo file from the graph/worfklow
-    - [ ] Create a different entry for each component
-    - [ ] execute each element in the right order 
+**monitor_mode** : should be either "local","container", ""
 
-## CHANGE ENV FOR KUBE
-Add your proper CA, Cert & Data + external IP for kube config.
+## TODO
+
+- [ ] Implement the discovery of current mode : local, local in container, as a container

conf/conf.go

@@ -8,18 +8,18 @@ import (
 )
 
 type Config struct {
-	MonitorPath string
-	MongoUrl    string
-	DBName      string
-	Logs        string
-	LokiUrl     string
-	NatsUrl     string
-	Mode        string
-	KubeHost    string
-	KubePort    string
-	KubeCA      string
-	KubeCert    string
-	KubeData    string
+	MonitorPath 	string
+	MongoUrl    	string
+	DBName      	string
+	Logs        	string
+	LokiUrl     	string
+	NatsUrl     	string
+	Mode			string
+	KubeHost    	string
+	KubePort    	string
+	KubeCA      	string
+	KubeCert    	string
+	KubeData    	string
 }
 
 var instance *Config

daemons/execute_monitor_container.go

@@ -0,0 +1,132 @@
+package daemons
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"oc-schedulerd/conf"
+
+	"github.com/rs/zerolog"
+)
+
+type ContainerMonitor struct {
+	Monitor 	LocalMonitor
+	KubeCA		string
+	KubeCert	string
+	KubeData	string
+	KubeHost	string
+	KubePort	string
+}
+
+func NewContainerMonitor(executionsId string, peerId string, duration int) (Executor){
+	return &ContainerMonitor{
+		Monitor: LocalMonitor{	
+			ExecutionID: executionsId,
+			PeerID: peerId,
+			Duration: duration,
+			LokiUrl: conf.GetConfig().LokiUrl,
+			MongoUrl: conf.GetConfig().MongoUrl,
+			DBName: conf.GetConfig().DBName,
+		},
+		KubeCA: conf.GetConfig().KubeCA,
+		KubeCert: conf.GetConfig().KubeCert,
+		KubeData: conf.GetConfig().KubeData,
+		KubeHost: conf.GetConfig().KubeHost,
+		KubePort: conf.GetConfig().KubePort,
+	}
+}
+
+func (cm *ContainerMonitor) PrepareMonitorExec() []string { 
+
+	args := []string{
+		"-e", cm.Monitor.ExecutionID,
+		"-p", cm.Monitor.PeerID,
+		"-u", cm.Monitor.LokiUrl,
+		"-m", cm.Monitor.MongoUrl,
+		"-d", cm.Monitor.DBName,
+		"-M", "kubernetes",
+		"-H", cm.KubeHost,
+		"-P", cm.KubePort,
+		"-C", cm.KubeCert, 
+		"-D", cm.KubeData,
+		"-c", cm.KubeCA,
+	}
+
+	if cm.Monitor.Duration > 0 {
+		args = append(args, "-t", fmt.Sprintf("%d", cm.Monitor.Duration))
+	}
+
+	return args 
+	
+}
+
+// Contact the docker's API at the KubeHost's URL to :
+// - Check if the image exists
+// - Create the container
+// - Start the container
+func (cm *ContainerMonitor) LaunchMonitor(args []string, l zerolog.Logger) {
+	
+	var containerID string 
+	imageName := "oc-monitord"
+	url := "http://" + conf.GetConfig().KubeHost + ":2375"
+
+	resp, err := http.Get(url + "/images/" + imageName + "/json")
+	if err != nil {
+		l.Fatal().Msg("Error when contacting the docker API on " + conf.GetConfig().KubeHost + ": " + err.Error())
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		d, _ := io.ReadAll(resp.Body)
+		l.Fatal().Msg("Couldn't find the oc-monitord image : " + string(d))
+	}
+	
+	dataCreation := map[string]interface{}{"Image": imageName, "Cmd" : args}
+	byteData, err := json.Marshal(dataCreation)
+	if err != nil {
+		l.Fatal().Msg("Error when contacting the creating request body : " + err.Error())
+	}
+	
+	r, _ := http.NewRequest("POST",url + "/containers/create", bytes.NewBuffer(byteData))
+	r.Header.Add("Content-Type","application/json")
+	resp, err = http.DefaultClient.Do(r)
+	if err != nil {
+		l.Fatal().Msg("Error when contacting the docker API on " + conf.GetConfig().KubeHost + ": " + err.Error())
+	}
+
+	if resp.StatusCode == 201 {
+		var d map[string]interface{}
+
+		b, err := io.ReadAll(resp.Body)
+		if err != nil {
+			l.Fatal().Msg(err.Error())
+		}
+
+		err = json.Unmarshal(b, &d)
+		if err != nil {
+			l.Fatal().Msg(err.Error())
+		}
+
+		containerID = d["Id"].(string)
+	} else {
+		d, _ := io.ReadAll(resp.Body)
+		l.Fatal().Msg("Error when creating the container on " + conf.GetConfig().KubeHost + "\n " + string(d))
+	}
+
+	
+	resp, err = http.Post( url + "/containers/" + containerID + "/start", "", nil)
+	if err != nil {
+		l.Fatal().Msg("Error when contacting the docker API on " + conf.GetConfig().KubeHost + ": " + err.Error())
+	}
+
+	if resp.StatusCode >= 300 {
+		d, _ := io.ReadAll(resp.Body)
+		l.Fatal().Msg("Error when starting the container on " + conf.GetConfig().KubeHost + "\n " + string(d))
+	}
+
+	l.Info().Msg("Started container " + containerID)
+	// we can add logging with GET /containers/id/logs?stdout=true&follow=true
+
+	// logExecution(stdoutMonitord, l)
+}

daemons/execute_monitor_local.go

@@ -9,36 +9,65 @@ import (
 )
 
 type LocalMonitor struct {
-	LokiURL     string
-	KubeURL     string
 	ExecutionID string
 	PeerID      string
 	Duration    int
-	Logger      zerolog.Logger
+	LokiUrl		string
+	MongoUrl	string
+	DBName		string
+
 }
 
-func (lm *LocalMonitor) LaunchLocalMonitor() {
-	if lm.LokiURL == "" || lm.KubeURL == "" || lm.ExecutionID == "" {
-		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
+func NewLocalMonitor(executionsId string, peerId string, duration int) (Executor){
+	return &LocalMonitor{
+		ExecutionID: executionsId,
+		PeerID: peerId,
+		Duration: duration,
+		LokiUrl: conf.GetConfig().LokiUrl,
+		MongoUrl: conf.GetConfig().MongoUrl,
+		DBName: conf.GetConfig().DBName,
 	}
-	lm.execKube()
 }
 
-func (lm *LocalMonitor) execKube() {
-	args := []string{"-e", lm.ExecutionID, "-p", lm.PeerID, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl,
-		"-d", conf.GetConfig().DBName}
+// func (lm *LocalMonitor) LaunchLocalMonitor() {
+// 	if lm.ExecutionID == "" {
+// 		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
+// 	}
 
-	if conf.GetConfig().Mode == "kubernetes" {
-		args = append(args, []string{"-M", conf.GetConfig().Mode, "-H", conf.GetConfig().KubeHost, "-P", conf.GetConfig().KubePort,
-			"-C", conf.GetConfig().KubeCert, "-D", conf.GetConfig().KubeData, "-c", conf.GetConfig().KubeCA}...)
+// }
+
+func (lm *LocalMonitor) PrepareMonitorExec() []string {
+
+	args := []string{
+		"-e", lm.ExecutionID,
+		"-p", lm.PeerID,
+		"-u", lm.LokiUrl,
+		"-m", lm.MongoUrl,
+		"-d", lm.DBName,
 	}
+
+
 	if lm.Duration > 0 {
 		args = append(args, "-t", fmt.Sprintf("%d", lm.Duration))
 	}
+
+	return args
+}
+
+func (lm *LocalMonitor) LaunchMonitor(args []string, l zerolog.Logger)  {
 	cmd := exec.Command(conf.GetConfig().MonitorPath, args...)
 	fmt.Printf("Command : %v\n", cmd)
-	err := cmd.Start()
+
+	stdoutMonitord, err := cmd.StdoutPipe()
 	if err != nil {
-		lm.Logger.Error().Msg("Could not start oc-monitor for " + lm.ExecutionID + " : " + err.Error())
+		l.Error().Msg("Could not retrieve stdoutpipe for execution of oc-monitord" + err.Error())
 	}
+
+	err = cmd.Start()
+	if err != nil {
+		l.Error().Msg("Could not start oc-monitor for " + lm.ExecutionID + " : " + err.Error())
+	}
+
+	logExecution(stdoutMonitord, l)
 }
+

daemons/execution_manager.go

@@ -3,7 +3,6 @@ package daemons
 import (
 	"fmt"
 	"oc-schedulerd/conf"
-	"os"
 	"time"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
@@ -39,24 +38,44 @@ func (em *ExecutionManager) RetrieveNextExecutions() {
 func (em *ExecutionManager) executeExecution(Execution *workflow_execution.WorkflowExecution) {
 	// start execution
 	// create the yaml that describes the pod : filename, path/url to Loki
-	exec_method := os.Getenv("MONITOR_METHOD")
+	var executor Executor
+	// exec_method := os.Getenv("MONITOR_METHOD")
 	logger := oclib.GetLogger()
-	if exec_method == "k8s" {
-		logger.Error().Msg("TODO : executing oc-monitor in a k8s")
-	} else {
-		logger.Debug().Msg("Executing oc-monitor localy")
-		duration := 0
-		if Execution.EndDate != nil {
-			duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
-		}
-		monitor := LocalMonitor{
-			Logger:      logger,
-			Duration:    duration,
-			LokiURL:     conf.GetConfig().LokiUrl,
-			KubeURL:     "localhost",
-			ExecutionID: Execution.UUID,
-			PeerID:      Execution.CreatorID,
-		}
-		monitor.LaunchLocalMonitor()
+	duration := 0
+	if Execution.EndDate != nil {
+		duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
 	}
+
+	if conf.GetConfig().Mode == "local" {
+		executor = NewLocalMonitor(Execution.ExecutionsID, Execution.CreatorID, duration)
+	}
+
+	if conf.GetConfig().Mode == "container" {
+		executor = NewContainerMonitor(Execution.ExecutionsID, Execution.CreatorID, duration)
+	}
+
+	if executor == nil {
+		logger.Fatal().Msg("Could not create logger")
+	}
+	args := executor.PrepareMonitorExec()
+	executor.LaunchMonitor(args,logger)
+
+	// if exec_method == "k8s" {
+	// 	logger.Error().Msg("TODO : executing oc-monitor in a k8s")
+	// } else {
+	// 	logger.Debug().Msg("Executing oc-monitor localy")
+	// 	duration := 0
+	// 	if Execution.EndDate != nil {
+	// 		duration = int(Execution.EndDate.Sub(Execution.ExecDate).Seconds())
+	// 	}
+	// 	monitor := LocalMonitor{
+	// 		Logger:      	logger,
+	// 		Duration:    	duration,
+	// 		ExecutionID: 	Execution.ExecutionsID,
+	// 		PeerID:     	Execution.CreatorID,
+	// 		LokiUrl:		conf.GetConfig().LokiUrl,
+			
+	// 	}
+	// 	monitor.LaunchLocalMonitor()
+	// }
 }

daemons/interface.go

@@ -0,0 +1,21 @@
+package daemons
+
+import (
+	"bufio"
+	"io"
+
+	"github.com/rs/zerolog"
+)
+
+type Executor interface {
+	PrepareMonitorExec() []string
+	LaunchMonitor(args []string, l zerolog.Logger)
+}
+
+func logExecution(reader io.ReadCloser, l zerolog.Logger) {
+	scanner := bufio.NewScanner(reader)
+	for scanner.Scan() {
+		output := scanner.Text()
+		l.Debug().Msg(output)
+	}
+}

daemons/schedule_manager.go

@@ -111,11 +111,11 @@ func (s *ScheduleManager) listenForChange(nc *nats.Conn, chanName string, delete
 // Used at launch of the component to retrieve the next scheduled workflows
 // and then every X minutes in case some workflows were scheduled before launch
 func (s *ScheduleManager) SchedulePolling() {
-	var sleep_time float64 = 1
+	var sleep_time float64 = 20
 	for {
 		s.getNextScheduledWorkflows(1)
 		s.Logger.Info().Msg("Current list of schedules -------> " + fmt.Sprintf("%v", len(Executions.Execs)))
-		time.Sleep(time.Minute * time.Duration(sleep_time))
+		time.Sleep(time.Second * time.Duration(sleep_time))
 	}
 }
 func (s *ScheduleManager) getExecution(from time.Time, to time.Time) (exec_list []*workflow_execution.WorkflowExecution, err error) {

docker-compose.tools.yml

@@ -1,36 +0,0 @@
-version: '3.4'
-
-services:
-  nats:
-    image: 'nats:latest'
-    container_name: nats
-    ports:
-      - 4222:4222
-    command:
-      - "--debug"
-    networks: 
-      - catalog
-  loki:
-    image: 'grafana/loki'
-    container_name: loki
-    ports : 
-      - "3100:3100"
-    networks:
-      - catalog
-  grafana:
-    image: 'grafana/grafana'
-    container_name: grafana
-    ports:
-      - '3000:3000'
-    networks:
-      - catalog
-    volumes:
-      - ./conf/grafana_data_source.yml:/etc/grafana/provisioning/datasources/datasource.yml
-    environment:
-      - GF_SECURITY_ADMIN_PASSWORD=pfnirt                   # Change this to anything but admin to not have a password change page at startup
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_DISABLE_INITIAL_ADMIN_PASSWORD_CHANGE=true
-
-networks: 
-  catalog:
-    external: true

docker-compose.yml

@@ -12,8 +12,8 @@ services:
       - 9001:8080
     container_name: oc-schedulerd
     networks: 
-      - catalog
+      - oc
 
 networks: 
-  catalog:
+  oc:
     external: true

docker_schedulerd.json

@@ -4,9 +4,9 @@
     "NATS_URL":"nats://nats:4222",
     "MONGO_DATABASE":"DC_myDC",
     "MONITORD_PATH": "oc-monitord",
-    "KUBERNETES_SERVICE_HOST" : "192.168.1.69",
+    "KUBERNETES_SERVICE_HOST" : "192.168.47.41",
     "MODE": "kubernetes",
-    "KUBE_CA" : "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTVlk3ZHZhNEdYTVdkMy9jMlhLN3JLYjlnWXgyNSthaEE0NmkyNVBkSFAKRktQL2UxSVMyWVF0dzNYZW1TTUQxaStZdzJSaVppNUQrSVZUamNtNHdhcnFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWtlUVJpNFJiODduME5yRnZaWjZHClc2SU55NnN3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnRXA5ck04WmdNclRZSHYxZjNzOW5DZXZZeWVVa3lZUk4KWjUzazdoaytJS1FDSVFDbk05TnVGKzlTakIzNDFacGZ5ays2NEpWdkpSM3BhcmVaejdMd2lhNm9kdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_CERT":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJWUxWNkFPQkdrU1F3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl6TVRFeU1ETTJNQjRYRFRJME1EZ3dPREV3TVRNMU5sb1hEVEkxTURndwpPREV3TVRNMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJGQ2Q1MFdPeWdlQ2syQzcKV2FrOWY4MVAvSkJieVRIajRWOXBsTEo0ck5HeHFtSjJOb2xROFYxdUx5RjBtOTQ2Nkc0RmRDQ2dqaXFVSk92Swp3NVRPNnd5alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFJkOFI5cXVWK2pjeUVmL0ovT1hQSzMyS09XekFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQTArbThqTDBJVldvUTZ0dnB4cFo4NVlMalF1SmpwdXM0aDdnSXRxS3NmUVVDSUI2M2ZNdzFBMm5OVWU1TgpIUGZOcEQwSEtwcVN0Wnk4djIyVzliYlJUNklZCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpNeE1USXdNell3SGhjTk1qUXdPREE0TVRBeE16VTJXaGNOTXpRd09EQTJNVEF4TXpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpNeE1USXdNell3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRc3hXWk9pbnIrcVp4TmFEQjVGMGsvTDF5cE01VHAxOFRaeU92ektJazQKRTFsZWVqUm9STW0zNmhPeVljbnN3d3JoNnhSUnBpMW5RdGhyMzg0S0Z6MlBvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBYZkVmYXJsZm8zTWhIL3lmemx6Cnl0OWlqbHN3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUxJL2dNYnNMT3MvUUpJa3U2WHVpRVMwTEE2cEJHMXgKcnBlTnpGdlZOekZsQWlFQW1wdjBubjZqN3M0MVI0QzFNMEpSL0djNE53MHdldlFmZWdEVGF1R2p3cFk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
-    "KUBE_DATA": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSU5ZS1BFb1dhd1NKUzJlRW5oWmlYMk5VZlY1ZlhKV2krSVNnV09TNFE5VTlvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVUozblJZN0tCNEtUWUx0WnFUMS96VS84a0Z2Sk1lUGhYMm1Vc25pczBiR3FZblkyaVZEeApYVzR2SVhTYjNqcm9iZ1YwSUtDT0twUWs2OHJEbE03ckRBPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
-}
+    "KUBE_CA": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUL1NDWEMycjFTWGdza0FvTGJKSEtIem4zQXYva2t0ZElpSk42WlBsWVEKY3p0dXV5K3JBMHJ5VUlkZnIyK3VCRS9VN0NjSlhPL004QVdyODFwVklzVmdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVFHOVBQQ0g0c1lMbFkvQk5CdnN5CklEam1PK0l3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUtJeFc4NERQTW1URXVVN0Z3ek44SFB6ZHdldWh6U20KVzNYMU9tczFSQVNRQWlFQXI4UTJZSGtNQndSOThhcWtTa2JqU1dhejg0OEY2VkZLWjFacXpNbDFZaTg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
+    "KUBE_CERT": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJZWFxQUp2bHhmYzh3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOelF6TmpjME56ZzVNQjRYRFRJMU1EUXdNekV3TURZeU9Wb1hEVEkyTURRdwpNekV3TURZeU9Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJJelpGSlJUVHJmYXlNNFoKTjlRclN4MC9wbDdoZGdvWFM5bGEydmFFRkhlYVFaalRML2NZd1dMUnhoOWVOa01SRDZjTk4reWZkSXE2aWo1SQo5RTlENGdLalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFFzUkZXUlNweDV0RGZnZDh1UTdweUw0ZERMVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQStXZTlBVXJRUm5pWjVCUERELzJwWjA3TzFQWWFIc01ycTZZcVB4VlV5cGdDSUhrRE8rcVlMYUhkUEhXZgpWUGszNXJmejM0Qk4xN2VyaEVxRjF0U0c1MWFqCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUNDF1NXIzM0JyenZ3ZXZaWHM2TEg3T1k4NGhOOGRrODdnTlhaUndBdWkKdXJBaU45TFdYcmYxeFoyaXp5d0FiVGk1ZVc2Q1hIMjhDdEVSWUlrcjNoTXdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBMRVJWa1VxY2ViUTM0SGZMa082CmNpK0hReTB3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUpLWGZLdXBzdklONEtQVW50c1lPNXhiaGhSQmhSYlIKN3JyeWs2VHpZMU5JQWlBVktKWis3UUxzeGFyQktORnI3eTVYYlNGanI3Y1gyQmhOYy9wdnFLcWtFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
+    "KUBE_DATA": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVJd01wVjdzMHc2S0VTQ2FBWDhvSVZPUHloa2U0Q3duNWZQZnhOaUYyM3JvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFak5rVWxGTk90OXJJemhrMzFDdExIVCttWHVGMkNoZEwyVnJhOW9RVWQ1cEJtTk12OXhqQgpZdEhHSDE0MlF4RVBwdzAzN0o5MGlycUtQa2owVDBQaUFnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
+}

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.22.5
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026
+	cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7
 	github.com/beego/beego v1.12.12
 	github.com/goraz/onion v0.1.3
 	github.com/nats-io/nats.go v1.37.0

go.sum

@@ -1,5 +1,31 @@
 cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026 h1:CYwpofGfpAhMDrT6jqvu9NI/tcgxCD8PKJZDKEfTvVI=
 cloud.o-forge.io/core/oc-lib v0.0.0-20250213085018-271cc2caa026/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/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

main.go

@@ -4,22 +4,28 @@ import (
 	"fmt"
 	"oc-schedulerd/conf"
 	"oc-schedulerd/daemons"
+	"os"
 
 	oclib "cloud.o-forge.io/core/oc-lib"
 )
 
 func main() {
-
 	oclib.InitDaemon("oc-schedulerd")
+	l := oclib.GetLogger()
 	o := oclib.GetConfLoader()
 
-	oclib.SetConfig(
+	c := oclib.SetConfig(
 		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("LOG_LEVEL", "info"),
 	)
+
+	conf.GetConfig().DBName = c.MongoDatabase
+	conf.GetConfig().MongoUrl = c.MongoUrl
+	conf.GetConfig().NatsUrl = c.NATSUrl
+	conf.GetConfig().LokiUrl = c.LokiUrl
 	conf.GetConfig().Mode = o.GetStringDefault("MODE", "")
 	conf.GetConfig().KubeHost = o.GetStringDefault("KUBERNETES_SERVICE_HOST", "")
 	conf.GetConfig().KubePort = o.GetStringDefault("KUBERNETES_SERVICE_PORT", "6443")
@@ -28,6 +34,22 @@ func main() {
 	conf.GetConfig().KubeCert = o.GetStringDefault("KUBE_CERT", "")
 	conf.GetConfig().KubeData = o.GetStringDefault("KUBE_DATA", "")
 
+	// Test if oc-monitor binary is reachable
+	// For local executions
+	if _, err := os.Stat("../oc-monitord/oc-monitord"); err == nil {
+		conf.GetConfig().MonitorPath = "../oc-monitord/oc-monitord"
+	}
+	// For container executions
+	if _, err := os.Stat("/usr/bin/oc-monitord"); conf.GetConfig().MonitorPath == "" && err == nil {
+		conf.GetConfig().MonitorPath = "/usr/bin/oc-monitord"
+	}
+
+	if conf.GetConfig().MonitorPath == "" {
+		l.Fatal().Msg("Could not find oc-monitord binary")
+	}
+
+	l.Info().Msg("oc-monitord binary at " + conf.GetConfig().MonitorPath )
+
 	sch_mngr := daemons.ScheduleManager{Logger: oclib.GetLogger()}
 	exe_mngr := daemons.ExecutionManager{}
 

schedulerd.json

@@ -0,0 +1,12 @@
+{
+    "LOKI_URL" : "http://172.16.0.181:3100",
+    "MONGO_URL":"mongodb://172.16.0.181:27017/", 
+    "NATS_URL":"nats://172.16.0.181:4222",
+    "MONGO_DATABASE":"DC_myDC",
+    "MONITORD_PATH": "../oc-monitord/oc-monitord",
+    "KUBERNETES_SERVICE_HOST" : "172.16.0.181",
+    "MODE": "container",
+    "KUBE_CA": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJlRENDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUL1NDWEMycjFTWGdza0FvTGJKSEtIem4zQXYva2t0ZElpSk42WlBsWVEKY3p0dXV5K3JBMHJ5VUlkZnIyK3VCRS9VN0NjSlhPL004QVdyODFwVklzVmdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVFHOVBQQ0g0c1lMbFkvQk5CdnN5CklEam1PK0l3Q2dZSUtvWkl6ajBFQXdJRFNRQXdSZ0loQUtJeFc4NERQTW1URXVVN0Z3ek44SFB6ZHdldWh6U20KVzNYMU9tczFSQVNRQWlFQXI4UTJZSGtNQndSOThhcWtTa2JqU1dhejg0OEY2VkZLWjFacXpNbDFZaTg9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
+    "KUBE_CERT": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJZWFxQUp2bHhmYzh3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOelF6TmpjME56ZzVNQjRYRFRJMU1EUXdNekV3TURZeU9Wb1hEVEkyTURRdwpNekV3TURZeU9Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJJelpGSlJUVHJmYXlNNFoKTjlRclN4MC9wbDdoZGdvWFM5bGEydmFFRkhlYVFaalRML2NZd1dMUnhoOWVOa01SRDZjTk4reWZkSXE2aWo1SQo5RTlENGdLalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCVFFzUkZXUlNweDV0RGZnZDh1UTdweUw0ZERMVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQStXZTlBVXJRUm5pWjVCUERELzJwWjA3TzFQWWFIc01ycTZZcVB4VlV5cGdDSUhrRE8rcVlMYUhkUEhXZgpWUGszNXJmejM0Qk4xN2VyaEVxRjF0U0c1MWFqCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTkRNMk56UTNPRGt3SGhjTk1qVXdOREF6TVRBd05qSTVXaGNOTXpVd05EQXhNVEF3TmpJNQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTkRNMk56UTNPRGt3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUNDF1NXIzM0JyenZ3ZXZaWHM2TEg3T1k4NGhOOGRrODdnTlhaUndBdWkKdXJBaU45TFdYcmYxeFoyaXp5d0FiVGk1ZVc2Q1hIMjhDdEVSWUlrcjNoTXdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVTBMRVJWa1VxY2ViUTM0SGZMa082CmNpK0hReTB3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQUpLWGZLdXBzdklONEtQVW50c1lPNXhiaGhSQmhSYlIKN3JyeWs2VHpZMU5JQWlBVktKWis3UUxzeGFyQktORnI3eTVYYlNGanI3Y1gyQmhOYy9wdnFLcWtFUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
+    "KUBE_DATA": "LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVJd01wVjdzMHc2S0VTQ2FBWDhvSVZPUHloa2U0Q3duNWZQZnhOaUYyM3JvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFak5rVWxGTk90OXJJemhrMzFDdExIVCttWHVGMkNoZEwyVnJhOW9RVWQ1cEJtTk12OXhqQgpZdEhHSDE0MlF4RVBwdzAzN0o5MGlycUtQa2owVDBQaUFnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo="
+}