Merge pull request #520 from ARGOeu/devel

Version 1.13.3
ARGOeu · May 10, 2023 · 628e786 · 628e786
2 parents 1b93247 + 31e96f0
commit 628e786
Show file tree

Hide file tree

Showing 13 changed files with 1,919 additions and 670 deletions.
diff --git a/app/topology/controller.go b/app/topology/controller.go
diff --git a/app/topology/model.go b/app/topology/model.go
@@ -22,7 +22,11 @@
 
 package topology
 
-import "encoding/xml"
+import (
+	"encoding/xml"
+
+	"github.com/ARGOeu/argo-web-api/utils/config"
+)
 
 // MongoInterface to retrieve and insert metricProfiles in mongo
 // type MongoInterface struct {
@@ -75,6 +79,7 @@ type Endpoint struct {
 	Hostname      string            `bson:"hostname" json:"hostname"`
 	Notifications *Notifications    `bson:"notifications" json:"notifications,omitempty"`
 	Tags          map[string]string `bson:"tags" json:"tags"`
+	Tenant        string            `json:"tenant,omitempty"`
 }
 
 // Group includes information on  of group group topology
@@ -86,6 +91,7 @@ type Group struct {
 	Subgroup      string            `bson:"subgroup" json:"subgroup"`
 	Notifications *Notifications    `bson:"notifications" json:"notifications,omitempty"`
 	Tags          map[string]string `bson:"tags" json:"tags"`
+	Tenant        string            `json:"tenant,omitempty"`
 }
 
 // ServiceType includes information about an available service type
@@ -96,6 +102,7 @@ type ServiceType struct {
 	Title       string   `bson:"title" json:"title"`
 	Description string   `bson:"description" json:"description"`
 	Tags        []string `bson:"tags" json:"tags,omitempty"`
+	Tenant      string   `json:"tenant,omitempty"`
 }
 
 // Notifications holds notification information about topology items
@@ -104,6 +111,11 @@ type Notifications struct {
 	Enabled  bool     `bson:"enabled" json:"enabled,omitempty"`
 }
 
+type TenantDB struct {
+	Tenant string
+	Config config.MongoConfig
+}
+
 // TagInfo groups all tags for a topology type
 type TagInfo struct {
 	Name   string      `json:"name"`