diff --git a/go.mod b/go.mod index 8d50990..5874c16 100644 --- a/go.mod +++ b/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-20240830131445-af18dba5563c github.com/akamensky/argparse v1.4.0 github.com/goraz/onion v0.1.3 github.com/nats-io/nats-server/v2 v2.10.18 diff --git a/go.sum b/go.sum index 6bf2dc7..6d7d36e 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,10 @@ 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-20240830071403-db78c70dc349 h1:bEIY1lCsA78/mJqFE0gV6likAv5ZifH3RMnLJxiSk3o= +cloud.o-forge.io/core/oc-lib v0.0.0-20240830071403-db78c70dc349/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0= +cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c h1:4ZoM9ONJiaeLHSi0s8gsCe4lHuRHXkfK+eDSnTCspa0= +cloud.o-forge.io/core/oc-lib v0.0.0-20240830131445-af18dba5563c/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= diff --git a/main.go b/main.go index 580c04e..0eb3ef0 100644 --- a/main.go +++ b/main.go @@ -19,6 +19,7 @@ import ( oclib "cloud.o-forge.io/core/oc-lib" "cloud.o-forge.io/core/oc-lib/logs" + "cloud.o-forge.io/core/oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/models/workflow_execution" "cloud.o-forge.io/core/oc-lib/tools" @@ -47,7 +48,7 @@ const localConfigFile = "./conf/local_ocmonitord_conf.json" func main() { - os.Setenv("test_service","true") // Only for service demo, delete before merging on main + os.Setenv("test_service", "true") // Only for service demo, delete before merging on main monitorLocal = false // Test if monitor is launched outside (with parameters) or in a k8s environment (env variables sets) @@ -69,7 +70,7 @@ func main() { logger.Debug().Msg("Loki URL : " + conf.GetConfig().LokiURL) logger.Debug().Msg("Workflow executed : " + conf.GetConfig().ExecutionID) - oclib.Init("oc-monitord","","") + oclib.Init("oc-monitord", "", "") wf_id := getWorkflowId(conf.GetConfig().ExecutionID) conf.GetConfig().WorkflowID = wf_id @@ -242,7 +243,6 @@ func setConf(is_k8s bool, o *onion.Onion, parser *argparse.Parser) { } - func initOnion(o *onion.Onion) *onion.Onion { logger = logs.CreateLogger("oc-monitord", "") configFile := "" @@ -294,10 +294,11 @@ func checkStatus(current string, previous string) { func updateStatus(status string) { exec_id := conf.GetConfig().ExecutionID - wf_exec := &workflow_execution.WorkflowExecution{} + wf_exec := &workflow_execution.WorkflowExecution{AbstractObject: utils.AbstractObject{UUID: conf.GetConfig().ExecutionID}} wf_exec.ArgoStatusToState(status) serialized := wf_exec.Serialize() + res := oclib.UpdateOne(oclib.LibDataEnum(oclib.WORKFLOW_EXECUTION), serialized, exec_id) if res.Code != 200 { diff --git a/oc-monitord b/oc-monitord index 1ae54fe..063254a 100755 Binary files a/oc-monitord and b/oc-monitord differ