change view to get mix of agents

agent/cloud_config/cloud_config.go

@@ -121,7 +121,8 @@ func (cc *cloudConfigManager) autoProvision(apiAddress string, token string) (co
 	}
 
 	type AgentReq struct {
-		Name string `json:"name"`
+		Name      string            `json:"name"`
+		AgentTags map[string]string `json:"agent_tags"`
 	}
 
 	aname := cc.config.OrbAgent.Cloud.Config.AgentName
@@ -133,7 +134,7 @@ func (cc *cloudConfigManager) autoProvision(apiAddress string, token string) (co
 		aname = hostname
 	}
 
-	agentReq := AgentReq{Name: strings.Replace(aname, ".", "-", -1)}
+	agentReq := AgentReq{Name: strings.Replace(aname, ".", "-", -1), AgentTags: cc.config.OrbAgent.Tags}
 	body, err := json.Marshal(agentReq)
 	if err != nil {
 		return config.MQTTConfig{}, err

fleet/agent_service.go

@@ -30,11 +30,11 @@ var (
 )
 
 func (svc fleetService) addAgentToAgentGroupChannels(token string, a Agent) error {
-	// first we get the agent group to connect the new agent to the correct group channel
 	groupList, err := svc.agentGroupRepository.RetrieveAllByAgent(context.Background(), a)
 	if err != nil {
 		return err
 	}
+
 	if len(groupList) == 0 {
 		return nil
 	}
@@ -160,6 +160,7 @@ func (svc fleetService) CreateAgent(ctx context.Context, token string, a Agent)
 		// TODO should we roll back?
 		svc.logger.Error("failed to add agent to a existing group channel", zap.String("agent_id", a.MFThingID), zap.Error(err))
 	}
+
 	return a, nil
 }
 

fleet/api/http/endpoint.go

@@ -176,6 +176,7 @@ func addAgentEndpoint(svc fleet.Service) endpoint.Endpoint {
 		agent := fleet.Agent{
 			Name:    nID,
 			OrbTags: req.OrbTags,
+			AgentTags: req.AgentTags,
 		}
 		saved, err := svc.CreateAgent(c, req.token, agent)
 		if err != nil {

fleet/api/http/requests.go

@@ -79,9 +79,10 @@ func (req updateAgentGroupReq) validate() error {
 }
 
 type addAgentReq struct {
-	token   string
-	Name    string     `json:"name,omitempty"`
-	OrbTags types.Tags `json:"orb_tags,omitempty"`
+	token     string
+	Name      string     `json:"name,omitempty"`
+	OrbTags   types.Tags `json:"orb_tags,omitempty"`
+	AgentTags types.Tags `json:"agent_tags,omitempty"`
 }
 
 func (req addAgentReq) validate() error {

fleet/postgres/init.go

@@ -100,6 +100,22 @@ func migrateDB(db *sqlx.DB) error {
 					"DROP TABLE agent_groups",
 					"DROP VIEW agent_group_membership",
 				},
+			}, {
+				Id: "fleet_2",
+				Up: []string{
+					`CREATE or REPLACE VIEW agent_group_membership(agent_groups_id, agent_groups_name, agent_mf_thing_id, agent_mf_channel_id, group_mf_channel_id, mf_owner_id, agent_state) as
+					SELECT agent_groups.id,
+						   agent_groups.name,
+						   agents.mf_thing_id,
+						   agents.mf_channel_id,
+						   agent_groups.mf_channel_id,
+						   agent_groups.mf_owner_id,
+						   agents.state
+					FROM agents,
+						 agent_groups
+					WHERE agent_groups.mf_owner_id = agents.mf_owner_id
+					  AND (agent_groups.tags <@ coalesce(agents.agent_tags || agents.orb_tags, agents.agent_tags, agents.orb_tags))`,
+				},
 			},
 		},
 	}