Add LowCollector & rename Supervisor to Monitoring

[src/xds/xds-agent.git] / lib / agent / apiv1.go

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 730e7c0..ef9704c 100644 (file)
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 "IoT.bzh"
+ * Copyright (C) 2017-2019 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,8 +22,8 @@ import (
        "strconv"
        "strings"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
 )
@@ -67,6 +67,13 @@ func NewAPIV1(ctx *Context) *APIService {
        s.apiRouter.POST("/events/register", s.eventsRegister)
        s.apiRouter.POST("/events/unregister", s.eventsUnRegister)
 
+       s.apiRouter.GET("/monitoring/topo", s.getMonitoringTopo)
+       s.apiRouter.POST("/monitoring/trace/start", s.startMonitoring)
+       s.apiRouter.POST("/monitoring/trace/stop", s.stopMonitoring)
+       s.apiRouter.POST("/monitoring/alc/start", s.StartLowCollector)
+       s.apiRouter.POST("/monitoring/alc/stop", s.StopLowCollector)
+       s.apiRouter.GET("/monitoring/alc/read", s.ReadLowCollector)
+       s.apiRouter.POST("/monitoring/alc/reset", s.ResetLowCollector)
        return s
 }
 
@@ -137,6 +144,12 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
                        if err := s.sdksEventsForwardInit(server); err != nil {
                                s.Log.Errorf("XDS Server %v - sdk events forwarding error: %v", server.ID, err)
                        }
+                       if err := s.targetsEventsForwardInit(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - target events forwarding error: %v", server.ID, err)
+                       }
+                       if err := s.terminalsEventsForwardInit(server); err != nil {
+                               s.Log.Errorf("XDS Server %v - terminal events forwarding error: %v", server.ID, err)
+                       }
 
                        // Load projects
                        if err := s.projects.Init(server); err != nil {