trace system up is up per tenant for cloud

server/memphis_cloud.go

@@ -1886,3 +1886,27 @@ func getStationReplicas(replicas int) int {
 func getDefaultReplicas() int {
 	return 1
 }
+
+func updateSystemLiveness() {
+	stationsHandler := StationsHandler{S: serv}
+	stations, totalMessages, totalDlsMsgs, err := stationsHandler.GetAllStationsDetails(false, "")
+	if err != nil {
+		serv.Warnf("updateSystemLiveness: %v", err.Error())
+		return
+	}
+
+	producersCount, err := db.CountAllActiveProudcers()
+	if err != nil {
+		serv.Warnf("updateSystemLiveness: %v", err.Error())
+		return
+	}
+
+	consumersCount, err := db.CountAllActiveConsumers()
+	if err != nil {
+		serv.Warnf("updateSystemLiveness: %v", err.Error())
+		return
+	}
+
+	analyticsParams := map[string]interface{}{"total-messages": strconv.Itoa(int(totalMessages)), "total-dls-messages": strconv.Itoa(int(totalDlsMsgs)), "total-stations": strconv.Itoa(len(stations)), "active-producers": strconv.Itoa(int(producersCount)), "active-consumers": strconv.Itoa(int(consumersCount))}
+	analytics.SendEvent("", "", analyticsParams, "system-is-up")
+}

server/memphis_handlers_stations.go

@@ -17,6 +17,7 @@ import (
 	"errors"
 	"fmt"
 	"memphis/analytics"
+	"memphis/conf"
 	"memphis/db"
 	"memphis/models"
 	"memphis/utils"
@@ -42,6 +43,21 @@ type StationName struct {
 	external string
 }
 
+type StationsDetailsPerAccount struct {
+	TotalMessages    uint64 `json:"total_messages"`
+	TotalDlsMessages uint64 `json:"total_dls_messages"`
+	TotalStations    int    `json:"total_stations"`
+}
+
+type StationsDetailsPerAccountRes struct {
+	Account          string `json:"account"`
+	TotalMessages    string `json:"total_messages"`
+	TotalDlsMessages string `json:"total_dls_messages"`
+	TotalStations    string `json:"total_stations"`
+	ActiveProducers  int    `json:"active_producers"`
+	ActiveConsumers  int    `json:"active_consumers"`
+}
+
 func (sn StationName) Ext() string {
 	return sn.external
 }
@@ -659,6 +675,58 @@ func (sh StationsHandler) GetAllStationsDetails(shouldGetTags bool, tenantName s
 	}
 }
 
+func (sh StationsHandler) GetAllStationsDetailsPerTenant(tenantName []string) (map[string]StationsDetailsPerAccount, error) {
+	var stations []models.ExtendedStation
+	totalMessages := uint64(0)
+	StationsDetailsPerTenant := make(map[string]StationsDetailsPerAccount)
+	for _, tenantName := range tenantName {
+		if tenantName == "" {
+			tenantName = conf.MemphisGlobalAccountName
+		}
+		totalDlsMessages, err := db.GetTotalDlsMessages(tenantName)
+		if err != nil {
+			return map[string]StationsDetailsPerAccount{}, err
+		}
+
+		stations, err = db.GetAllStationsDetailsPerTenant(tenantName)
+		if err != nil {
+			return map[string]StationsDetailsPerAccount{}, err
+		}
+		if len(stations) == 0 {
+			res := StationsDetailsPerAccount{
+				TotalMessages:    0,
+				TotalDlsMessages: 0,
+				TotalStations:    0,
+			}
+			StationsDetailsPerTenant[tenantName] = res
+		} else {
+			acc, err := sh.S.lookupAccount(tenantName)
+			if err != nil {
+				return map[string]StationsDetailsPerAccount{}, err
+			}
+			accName := acc.Name
+			allStreamInfo, err := serv.memphisAllStreamsInfo(accName)
+			if err != nil {
+				return map[string]StationsDetailsPerAccount{}, err
+			}
+			for _, info := range allStreamInfo {
+				streamName := info.Config.Name
+				if !strings.Contains(streamName, "$memphis") {
+					totalMessages += info.State.Msgs
+				}
+			}
+			stationDetailsPerAccountRes := StationsDetailsPerAccount{
+				TotalMessages:    totalMessages,
+				TotalDlsMessages: totalDlsMessages,
+				TotalStations:    len(stations),
+			}
+
+			StationsDetailsPerTenant[tenantName] = stationDetailsPerAccountRes
+		}
+	}
+	return StationsDetailsPerTenant, nil
+}
+
 func (sh StationsHandler) GetStations(c *gin.Context) {
 	user, err := getUserDetailsFromMiddleware(c)
 	if err != nil {

server/memphis_zombie_resources.go

@@ -13,10 +13,8 @@ package server
 
 import (
 	"encoding/json"
-	"memphis/analytics"
 	"memphis/db"
 	"memphis/models"
-	"strconv"
 	"sync"
 	"time"
 )
@@ -45,30 +43,6 @@ func (srv *Server) removeStaleStations() {
 	}
 }
 
-func updateSystemLiveness() {
-	stationsHandler := StationsHandler{S: serv}
-	stations, totalMessages, totalDlsMsgs, err := stationsHandler.GetAllStationsDetails(false, "")
-	if err != nil {
-		serv.Warnf("updateSystemLiveness: %v", err.Error())
-		return
-	}
-
-	producersCount, err := db.CountAllActiveProudcers()
-	if err != nil {
-		serv.Warnf("updateSystemLiveness: %v", err.Error())
-		return
-	}
-
-	consumersCount, err := db.CountAllActiveConsumers()
-	if err != nil {
-		serv.Warnf("updateSystemLiveness: %v", err.Error())
-		return
-	}
-
-	analyticsParams := map[string]interface{}{"total-messages": strconv.Itoa(int(totalMessages)), "total-dls-messages": strconv.Itoa(int(totalDlsMsgs)), "total-stations": strconv.Itoa(len(stations)), "active-producers": strconv.Itoa(int(producersCount)), "active-consumers": strconv.Itoa(int(consumersCount))}
-	analytics.SendEvent("", "", analyticsParams, "system-is-up")
-}
-
 func aggregateClientConnections(s *Server) (map[string]string, error) {
 	connectionIds := make(map[string]string)
 	var lock sync.Mutex