Merge branch 'main' of https://cloud.o-forge.io/core/oc-monitord into services_demo

README.md

@@ -54,4 +54,11 @@ This command **must return "yes"**
   - logsPods() function already exists
   - need to implement the logic to create each pod's logger and start the monitoring routing
 - [ ] Allow the front to known on which IP the service are reachable
-  - currently doing it by using `kubectl get nodes -o wide`
+  - currently doing it by using `kubectl get nodes -o wide`
+
+
+### Adding ingress handling to support reverse proxing
+
+- Test wether ingress-nginx is running or not
+  - Do something if not found : stop running and send error log OR start installation
+- 

conf/conf.go

@@ -3,10 +3,14 @@ package conf
 import "sync"
 
 type Config struct {
+	MongoURL	string
+	Database	string
 	LokiURL     string
+	NatsURL		string
 	ExecutionID string
 	Timeout     int
 	WorkflowID  string
+	Logs 		string
 }
 
 var instance *Config

go.mod

@@ -3,7 +3,7 @@ module oc-monitord
 go 1.22.0
 
 require (
-	cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e
+	cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f
 	github.com/akamensky/argparse v1.4.0
 	github.com/goraz/onion v0.1.3
 	github.com/nats-io/nats-server/v2 v2.10.18
@@ -42,6 +42,6 @@ require (
 	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 )

go.sum

@@ -40,6 +40,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34 h1:40XQgwR9HxXSn
 cloud.o-forge.io/core/oc-lib v0.0.0-20240826085916-d0e1474f8f34/go.mod h1:1hhYh5QWAbYw9cKplQ0ZD9PMgU8t6gPqiYF8sldv1HU=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e h1:/KWO/gIcP5f7T4r00715fNz0Y/Hil6Bj3J1ycuES1Zw=
 cloud.o-forge.io/core/oc-lib v0.0.0-20240828135227-14d6a5f11c4e/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f h1:v9mw3uNg/DJswOvHooMu8/BMedA+vIXbma+8iUwsjUI=
+cloud.o-forge.io/core/oc-lib v0.0.0-20240904135449-4f0ab6a3760f/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
 github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
@@ -206,6 +208,8 @@ golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -216,6 +220,8 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

main.go

@@ -20,7 +20,6 @@ import (
 
 	"cloud.o-forge.io/core/oc-lib/logs"
 	"cloud.o-forge.io/core/oc-lib/models/workflow_execution"
-	"cloud.o-forge.io/core/oc-lib/tools"
 
 	"github.com/akamensky/argparse"
 	"github.com/google/uuid"
@@ -61,13 +60,19 @@ func main() {
 		loadConfig(true, nil)
 	}
 
-	logs.SetAppName("oc-monitord")
+	logger = logs.CreateLogger("oc-monitord")
-	logger = logs.CreateLogger("oc-monitord", conf.GetConfig().LokiURL)
 
 	logger.Debug().Msg("Loki URL : " + conf.GetConfig().LokiURL)
 	logger.Debug().Msg("Workflow executed : " + conf.GetConfig().ExecutionID)
 
-	oclib.Init("oc-monitord","","")
+	oclib.SetConfig(
+		conf.GetConfig().MongoURL,
+		conf.GetConfig().Database,
+		conf.GetConfig().NatsURL,
+		conf.GetConfig().LokiURL,
+		conf.GetConfig().Logs,
+	)
+	oclib.Init("oc-monitord")
 
 	wf_id := getWorkflowId(conf.GetConfig().ExecutionID)
 	conf.GetConfig().WorkflowID = wf_id
@@ -222,7 +227,9 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {
 		conf.GetConfig().ExecutionID = o.GetString("workflow")
 		mongo := o.GetStringDefault("mongourl", "mongodb://127.0.0.1:27017")
 		db := o.GetStringDefault("database", "DC_myDC")
-		tools.SetConfig(mongo, db, "")
+
+		conf.GetConfig().MongoURL = mongo
+		conf.GetConfig().Database = db
 	} else {
 		url := parser.String("u", "url", &argparse.Options{Required: true, Default: "http://127.0.0.1:3100", Help: "Url to the Loki database logs will be sent to"})
 		execution := parser.String("e", "execution", &argparse.Options{Required: true, Help: "Execution ID of the workflow to request from oc-catalog API"})
@@ -234,17 +241,21 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) {
 			fmt.Println(parser.Usage(err))
 			os.Exit(1)
 		}
+		
+		conf.GetConfig().Logs = "debug"
+
 		conf.GetConfig().LokiURL = *url
+		conf.GetConfig().MongoURL = *mongo
+		conf.GetConfig().Database = *db
 		conf.GetConfig().Timeout = *timeout
 		conf.GetConfig().ExecutionID = *execution
-		tools.SetConfig(*mongo, *db, "")
 	}
 
 }
 
 
 func initOnion(o *onion.Onion) *onion.Onion {
-	logger = logs.CreateLogger("oc-monitord", "")
+	logger = logs.CreateLogger("oc-monitord")
 	configFile := ""
 
 	l3 := onion.NewEnvLayerPrefix("_", "OCMONITORD")