Merge pull request #331 from openziti/v0.4_web_console

V0.4 Web Console

controller/access.go

@@ -76,7 +76,7 @@ func (h *accessHandler) Handle(params share.AccessParams, principal *rest_model_
 		"zrokFrontendToken":  feToken,
 		"zrokShareToken":     shrToken,
 	}
-	if err := zrokEdgeSdk.CreateServicePolicyDial(envZId+"-"+shr.ZId+"-dial", shr.ZId, []string{envZId}, addlTags, edge); err != nil {
+	if err := zrokEdgeSdk.CreateServicePolicyDial(feToken+"-"+envZId+"-"+shr.ZId+"-dial", shr.ZId, []string{envZId}, addlTags, edge); err != nil {
 		logrus.Errorf("unable to create dial policy for user '%v': %v", principal.Email, err)
 		return share.NewAccessInternalServerError()
 	}

controller/accountDetail.go

@@ -0,0 +1,55 @@
+package controller
+
+import (
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/openziti/zrok/rest_model_zrok"
+	"github.com/openziti/zrok/rest_server_zrok/operations/metadata"
+	"github.com/sirupsen/logrus"
+)
+
+type accountDetailHandler struct{}
+
+func newAccountDetailHandler() *accountDetailHandler {
+	return &accountDetailHandler{}
+}
+
+func (h *accountDetailHandler) Handle(params metadata.GetAccountDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	trx, err := str.Begin()
+	if err != nil {
+		logrus.Errorf("error stasrting transaction for '%v': %v", principal.Email, err)
+		return metadata.NewGetAccountDetailInternalServerError()
+	}
+	defer func() { _ = trx.Rollback() }()
+	envs, err := str.FindEnvironmentsForAccount(int(principal.ID), trx)
+	if err != nil {
+		logrus.Errorf("error retrieving environments for '%v': %v", principal.Email, err)
+		return metadata.NewGetAccountDetailInternalServerError()
+	}
+	sparkRx := make(map[int][]int64)
+	sparkTx := make(map[int][]int64)
+	if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
+		sparkRx, sparkTx, err = sparkDataForEnvironments(envs)
+		if err != nil {
+			logrus.Errorf("error querying spark data for environments for '%v': %v", principal.Email, err)
+		}
+	} else {
+		logrus.Debug("skipping spark data for environments; no influx configuration")
+	}
+	var payload []*rest_model_zrok.Environment
+	for _, env := range envs {
+		var sparkData []*rest_model_zrok.SparkDataSample
+		for i := 0; i < len(sparkRx[env.Id]) && i < len(sparkTx[env.Id]); i++ {
+			sparkData = append(sparkData, &rest_model_zrok.SparkDataSample{Rx: float64(sparkRx[env.Id][i]), Tx: float64(sparkTx[env.Id][i])})
+		}
+		payload = append(payload, &rest_model_zrok.Environment{
+			Activity:    sparkData,
+			Address:     env.Address,
+			CreatedAt:   env.CreatedAt.UnixMilli(),
+			Description: env.Description,
+			Host:        env.Host,
+			UpdatedAt:   env.UpdatedAt.UnixMilli(),
+			ZID:         env.ZId,
+		})
+	}
+	return metadata.NewGetAccountDetailOK().WithPayload(payload)
+}

controller/controller.go

@@ -46,10 +46,17 @@ func Run(inCfg *config.Config) error {
 	api.AdminUpdateFrontendHandler = newUpdateFrontendHandler()
 	api.EnvironmentEnableHandler = newEnableHandler()
 	api.EnvironmentDisableHandler = newDisableHandler()
+	api.MetadataGetAccountDetailHandler = newAccountDetailHandler()
 	api.MetadataConfigurationHandler = newConfigurationHandler(cfg)
+	if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
+		api.MetadataGetAccountMetricsHandler = newGetAccountMetricsHandler(cfg.Metrics.Influx)
+		api.MetadataGetEnvironmentMetricsHandler = newGetEnvironmentMetricsHandler(cfg.Metrics.Influx)
+		api.MetadataGetShareMetricsHandler = newGetShareMetricsHandler(cfg.Metrics.Influx)
+	}
 	api.MetadataGetEnvironmentDetailHandler = newEnvironmentDetailHandler()
+	api.MetadataGetFrontendDetailHandler = newGetFrontendDetailHandler()
 	api.MetadataGetShareDetailHandler = newShareDetailHandler()
-	api.MetadataOverviewHandler = metadata.OverviewHandlerFunc(overviewHandler)
+	api.MetadataOverviewHandler = newOverviewHandler()
 	api.MetadataVersionHandler = metadata.VersionHandlerFunc(versionHandler)
 	api.ShareAccessHandler = newAccessHandler()
 	api.ShareShareHandler = newShareHandler()

controller/disable.go

@@ -100,10 +100,10 @@ func (h *disableHandler) removeSharesForEnvironment(envId int, tx *sqlx.Tx, edge
 			if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy(env.ZId, shrToken, edge); err != nil {
 				logrus.Error(err)
 			}
-			if err := zrokEdgeSdk.DeleteServicePolicyDial(env.ZId, shrToken, edge); err != nil {
+			if err := zrokEdgeSdk.DeleteServicePoliciesDial(env.ZId, shrToken, edge); err != nil {
 				logrus.Error(err)
 			}
-			if err := zrokEdgeSdk.DeleteServicePolicyBind(env.ZId, shrToken, edge); err != nil {
+			if err := zrokEdgeSdk.DeleteServicePoliciesBind(env.ZId, shrToken, edge); err != nil {
 				logrus.Error(err)
 			}
 			if err := zrokEdgeSdk.DeleteConfig(env.ZId, shrToken, edge); err != nil {
@@ -129,7 +129,7 @@ func (h *disableHandler) removeFrontendsForEnvironment(envId int, tx *sqlx.Tx, e
 			return err
 		}
 		for _, fe := range fes {
-			if err := zrokEdgeSdk.DeleteServicePolicy(env.ZId, fmt.Sprintf("tags.zrokFrontendToken=\"%v\" and type=1", fe.Token), edge); err != nil {
+			if err := zrokEdgeSdk.DeleteServicePolicies(env.ZId, fmt.Sprintf("tags.zrokFrontendToken=\"%v\" and type=1", fe.Token), edge); err != nil {
 				logrus.Errorf("error removing frontend access for '%v': %v", fe.Token, err)
 			}
 		}

controller/environmentDetail.go

@@ -25,7 +25,7 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
 		logrus.Errorf("environment '%v' not found for account '%v': %v", params.EnvZID, principal.Email, err)
 		return metadata.NewGetEnvironmentDetailNotFound()
 	}
-	es := &rest_model_zrok.EnvironmentShares{
+	es := &rest_model_zrok.EnvironmentAndResources{
 		Environment: &rest_model_zrok.Environment{
 			Address:     senv.Address,
 			CreatedAt:   senv.CreatedAt.UnixMilli(),
@@ -40,9 +40,10 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
 		logrus.Errorf("error finding shares for environment '%v' for user '%v': %v", senv.ZId, principal.Email, err)
 		return metadata.NewGetEnvironmentDetailInternalServerError()
 	}
-	var sparkData map[string][]int64
+	sparkRx := make(map[string][]int64)
+	sparkTx := make(map[string][]int64)
 	if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
-		sparkData, err = sparkDataForShares(shrs)
+		sparkRx, sparkTx, err = sparkDataForShares(shrs)
 		if err != nil {
 			logrus.Errorf("error querying spark data for shares for user '%v': %v", principal.Email, err)
 		}
@@ -62,6 +63,10 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
 		if shr.BackendProxyEndpoint != nil {
 			beProxyEndpoint = *shr.BackendProxyEndpoint
 		}
+		var sparkData []*rest_model_zrok.SparkDataSample
+		for i := 0; i < len(sparkRx[shr.Token]) && i < len(sparkTx[shr.Token]); i++ {
+			sparkData = append(sparkData, &rest_model_zrok.SparkDataSample{Rx: float64(sparkRx[shr.Token][i]), Tx: float64(sparkTx[shr.Token][i])})
+		}
 		es.Shares = append(es.Shares, &rest_model_zrok.Share{
 			Token:                shr.Token,
 			ZID:                  shr.ZId,
@@ -71,7 +76,7 @@ func (h *environmentDetailHandler) Handle(params metadata.GetEnvironmentDetailPa
 			FrontendEndpoint:     feEndpoint,
 			BackendProxyEndpoint: beProxyEndpoint,
 			Reserved:             shr.Reserved,
-			Metrics:              sparkData[shr.Token],
+			Activity:             sparkData,
 			CreatedAt:            shr.CreatedAt.UnixMilli(),
 			UpdatedAt:            shr.UpdatedAt.UnixMilli(),
 		})

controller/frontendDetail.go

@@ -0,0 +1,60 @@
+package controller
+
+import (
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/openziti/zrok/rest_model_zrok"
+	"github.com/openziti/zrok/rest_server_zrok/operations/metadata"
+	"github.com/sirupsen/logrus"
+)
+
+type getFrontendDetailHandler struct{}
+
+func newGetFrontendDetailHandler() *getFrontendDetailHandler {
+	return &getFrontendDetailHandler{}
+}
+
+func (h *getFrontendDetailHandler) Handle(params metadata.GetFrontendDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	trx, err := str.Begin()
+	if err != nil {
+		logrus.Errorf("error starting transaction: %v", err)
+		return metadata.NewGetFrontendDetailInternalServerError()
+	}
+	defer func() { _ = trx.Rollback() }()
+	fe, err := str.GetFrontend(int(params.FeID), trx)
+	if err != nil {
+		logrus.Errorf("error finding share '%d': %v", params.FeID, err)
+		return metadata.NewGetFrontendDetailNotFound()
+	}
+	envs, err := str.FindEnvironmentsForAccount(int(principal.ID), trx)
+	if err != nil {
+		logrus.Errorf("error finding environments for account '%v': %v", principal.Email, err)
+		return metadata.NewGetFrontendDetailInternalServerError()
+	}
+	found := false
+	if fe.EnvironmentId == nil {
+		logrus.Errorf("non owned environment '%d' for '%v'", fe.Id, principal.Email)
+		return metadata.NewGetFrontendDetailNotFound()
+	}
+	for _, env := range envs {
+		if *fe.EnvironmentId == env.Id {
+			found = true
+			break
+		}
+	}
+	if !found {
+		logrus.Errorf("environment not matched for frontend '%d' for account '%v'", fe.Id, principal.Email)
+		return metadata.NewGetFrontendDetailNotFound()
+	}
+	shr, err := str.GetShare(fe.Id, trx)
+	if err != nil {
+		logrus.Errorf("error getting share for frontend '%d': %v", fe.Id, err)
+		return metadata.NewGetFrontendDetailInternalServerError()
+	}
+	return metadata.NewGetFrontendDetailOK().WithPayload(&rest_model_zrok.Frontend{
+		ID:        int64(fe.Id),
+		ShrToken:  shr.Token,
+		ZID:       fe.ZId,
+		CreatedAt: fe.CreatedAt.UnixMilli(),
+		UpdatedAt: fe.UpdatedAt.UnixMilli(),
+	})
+}

controller/gc.go

@@ -76,10 +76,10 @@ func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map
 				if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy("gc", *svc.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting service edge router policy: %v", err)
 				}
-				if err := zrokEdgeSdk.DeleteServicePolicyDial("gc", *svc.Name, edge); err != nil {
+				if err := zrokEdgeSdk.DeleteServicePoliciesDial("gc", *svc.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting service dial policy: %v", err)
 				}
-				if err := zrokEdgeSdk.DeleteServicePolicyBind("gc", *svc.Name, edge); err != nil {
+				if err := zrokEdgeSdk.DeleteServicePoliciesBind("gc", *svc.Name, edge); err != nil {
 					logrus.Errorf("error garbage collecting service bind policy: %v", err)
 				}
 				if err := zrokEdgeSdk.DeleteConfig("gc", *svc.Name, edge); err != nil {
@@ -137,7 +137,7 @@ func gcServicePolicies(edge *rest_management_api_client.ZitiEdgeManagement, live
 			if _, found := liveMap[spName]; !found {
 				logrus.Infof("garbage collecting, svcId='%v'", spName)
 				deleteFilter := fmt.Sprintf("id=\"%v\"", *sp.ID)
-				if err := zrokEdgeSdk.DeleteServicePolicy("gc", deleteFilter, edge); err != nil {
+				if err := zrokEdgeSdk.DeleteServicePolicies("gc", deleteFilter, edge); err != nil {
 					logrus.Errorf("error garbage collecting service policy: %v", err)
 				}
 			} else {

controller/limits/accountLimitAction.go

@@ -33,7 +33,7 @@ func (a *accountLimitAction) HandleAccount(acct *store.Account, rxBytes, txBytes
 		}
 
 		for _, shr := range shrs {
-			if err := zrokEdgeSdk.DeleteServicePolicyDial(env.ZId, shr.Token, a.edge); err != nil {
+			if err := zrokEdgeSdk.DeleteServicePoliciesDial(env.ZId, shr.Token, a.edge); err != nil {
 				return errors.Wrapf(err, "error deleting dial service policy for '%v'", shr.Token)
 			}
 			logrus.Infof("removed dial service policy for share '%v' of environment '%v'", shr.Token, env.ZId)

controller/limits/accountRelaxAction.go

@@ -35,11 +35,11 @@ func (a *accountRelaxAction) HandleAccount(acct *store.Account, _, _ int64, _ *B
 			switch shr.ShareMode {
 			case "public":
 				if err := relaxPublicShare(a.str, a.edge, shr, trx); err != nil {
-					return err
+					return errors.Wrap(err, "error relaxing public share")
 				}
 			case "private":
 				if err := relaxPrivateShare(a.str, a.edge, shr, trx); err != nil {
-					return err
+					return errors.Wrap(err, "error relaxing private share")
 				}
 			}
 		}

controller/limits/environmentLimitAction.go

@@ -27,7 +27,7 @@ func (a *environmentLimitAction) HandleEnvironment(env *store.Environment, _, _
 	}
 
 	for _, shr := range shrs {
-		if err := zrokEdgeSdk.DeleteServicePolicyDial(env.ZId, shr.Token, a.edge); err != nil {
+		if err := zrokEdgeSdk.DeleteServicePoliciesDial(env.ZId, shr.Token, a.edge); err != nil {
 			return errors.Wrapf(err, "error deleting dial service policy for '%v'", shr.Token)
 		}
 		logrus.Infof("removed dial service policy for share '%v' of environment '%v'", shr.Token, env.ZId)

controller/limits/shareLimitAction.go

@@ -25,7 +25,7 @@ func (a *shareLimitAction) HandleShare(shr *store.Share, _, _ int64, _ *Bandwidt
 		return err
 	}
 
-	if err := zrokEdgeSdk.DeleteServicePolicyDial(env.ZId, shr.Token, a.edge); err != nil {
+	if err := zrokEdgeSdk.DeleteServicePoliciesDial(env.ZId, shr.Token, a.edge); err != nil {
 		return err
 	}
 	logrus.Infof("removed dial service policy for '%v'", shr.Token)

controller/limits/shareRelaxAction.go

@@ -72,7 +72,7 @@ func relaxPrivateShare(str *store.Store, edge *rest_management_api_client.ZitiEd
 				"zrokFrontendToken":  fe.Token,
 				"zrokShareToken":     shr.Token,
 			}
-			if err := zrokEdgeSdk.CreateServicePolicyDial(env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{env.ZId}, addlTags, edge); err != nil {
+			if err := zrokEdgeSdk.CreateServicePolicyDial(fe.Token+"-"+env.ZId+"-"+shr.ZId+"-dial", shr.ZId, []string{env.ZId}, addlTags, edge); err != nil {
 				return errors.Wrapf(err, "unable to create dial policy for frontend '%v'", fe.Token)
 			}
 

controller/metrics.go

@@ -0,0 +1,261 @@
+package controller
+
+import (
+	"context"
+	"fmt"
+	"github.com/go-openapi/runtime/middleware"
+	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
+	"github.com/influxdata/influxdb-client-go/v2/api"
+	"github.com/openziti/zrok/controller/metrics"
+	"github.com/openziti/zrok/rest_model_zrok"
+	"github.com/openziti/zrok/rest_server_zrok/operations/metadata"
+	"github.com/sirupsen/logrus"
+	"time"
+)
+
+type getAccountMetricsHandler struct {
+	cfg      *metrics.InfluxConfig
+	idb      influxdb2.Client
+	queryApi api.QueryAPI
+}
+
+func newGetAccountMetricsHandler(cfg *metrics.InfluxConfig) *getAccountMetricsHandler {
+	idb := influxdb2.NewClient(cfg.Url, cfg.Token)
+	queryApi := idb.QueryAPI(cfg.Org)
+	return &getAccountMetricsHandler{
+		cfg:      cfg,
+		idb:      idb,
+		queryApi: queryApi,
+	}
+}
+
+func (h *getAccountMetricsHandler) Handle(params metadata.GetAccountMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	duration := 30 * 24 * time.Hour
+	if params.Duration != nil {
+		v, err := time.ParseDuration(*params.Duration)
+		if err != nil {
+			logrus.Errorf("bad duration '%v' for '%v': %v", *params.Duration, principal.Email, err)
+			return metadata.NewGetAccountMetricsBadRequest()
+		}
+		duration = v
+	}
+	slice := sliceSize(duration)
+
+	query := fmt.Sprintf("from(bucket: \"%v\")\n", h.cfg.Bucket) +
+		fmt.Sprintf("|> range(start: -%v)\n", duration) +
+		"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")\n" +
+		"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")\n" +
+		"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")\n" +
+		fmt.Sprintf("|> filter(fn: (r) => r[\"acctId\"] == \"%d\")\n", principal.ID) +
+		"|> drop(columns: [\"share\", \"envId\"])\n" +
+		fmt.Sprintf("|> aggregateWindow(every: %v, fn: sum, createEmpty: true)", slice)
+
+	rx, tx, timestamps, err := runFluxForRxTxArray(query, h.queryApi)
+	if err != nil {
+		logrus.Errorf("error running account metrics query for '%v': %v", principal.Email, err)
+		return metadata.NewGetAccountMetricsInternalServerError()
+	}
+
+	response := &rest_model_zrok.Metrics{
+		Scope:  "account",
+		ID:     fmt.Sprintf("%d", principal.ID),
+		Period: duration.Seconds(),
+	}
+	for i := 0; i < len(rx) && i < len(tx) && i < len(timestamps); i++ {
+		response.Samples = append(response.Samples, &rest_model_zrok.MetricsSample{
+			Rx:        rx[i],
+			Tx:        tx[i],
+			Timestamp: timestamps[i],
+		})
+	}
+	return metadata.NewGetAccountMetricsOK().WithPayload(response)
+}
+
+type getEnvironmentMetricsHandler struct {
+	cfg      *metrics.InfluxConfig
+	idb      influxdb2.Client
+	queryApi api.QueryAPI
+}
+
+func newGetEnvironmentMetricsHandler(cfg *metrics.InfluxConfig) *getEnvironmentMetricsHandler {
+	idb := influxdb2.NewClient(cfg.Url, cfg.Token)
+	queryApi := idb.QueryAPI(cfg.Org)
+	return &getEnvironmentMetricsHandler{
+		cfg:      cfg,
+		idb:      idb,
+		queryApi: queryApi,
+	}
+}
+
+func (h *getEnvironmentMetricsHandler) Handle(params metadata.GetEnvironmentMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	trx, err := str.Begin()
+	if err != nil {
+		logrus.Errorf("error starting transaction: %v", err)
+		return metadata.NewGetEnvironmentMetricsInternalServerError()
+	}
+	defer func() { _ = trx.Rollback() }()
+	env, err := str.FindEnvironmentForAccount(params.EnvID, int(principal.ID), trx)
+	if err != nil {
+		logrus.Errorf("error finding environment '%s' for '%s': %v", params.EnvID, principal.Email, err)
+		return metadata.NewGetEnvironmentMetricsUnauthorized()
+	}
+
+	duration := 30 * 24 * time.Hour
+	if params.Duration != nil {
+		v, err := time.ParseDuration(*params.Duration)
+		if err != nil {
+			logrus.Errorf("bad duration '%v' for '%v': %v", *params.Duration, principal.Email, err)
+			return metadata.NewGetAccountMetricsBadRequest()
+		}
+		duration = v
+	}
+	slice := sliceSize(duration)
+
+	query := fmt.Sprintf("from(bucket: \"%v\")\n", h.cfg.Bucket) +
+		fmt.Sprintf("|> range(start: -%v)\n", duration) +
+		"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")\n" +
+		"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")\n" +
+		"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")\n" +
+		fmt.Sprintf("|> filter(fn: (r) => r[\"envId\"] == \"%d\")\n", int64(env.Id)) +
+		"|> drop(columns: [\"share\", \"acctId\"])\n" +
+		fmt.Sprintf("|> aggregateWindow(every: %v, fn: sum, createEmpty: true)", slice)
+
+	rx, tx, timestamps, err := runFluxForRxTxArray(query, h.queryApi)
+	if err != nil {
+		logrus.Errorf("error running account metrics query for '%v': %v", principal.Email, err)
+		return metadata.NewGetAccountMetricsInternalServerError()
+	}
+
+	response := &rest_model_zrok.Metrics{
+		Scope:  "account",
+		ID:     fmt.Sprintf("%d", principal.ID),
+		Period: duration.Seconds(),
+	}
+	for i := 0; i < len(rx) && i < len(tx) && i < len(timestamps); i++ {
+		response.Samples = append(response.Samples, &rest_model_zrok.MetricsSample{
+			Rx:        rx[i],
+			Tx:        tx[i],
+			Timestamp: timestamps[i],
+		})
+	}
+
+	return metadata.NewGetEnvironmentMetricsOK().WithPayload(response)
+}
+
+type getShareMetricsHandler struct {
+	cfg      *metrics.InfluxConfig
+	idb      influxdb2.Client
+	queryApi api.QueryAPI
+}
+
+func newGetShareMetricsHandler(cfg *metrics.InfluxConfig) *getShareMetricsHandler {
+	idb := influxdb2.NewClient(cfg.Url, cfg.Token)
+	queryApi := idb.QueryAPI(cfg.Org)
+	return &getShareMetricsHandler{
+		cfg:      cfg,
+		idb:      idb,
+		queryApi: queryApi,
+	}
+}
+
+func (h *getShareMetricsHandler) Handle(params metadata.GetShareMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	trx, err := str.Begin()
+	if err != nil {
+		logrus.Errorf("error starting transaction: %v", err)
+		return metadata.NewGetEnvironmentMetricsInternalServerError()
+	}
+	defer func() { _ = trx.Rollback() }()
+	shr, err := str.FindShareWithToken(params.ShrToken, trx)
+	if err != nil {
+		logrus.Errorf("error finding share '%v' for '%v': %v", params.ShrToken, principal.Email, err)
+		return metadata.NewGetShareMetricsUnauthorized()
+	}
+	env, err := str.GetEnvironment(shr.EnvironmentId, trx)
+	if err != nil {
+		logrus.Errorf("error finding environment '%d' for '%v': %v", shr.EnvironmentId, principal.Email, err)
+		return metadata.NewGetShareMetricsUnauthorized()
+	}
+	if env.AccountId != nil && int64(*env.AccountId) != principal.ID {
+		logrus.Errorf("user '%v' does not own share '%v'", principal.Email, params.ShrToken)
+		return metadata.NewGetShareMetricsUnauthorized()
+	}
+
+	duration := 30 * 24 * time.Hour
+	if params.Duration != nil {
+		v, err := time.ParseDuration(*params.Duration)
+		if err != nil {
+			logrus.Errorf("bad duration '%v' for '%v': %v", *params.Duration, principal.Email, err)
+			return metadata.NewGetAccountMetricsBadRequest()
+		}
+		duration = v
+	}
+	slice := sliceSize(duration)
+
+	query := fmt.Sprintf("from(bucket: \"%v\")\n", h.cfg.Bucket) +
+		fmt.Sprintf("|> range(start: -%v)\n", duration) +
+		"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")\n" +
+		"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")\n" +
+		"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")\n" +
+		fmt.Sprintf("|> filter(fn: (r) => r[\"share\"] == \"%v\")\n", shr.Token) +
+		fmt.Sprintf("|> aggregateWindow(every: %v, fn: sum, createEmpty: true)", slice)
+
+	rx, tx, timestamps, err := runFluxForRxTxArray(query, h.queryApi)
+	if err != nil {
+		logrus.Errorf("error running account metrics query for '%v': %v", principal.Email, err)
+		return metadata.NewGetAccountMetricsInternalServerError()
+	}
+
+	response := &rest_model_zrok.Metrics{
+		Scope:  "account",
+		ID:     fmt.Sprintf("%d", principal.ID),
+		Period: duration.Seconds(),
+	}
+	for i := 0; i < len(rx) && i < len(tx) && i < len(timestamps); i++ {
+		response.Samples = append(response.Samples, &rest_model_zrok.MetricsSample{
+			Rx:        rx[i],
+			Tx:        tx[i],
+			Timestamp: timestamps[i],
+		})
+	}
+
+	return metadata.NewGetShareMetricsOK().WithPayload(response)
+}
+
+func runFluxForRxTxArray(query string, queryApi api.QueryAPI) (rx, tx, timestamps []float64, err error) {
+	result, err := queryApi.Query(context.Background(), query)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	for result.Next() {
+		switch result.Record().Field() {
+		case "rx":
+			rxV := int64(0)
+			if v, ok := result.Record().Value().(int64); ok {
+				rxV = v
+			}
+			rx = append(rx, float64(rxV))
+			timestamps = append(timestamps, float64(result.Record().Time().UnixMilli()))
+
+		case "tx":
+			txV := int64(0)
+			if v, ok := result.Record().Value().(int64); ok {
+				txV = v
+			}
+			tx = append(tx, float64(txV))
+		}
+	}
+	return rx, tx, timestamps, nil
+}
+
+func sliceSize(duration time.Duration) time.Duration {
+	switch duration {
+	case 30 * 24 * time.Hour:
+		return 24 * time.Hour
+	case 7 * 24 * time.Hour:
+		return 4 * time.Hour
+	case 24 * time.Hour:
+		return 30 * time.Minute
+	default:
+		return duration
+	}
+}

controller/overview.go

@@ -2,41 +2,63 @@ package controller
 
 import (
 	"github.com/go-openapi/runtime/middleware"
+	"github.com/jmoiron/sqlx"
+	"github.com/openziti/zrok/controller/store"
 	"github.com/openziti/zrok/rest_model_zrok"
 	"github.com/openziti/zrok/rest_server_zrok/operations/metadata"
 	"github.com/sirupsen/logrus"
 )
 
-func overviewHandler(_ metadata.OverviewParams, principal *rest_model_zrok.Principal) middleware.Responder {
-	tx, err := str.Begin()
+type overviewHandler struct{}
+
+func newOverviewHandler() *overviewHandler {
+	return &overviewHandler{}
+}
+
+func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	trx, err := str.Begin()
 	if err != nil {
 		logrus.Errorf("error starting transaction: %v", err)
 		return metadata.NewOverviewInternalServerError()
 	}
-	defer func() { _ = tx.Rollback() }()
-	envs, err := str.FindEnvironmentsForAccount(int(principal.ID), tx)
+	defer func() { _ = trx.Rollback() }()
+	envs, err := str.FindEnvironmentsForAccount(int(principal.ID), trx)
 	if err != nil {
 		logrus.Errorf("error finding environments for '%v': %v", principal.Email, err)
 		return metadata.NewOverviewInternalServerError()
 	}
-	var out rest_model_zrok.EnvironmentSharesList
+	elm, err := newEnvironmentsLimitedMap(envs, trx)
+	if err != nil {
+		logrus.Errorf("error finding limited environments for '%v': %v", principal.Email, err)
+		return metadata.NewOverviewInternalServerError()
+	}
+	accountLimited, err := h.isAccountLimited(principal, trx)
+	if err != nil {
+		logrus.Errorf("error checking account limited for '%v': %v", principal.Email, err)
+	}
+	ovr := &rest_model_zrok.Overview{AccountLimited: accountLimited}
 	for _, env := range envs {
-		shrs, err := str.FindSharesForEnvironment(env.Id, tx)
+		envRes := &rest_model_zrok.EnvironmentAndResources{
+			Environment: &rest_model_zrok.Environment{
+				Address:     env.Address,
+				Description: env.Description,
+				Host:        env.Host,
+				ZID:         env.ZId,
+				Limited:     elm.isLimited(env),
+				CreatedAt:   env.CreatedAt.UnixMilli(),
+				UpdatedAt:   env.UpdatedAt.UnixMilli(),
+			},
+		}
+		shrs, err := str.FindSharesForEnvironment(env.Id, trx)
 		if err != nil {
 			logrus.Errorf("error finding shares for environment '%v': %v", env.ZId, err)
 			return metadata.NewOverviewInternalServerError()
 		}
-		es := &rest_model_zrok.EnvironmentShares{
-			Environment: &rest_model_zrok.Environment{
-				Address:     env.Address,
-				CreatedAt:   env.CreatedAt.UnixMilli(),
-				Description: env.Description,
-				Host:        env.Host,
-				UpdatedAt:   env.UpdatedAt.UnixMilli(),
-				ZID:         env.ZId,
-			},
+		slm, err := newSharesLimitedMap(shrs, trx)
+		if err != nil {
+			logrus.Errorf("error finding limited shares for environment '%v': %v", env.ZId, err)
+			return metadata.NewOverviewInternalServerError()
 		}
-
 		for _, shr := range shrs {
 			feEndpoint := ""
 			if shr.FrontendEndpoint != nil {
@@ -50,7 +72,7 @@ func overviewHandler(_ metadata.OverviewParams, principal *rest_model_zrok.Princ
 			if shr.BackendProxyEndpoint != nil {
 				beProxyEndpoint = *shr.BackendProxyEndpoint
 			}
-			es.Shares = append(es.Shares, &rest_model_zrok.Share{
+			envShr := &rest_model_zrok.Share{
 				Token:                shr.Token,
 				ZID:                  shr.ZId,
 				ShareMode:            shr.ShareMode,
@@ -59,11 +81,104 @@ func overviewHandler(_ metadata.OverviewParams, principal *rest_model_zrok.Princ
 				FrontendEndpoint:     feEndpoint,
 				BackendProxyEndpoint: beProxyEndpoint,
 				Reserved:             shr.Reserved,
+				Limited:              slm.isLimited(shr),
 				CreatedAt:            shr.CreatedAt.UnixMilli(),
 				UpdatedAt:            shr.UpdatedAt.UnixMilli(),
-			})
+			}
+			envRes.Shares = append(envRes.Shares, envShr)
 		}
-		out = append(out, es)
+		fes, err := str.FindFrontendsForEnvironment(env.Id, trx)
+		if err != nil {
+			logrus.Errorf("error finding frontends for environment '%v': %v", env.ZId, err)
+			return metadata.NewOverviewInternalServerError()
+		}
+		for _, fe := range fes {
+			envFe := &rest_model_zrok.Frontend{
+				ID:        int64(fe.Id),
+				ZID:       fe.ZId,
+				CreatedAt: fe.CreatedAt.UnixMilli(),
+				UpdatedAt: fe.UpdatedAt.UnixMilli(),
+			}
+			if fe.PrivateShareId != nil {
+				feShr, err := str.GetShare(*fe.PrivateShareId, trx)
+				if err != nil {
+					logrus.Errorf("error getting share for frontend '%v': %v", fe.ZId, err)
+					return metadata.NewOverviewInternalServerError()
+				}
+				envFe.ShrToken = feShr.Token
+			}
+			envRes.Frontends = append(envRes.Frontends, envFe)
+		}
+		ovr.Environments = append(ovr.Environments, envRes)
 	}
-	return metadata.NewOverviewOK().WithPayload(out)
+	return metadata.NewOverviewOK().WithPayload(ovr)
+}
+
+func (h *overviewHandler) isAccountLimited(principal *rest_model_zrok.Principal, trx *sqlx.Tx) (bool, error) {
+	var alj *store.AccountLimitJournal
+	aljEmpty, err := str.IsAccountLimitJournalEmpty(int(principal.ID), trx)
+	if err != nil {
+		return false, err
+	}
+	if !aljEmpty {
+		alj, err = str.FindLatestAccountLimitJournal(int(principal.ID), trx)
+		if err != nil {
+			return false, err
+		}
+	}
+	return alj != nil && alj.Action == store.LimitAction, nil
+}
+
+type sharesLimitedMap struct {
+	v map[int]struct{}
+}
+
+func newSharesLimitedMap(shrs []*store.Share, trx *sqlx.Tx) (*sharesLimitedMap, error) {
+	var shrIds []int
+	for i := range shrs {
+		shrIds = append(shrIds, shrs[i].Id)
+	}
+	shrsLimited, err := str.FindSelectedLatestShareLimitjournal(shrIds, trx)
+	if err != nil {
+		return nil, err
+	}
+	slm := &sharesLimitedMap{v: make(map[int]struct{})}
+	for i := range shrsLimited {
+		if shrsLimited[i].Action == store.LimitAction {
+			slm.v[shrsLimited[i].ShareId] = struct{}{}
+		}
+	}
+	return slm, nil
+}
+
+func (m *sharesLimitedMap) isLimited(shr *store.Share) bool {
+	_, limited := m.v[shr.Id]
+	return limited
+}
+
+type environmentsLimitedMap struct {
+	v map[int]struct{}
+}
+
+func newEnvironmentsLimitedMap(envs []*store.Environment, trx *sqlx.Tx) (*environmentsLimitedMap, error) {
+	var envIds []int
+	for i := range envs {
+		envIds = append(envIds, envs[i].Id)
+	}
+	envsLimited, err := str.FindSelectedLatestEnvironmentLimitJournal(envIds, trx)
+	if err != nil {
+		return nil, err
+	}
+	elm := &environmentsLimitedMap{v: make(map[int]struct{})}
+	for i := range envsLimited {
+		if envsLimited[i].Action == store.LimitAction {
+			elm.v[envsLimited[i].EnvironmentId] = struct{}{}
+		}
+	}
+	return elm, nil
+}
+
+func (m *environmentsLimitedMap) isLimited(env *store.Environment) bool {
+	_, limited := m.v[env.Id]
+	return limited
 }

controller/shareDetail.go

@@ -42,9 +42,10 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
 		logrus.Errorf("environment not matched for share '%v' for account '%v'", params.ShrToken, principal.Email)
 		return metadata.NewGetShareDetailNotFound()
 	}
-	var sparkData map[string][]int64
+	sparkRx := make(map[string][]int64)
+	sparkTx := make(map[string][]int64)
 	if cfg.Metrics != nil && cfg.Metrics.Influx != nil {
-		sparkData, err = sparkDataForShares([]*store.Share{shr})
+		sparkRx, sparkTx, err = sparkDataForShares([]*store.Share{shr})
 		if err != nil {
 			logrus.Errorf("error querying spark data for share: %v", err)
 		}
@@ -63,6 +64,10 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
 	if shr.BackendProxyEndpoint != nil {
 		beProxyEndpoint = *shr.BackendProxyEndpoint
 	}
+	var sparkData []*rest_model_zrok.SparkDataSample
+	for i := 0; i < len(sparkRx[shr.Token]) && i < len(sparkTx[shr.Token]); i++ {
+		sparkData = append(sparkData, &rest_model_zrok.SparkDataSample{Rx: float64(sparkRx[shr.Token][i]), Tx: float64(sparkTx[shr.Token][i])})
+	}
 	return metadata.NewGetShareDetailOK().WithPayload(&rest_model_zrok.Share{
 		Token:                shr.Token,
 		ZID:                  shr.ZId,
@@ -72,7 +77,7 @@ func (h *shareDetailHandler) Handle(params metadata.GetShareDetailParams, princi
 		FrontendEndpoint:     feEndpoint,
 		BackendProxyEndpoint: beProxyEndpoint,
 		Reserved:             shr.Reserved,
-		Metrics:              sparkData[shr.Token],
+		Activity:             sparkData,
 		CreatedAt:            shr.CreatedAt.UnixMilli(),
 		UpdatedAt:            shr.UpdatedAt.UnixMilli(),
 	})

controller/sparkData.go

@@ -4,55 +4,114 @@ import (
 	"context"
 	"fmt"
 	"github.com/openziti/zrok/controller/store"
+	"github.com/sirupsen/logrus"
+	"strconv"
 )
 
-func sparkDataForShares(shrs []*store.Share) (map[string][]int64, error) {
-	out := make(map[string][]int64)
-
-	if len(shrs) > 0 {
+func sparkDataForEnvironments(envs []*store.Environment) (rx, tx map[int][]int64, err error) {
+	rx = make(map[int][]int64)
+	tx = make(map[int][]int64)
+	if len(envs) > 0 {
 		qapi := idb.QueryAPI(cfg.Metrics.Influx.Org)
 
-		result, err := qapi.Query(context.Background(), sparkFluxQuery(shrs))
+		envFilter := "|> filter(fn: (r) =>"
+		for i, env := range envs {
+			if i > 0 {
+				envFilter += " or"
+			}
+			envFilter += fmt.Sprintf(" r[\"envId\"] == \"%d\"", env.Id)
+		}
+		envFilter += ")"
+		query := fmt.Sprintf("from(bucket: \"%v\")\n", cfg.Metrics.Influx.Bucket) +
+			"|> range(start: -5m)\n" +
+			"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")\n" +
+			"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")\n" +
+			"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")\n" +
+			envFilter +
+			"|> drop(columns: [\"share\", \"acctId\"])\n" +
+			"|> aggregateWindow(every: 10s, fn: sum, createEmpty: true)\n"
+
+		result, err := qapi.Query(context.Background(), query)
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 
 		for result.Next() {
-			combinedRate := int64(0)
-			readRate := result.Record().ValueByKey("tx")
-			if readRate != nil {
-				combinedRate += readRate.(int64)
+			envIdS := result.Record().ValueByKey("envId").(string)
+			envId, err := strconv.ParseInt(envIdS, 10, 32)
+			if err != nil {
+				logrus.Errorf("error parsing '%v': %v", envIdS, err)
+				continue
 			}
-			writeRate := result.Record().ValueByKey("tx")
-			if writeRate != nil {
-				combinedRate += writeRate.(int64)
+			switch result.Record().Field() {
+			case "rx":
+				rxV := int64(0)
+				if v, ok := result.Record().Value().(int64); ok {
+					rxV = v
+				}
+				rxData := append(rx[int(envId)], rxV)
+				rx[int(envId)] = rxData
+
+			case "tx":
+				txV := int64(0)
+				if v, ok := result.Record().Value().(int64); ok {
+					txV = v
+				}
+				txData := append(tx[int(envId)], txV)
+				tx[int(envId)] = txData
 			}
-			shrToken := result.Record().ValueByKey("share").(string)
-			shrMetrics := out[shrToken]
-			shrMetrics = append(shrMetrics, combinedRate)
-			out[shrToken] = shrMetrics
 		}
 	}
-	return out, nil
+	return rx, tx, nil
 }
 
-func sparkFluxQuery(shrs []*store.Share) string {
-	shrFilter := "|> filter(fn: (r) =>"
-	for i, shr := range shrs {
-		if i > 0 {
-			shrFilter += " or"
+func sparkDataForShares(shrs []*store.Share) (rx, tx map[string][]int64, err error) {
+	rx = make(map[string][]int64)
+	tx = make(map[string][]int64)
+	if len(shrs) > 0 {
+		qapi := idb.QueryAPI(cfg.Metrics.Influx.Org)
+
+		shrFilter := "|> filter(fn: (r) =>"
+		for i, shr := range shrs {
+			if i > 0 {
+				shrFilter += " or"
+			}
+			shrFilter += fmt.Sprintf(" r[\"share\"] == \"%v\"", shr.Token)
+		}
+		shrFilter += ")"
+		query := fmt.Sprintf("from(bucket: \"%v\")\n", cfg.Metrics.Influx.Bucket) +
+			"|> range(start: -5m)\n" +
+			"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")\n" +
+			"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")\n" +
+			"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")\n" +
+			shrFilter +
+			"|> aggregateWindow(every: 10s, fn: sum, createEmpty: true)\n"
+
+		result, err := qapi.Query(context.Background(), query)
+		if err != nil {
+			return nil, nil, err
+		}
+
+		for result.Next() {
+			shrToken := result.Record().ValueByKey("share").(string)
+			switch result.Record().Field() {
+			case "rx":
+				rxV := int64(0)
+				if v, ok := result.Record().Value().(int64); ok {
+					rxV = v
+				}
+				rxData := append(rx[shrToken], rxV)
+				rx[shrToken] = rxData
+
+			case "tx":
+				txV := int64(0)
+				if v, ok := result.Record().Value().(int64); ok {
+					txV = v
+				}
+				txData := append(tx[shrToken], txV)
+				tx[shrToken] = txData
+			}
 		}
-		shrFilter += fmt.Sprintf(" r[\"share\"] == \"%v\"", shr.Token)
 	}
-	shrFilter += ")"
-	query := "read = from(bucket: \"zrok\")" +
-		"|> range(start: -5m)" +
-		"|> filter(fn: (r) => r[\"_measurement\"] == \"xfer\")" +
-		"|> filter(fn: (r) => r[\"_field\"] == \"rx\" or r[\"_field\"] == \"tx\")" +
-		"|> filter(fn: (r) => r[\"namespace\"] == \"backend\")" +
-		shrFilter +
-		"|> aggregateWindow(every: 5s, fn: sum, createEmpty: true)\n" +
-		"|> pivot(rowKey:[\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")" +
-		"|> yield(name: \"last\")"
-	return query
+	return rx, tx, nil
 }

controller/store/environmentLimitJournal.go

@@ -1,6 +1,7 @@
 package store
 
 import (
+	"fmt"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )
@@ -41,6 +42,33 @@ func (str *Store) FindLatestEnvironmentLimitJournal(envId int, trx *sqlx.Tx) (*E
 	return j, nil
 }
 
+func (str *Store) FindSelectedLatestEnvironmentLimitJournal(envIds []int, trx *sqlx.Tx) ([]*EnvironmentLimitJournal, error) {
+	if len(envIds) < 1 {
+		return nil, nil
+	}
+	in := "("
+	for i := range envIds {
+		if i > 0 {
+			in += ", "
+		}
+		in += fmt.Sprintf("%d", envIds[i])
+	}
+	in += ")"
+	rows, err := trx.Queryx("select id, environment_id, rx_bytes, tx_bytes, action, created_at, updated_at from environment_limit_journal where id in (select max(id) as id from environment_limit_journal group by environment_id) and environment_id in " + in)
+	if err != nil {
+		return nil, errors.Wrap(err, "error selecting all latest environment_limit_journal")
+	}
+	var eljs []*EnvironmentLimitJournal
+	for rows.Next() {
+		elj := &EnvironmentLimitJournal{}
+		if err := rows.StructScan(elj); err != nil {
+			return nil, errors.Wrap(err, "error scanning environment_limit_journal")
+		}
+		eljs = append(eljs, elj)
+	}
+	return eljs, nil
+}
+
 func (str *Store) FindAllLatestEnvironmentLimitJournal(trx *sqlx.Tx) ([]*EnvironmentLimitJournal, error) {
 	rows, err := trx.Queryx("select id, environment_id, rx_bytes, tx_bytes, action, created_at, updated_at from environment_limit_journal where id in (select max(id) as id from environment_limit_journal group by environment_id)")
 	if err != nil {

controller/store/shareLimitJournal.go

@@ -1,6 +1,7 @@
 package store
 
 import (
+	"fmt"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )
@@ -41,6 +42,33 @@ func (str *Store) FindLatestShareLimitJournal(shrId int, trx *sqlx.Tx) (*ShareLi
 	return j, nil
 }
 
+func (str *Store) FindSelectedLatestShareLimitjournal(shrIds []int, trx *sqlx.Tx) ([]*ShareLimitJournal, error) {
+	if len(shrIds) < 1 {
+		return nil, nil
+	}
+	in := "("
+	for i := range shrIds {
+		if i > 0 {
+			in += ", "
+		}
+		in += fmt.Sprintf("%d", shrIds[i])
+	}
+	in += ")"
+	rows, err := trx.Queryx("select id, share_id, rx_bytes, tx_bytes, action, created_at, updated_at from share_limit_journal where id in (select max(id) as id from share_limit_journal group by share_id) and share_id in " + in)
+	if err != nil {
+		return nil, errors.Wrap(err, "error selecting all latest share_limit_journal")
+	}
+	var sljs []*ShareLimitJournal
+	for rows.Next() {
+		slj := &ShareLimitJournal{}
+		if err := rows.StructScan(slj); err != nil {
+			return nil, errors.Wrap(err, "error scanning share_limit_journal")
+		}
+		sljs = append(sljs, slj)
+	}
+	return sljs, nil
+}
+
 func (str *Store) FindAllLatestShareLimitJournal(trx *sqlx.Tx) ([]*ShareLimitJournal, error) {
 	rows, err := trx.Queryx("select id, share_id, rx_bytes, tx_bytes, action, created_at, updated_at from share_limit_journal where id in (select max(id) as id from share_limit_journal group by share_id)")
 	if err != nil {

controller/unaccess.go

@@ -68,7 +68,7 @@ func (h *unaccessHandler) Handle(params share.UnaccessParams, principal *rest_mo
 		return share.NewUnaccessNotFound()
 	}
 
-	if err := zrokEdgeSdk.DeleteServicePolicy(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", shrToken, feToken), edge); err != nil {
+	if err := zrokEdgeSdk.DeleteServicePolicies(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", shrToken, feToken), edge); err != nil {
 		logrus.Errorf("error removing access to '%v' for '%v': %v", shrToken, envZId, err)
 		return share.NewUnaccessInternalServerError()
 	}

controller/unshare.go

@@ -124,10 +124,10 @@ func (h *unshareHandler) deallocateResources(senv *store.Environment, shrToken,
 	if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy(senv.ZId, shrToken, edge); err != nil {
 		return err
 	}
-	if err := zrokEdgeSdk.DeleteServicePolicyDial(senv.ZId, shrToken, edge); err != nil {
+	if err := zrokEdgeSdk.DeleteServicePoliciesDial(senv.ZId, shrToken, edge); err != nil {
 		return err
 	}
-	if err := zrokEdgeSdk.DeleteServicePolicyBind(senv.ZId, shrToken, edge); err != nil {
+	if err := zrokEdgeSdk.DeleteServicePoliciesBind(senv.ZId, shrToken, edge); err != nil {
 		return err
 	}
 	if err := zrokEdgeSdk.DeleteConfig(senv.ZId, shrToken, edge); err != nil {

controller/zrokEdgeSdk/sp.go

@@ -78,16 +78,16 @@ func createServicePolicy(name string, semantic rest_model.Semantic, identityRole
 	return resp.Payload.Data.ID, nil
 }
 
-func DeleteServicePolicyBind(envZId, shrToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
-	return DeleteServicePolicy(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and type=%d", shrToken, servicePolicyBind), edge)
+func DeleteServicePoliciesBind(envZId, shrToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
+	return DeleteServicePolicies(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and type=%d", shrToken, servicePolicyBind), edge)
 }
 
-func DeleteServicePolicyDial(envZId, shrToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
-	return DeleteServicePolicy(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and type=%d", shrToken, servicePolicyDial), edge)
+func DeleteServicePoliciesDial(envZId, shrToken string, edge *rest_management_api_client.ZitiEdgeManagement) error {
+	return DeleteServicePolicies(envZId, fmt.Sprintf("tags.zrokShareToken=\"%v\" and type=%d", shrToken, servicePolicyDial), edge)
 }
 
-func DeleteServicePolicy(envZId, filter string, edge *rest_management_api_client.ZitiEdgeManagement) error {
-	limit := int64(1)
+func DeleteServicePolicies(envZId, filter string, edge *rest_management_api_client.ZitiEdgeManagement) error {
+	limit := int64(0)
 	offset := int64(0)
 	listReq := &service_policy.ListServicePoliciesParams{
 		Filter:  &filter,
@@ -100,8 +100,9 @@ func DeleteServicePolicy(envZId, filter string, edge *rest_management_api_client
 	if err != nil {
 		return err
 	}
-	if len(listResp.Payload.Data) == 1 {
-		spId := *(listResp.Payload.Data[0].ID)
+	logrus.Infof("found %d service policies to delete for '%v'", len(listResp.Payload.Data), filter)
+	for i := range listResp.Payload.Data {
+		spId := *(listResp.Payload.Data[i].ID)
 		req := &service_policy.DeleteServicePolicyParams{
 			ID:      spId,
 			Context: context.Background(),
@@ -112,8 +113,9 @@ func DeleteServicePolicy(envZId, filter string, edge *rest_management_api_client
 			return err
 		}
 		logrus.Infof("deleted service policy '%v' for environment '%v'", spId, envZId)
-	} else {
-		logrus.Infof("did not find a service policy")
+	}
+	if len(listResp.Payload.Data) < 1 {
+		logrus.Warnf("did not find any service policies to delete for '%v'", filter)
 	}
 	return nil
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/openziti/zrok
 
-go 1.19
+go 1.20
 
 require (
 	github.com/charmbracelet/bubbles v0.14.0
@@ -31,6 +31,7 @@ require (
 	github.com/openziti/fabric v0.22.59
 	github.com/openziti/identity v1.0.37
 	github.com/openziti/sdk-golang v0.18.61
+	github.com/openziti/transport/v2 v2.0.63
 	github.com/pkg/errors v0.9.1
 	github.com/rabbitmq/amqp091-go v1.7.0
 	github.com/rubenv/sql-migrate v1.1.2
@@ -91,7 +92,6 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/openziti/foundation/v2 v2.0.17 // indirect
 	github.com/openziti/metrics v1.2.10 // indirect
-	github.com/openziti/transport/v2 v2.0.63 // indirect
 	github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
 	github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

rest_client_zrok/metadata/get_account_detail_parameters.go

@@ -0,0 +1,128 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetAccountDetailParams creates a new GetAccountDetailParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetAccountDetailParams() *GetAccountDetailParams {
+	return &GetAccountDetailParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetAccountDetailParamsWithTimeout creates a new GetAccountDetailParams object
+// with the ability to set a timeout on a request.
+func NewGetAccountDetailParamsWithTimeout(timeout time.Duration) *GetAccountDetailParams {
+	return &GetAccountDetailParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetAccountDetailParamsWithContext creates a new GetAccountDetailParams object
+// with the ability to set a context for a request.
+func NewGetAccountDetailParamsWithContext(ctx context.Context) *GetAccountDetailParams {
+	return &GetAccountDetailParams{
+		Context: ctx,
+	}
+}
+
+// NewGetAccountDetailParamsWithHTTPClient creates a new GetAccountDetailParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetAccountDetailParamsWithHTTPClient(client *http.Client) *GetAccountDetailParams {
+	return &GetAccountDetailParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetAccountDetailParams contains all the parameters to send to the API endpoint
+
+	for the get account detail operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetAccountDetailParams struct {
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get account detail params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountDetailParams) WithDefaults() *GetAccountDetailParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get account detail params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountDetailParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get account detail params
+func (o *GetAccountDetailParams) WithTimeout(timeout time.Duration) *GetAccountDetailParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get account detail params
+func (o *GetAccountDetailParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get account detail params
+func (o *GetAccountDetailParams) WithContext(ctx context.Context) *GetAccountDetailParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get account detail params
+func (o *GetAccountDetailParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get account detail params
+func (o *GetAccountDetailParams) WithHTTPClient(client *http.Client) *GetAccountDetailParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get account detail params
+func (o *GetAccountDetailParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetAccountDetailParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metadata/get_account_detail_responses.go

@@ -0,0 +1,153 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountDetailReader is a Reader for the GetAccountDetail structure.
+type GetAccountDetailReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetAccountDetailReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetAccountDetailOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 500:
+		result := NewGetAccountDetailInternalServerError()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetAccountDetailOK creates a GetAccountDetailOK with default headers values
+func NewGetAccountDetailOK() *GetAccountDetailOK {
+	return &GetAccountDetailOK{}
+}
+
+/*
+GetAccountDetailOK describes a response with status code 200, with default header values.
+
+ok
+*/
+type GetAccountDetailOK struct {
+	Payload rest_model_zrok.Environments
+}
+
+// IsSuccess returns true when this get account detail o k response has a 2xx status code
+func (o *GetAccountDetailOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get account detail o k response has a 3xx status code
+func (o *GetAccountDetailOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account detail o k response has a 4xx status code
+func (o *GetAccountDetailOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get account detail o k response has a 5xx status code
+func (o *GetAccountDetailOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get account detail o k response a status code equal to that given
+func (o *GetAccountDetailOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetAccountDetailOK) Error() string {
+	return fmt.Sprintf("[GET /detail/account][%d] getAccountDetailOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountDetailOK) String() string {
+	return fmt.Sprintf("[GET /detail/account][%d] getAccountDetailOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountDetailOK) GetPayload() rest_model_zrok.Environments {
+	return o.Payload
+}
+
+func (o *GetAccountDetailOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	// response payload
+	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetAccountDetailInternalServerError creates a GetAccountDetailInternalServerError with default headers values
+func NewGetAccountDetailInternalServerError() *GetAccountDetailInternalServerError {
+	return &GetAccountDetailInternalServerError{}
+}
+
+/*
+GetAccountDetailInternalServerError describes a response with status code 500, with default header values.
+
+internal server error
+*/
+type GetAccountDetailInternalServerError struct {
+}
+
+// IsSuccess returns true when this get account detail internal server error response has a 2xx status code
+func (o *GetAccountDetailInternalServerError) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get account detail internal server error response has a 3xx status code
+func (o *GetAccountDetailInternalServerError) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account detail internal server error response has a 4xx status code
+func (o *GetAccountDetailInternalServerError) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get account detail internal server error response has a 5xx status code
+func (o *GetAccountDetailInternalServerError) IsServerError() bool {
+	return true
+}
+
+// IsCode returns true when this get account detail internal server error response a status code equal to that given
+func (o *GetAccountDetailInternalServerError) IsCode(code int) bool {
+	return code == 500
+}
+
+func (o *GetAccountDetailInternalServerError) Error() string {
+	return fmt.Sprintf("[GET /detail/account][%d] getAccountDetailInternalServerError ", 500)
+}
+
+func (o *GetAccountDetailInternalServerError) String() string {
+	return fmt.Sprintf("[GET /detail/account][%d] getAccountDetailInternalServerError ", 500)
+}
+
+func (o *GetAccountDetailInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metadata/get_account_metrics_parameters.go

@@ -0,0 +1,160 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetAccountMetricsParams creates a new GetAccountMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetAccountMetricsParams() *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetAccountMetricsParamsWithTimeout creates a new GetAccountMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetAccountMetricsParamsWithTimeout(timeout time.Duration) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetAccountMetricsParamsWithContext creates a new GetAccountMetricsParams object
+// with the ability to set a context for a request.
+func NewGetAccountMetricsParamsWithContext(ctx context.Context) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetAccountMetricsParamsWithHTTPClient creates a new GetAccountMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetAccountMetricsParamsWithHTTPClient(client *http.Client) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetAccountMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get account metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetAccountMetricsParams struct {
+
+	// Duration.
+	Duration *string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get account metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountMetricsParams) WithDefaults() *GetAccountMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get account metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get account metrics params
+func (o *GetAccountMetricsParams) WithTimeout(timeout time.Duration) *GetAccountMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get account metrics params
+func (o *GetAccountMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get account metrics params
+func (o *GetAccountMetricsParams) WithContext(ctx context.Context) *GetAccountMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get account metrics params
+func (o *GetAccountMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get account metrics params
+func (o *GetAccountMetricsParams) WithHTTPClient(client *http.Client) *GetAccountMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get account metrics params
+func (o *GetAccountMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get account metrics params
+func (o *GetAccountMetricsParams) WithDuration(duration *string) *GetAccountMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get account metrics params
+func (o *GetAccountMetricsParams) SetDuration(duration *string) {
+	o.Duration = duration
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetAccountMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration string
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := qrDuration
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metadata/get_account_metrics_responses.go

@@ -0,0 +1,212 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsReader is a Reader for the GetAccountMetrics structure.
+type GetAccountMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetAccountMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetAccountMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 400:
+		result := NewGetAccountMetricsBadRequest()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 500:
+		result := NewGetAccountMetricsInternalServerError()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetAccountMetricsOK creates a GetAccountMetricsOK with default headers values
+func NewGetAccountMetricsOK() *GetAccountMetricsOK {
+	return &GetAccountMetricsOK{}
+}
+
+/*
+GetAccountMetricsOK describes a response with status code 200, with default header values.
+
+account metrics
+*/
+type GetAccountMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get account metrics o k response has a 2xx status code
+func (o *GetAccountMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get account metrics o k response has a 3xx status code
+func (o *GetAccountMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account metrics o k response has a 4xx status code
+func (o *GetAccountMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get account metrics o k response has a 5xx status code
+func (o *GetAccountMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get account metrics o k response a status code equal to that given
+func (o *GetAccountMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetAccountMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetAccountMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetAccountMetricsBadRequest creates a GetAccountMetricsBadRequest with default headers values
+func NewGetAccountMetricsBadRequest() *GetAccountMetricsBadRequest {
+	return &GetAccountMetricsBadRequest{}
+}
+
+/*
+GetAccountMetricsBadRequest describes a response with status code 400, with default header values.
+
+bad request
+*/
+type GetAccountMetricsBadRequest struct {
+}
+
+// IsSuccess returns true when this get account metrics bad request response has a 2xx status code
+func (o *GetAccountMetricsBadRequest) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get account metrics bad request response has a 3xx status code
+func (o *GetAccountMetricsBadRequest) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account metrics bad request response has a 4xx status code
+func (o *GetAccountMetricsBadRequest) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get account metrics bad request response has a 5xx status code
+func (o *GetAccountMetricsBadRequest) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get account metrics bad request response a status code equal to that given
+func (o *GetAccountMetricsBadRequest) IsCode(code int) bool {
+	return code == 400
+}
+
+func (o *GetAccountMetricsBadRequest) Error() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsBadRequest ", 400)
+}
+
+func (o *GetAccountMetricsBadRequest) String() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsBadRequest ", 400)
+}
+
+func (o *GetAccountMetricsBadRequest) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetAccountMetricsInternalServerError creates a GetAccountMetricsInternalServerError with default headers values
+func NewGetAccountMetricsInternalServerError() *GetAccountMetricsInternalServerError {
+	return &GetAccountMetricsInternalServerError{}
+}
+
+/*
+GetAccountMetricsInternalServerError describes a response with status code 500, with default header values.
+
+internal server error
+*/
+type GetAccountMetricsInternalServerError struct {
+}
+
+// IsSuccess returns true when this get account metrics internal server error response has a 2xx status code
+func (o *GetAccountMetricsInternalServerError) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get account metrics internal server error response has a 3xx status code
+func (o *GetAccountMetricsInternalServerError) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account metrics internal server error response has a 4xx status code
+func (o *GetAccountMetricsInternalServerError) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get account metrics internal server error response has a 5xx status code
+func (o *GetAccountMetricsInternalServerError) IsServerError() bool {
+	return true
+}
+
+// IsCode returns true when this get account metrics internal server error response a status code equal to that given
+func (o *GetAccountMetricsInternalServerError) IsCode(code int) bool {
+	return code == 500
+}
+
+func (o *GetAccountMetricsInternalServerError) Error() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsInternalServerError ", 500)
+}
+
+func (o *GetAccountMetricsInternalServerError) String() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsInternalServerError ", 500)
+}
+
+func (o *GetAccountMetricsInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metadata/get_environment_detail_responses.go

@@ -63,7 +63,7 @@ GetEnvironmentDetailOK describes a response with status code 200, with default h
 ok
 */
 type GetEnvironmentDetailOK struct {
-	Payload *rest_model_zrok.EnvironmentShares
+	Payload *rest_model_zrok.EnvironmentAndResources
 }
 
 // IsSuccess returns true when this get environment detail o k response has a 2xx status code
@@ -99,13 +99,13 @@ func (o *GetEnvironmentDetailOK) String() string {
 	return fmt.Sprintf("[GET /detail/environment/{envZId}][%d] getEnvironmentDetailOK  %+v", 200, o.Payload)
 }
 
-func (o *GetEnvironmentDetailOK) GetPayload() *rest_model_zrok.EnvironmentShares {
+func (o *GetEnvironmentDetailOK) GetPayload() *rest_model_zrok.EnvironmentAndResources {
 	return o.Payload
 }
 
 func (o *GetEnvironmentDetailOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
 
-	o.Payload = new(rest_model_zrok.EnvironmentShares)
+	o.Payload = new(rest_model_zrok.EnvironmentAndResources)
 
 	// response payload
 	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {

rest_client_zrok/metadata/get_environment_metrics_parameters.go

@@ -0,0 +1,179 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetEnvironmentMetricsParams creates a new GetEnvironmentMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetEnvironmentMetricsParams() *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithTimeout creates a new GetEnvironmentMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetEnvironmentMetricsParamsWithTimeout(timeout time.Duration) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithContext creates a new GetEnvironmentMetricsParams object
+// with the ability to set a context for a request.
+func NewGetEnvironmentMetricsParamsWithContext(ctx context.Context) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithHTTPClient creates a new GetEnvironmentMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetEnvironmentMetricsParamsWithHTTPClient(client *http.Client) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetEnvironmentMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get environment metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetEnvironmentMetricsParams struct {
+
+	// Duration.
+	Duration *string
+
+	// EnvID.
+	EnvID string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get environment metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetEnvironmentMetricsParams) WithDefaults() *GetEnvironmentMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get environment metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetEnvironmentMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithTimeout(timeout time.Duration) *GetEnvironmentMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithContext(ctx context.Context) *GetEnvironmentMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithHTTPClient(client *http.Client) *GetEnvironmentMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithDuration(duration *string) *GetEnvironmentMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetDuration(duration *string) {
+	o.Duration = duration
+}
+
+// WithEnvID adds the envID to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithEnvID(envID string) *GetEnvironmentMetricsParams {
+	o.SetEnvID(envID)
+	return o
+}
+
+// SetEnvID adds the envId to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetEnvID(envID string) {
+	o.EnvID = envID
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetEnvironmentMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration string
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := qrDuration
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	// path param envId
+	if err := r.SetPathParam("envId", o.EnvID); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metadata/get_environment_metrics_responses.go

@@ -0,0 +1,269 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsReader is a Reader for the GetEnvironmentMetrics structure.
+type GetEnvironmentMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetEnvironmentMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetEnvironmentMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 400:
+		result := NewGetEnvironmentMetricsBadRequest()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 401:
+		result := NewGetEnvironmentMetricsUnauthorized()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 500:
+		result := NewGetEnvironmentMetricsInternalServerError()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetEnvironmentMetricsOK creates a GetEnvironmentMetricsOK with default headers values
+func NewGetEnvironmentMetricsOK() *GetEnvironmentMetricsOK {
+	return &GetEnvironmentMetricsOK{}
+}
+
+/*
+GetEnvironmentMetricsOK describes a response with status code 200, with default header values.
+
+environment metrics
+*/
+type GetEnvironmentMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get environment metrics o k response has a 2xx status code
+func (o *GetEnvironmentMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get environment metrics o k response has a 3xx status code
+func (o *GetEnvironmentMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics o k response has a 4xx status code
+func (o *GetEnvironmentMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get environment metrics o k response has a 5xx status code
+func (o *GetEnvironmentMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get environment metrics o k response a status code equal to that given
+func (o *GetEnvironmentMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetEnvironmentMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetEnvironmentMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetEnvironmentMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetEnvironmentMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetEnvironmentMetricsBadRequest creates a GetEnvironmentMetricsBadRequest with default headers values
+func NewGetEnvironmentMetricsBadRequest() *GetEnvironmentMetricsBadRequest {
+	return &GetEnvironmentMetricsBadRequest{}
+}
+
+/*
+GetEnvironmentMetricsBadRequest describes a response with status code 400, with default header values.
+
+bad request
+*/
+type GetEnvironmentMetricsBadRequest struct {
+}
+
+// IsSuccess returns true when this get environment metrics bad request response has a 2xx status code
+func (o *GetEnvironmentMetricsBadRequest) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get environment metrics bad request response has a 3xx status code
+func (o *GetEnvironmentMetricsBadRequest) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics bad request response has a 4xx status code
+func (o *GetEnvironmentMetricsBadRequest) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get environment metrics bad request response has a 5xx status code
+func (o *GetEnvironmentMetricsBadRequest) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get environment metrics bad request response a status code equal to that given
+func (o *GetEnvironmentMetricsBadRequest) IsCode(code int) bool {
+	return code == 400
+}
+
+func (o *GetEnvironmentMetricsBadRequest) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsBadRequest ", 400)
+}
+
+func (o *GetEnvironmentMetricsBadRequest) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsBadRequest ", 400)
+}
+
+func (o *GetEnvironmentMetricsBadRequest) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetEnvironmentMetricsUnauthorized creates a GetEnvironmentMetricsUnauthorized with default headers values
+func NewGetEnvironmentMetricsUnauthorized() *GetEnvironmentMetricsUnauthorized {
+	return &GetEnvironmentMetricsUnauthorized{}
+}
+
+/*
+GetEnvironmentMetricsUnauthorized describes a response with status code 401, with default header values.
+
+unauthorized
+*/
+type GetEnvironmentMetricsUnauthorized struct {
+}
+
+// IsSuccess returns true when this get environment metrics unauthorized response has a 2xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get environment metrics unauthorized response has a 3xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics unauthorized response has a 4xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get environment metrics unauthorized response has a 5xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get environment metrics unauthorized response a status code equal to that given
+func (o *GetEnvironmentMetricsUnauthorized) IsCode(code int) bool {
+	return code == 401
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsUnauthorized ", 401)
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsUnauthorized ", 401)
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetEnvironmentMetricsInternalServerError creates a GetEnvironmentMetricsInternalServerError with default headers values
+func NewGetEnvironmentMetricsInternalServerError() *GetEnvironmentMetricsInternalServerError {
+	return &GetEnvironmentMetricsInternalServerError{}
+}
+
+/*
+GetEnvironmentMetricsInternalServerError describes a response with status code 500, with default header values.
+
+internal server error
+*/
+type GetEnvironmentMetricsInternalServerError struct {
+}
+
+// IsSuccess returns true when this get environment metrics internal server error response has a 2xx status code
+func (o *GetEnvironmentMetricsInternalServerError) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get environment metrics internal server error response has a 3xx status code
+func (o *GetEnvironmentMetricsInternalServerError) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics internal server error response has a 4xx status code
+func (o *GetEnvironmentMetricsInternalServerError) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get environment metrics internal server error response has a 5xx status code
+func (o *GetEnvironmentMetricsInternalServerError) IsServerError() bool {
+	return true
+}
+
+// IsCode returns true when this get environment metrics internal server error response a status code equal to that given
+func (o *GetEnvironmentMetricsInternalServerError) IsCode(code int) bool {
+	return code == 500
+}
+
+func (o *GetEnvironmentMetricsInternalServerError) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsInternalServerError ", 500)
+}
+
+func (o *GetEnvironmentMetricsInternalServerError) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsInternalServerError ", 500)
+}
+
+func (o *GetEnvironmentMetricsInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metadata/get_frontend_detail_parameters.go

@@ -0,0 +1,149 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetFrontendDetailParams creates a new GetFrontendDetailParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetFrontendDetailParams() *GetFrontendDetailParams {
+	return &GetFrontendDetailParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetFrontendDetailParamsWithTimeout creates a new GetFrontendDetailParams object
+// with the ability to set a timeout on a request.
+func NewGetFrontendDetailParamsWithTimeout(timeout time.Duration) *GetFrontendDetailParams {
+	return &GetFrontendDetailParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetFrontendDetailParamsWithContext creates a new GetFrontendDetailParams object
+// with the ability to set a context for a request.
+func NewGetFrontendDetailParamsWithContext(ctx context.Context) *GetFrontendDetailParams {
+	return &GetFrontendDetailParams{
+		Context: ctx,
+	}
+}
+
+// NewGetFrontendDetailParamsWithHTTPClient creates a new GetFrontendDetailParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetFrontendDetailParamsWithHTTPClient(client *http.Client) *GetFrontendDetailParams {
+	return &GetFrontendDetailParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetFrontendDetailParams contains all the parameters to send to the API endpoint
+
+	for the get frontend detail operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetFrontendDetailParams struct {
+
+	// FeID.
+	FeID int64
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get frontend detail params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetFrontendDetailParams) WithDefaults() *GetFrontendDetailParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get frontend detail params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetFrontendDetailParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get frontend detail params
+func (o *GetFrontendDetailParams) WithTimeout(timeout time.Duration) *GetFrontendDetailParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get frontend detail params
+func (o *GetFrontendDetailParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get frontend detail params
+func (o *GetFrontendDetailParams) WithContext(ctx context.Context) *GetFrontendDetailParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get frontend detail params
+func (o *GetFrontendDetailParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get frontend detail params
+func (o *GetFrontendDetailParams) WithHTTPClient(client *http.Client) *GetFrontendDetailParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get frontend detail params
+func (o *GetFrontendDetailParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithFeID adds the feID to the get frontend detail params
+func (o *GetFrontendDetailParams) WithFeID(feID int64) *GetFrontendDetailParams {
+	o.SetFeID(feID)
+	return o
+}
+
+// SetFeID adds the feId to the get frontend detail params
+func (o *GetFrontendDetailParams) SetFeID(feID int64) {
+	o.FeID = feID
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetFrontendDetailParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	// path param feId
+	if err := r.SetPathParam("feId", swag.FormatInt64(o.FeID)); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metadata/get_frontend_detail_responses.go

@@ -0,0 +1,269 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetFrontendDetailReader is a Reader for the GetFrontendDetail structure.
+type GetFrontendDetailReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetFrontendDetailReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetFrontendDetailOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 401:
+		result := NewGetFrontendDetailUnauthorized()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 404:
+		result := NewGetFrontendDetailNotFound()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 500:
+		result := NewGetFrontendDetailInternalServerError()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetFrontendDetailOK creates a GetFrontendDetailOK with default headers values
+func NewGetFrontendDetailOK() *GetFrontendDetailOK {
+	return &GetFrontendDetailOK{}
+}
+
+/*
+GetFrontendDetailOK describes a response with status code 200, with default header values.
+
+ok
+*/
+type GetFrontendDetailOK struct {
+	Payload *rest_model_zrok.Frontend
+}
+
+// IsSuccess returns true when this get frontend detail o k response has a 2xx status code
+func (o *GetFrontendDetailOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get frontend detail o k response has a 3xx status code
+func (o *GetFrontendDetailOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get frontend detail o k response has a 4xx status code
+func (o *GetFrontendDetailOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get frontend detail o k response has a 5xx status code
+func (o *GetFrontendDetailOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get frontend detail o k response a status code equal to that given
+func (o *GetFrontendDetailOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetFrontendDetailOK) Error() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailOK  %+v", 200, o.Payload)
+}
+
+func (o *GetFrontendDetailOK) String() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailOK  %+v", 200, o.Payload)
+}
+
+func (o *GetFrontendDetailOK) GetPayload() *rest_model_zrok.Frontend {
+	return o.Payload
+}
+
+func (o *GetFrontendDetailOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Frontend)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetFrontendDetailUnauthorized creates a GetFrontendDetailUnauthorized with default headers values
+func NewGetFrontendDetailUnauthorized() *GetFrontendDetailUnauthorized {
+	return &GetFrontendDetailUnauthorized{}
+}
+
+/*
+GetFrontendDetailUnauthorized describes a response with status code 401, with default header values.
+
+unauthorized
+*/
+type GetFrontendDetailUnauthorized struct {
+}
+
+// IsSuccess returns true when this get frontend detail unauthorized response has a 2xx status code
+func (o *GetFrontendDetailUnauthorized) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get frontend detail unauthorized response has a 3xx status code
+func (o *GetFrontendDetailUnauthorized) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get frontend detail unauthorized response has a 4xx status code
+func (o *GetFrontendDetailUnauthorized) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get frontend detail unauthorized response has a 5xx status code
+func (o *GetFrontendDetailUnauthorized) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get frontend detail unauthorized response a status code equal to that given
+func (o *GetFrontendDetailUnauthorized) IsCode(code int) bool {
+	return code == 401
+}
+
+func (o *GetFrontendDetailUnauthorized) Error() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailUnauthorized ", 401)
+}
+
+func (o *GetFrontendDetailUnauthorized) String() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailUnauthorized ", 401)
+}
+
+func (o *GetFrontendDetailUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetFrontendDetailNotFound creates a GetFrontendDetailNotFound with default headers values
+func NewGetFrontendDetailNotFound() *GetFrontendDetailNotFound {
+	return &GetFrontendDetailNotFound{}
+}
+
+/*
+GetFrontendDetailNotFound describes a response with status code 404, with default header values.
+
+not found
+*/
+type GetFrontendDetailNotFound struct {
+}
+
+// IsSuccess returns true when this get frontend detail not found response has a 2xx status code
+func (o *GetFrontendDetailNotFound) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get frontend detail not found response has a 3xx status code
+func (o *GetFrontendDetailNotFound) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get frontend detail not found response has a 4xx status code
+func (o *GetFrontendDetailNotFound) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get frontend detail not found response has a 5xx status code
+func (o *GetFrontendDetailNotFound) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get frontend detail not found response a status code equal to that given
+func (o *GetFrontendDetailNotFound) IsCode(code int) bool {
+	return code == 404
+}
+
+func (o *GetFrontendDetailNotFound) Error() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailNotFound ", 404)
+}
+
+func (o *GetFrontendDetailNotFound) String() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailNotFound ", 404)
+}
+
+func (o *GetFrontendDetailNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetFrontendDetailInternalServerError creates a GetFrontendDetailInternalServerError with default headers values
+func NewGetFrontendDetailInternalServerError() *GetFrontendDetailInternalServerError {
+	return &GetFrontendDetailInternalServerError{}
+}
+
+/*
+GetFrontendDetailInternalServerError describes a response with status code 500, with default header values.
+
+internal server error
+*/
+type GetFrontendDetailInternalServerError struct {
+}
+
+// IsSuccess returns true when this get frontend detail internal server error response has a 2xx status code
+func (o *GetFrontendDetailInternalServerError) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get frontend detail internal server error response has a 3xx status code
+func (o *GetFrontendDetailInternalServerError) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get frontend detail internal server error response has a 4xx status code
+func (o *GetFrontendDetailInternalServerError) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get frontend detail internal server error response has a 5xx status code
+func (o *GetFrontendDetailInternalServerError) IsServerError() bool {
+	return true
+}
+
+// IsCode returns true when this get frontend detail internal server error response a status code equal to that given
+func (o *GetFrontendDetailInternalServerError) IsCode(code int) bool {
+	return code == 500
+}
+
+func (o *GetFrontendDetailInternalServerError) Error() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailInternalServerError ", 500)
+}
+
+func (o *GetFrontendDetailInternalServerError) String() string {
+	return fmt.Sprintf("[GET /detail/frontend/{feId}][%d] getFrontendDetailInternalServerError ", 500)
+}
+
+func (o *GetFrontendDetailInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metadata/get_share_metrics_parameters.go

@@ -0,0 +1,179 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetShareMetricsParams creates a new GetShareMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetShareMetricsParams() *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetShareMetricsParamsWithTimeout creates a new GetShareMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetShareMetricsParamsWithTimeout(timeout time.Duration) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetShareMetricsParamsWithContext creates a new GetShareMetricsParams object
+// with the ability to set a context for a request.
+func NewGetShareMetricsParamsWithContext(ctx context.Context) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetShareMetricsParamsWithHTTPClient creates a new GetShareMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetShareMetricsParamsWithHTTPClient(client *http.Client) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetShareMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get share metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetShareMetricsParams struct {
+
+	// Duration.
+	Duration *string
+
+	// ShrToken.
+	ShrToken string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get share metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetShareMetricsParams) WithDefaults() *GetShareMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get share metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetShareMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get share metrics params
+func (o *GetShareMetricsParams) WithTimeout(timeout time.Duration) *GetShareMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get share metrics params
+func (o *GetShareMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get share metrics params
+func (o *GetShareMetricsParams) WithContext(ctx context.Context) *GetShareMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get share metrics params
+func (o *GetShareMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get share metrics params
+func (o *GetShareMetricsParams) WithHTTPClient(client *http.Client) *GetShareMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get share metrics params
+func (o *GetShareMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get share metrics params
+func (o *GetShareMetricsParams) WithDuration(duration *string) *GetShareMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get share metrics params
+func (o *GetShareMetricsParams) SetDuration(duration *string) {
+	o.Duration = duration
+}
+
+// WithShrToken adds the shrToken to the get share metrics params
+func (o *GetShareMetricsParams) WithShrToken(shrToken string) *GetShareMetricsParams {
+	o.SetShrToken(shrToken)
+	return o
+}
+
+// SetShrToken adds the shrToken to the get share metrics params
+func (o *GetShareMetricsParams) SetShrToken(shrToken string) {
+	o.ShrToken = shrToken
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetShareMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration string
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := qrDuration
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	// path param shrToken
+	if err := r.SetPathParam("shrToken", o.ShrToken); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metadata/get_share_metrics_responses.go

@@ -0,0 +1,269 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsReader is a Reader for the GetShareMetrics structure.
+type GetShareMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetShareMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetShareMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 400:
+		result := NewGetShareMetricsBadRequest()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 401:
+		result := NewGetShareMetricsUnauthorized()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	case 500:
+		result := NewGetShareMetricsInternalServerError()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetShareMetricsOK creates a GetShareMetricsOK with default headers values
+func NewGetShareMetricsOK() *GetShareMetricsOK {
+	return &GetShareMetricsOK{}
+}
+
+/*
+GetShareMetricsOK describes a response with status code 200, with default header values.
+
+share metrics
+*/
+type GetShareMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get share metrics o k response has a 2xx status code
+func (o *GetShareMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get share metrics o k response has a 3xx status code
+func (o *GetShareMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics o k response has a 4xx status code
+func (o *GetShareMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get share metrics o k response has a 5xx status code
+func (o *GetShareMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get share metrics o k response a status code equal to that given
+func (o *GetShareMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetShareMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetShareMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetShareMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetShareMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetShareMetricsBadRequest creates a GetShareMetricsBadRequest with default headers values
+func NewGetShareMetricsBadRequest() *GetShareMetricsBadRequest {
+	return &GetShareMetricsBadRequest{}
+}
+
+/*
+GetShareMetricsBadRequest describes a response with status code 400, with default header values.
+
+bad request
+*/
+type GetShareMetricsBadRequest struct {
+}
+
+// IsSuccess returns true when this get share metrics bad request response has a 2xx status code
+func (o *GetShareMetricsBadRequest) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get share metrics bad request response has a 3xx status code
+func (o *GetShareMetricsBadRequest) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics bad request response has a 4xx status code
+func (o *GetShareMetricsBadRequest) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get share metrics bad request response has a 5xx status code
+func (o *GetShareMetricsBadRequest) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get share metrics bad request response a status code equal to that given
+func (o *GetShareMetricsBadRequest) IsCode(code int) bool {
+	return code == 400
+}
+
+func (o *GetShareMetricsBadRequest) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsBadRequest ", 400)
+}
+
+func (o *GetShareMetricsBadRequest) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsBadRequest ", 400)
+}
+
+func (o *GetShareMetricsBadRequest) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetShareMetricsUnauthorized creates a GetShareMetricsUnauthorized with default headers values
+func NewGetShareMetricsUnauthorized() *GetShareMetricsUnauthorized {
+	return &GetShareMetricsUnauthorized{}
+}
+
+/*
+GetShareMetricsUnauthorized describes a response with status code 401, with default header values.
+
+unauthorized
+*/
+type GetShareMetricsUnauthorized struct {
+}
+
+// IsSuccess returns true when this get share metrics unauthorized response has a 2xx status code
+func (o *GetShareMetricsUnauthorized) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get share metrics unauthorized response has a 3xx status code
+func (o *GetShareMetricsUnauthorized) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics unauthorized response has a 4xx status code
+func (o *GetShareMetricsUnauthorized) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get share metrics unauthorized response has a 5xx status code
+func (o *GetShareMetricsUnauthorized) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get share metrics unauthorized response a status code equal to that given
+func (o *GetShareMetricsUnauthorized) IsCode(code int) bool {
+	return code == 401
+}
+
+func (o *GetShareMetricsUnauthorized) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401)
+}
+
+func (o *GetShareMetricsUnauthorized) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401)
+}
+
+func (o *GetShareMetricsUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}
+
+// NewGetShareMetricsInternalServerError creates a GetShareMetricsInternalServerError with default headers values
+func NewGetShareMetricsInternalServerError() *GetShareMetricsInternalServerError {
+	return &GetShareMetricsInternalServerError{}
+}
+
+/*
+GetShareMetricsInternalServerError describes a response with status code 500, with default header values.
+
+internal server error
+*/
+type GetShareMetricsInternalServerError struct {
+}
+
+// IsSuccess returns true when this get share metrics internal server error response has a 2xx status code
+func (o *GetShareMetricsInternalServerError) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get share metrics internal server error response has a 3xx status code
+func (o *GetShareMetricsInternalServerError) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics internal server error response has a 4xx status code
+func (o *GetShareMetricsInternalServerError) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get share metrics internal server error response has a 5xx status code
+func (o *GetShareMetricsInternalServerError) IsServerError() bool {
+	return true
+}
+
+// IsCode returns true when this get share metrics internal server error response a status code equal to that given
+func (o *GetShareMetricsInternalServerError) IsCode(code int) bool {
+	return code == 500
+}
+
+func (o *GetShareMetricsInternalServerError) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsInternalServerError ", 500)
+}
+
+func (o *GetShareMetricsInternalServerError) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsInternalServerError ", 500)
+}
+
+func (o *GetShareMetricsInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metadata/metadata_client.go

@@ -32,10 +32,20 @@ type ClientOption func(*runtime.ClientOperation)
 type ClientService interface {
 	Configuration(params *ConfigurationParams, opts ...ClientOption) (*ConfigurationOK, error)
 
+	GetAccountDetail(params *GetAccountDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountDetailOK, error)
+
+	GetAccountMetrics(params *GetAccountMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountMetricsOK, error)
+
 	GetEnvironmentDetail(params *GetEnvironmentDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEnvironmentDetailOK, error)
 
+	GetEnvironmentMetrics(params *GetEnvironmentMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEnvironmentMetricsOK, error)
+
+	GetFrontendDetail(params *GetFrontendDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetFrontendDetailOK, error)
+
 	GetShareDetail(params *GetShareDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetShareDetailOK, error)
 
+	GetShareMetrics(params *GetShareMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetShareMetricsOK, error)
+
 	Overview(params *OverviewParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*OverviewOK, error)
 
 	Version(params *VersionParams, opts ...ClientOption) (*VersionOK, error)
@@ -81,6 +91,84 @@ func (a *Client) Configuration(params *ConfigurationParams, opts ...ClientOption
 	panic(msg)
 }
 
+/*
+GetAccountDetail get account detail API
+*/
+func (a *Client) GetAccountDetail(params *GetAccountDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountDetailOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetAccountDetailParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getAccountDetail",
+		Method:             "GET",
+		PathPattern:        "/detail/account",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetAccountDetailReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetAccountDetailOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getAccountDetail: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
+/*
+GetAccountMetrics get account metrics API
+*/
+func (a *Client) GetAccountMetrics(params *GetAccountMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetAccountMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getAccountMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/account",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetAccountMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetAccountMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getAccountMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
 /*
 GetEnvironmentDetail get environment detail API
 */
@@ -120,6 +208,84 @@ func (a *Client) GetEnvironmentDetail(params *GetEnvironmentDetailParams, authIn
 	panic(msg)
 }
 
+/*
+GetEnvironmentMetrics get environment metrics API
+*/
+func (a *Client) GetEnvironmentMetrics(params *GetEnvironmentMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEnvironmentMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetEnvironmentMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getEnvironmentMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/environment/{envId}",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetEnvironmentMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetEnvironmentMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getEnvironmentMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
+/*
+GetFrontendDetail get frontend detail API
+*/
+func (a *Client) GetFrontendDetail(params *GetFrontendDetailParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetFrontendDetailOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetFrontendDetailParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getFrontendDetail",
+		Method:             "GET",
+		PathPattern:        "/detail/frontend/{feId}",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetFrontendDetailReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetFrontendDetailOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getFrontendDetail: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
 /*
 GetShareDetail get share detail API
 */
@@ -159,6 +325,45 @@ func (a *Client) GetShareDetail(params *GetShareDetailParams, authInfo runtime.C
 	panic(msg)
 }
 
+/*
+GetShareMetrics get share metrics API
+*/
+func (a *Client) GetShareMetrics(params *GetShareMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetShareMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetShareMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getShareMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/share/{shrToken}",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetShareMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetShareMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getShareMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
 /*
 Overview overview API
 */

rest_client_zrok/metadata/overview_responses.go

@@ -51,7 +51,7 @@ OverviewOK describes a response with status code 200, with default header values
 overview returned
 */
 type OverviewOK struct {
-	Payload rest_model_zrok.EnvironmentSharesList
+	Payload *rest_model_zrok.Overview
 }
 
 // IsSuccess returns true when this overview o k response has a 2xx status code
@@ -87,14 +87,16 @@ func (o *OverviewOK) String() string {
 	return fmt.Sprintf("[GET /overview][%d] overviewOK  %+v", 200, o.Payload)
 }
 
-func (o *OverviewOK) GetPayload() rest_model_zrok.EnvironmentSharesList {
+func (o *OverviewOK) GetPayload() *rest_model_zrok.Overview {
 	return o.Payload
 }
 
 func (o *OverviewOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
 
+	o.Payload = new(rest_model_zrok.Overview)
+
 	// response payload
-	if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF {
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
 		return err
 	}
 

rest_client_zrok/metrics/get_account_metrics_parameters.go

@@ -0,0 +1,161 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetAccountMetricsParams creates a new GetAccountMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetAccountMetricsParams() *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetAccountMetricsParamsWithTimeout creates a new GetAccountMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetAccountMetricsParamsWithTimeout(timeout time.Duration) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetAccountMetricsParamsWithContext creates a new GetAccountMetricsParams object
+// with the ability to set a context for a request.
+func NewGetAccountMetricsParamsWithContext(ctx context.Context) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetAccountMetricsParamsWithHTTPClient creates a new GetAccountMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetAccountMetricsParamsWithHTTPClient(client *http.Client) *GetAccountMetricsParams {
+	return &GetAccountMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetAccountMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get account metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetAccountMetricsParams struct {
+
+	// Duration.
+	Duration *float64
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get account metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountMetricsParams) WithDefaults() *GetAccountMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get account metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetAccountMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get account metrics params
+func (o *GetAccountMetricsParams) WithTimeout(timeout time.Duration) *GetAccountMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get account metrics params
+func (o *GetAccountMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get account metrics params
+func (o *GetAccountMetricsParams) WithContext(ctx context.Context) *GetAccountMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get account metrics params
+func (o *GetAccountMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get account metrics params
+func (o *GetAccountMetricsParams) WithHTTPClient(client *http.Client) *GetAccountMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get account metrics params
+func (o *GetAccountMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get account metrics params
+func (o *GetAccountMetricsParams) WithDuration(duration *float64) *GetAccountMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get account metrics params
+func (o *GetAccountMetricsParams) SetDuration(duration *float64) {
+	o.Duration = duration
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetAccountMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration float64
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := swag.FormatFloat64(qrDuration)
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metrics/get_account_metrics_responses.go

@@ -0,0 +1,98 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsReader is a Reader for the GetAccountMetrics structure.
+type GetAccountMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetAccountMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetAccountMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetAccountMetricsOK creates a GetAccountMetricsOK with default headers values
+func NewGetAccountMetricsOK() *GetAccountMetricsOK {
+	return &GetAccountMetricsOK{}
+}
+
+/*
+GetAccountMetricsOK describes a response with status code 200, with default header values.
+
+account metrics
+*/
+type GetAccountMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get account metrics o k response has a 2xx status code
+func (o *GetAccountMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get account metrics o k response has a 3xx status code
+func (o *GetAccountMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get account metrics o k response has a 4xx status code
+func (o *GetAccountMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get account metrics o k response has a 5xx status code
+func (o *GetAccountMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get account metrics o k response a status code equal to that given
+func (o *GetAccountMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetAccountMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/account][%d] getAccountMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetAccountMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetAccountMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}

rest_client_zrok/metrics/get_environment_metrics_parameters.go

@@ -0,0 +1,180 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetEnvironmentMetricsParams creates a new GetEnvironmentMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetEnvironmentMetricsParams() *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithTimeout creates a new GetEnvironmentMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetEnvironmentMetricsParamsWithTimeout(timeout time.Duration) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithContext creates a new GetEnvironmentMetricsParams object
+// with the ability to set a context for a request.
+func NewGetEnvironmentMetricsParamsWithContext(ctx context.Context) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetEnvironmentMetricsParamsWithHTTPClient creates a new GetEnvironmentMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetEnvironmentMetricsParamsWithHTTPClient(client *http.Client) *GetEnvironmentMetricsParams {
+	return &GetEnvironmentMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetEnvironmentMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get environment metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetEnvironmentMetricsParams struct {
+
+	// Duration.
+	Duration *float64
+
+	// EnvID.
+	EnvID string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get environment metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetEnvironmentMetricsParams) WithDefaults() *GetEnvironmentMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get environment metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetEnvironmentMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithTimeout(timeout time.Duration) *GetEnvironmentMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithContext(ctx context.Context) *GetEnvironmentMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithHTTPClient(client *http.Client) *GetEnvironmentMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithDuration(duration *float64) *GetEnvironmentMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetDuration(duration *float64) {
+	o.Duration = duration
+}
+
+// WithEnvID adds the envID to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) WithEnvID(envID string) *GetEnvironmentMetricsParams {
+	o.SetEnvID(envID)
+	return o
+}
+
+// SetEnvID adds the envId to the get environment metrics params
+func (o *GetEnvironmentMetricsParams) SetEnvID(envID string) {
+	o.EnvID = envID
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetEnvironmentMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration float64
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := swag.FormatFloat64(qrDuration)
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	// path param envId
+	if err := r.SetPathParam("envId", o.EnvID); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metrics/get_environment_metrics_responses.go

@@ -0,0 +1,155 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsReader is a Reader for the GetEnvironmentMetrics structure.
+type GetEnvironmentMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetEnvironmentMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetEnvironmentMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 401:
+		result := NewGetEnvironmentMetricsUnauthorized()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetEnvironmentMetricsOK creates a GetEnvironmentMetricsOK with default headers values
+func NewGetEnvironmentMetricsOK() *GetEnvironmentMetricsOK {
+	return &GetEnvironmentMetricsOK{}
+}
+
+/*
+GetEnvironmentMetricsOK describes a response with status code 200, with default header values.
+
+environment metrics
+*/
+type GetEnvironmentMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get environment metrics o k response has a 2xx status code
+func (o *GetEnvironmentMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get environment metrics o k response has a 3xx status code
+func (o *GetEnvironmentMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics o k response has a 4xx status code
+func (o *GetEnvironmentMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get environment metrics o k response has a 5xx status code
+func (o *GetEnvironmentMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get environment metrics o k response a status code equal to that given
+func (o *GetEnvironmentMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetEnvironmentMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetEnvironmentMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetEnvironmentMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetEnvironmentMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetEnvironmentMetricsUnauthorized creates a GetEnvironmentMetricsUnauthorized with default headers values
+func NewGetEnvironmentMetricsUnauthorized() *GetEnvironmentMetricsUnauthorized {
+	return &GetEnvironmentMetricsUnauthorized{}
+}
+
+/*
+GetEnvironmentMetricsUnauthorized describes a response with status code 401, with default header values.
+
+unauthorized
+*/
+type GetEnvironmentMetricsUnauthorized struct {
+}
+
+// IsSuccess returns true when this get environment metrics unauthorized response has a 2xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get environment metrics unauthorized response has a 3xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get environment metrics unauthorized response has a 4xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get environment metrics unauthorized response has a 5xx status code
+func (o *GetEnvironmentMetricsUnauthorized) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get environment metrics unauthorized response a status code equal to that given
+func (o *GetEnvironmentMetricsUnauthorized) IsCode(code int) bool {
+	return code == 401
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) Error() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsUnauthorized ", 401)
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) String() string {
+	return fmt.Sprintf("[GET /metrics/environment/{envId}][%d] getEnvironmentMetricsUnauthorized ", 401)
+}
+
+func (o *GetEnvironmentMetricsUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metrics/get_share_metrics_parameters.go

@@ -0,0 +1,180 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	cr "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetShareMetricsParams creates a new GetShareMetricsParams object,
+// with the default timeout for this client.
+//
+// Default values are not hydrated, since defaults are normally applied by the API server side.
+//
+// To enforce default values in parameter, use SetDefaults or WithDefaults.
+func NewGetShareMetricsParams() *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		timeout: cr.DefaultTimeout,
+	}
+}
+
+// NewGetShareMetricsParamsWithTimeout creates a new GetShareMetricsParams object
+// with the ability to set a timeout on a request.
+func NewGetShareMetricsParamsWithTimeout(timeout time.Duration) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		timeout: timeout,
+	}
+}
+
+// NewGetShareMetricsParamsWithContext creates a new GetShareMetricsParams object
+// with the ability to set a context for a request.
+func NewGetShareMetricsParamsWithContext(ctx context.Context) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		Context: ctx,
+	}
+}
+
+// NewGetShareMetricsParamsWithHTTPClient creates a new GetShareMetricsParams object
+// with the ability to set a custom HTTPClient for a request.
+func NewGetShareMetricsParamsWithHTTPClient(client *http.Client) *GetShareMetricsParams {
+	return &GetShareMetricsParams{
+		HTTPClient: client,
+	}
+}
+
+/*
+GetShareMetricsParams contains all the parameters to send to the API endpoint
+
+	for the get share metrics operation.
+
+	Typically these are written to a http.Request.
+*/
+type GetShareMetricsParams struct {
+
+	// Duration.
+	Duration *float64
+
+	// ShrToken.
+	ShrToken string
+
+	timeout    time.Duration
+	Context    context.Context
+	HTTPClient *http.Client
+}
+
+// WithDefaults hydrates default values in the get share metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetShareMetricsParams) WithDefaults() *GetShareMetricsParams {
+	o.SetDefaults()
+	return o
+}
+
+// SetDefaults hydrates default values in the get share metrics params (not the query body).
+//
+// All values with no default are reset to their zero value.
+func (o *GetShareMetricsParams) SetDefaults() {
+	// no default values defined for this parameter
+}
+
+// WithTimeout adds the timeout to the get share metrics params
+func (o *GetShareMetricsParams) WithTimeout(timeout time.Duration) *GetShareMetricsParams {
+	o.SetTimeout(timeout)
+	return o
+}
+
+// SetTimeout adds the timeout to the get share metrics params
+func (o *GetShareMetricsParams) SetTimeout(timeout time.Duration) {
+	o.timeout = timeout
+}
+
+// WithContext adds the context to the get share metrics params
+func (o *GetShareMetricsParams) WithContext(ctx context.Context) *GetShareMetricsParams {
+	o.SetContext(ctx)
+	return o
+}
+
+// SetContext adds the context to the get share metrics params
+func (o *GetShareMetricsParams) SetContext(ctx context.Context) {
+	o.Context = ctx
+}
+
+// WithHTTPClient adds the HTTPClient to the get share metrics params
+func (o *GetShareMetricsParams) WithHTTPClient(client *http.Client) *GetShareMetricsParams {
+	o.SetHTTPClient(client)
+	return o
+}
+
+// SetHTTPClient adds the HTTPClient to the get share metrics params
+func (o *GetShareMetricsParams) SetHTTPClient(client *http.Client) {
+	o.HTTPClient = client
+}
+
+// WithDuration adds the duration to the get share metrics params
+func (o *GetShareMetricsParams) WithDuration(duration *float64) *GetShareMetricsParams {
+	o.SetDuration(duration)
+	return o
+}
+
+// SetDuration adds the duration to the get share metrics params
+func (o *GetShareMetricsParams) SetDuration(duration *float64) {
+	o.Duration = duration
+}
+
+// WithShrToken adds the shrToken to the get share metrics params
+func (o *GetShareMetricsParams) WithShrToken(shrToken string) *GetShareMetricsParams {
+	o.SetShrToken(shrToken)
+	return o
+}
+
+// SetShrToken adds the shrToken to the get share metrics params
+func (o *GetShareMetricsParams) SetShrToken(shrToken string) {
+	o.ShrToken = shrToken
+}
+
+// WriteToRequest writes these params to a swagger request
+func (o *GetShareMetricsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
+
+	if err := r.SetTimeout(o.timeout); err != nil {
+		return err
+	}
+	var res []error
+
+	if o.Duration != nil {
+
+		// query param duration
+		var qrDuration float64
+
+		if o.Duration != nil {
+			qrDuration = *o.Duration
+		}
+		qDuration := swag.FormatFloat64(qrDuration)
+		if qDuration != "" {
+
+			if err := r.SetQueryParam("duration", qDuration); err != nil {
+				return err
+			}
+		}
+	}
+
+	// path param shrToken
+	if err := r.SetPathParam("shrToken", o.ShrToken); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_client_zrok/metrics/get_share_metrics_responses.go

@@ -0,0 +1,155 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsReader is a Reader for the GetShareMetrics structure.
+type GetShareMetricsReader struct {
+	formats strfmt.Registry
+}
+
+// ReadResponse reads a server response into the received o.
+func (o *GetShareMetricsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
+	switch response.Code() {
+	case 200:
+		result := NewGetShareMetricsOK()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return result, nil
+	case 401:
+		result := NewGetShareMetricsUnauthorized()
+		if err := result.readResponse(response, consumer, o.formats); err != nil {
+			return nil, err
+		}
+		return nil, result
+	default:
+		return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code())
+	}
+}
+
+// NewGetShareMetricsOK creates a GetShareMetricsOK with default headers values
+func NewGetShareMetricsOK() *GetShareMetricsOK {
+	return &GetShareMetricsOK{}
+}
+
+/*
+GetShareMetricsOK describes a response with status code 200, with default header values.
+
+share metrics
+*/
+type GetShareMetricsOK struct {
+	Payload *rest_model_zrok.Metrics
+}
+
+// IsSuccess returns true when this get share metrics o k response has a 2xx status code
+func (o *GetShareMetricsOK) IsSuccess() bool {
+	return true
+}
+
+// IsRedirect returns true when this get share metrics o k response has a 3xx status code
+func (o *GetShareMetricsOK) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics o k response has a 4xx status code
+func (o *GetShareMetricsOK) IsClientError() bool {
+	return false
+}
+
+// IsServerError returns true when this get share metrics o k response has a 5xx status code
+func (o *GetShareMetricsOK) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get share metrics o k response a status code equal to that given
+func (o *GetShareMetricsOK) IsCode(code int) bool {
+	return code == 200
+}
+
+func (o *GetShareMetricsOK) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetShareMetricsOK) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsOK  %+v", 200, o.Payload)
+}
+
+func (o *GetShareMetricsOK) GetPayload() *rest_model_zrok.Metrics {
+	return o.Payload
+}
+
+func (o *GetShareMetricsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	o.Payload = new(rest_model_zrok.Metrics)
+
+	// response payload
+	if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF {
+		return err
+	}
+
+	return nil
+}
+
+// NewGetShareMetricsUnauthorized creates a GetShareMetricsUnauthorized with default headers values
+func NewGetShareMetricsUnauthorized() *GetShareMetricsUnauthorized {
+	return &GetShareMetricsUnauthorized{}
+}
+
+/*
+GetShareMetricsUnauthorized describes a response with status code 401, with default header values.
+
+unauthorized
+*/
+type GetShareMetricsUnauthorized struct {
+}
+
+// IsSuccess returns true when this get share metrics unauthorized response has a 2xx status code
+func (o *GetShareMetricsUnauthorized) IsSuccess() bool {
+	return false
+}
+
+// IsRedirect returns true when this get share metrics unauthorized response has a 3xx status code
+func (o *GetShareMetricsUnauthorized) IsRedirect() bool {
+	return false
+}
+
+// IsClientError returns true when this get share metrics unauthorized response has a 4xx status code
+func (o *GetShareMetricsUnauthorized) IsClientError() bool {
+	return true
+}
+
+// IsServerError returns true when this get share metrics unauthorized response has a 5xx status code
+func (o *GetShareMetricsUnauthorized) IsServerError() bool {
+	return false
+}
+
+// IsCode returns true when this get share metrics unauthorized response a status code equal to that given
+func (o *GetShareMetricsUnauthorized) IsCode(code int) bool {
+	return code == 401
+}
+
+func (o *GetShareMetricsUnauthorized) Error() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401)
+}
+
+func (o *GetShareMetricsUnauthorized) String() string {
+	return fmt.Sprintf("[GET /metrics/share/{shrToken}][%d] getShareMetricsUnauthorized ", 401)
+}
+
+func (o *GetShareMetricsUnauthorized) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
+
+	return nil
+}

rest_client_zrok/metrics/metrics_client.go

@@ -0,0 +1,162 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"fmt"
+
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/strfmt"
+)
+
+// New creates a new metrics API client.
+func New(transport runtime.ClientTransport, formats strfmt.Registry) ClientService {
+	return &Client{transport: transport, formats: formats}
+}
+
+/*
+Client for metrics API
+*/
+type Client struct {
+	transport runtime.ClientTransport
+	formats   strfmt.Registry
+}
+
+// ClientOption is the option for Client methods
+type ClientOption func(*runtime.ClientOperation)
+
+// ClientService is the interface for Client methods
+type ClientService interface {
+	GetAccountMetrics(params *GetAccountMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountMetricsOK, error)
+
+	GetEnvironmentMetrics(params *GetEnvironmentMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEnvironmentMetricsOK, error)
+
+	GetShareMetrics(params *GetShareMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetShareMetricsOK, error)
+
+	SetTransport(transport runtime.ClientTransport)
+}
+
+/*
+GetAccountMetrics get account metrics API
+*/
+func (a *Client) GetAccountMetrics(params *GetAccountMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetAccountMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetAccountMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getAccountMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/account",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetAccountMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetAccountMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getAccountMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
+/*
+GetEnvironmentMetrics get environment metrics API
+*/
+func (a *Client) GetEnvironmentMetrics(params *GetEnvironmentMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEnvironmentMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetEnvironmentMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getEnvironmentMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/environment/{envId}",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetEnvironmentMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetEnvironmentMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getEnvironmentMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
+/*
+GetShareMetrics get share metrics API
+*/
+func (a *Client) GetShareMetrics(params *GetShareMetricsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetShareMetricsOK, error) {
+	// TODO: Validate the params before sending
+	if params == nil {
+		params = NewGetShareMetricsParams()
+	}
+	op := &runtime.ClientOperation{
+		ID:                 "getShareMetrics",
+		Method:             "GET",
+		PathPattern:        "/metrics/share/{shrToken}",
+		ProducesMediaTypes: []string{"application/zrok.v1+json"},
+		ConsumesMediaTypes: []string{"application/zrok.v1+json"},
+		Schemes:            []string{"http"},
+		Params:             params,
+		Reader:             &GetShareMetricsReader{formats: a.formats},
+		AuthInfo:           authInfo,
+		Context:            params.Context,
+		Client:             params.HTTPClient,
+	}
+	for _, opt := range opts {
+		opt(op)
+	}
+
+	result, err := a.transport.Submit(op)
+	if err != nil {
+		return nil, err
+	}
+	success, ok := result.(*GetShareMetricsOK)
+	if ok {
+		return success, nil
+	}
+	// unexpected success response
+	// safeguard: normally, absent a default response, unknown success responses return an error above: so this is a codegen issue
+	msg := fmt.Sprintf("unexpected success response for getShareMetrics: API contract not enforced by server. Client expected to get an error, but got: %T", result)
+	panic(msg)
+}
+
+// SetTransport changes the transport on the client
+func (a *Client) SetTransport(transport runtime.ClientTransport) {
+	a.transport = transport
+}

rest_model_zrok/environment.go

@@ -8,6 +8,7 @@ package rest_model_zrok
 import (
 	"context"
 
+	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 )
@@ -17,8 +18,8 @@ import (
 // swagger:model environment
 type Environment struct {
 
-	// active
-	Active bool `json:"active,omitempty"`
+	// activity
+	Activity SparkData `json:"activity,omitempty"`
 
 	// address
 	Address string `json:"address,omitempty"`
@@ -32,6 +33,9 @@ type Environment struct {
 	// host
 	Host string `json:"host,omitempty"`
 
+	// limited
+	Limited bool `json:"limited,omitempty"`
+
 	// updated at
 	UpdatedAt int64 `json:"updatedAt,omitempty"`
 
@@ -41,11 +45,60 @@ type Environment struct {
 
 // Validate validates this environment
 func (m *Environment) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateActivity(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
 	return nil
 }
 
-// ContextValidate validates this environment based on context it is used
+func (m *Environment) validateActivity(formats strfmt.Registry) error {
+	if swag.IsZero(m.Activity) { // not required
+		return nil
+	}
+
+	if err := m.Activity.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("activity")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("activity")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validate this environment based on the context it is used
 func (m *Environment) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateActivity(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Environment) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error {
+
+	if err := m.Activity.ContextValidate(ctx, formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("activity")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("activity")
+		}
+		return err
+	}
+
 	return nil
 }
 

rest_model_zrok/environment_and_resources.go

@@ -0,0 +1,188 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// EnvironmentAndResources environment and resources
+//
+// swagger:model environmentAndResources
+type EnvironmentAndResources struct {
+
+	// environment
+	Environment *Environment `json:"environment,omitempty"`
+
+	// frontends
+	Frontends Frontends `json:"frontends,omitempty"`
+
+	// shares
+	Shares Shares `json:"shares,omitempty"`
+}
+
+// Validate validates this environment and resources
+func (m *EnvironmentAndResources) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateEnvironment(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateFrontends(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateShares(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *EnvironmentAndResources) validateEnvironment(formats strfmt.Registry) error {
+	if swag.IsZero(m.Environment) { // not required
+		return nil
+	}
+
+	if m.Environment != nil {
+		if err := m.Environment.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("environment")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("environment")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EnvironmentAndResources) validateFrontends(formats strfmt.Registry) error {
+	if swag.IsZero(m.Frontends) { // not required
+		return nil
+	}
+
+	if err := m.Frontends.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("frontends")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("frontends")
+		}
+		return err
+	}
+
+	return nil
+}
+
+func (m *EnvironmentAndResources) validateShares(formats strfmt.Registry) error {
+	if swag.IsZero(m.Shares) { // not required
+		return nil
+	}
+
+	if err := m.Shares.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("shares")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("shares")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validate this environment and resources based on the context it is used
+func (m *EnvironmentAndResources) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateEnvironment(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateFrontends(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateShares(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *EnvironmentAndResources) contextValidateEnvironment(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Environment != nil {
+		if err := m.Environment.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("environment")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("environment")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EnvironmentAndResources) contextValidateFrontends(ctx context.Context, formats strfmt.Registry) error {
+
+	if err := m.Frontends.ContextValidate(ctx, formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("frontends")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("frontends")
+		}
+		return err
+	}
+
+	return nil
+}
+
+func (m *EnvironmentAndResources) contextValidateShares(ctx context.Context, formats strfmt.Registry) error {
+
+	if err := m.Shares.ContextValidate(ctx, formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("shares")
+		} else if ce, ok := err.(*errors.CompositeError); ok {
+			return ce.ValidateName("shares")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *EnvironmentAndResources) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *EnvironmentAndResources) UnmarshalBinary(b []byte) error {
+	var res EnvironmentAndResources
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/frontend.go

@@ -0,0 +1,62 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// Frontend frontend
+//
+// swagger:model frontend
+type Frontend struct {
+
+	// created at
+	CreatedAt int64 `json:"createdAt,omitempty"`
+
+	// id
+	ID int64 `json:"id,omitempty"`
+
+	// shr token
+	ShrToken string `json:"shrToken,omitempty"`
+
+	// updated at
+	UpdatedAt int64 `json:"updatedAt,omitempty"`
+
+	// z Id
+	ZID string `json:"zId,omitempty"`
+}
+
+// Validate validates this frontend
+func (m *Frontend) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this frontend based on context it is used
+func (m *Frontend) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *Frontend) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *Frontend) UnmarshalBinary(b []byte) error {
+	var res Frontend
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/frontends.go

@@ -0,0 +1,73 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// Frontends frontends
+//
+// swagger:model frontends
+type Frontends []*Frontend
+
+// Validate validates this frontends
+func (m Frontends) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+		if swag.IsZero(m[i]) { // not required
+			continue
+		}
+
+		if m[i] != nil {
+			if err := m[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// ContextValidate validate this frontends based on the context it is used
+func (m Frontends) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+
+		if m[i] != nil {
+			if err := m[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_model_zrok/metrics.go

@@ -0,0 +1,125 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// Metrics metrics
+//
+// swagger:model metrics
+type Metrics struct {
+
+	// id
+	ID string `json:"id,omitempty"`
+
+	// period
+	Period float64 `json:"period,omitempty"`
+
+	// samples
+	Samples []*MetricsSample `json:"samples"`
+
+	// scope
+	Scope string `json:"scope,omitempty"`
+}
+
+// Validate validates this metrics
+func (m *Metrics) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateSamples(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Metrics) validateSamples(formats strfmt.Registry) error {
+	if swag.IsZero(m.Samples) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Samples); i++ {
+		if swag.IsZero(m.Samples[i]) { // not required
+			continue
+		}
+
+		if m.Samples[i] != nil {
+			if err := m.Samples[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("samples" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("samples" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this metrics based on the context it is used
+func (m *Metrics) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateSamples(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Metrics) contextValidateSamples(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Samples); i++ {
+
+		if m.Samples[i] != nil {
+			if err := m.Samples[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("samples" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("samples" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *Metrics) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *Metrics) UnmarshalBinary(b []byte) error {
+	var res Metrics
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/metrics_sample.go

@@ -0,0 +1,56 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// MetricsSample metrics sample
+//
+// swagger:model metricsSample
+type MetricsSample struct {
+
+	// rx
+	Rx float64 `json:"rx,omitempty"`
+
+	// timestamp
+	Timestamp float64 `json:"timestamp,omitempty"`
+
+	// tx
+	Tx float64 `json:"tx,omitempty"`
+}
+
+// Validate validates this metrics sample
+func (m *MetricsSample) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this metrics sample based on context it is used
+func (m *MetricsSample) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *MetricsSample) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *MetricsSample) UnmarshalBinary(b []byte) error {
+	var res MetricsSample
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/overview.go

@@ -0,0 +1,119 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// Overview overview
+//
+// swagger:model overview
+type Overview struct {
+
+	// account limited
+	AccountLimited bool `json:"accountLimited,omitempty"`
+
+	// environments
+	Environments []*EnvironmentAndResources `json:"environments"`
+}
+
+// Validate validates this overview
+func (m *Overview) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateEnvironments(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Overview) validateEnvironments(formats strfmt.Registry) error {
+	if swag.IsZero(m.Environments) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Environments); i++ {
+		if swag.IsZero(m.Environments[i]) { // not required
+			continue
+		}
+
+		if m.Environments[i] != nil {
+			if err := m.Environments[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("environments" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("environments" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this overview based on the context it is used
+func (m *Overview) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateEnvironments(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Overview) contextValidateEnvironments(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Environments); i++ {
+
+		if m.Environments[i] != nil {
+			if err := m.Environments[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("environments" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("environments" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *Overview) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *Overview) UnmarshalBinary(b []byte) error {
+	var res Overview
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/share.go

@@ -18,6 +18,9 @@ import (
 // swagger:model share
 type Share struct {
 
+	// activity
+	Activity SparkData `json:"activity,omitempty"`
+
 	// backend mode
 	BackendMode string `json:"backendMode,omitempty"`
 
@@ -33,8 +36,8 @@ type Share struct {
 	// frontend selection
 	FrontendSelection string `json:"frontendSelection,omitempty"`
 
-	// metrics
-	Metrics ShareMetrics `json:"metrics,omitempty"`
+	// limited
+	Limited bool `json:"limited,omitempty"`
 
 	// reserved
 	Reserved bool `json:"reserved,omitempty"`
@@ -56,7 +59,7 @@ type Share struct {
 func (m *Share) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validateMetrics(formats); err != nil {
+	if err := m.validateActivity(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -66,16 +69,16 @@ func (m *Share) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Share) validateMetrics(formats strfmt.Registry) error {
-	if swag.IsZero(m.Metrics) { // not required
+func (m *Share) validateActivity(formats strfmt.Registry) error {
+	if swag.IsZero(m.Activity) { // not required
 		return nil
 	}
 
-	if err := m.Metrics.Validate(formats); err != nil {
+	if err := m.Activity.Validate(formats); err != nil {
 		if ve, ok := err.(*errors.Validation); ok {
-			return ve.ValidateName("metrics")
+			return ve.ValidateName("activity")
 		} else if ce, ok := err.(*errors.CompositeError); ok {
-			return ce.ValidateName("metrics")
+			return ce.ValidateName("activity")
 		}
 		return err
 	}
@@ -87,7 +90,7 @@ func (m *Share) validateMetrics(formats strfmt.Registry) error {
 func (m *Share) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.contextValidateMetrics(ctx, formats); err != nil {
+	if err := m.contextValidateActivity(ctx, formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -97,13 +100,13 @@ func (m *Share) ContextValidate(ctx context.Context, formats strfmt.Registry) er
 	return nil
 }
 
-func (m *Share) contextValidateMetrics(ctx context.Context, formats strfmt.Registry) error {
+func (m *Share) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error {
 
-	if err := m.Metrics.ContextValidate(ctx, formats); err != nil {
+	if err := m.Activity.ContextValidate(ctx, formats); err != nil {
 		if ve, ok := err.(*errors.Validation); ok {
-			return ve.ValidateName("metrics")
+			return ve.ValidateName("activity")
 		} else if ce, ok := err.(*errors.CompositeError); ok {
-			return ce.ValidateName("metrics")
+			return ce.ValidateName("activity")
 		}
 		return err
 	}

rest_model_zrok/share_metrics.go

@@ -7,21 +7,67 @@ package rest_model_zrok
 
 import (
 	"context"
+	"strconv"
 
+	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 )
 
 // ShareMetrics share metrics
 //
 // swagger:model shareMetrics
-type ShareMetrics []int64
+type ShareMetrics []*ShareMetricsSample
 
 // Validate validates this share metrics
 func (m ShareMetrics) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+		if swag.IsZero(m[i]) { // not required
+			continue
+		}
+
+		if m[i] != nil {
+			if err := m[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
 	return nil
 }
 
-// ContextValidate validates this share metrics based on context it is used
+// ContextValidate validate this share metrics based on the context it is used
 func (m ShareMetrics) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+
+		if m[i] != nil {
+			if err := m[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
 	return nil
 }

rest_model_zrok/share_metrics_sample.go

@@ -0,0 +1,56 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// ShareMetricsSample share metrics sample
+//
+// swagger:model shareMetricsSample
+type ShareMetricsSample struct {
+
+	// rx
+	Rx float64 `json:"rx,omitempty"`
+
+	// timestamp
+	Timestamp float64 `json:"timestamp,omitempty"`
+
+	// tx
+	Tx float64 `json:"tx,omitempty"`
+}
+
+// Validate validates this share metrics sample
+func (m *ShareMetricsSample) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this share metrics sample based on context it is used
+func (m *ShareMetricsSample) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *ShareMetricsSample) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *ShareMetricsSample) UnmarshalBinary(b []byte) error {
+	var res ShareMetricsSample
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_model_zrok/spark_data.go

@@ -0,0 +1,73 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// SparkData spark data
+//
+// swagger:model sparkData
+type SparkData []*SparkDataSample
+
+// Validate validates this spark data
+func (m SparkData) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+		if swag.IsZero(m[i]) { // not required
+			continue
+		}
+
+		if m[i] != nil {
+			if err := m[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// ContextValidate validate this spark data based on the context it is used
+func (m SparkData) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	for i := 0; i < len(m); i++ {
+
+		if m[i] != nil {
+			if err := m[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName(strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName(strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_model_zrok/spark_data_sample.go

@@ -0,0 +1,53 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package rest_model_zrok
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"context"
+
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// SparkDataSample spark data sample
+//
+// swagger:model sparkDataSample
+type SparkDataSample struct {
+
+	// rx
+	Rx float64 `json:"rx,omitempty"`
+
+	// tx
+	Tx float64 `json:"tx,omitempty"`
+}
+
+// Validate validates this spark data sample
+func (m *SparkDataSample) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this spark data sample based on context it is used
+func (m *SparkDataSample) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *SparkDataSample) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *SparkDataSample) UnmarshalBinary(b []byte) error {
+	var res SparkDataSample
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

rest_server_zrok/embedded_spec.go

@@ -90,6 +90,30 @@ func init() {
         }
       }
     },
+    "/detail/account": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getAccountDetail",
+        "responses": {
+          "200": {
+            "description": "ok",
+            "schema": {
+              "$ref": "#/definitions/environments"
+            }
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
     "/detail/environment/{envZId}": {
       "get": {
         "security": [
@@ -113,7 +137,45 @@ func init() {
           "200": {
             "description": "ok",
             "schema": {
-              "$ref": "#/definitions/environmentShares"
+              "$ref": "#/definitions/environmentAndResources"
+            }
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "404": {
+            "description": "not found"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/detail/frontend/{feId}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getFrontendDetail",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "feId",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ok",
+            "schema": {
+              "$ref": "#/definitions/frontend"
             }
           },
           "401": {
@@ -520,6 +582,126 @@ func init() {
         }
       }
     },
+    "/metrics/account": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getAccountMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "account metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/metrics/environment/{envId}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getEnvironmentMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "envId",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "environment metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/metrics/share/{shrToken}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getShareMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "shrToken",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "share metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
     "/overview": {
       "get": {
         "security": [
@@ -535,7 +717,7 @@ func init() {
           "200": {
             "description": "overview returned",
             "schema": {
-              "$ref": "#/definitions/environmentSharesList"
+              "$ref": "#/definitions/overview"
             }
           },
           "500": {
@@ -945,8 +1127,8 @@ func init() {
     "environment": {
       "type": "object",
       "properties": {
-        "active": {
-          "type": "boolean"
+        "activity": {
+          "$ref": "#/definitions/sparkData"
         },
         "address": {
           "type": "string"
@@ -960,6 +1142,9 @@ func init() {
         "host": {
           "type": "string"
         },
+        "limited": {
+          "type": "boolean"
+        },
         "updatedAt": {
           "type": "integer"
         },
@@ -968,23 +1153,20 @@ func init() {
         }
       }
     },
-    "environmentShares": {
+    "environmentAndResources": {
       "type": "object",
       "properties": {
         "environment": {
           "$ref": "#/definitions/environment"
         },
+        "frontends": {
+          "$ref": "#/definitions/frontends"
+        },
         "shares": {
           "$ref": "#/definitions/shares"
         }
       }
     },
-    "environmentSharesList": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/environmentShares"
-      }
-    },
     "environments": {
       "type": "array",
       "items": {
@@ -994,6 +1176,32 @@ func init() {
     "errorMessage": {
       "type": "string"
     },
+    "frontend": {
+      "type": "object",
+      "properties": {
+        "createdAt": {
+          "type": "integer"
+        },
+        "id": {
+          "type": "integer"
+        },
+        "shrToken": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "integer"
+        },
+        "zId": {
+          "type": "string"
+        }
+      }
+    },
+    "frontends": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/frontend"
+      }
+    },
     "inviteRequest": {
       "type": "object",
       "properties": {
@@ -1030,6 +1238,54 @@ func init() {
     "loginResponse": {
       "type": "string"
     },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "period": {
+          "type": "number"
+        },
+        "samples": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/metricsSample"
+          }
+        },
+        "scope": {
+          "type": "string"
+        }
+      }
+    },
+    "metricsSample": {
+      "type": "object",
+      "properties": {
+        "rx": {
+          "type": "number"
+        },
+        "timestamp": {
+          "type": "number"
+        },
+        "tx": {
+          "type": "number"
+        }
+      }
+    },
+    "overview": {
+      "type": "object",
+      "properties": {
+        "accountLimited": {
+          "type": "boolean"
+        },
+        "environments": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentAndResources"
+          }
+        }
+      }
+    },
     "principal": {
       "type": "object",
       "properties": {
@@ -1112,6 +1368,9 @@ func init() {
     "share": {
       "type": "object",
       "properties": {
+        "activity": {
+          "$ref": "#/definitions/sparkData"
+        },
         "backendMode": {
           "type": "string"
         },
@@ -1127,8 +1386,8 @@ func init() {
         "frontendSelection": {
           "type": "string"
         },
-        "metrics": {
-          "$ref": "#/definitions/shareMetrics"
+        "limited": {
+          "type": "boolean"
         },
         "reserved": {
           "type": "boolean"
@@ -1147,12 +1406,6 @@ func init() {
         }
       }
     },
-    "shareMetrics": {
-      "type": "array",
-      "items": {
-        "type": "integer"
-      }
-    },
     "shareRequest": {
       "type": "object",
       "properties": {
@@ -1218,6 +1471,23 @@ func init() {
         "$ref": "#/definitions/share"
       }
     },
+    "sparkData": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/sparkDataSample"
+      }
+    },
+    "sparkDataSample": {
+      "type": "object",
+      "properties": {
+        "rx": {
+          "type": "number"
+        },
+        "tx": {
+          "type": "number"
+        }
+      }
+    },
     "unaccessRequest": {
       "type": "object",
       "properties": {
@@ -1372,6 +1642,30 @@ func init() {
         }
       }
     },
+    "/detail/account": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getAccountDetail",
+        "responses": {
+          "200": {
+            "description": "ok",
+            "schema": {
+              "$ref": "#/definitions/environments"
+            }
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
     "/detail/environment/{envZId}": {
       "get": {
         "security": [
@@ -1395,7 +1689,45 @@ func init() {
           "200": {
             "description": "ok",
             "schema": {
-              "$ref": "#/definitions/environmentShares"
+              "$ref": "#/definitions/environmentAndResources"
+            }
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "404": {
+            "description": "not found"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/detail/frontend/{feId}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getFrontendDetail",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "feId",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "ok",
+            "schema": {
+              "$ref": "#/definitions/frontend"
             }
           },
           "401": {
@@ -1802,6 +2134,126 @@ func init() {
         }
       }
     },
+    "/metrics/account": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getAccountMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "account metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/metrics/environment/{envId}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getEnvironmentMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "envId",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "environment metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
+    "/metrics/share/{shrToken}": {
+      "get": {
+        "security": [
+          {
+            "key": []
+          }
+        ],
+        "tags": [
+          "metadata"
+        ],
+        "operationId": "getShareMetrics",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "shrToken",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "duration",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "share metrics",
+            "schema": {
+              "$ref": "#/definitions/metrics"
+            }
+          },
+          "400": {
+            "description": "bad request"
+          },
+          "401": {
+            "description": "unauthorized"
+          },
+          "500": {
+            "description": "internal server error"
+          }
+        }
+      }
+    },
     "/overview": {
       "get": {
         "security": [
@@ -1817,7 +2269,7 @@ func init() {
           "200": {
             "description": "overview returned",
             "schema": {
-              "$ref": "#/definitions/environmentSharesList"
+              "$ref": "#/definitions/overview"
             }
           },
           "500": {
@@ -2227,8 +2679,8 @@ func init() {
     "environment": {
       "type": "object",
       "properties": {
-        "active": {
-          "type": "boolean"
+        "activity": {
+          "$ref": "#/definitions/sparkData"
         },
         "address": {
           "type": "string"
@@ -2242,6 +2694,9 @@ func init() {
         "host": {
           "type": "string"
         },
+        "limited": {
+          "type": "boolean"
+        },
         "updatedAt": {
           "type": "integer"
         },
@@ -2250,23 +2705,20 @@ func init() {
         }
       }
     },
-    "environmentShares": {
+    "environmentAndResources": {
       "type": "object",
       "properties": {
         "environment": {
           "$ref": "#/definitions/environment"
         },
+        "frontends": {
+          "$ref": "#/definitions/frontends"
+        },
         "shares": {
           "$ref": "#/definitions/shares"
         }
       }
     },
-    "environmentSharesList": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/environmentShares"
-      }
-    },
     "environments": {
       "type": "array",
       "items": {
@@ -2276,6 +2728,32 @@ func init() {
     "errorMessage": {
       "type": "string"
     },
+    "frontend": {
+      "type": "object",
+      "properties": {
+        "createdAt": {
+          "type": "integer"
+        },
+        "id": {
+          "type": "integer"
+        },
+        "shrToken": {
+          "type": "string"
+        },
+        "updatedAt": {
+          "type": "integer"
+        },
+        "zId": {
+          "type": "string"
+        }
+      }
+    },
+    "frontends": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/frontend"
+      }
+    },
     "inviteRequest": {
       "type": "object",
       "properties": {
@@ -2312,6 +2790,54 @@ func init() {
     "loginResponse": {
       "type": "string"
     },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "period": {
+          "type": "number"
+        },
+        "samples": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/metricsSample"
+          }
+        },
+        "scope": {
+          "type": "string"
+        }
+      }
+    },
+    "metricsSample": {
+      "type": "object",
+      "properties": {
+        "rx": {
+          "type": "number"
+        },
+        "timestamp": {
+          "type": "number"
+        },
+        "tx": {
+          "type": "number"
+        }
+      }
+    },
+    "overview": {
+      "type": "object",
+      "properties": {
+        "accountLimited": {
+          "type": "boolean"
+        },
+        "environments": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentAndResources"
+          }
+        }
+      }
+    },
     "principal": {
       "type": "object",
       "properties": {
@@ -2394,6 +2920,9 @@ func init() {
     "share": {
       "type": "object",
       "properties": {
+        "activity": {
+          "$ref": "#/definitions/sparkData"
+        },
         "backendMode": {
           "type": "string"
         },
@@ -2409,8 +2938,8 @@ func init() {
         "frontendSelection": {
           "type": "string"
         },
-        "metrics": {
-          "$ref": "#/definitions/shareMetrics"
+        "limited": {
+          "type": "boolean"
         },
         "reserved": {
           "type": "boolean"
@@ -2429,12 +2958,6 @@ func init() {
         }
       }
     },
-    "shareMetrics": {
-      "type": "array",
-      "items": {
-        "type": "integer"
-      }
-    },
     "shareRequest": {
       "type": "object",
       "properties": {
@@ -2500,6 +3023,23 @@ func init() {
         "$ref": "#/definitions/share"
       }
     },
+    "sparkData": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/sparkDataSample"
+      }
+    },
+    "sparkDataSample": {
+      "type": "object",
+      "properties": {
+        "rx": {
+          "type": "number"
+        },
+        "tx": {
+          "type": "number"
+        }
+      }
+    },
     "unaccessRequest": {
       "type": "object",
       "properties": {

rest_server_zrok/operations/metadata/get_account_detail.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountDetailHandlerFunc turns a function with the right signature into a get account detail handler
+type GetAccountDetailHandlerFunc func(GetAccountDetailParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetAccountDetailHandlerFunc) Handle(params GetAccountDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetAccountDetailHandler interface for that can handle valid get account detail params
+type GetAccountDetailHandler interface {
+	Handle(GetAccountDetailParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetAccountDetail creates a new http.Handler for the get account detail operation
+func NewGetAccountDetail(ctx *middleware.Context, handler GetAccountDetailHandler) *GetAccountDetail {
+	return &GetAccountDetail{Context: ctx, Handler: handler}
+}
+
+/*
+	GetAccountDetail swagger:route GET /detail/account metadata getAccountDetail
+
+GetAccountDetail get account detail API
+*/
+type GetAccountDetail struct {
+	Context *middleware.Context
+	Handler GetAccountDetailHandler
+}
+
+func (o *GetAccountDetail) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetAccountDetailParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metadata/get_account_detail_parameters.go

@@ -0,0 +1,46 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+)
+
+// NewGetAccountDetailParams creates a new GetAccountDetailParams object
+//
+// There are no default values defined in the spec.
+func NewGetAccountDetailParams() GetAccountDetailParams {
+
+	return GetAccountDetailParams{}
+}
+
+// GetAccountDetailParams contains all the bound params for the get account detail operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getAccountDetail
+type GetAccountDetailParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetAccountDetailParams() beforehand.
+func (o *GetAccountDetailParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

rest_server_zrok/operations/metadata/get_account_detail_responses.go

@@ -0,0 +1,87 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountDetailOKCode is the HTTP code returned for type GetAccountDetailOK
+const GetAccountDetailOKCode int = 200
+
+/*
+GetAccountDetailOK ok
+
+swagger:response getAccountDetailOK
+*/
+type GetAccountDetailOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload rest_model_zrok.Environments `json:"body,omitempty"`
+}
+
+// NewGetAccountDetailOK creates GetAccountDetailOK with default headers values
+func NewGetAccountDetailOK() *GetAccountDetailOK {
+
+	return &GetAccountDetailOK{}
+}
+
+// WithPayload adds the payload to the get account detail o k response
+func (o *GetAccountDetailOK) WithPayload(payload rest_model_zrok.Environments) *GetAccountDetailOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get account detail o k response
+func (o *GetAccountDetailOK) SetPayload(payload rest_model_zrok.Environments) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetAccountDetailOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	payload := o.Payload
+	if payload == nil {
+		// return empty array
+		payload = rest_model_zrok.Environments{}
+	}
+
+	if err := producer.Produce(rw, payload); err != nil {
+		panic(err) // let the recovery middleware deal with this
+	}
+}
+
+// GetAccountDetailInternalServerErrorCode is the HTTP code returned for type GetAccountDetailInternalServerError
+const GetAccountDetailInternalServerErrorCode int = 500
+
+/*
+GetAccountDetailInternalServerError internal server error
+
+swagger:response getAccountDetailInternalServerError
+*/
+type GetAccountDetailInternalServerError struct {
+}
+
+// NewGetAccountDetailInternalServerError creates GetAccountDetailInternalServerError with default headers values
+func NewGetAccountDetailInternalServerError() *GetAccountDetailInternalServerError {
+
+	return &GetAccountDetailInternalServerError{}
+}
+
+// WriteResponse to the client
+func (o *GetAccountDetailInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(500)
+}

rest_server_zrok/operations/metadata/get_account_detail_urlbuilder.go

@@ -0,0 +1,87 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+)
+
+// GetAccountDetailURL generates an URL for the get account detail operation
+type GetAccountDetailURL struct {
+	_basePath string
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountDetailURL) WithBasePath(bp string) *GetAccountDetailURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountDetailURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetAccountDetailURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/detail/account"
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetAccountDetailURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetAccountDetailURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetAccountDetailURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetAccountDetailURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetAccountDetailURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetAccountDetailURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metadata/get_account_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsHandlerFunc turns a function with the right signature into a get account metrics handler
+type GetAccountMetricsHandlerFunc func(GetAccountMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetAccountMetricsHandlerFunc) Handle(params GetAccountMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetAccountMetricsHandler interface for that can handle valid get account metrics params
+type GetAccountMetricsHandler interface {
+	Handle(GetAccountMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetAccountMetrics creates a new http.Handler for the get account metrics operation
+func NewGetAccountMetrics(ctx *middleware.Context, handler GetAccountMetricsHandler) *GetAccountMetrics {
+	return &GetAccountMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetAccountMetrics swagger:route GET /metrics/account metadata getAccountMetrics
+
+GetAccountMetrics get account metrics API
+*/
+type GetAccountMetrics struct {
+	Context *middleware.Context
+	Handler GetAccountMetricsHandler
+}
+
+func (o *GetAccountMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetAccountMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metadata/get_account_metrics_parameters.go

@@ -0,0 +1,77 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetAccountMetricsParams creates a new GetAccountMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetAccountMetricsParams() GetAccountMetricsParams {
+
+	return GetAccountMetricsParams{}
+}
+
+// GetAccountMetricsParams contains all the bound params for the get account metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getAccountMetrics
+type GetAccountMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetAccountMetricsParams() beforehand.
+func (o *GetAccountMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetAccountMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+	o.Duration = &raw
+
+	return nil
+}

rest_server_zrok/operations/metadata/get_account_metrics_responses.go

@@ -0,0 +1,109 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsOKCode is the HTTP code returned for type GetAccountMetricsOK
+const GetAccountMetricsOKCode int = 200
+
+/*
+GetAccountMetricsOK account metrics
+
+swagger:response getAccountMetricsOK
+*/
+type GetAccountMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetAccountMetricsOK creates GetAccountMetricsOK with default headers values
+func NewGetAccountMetricsOK() *GetAccountMetricsOK {
+
+	return &GetAccountMetricsOK{}
+}
+
+// WithPayload adds the payload to the get account metrics o k response
+func (o *GetAccountMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetAccountMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get account metrics o k response
+func (o *GetAccountMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetAccountMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetAccountMetricsBadRequestCode is the HTTP code returned for type GetAccountMetricsBadRequest
+const GetAccountMetricsBadRequestCode int = 400
+
+/*
+GetAccountMetricsBadRequest bad request
+
+swagger:response getAccountMetricsBadRequest
+*/
+type GetAccountMetricsBadRequest struct {
+}
+
+// NewGetAccountMetricsBadRequest creates GetAccountMetricsBadRequest with default headers values
+func NewGetAccountMetricsBadRequest() *GetAccountMetricsBadRequest {
+
+	return &GetAccountMetricsBadRequest{}
+}
+
+// WriteResponse to the client
+func (o *GetAccountMetricsBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(400)
+}
+
+// GetAccountMetricsInternalServerErrorCode is the HTTP code returned for type GetAccountMetricsInternalServerError
+const GetAccountMetricsInternalServerErrorCode int = 500
+
+/*
+GetAccountMetricsInternalServerError internal server error
+
+swagger:response getAccountMetricsInternalServerError
+*/
+type GetAccountMetricsInternalServerError struct {
+}
+
+// NewGetAccountMetricsInternalServerError creates GetAccountMetricsInternalServerError with default headers values
+func NewGetAccountMetricsInternalServerError() *GetAccountMetricsInternalServerError {
+
+	return &GetAccountMetricsInternalServerError{}
+}
+
+// WriteResponse to the client
+func (o *GetAccountMetricsInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(500)
+}

rest_server_zrok/operations/metadata/get_account_metrics_urlbuilder.go

@@ -0,0 +1,103 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+)
+
+// GetAccountMetricsURL generates an URL for the get account metrics operation
+type GetAccountMetricsURL struct {
+	Duration *string
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountMetricsURL) WithBasePath(bp string) *GetAccountMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetAccountMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/account"
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = *o.Duration
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetAccountMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetAccountMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetAccountMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetAccountMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetAccountMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetAccountMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metadata/get_environment_detail_responses.go

@@ -26,7 +26,7 @@ type GetEnvironmentDetailOK struct {
 	/*
 	  In: Body
 	*/
-	Payload *rest_model_zrok.EnvironmentShares `json:"body,omitempty"`
+	Payload *rest_model_zrok.EnvironmentAndResources `json:"body,omitempty"`
 }
 
 // NewGetEnvironmentDetailOK creates GetEnvironmentDetailOK with default headers values
@@ -36,13 +36,13 @@ func NewGetEnvironmentDetailOK() *GetEnvironmentDetailOK {
 }
 
 // WithPayload adds the payload to the get environment detail o k response
-func (o *GetEnvironmentDetailOK) WithPayload(payload *rest_model_zrok.EnvironmentShares) *GetEnvironmentDetailOK {
+func (o *GetEnvironmentDetailOK) WithPayload(payload *rest_model_zrok.EnvironmentAndResources) *GetEnvironmentDetailOK {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the get environment detail o k response
-func (o *GetEnvironmentDetailOK) SetPayload(payload *rest_model_zrok.EnvironmentShares) {
+func (o *GetEnvironmentDetailOK) SetPayload(payload *rest_model_zrok.EnvironmentAndResources) {
 	o.Payload = payload
 }
 

rest_server_zrok/operations/metadata/get_environment_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsHandlerFunc turns a function with the right signature into a get environment metrics handler
+type GetEnvironmentMetricsHandlerFunc func(GetEnvironmentMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetEnvironmentMetricsHandlerFunc) Handle(params GetEnvironmentMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetEnvironmentMetricsHandler interface for that can handle valid get environment metrics params
+type GetEnvironmentMetricsHandler interface {
+	Handle(GetEnvironmentMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetEnvironmentMetrics creates a new http.Handler for the get environment metrics operation
+func NewGetEnvironmentMetrics(ctx *middleware.Context, handler GetEnvironmentMetricsHandler) *GetEnvironmentMetrics {
+	return &GetEnvironmentMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetEnvironmentMetrics swagger:route GET /metrics/environment/{envId} metadata getEnvironmentMetrics
+
+GetEnvironmentMetrics get environment metrics API
+*/
+type GetEnvironmentMetrics struct {
+	Context *middleware.Context
+	Handler GetEnvironmentMetricsHandler
+}
+
+func (o *GetEnvironmentMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetEnvironmentMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metadata/get_environment_metrics_parameters.go

@@ -0,0 +1,101 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetEnvironmentMetricsParams creates a new GetEnvironmentMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetEnvironmentMetricsParams() GetEnvironmentMetricsParams {
+
+	return GetEnvironmentMetricsParams{}
+}
+
+// GetEnvironmentMetricsParams contains all the bound params for the get environment metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getEnvironmentMetrics
+type GetEnvironmentMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *string
+	/*
+	  Required: true
+	  In: path
+	*/
+	EnvID string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetEnvironmentMetricsParams() beforehand.
+func (o *GetEnvironmentMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	rEnvID, rhkEnvID, _ := route.Params.GetOK("envId")
+	if err := o.bindEnvID(rEnvID, rhkEnvID, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetEnvironmentMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+	o.Duration = &raw
+
+	return nil
+}
+
+// bindEnvID binds and validates parameter EnvID from path.
+func (o *GetEnvironmentMetricsParams) bindEnvID(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+	o.EnvID = raw
+
+	return nil
+}

rest_server_zrok/operations/metadata/get_environment_metrics_responses.go

@@ -0,0 +1,134 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsOKCode is the HTTP code returned for type GetEnvironmentMetricsOK
+const GetEnvironmentMetricsOKCode int = 200
+
+/*
+GetEnvironmentMetricsOK environment metrics
+
+swagger:response getEnvironmentMetricsOK
+*/
+type GetEnvironmentMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetEnvironmentMetricsOK creates GetEnvironmentMetricsOK with default headers values
+func NewGetEnvironmentMetricsOK() *GetEnvironmentMetricsOK {
+
+	return &GetEnvironmentMetricsOK{}
+}
+
+// WithPayload adds the payload to the get environment metrics o k response
+func (o *GetEnvironmentMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetEnvironmentMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get environment metrics o k response
+func (o *GetEnvironmentMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetEnvironmentMetricsBadRequestCode is the HTTP code returned for type GetEnvironmentMetricsBadRequest
+const GetEnvironmentMetricsBadRequestCode int = 400
+
+/*
+GetEnvironmentMetricsBadRequest bad request
+
+swagger:response getEnvironmentMetricsBadRequest
+*/
+type GetEnvironmentMetricsBadRequest struct {
+}
+
+// NewGetEnvironmentMetricsBadRequest creates GetEnvironmentMetricsBadRequest with default headers values
+func NewGetEnvironmentMetricsBadRequest() *GetEnvironmentMetricsBadRequest {
+
+	return &GetEnvironmentMetricsBadRequest{}
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(400)
+}
+
+// GetEnvironmentMetricsUnauthorizedCode is the HTTP code returned for type GetEnvironmentMetricsUnauthorized
+const GetEnvironmentMetricsUnauthorizedCode int = 401
+
+/*
+GetEnvironmentMetricsUnauthorized unauthorized
+
+swagger:response getEnvironmentMetricsUnauthorized
+*/
+type GetEnvironmentMetricsUnauthorized struct {
+}
+
+// NewGetEnvironmentMetricsUnauthorized creates GetEnvironmentMetricsUnauthorized with default headers values
+func NewGetEnvironmentMetricsUnauthorized() *GetEnvironmentMetricsUnauthorized {
+
+	return &GetEnvironmentMetricsUnauthorized{}
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsUnauthorized) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(401)
+}
+
+// GetEnvironmentMetricsInternalServerErrorCode is the HTTP code returned for type GetEnvironmentMetricsInternalServerError
+const GetEnvironmentMetricsInternalServerErrorCode int = 500
+
+/*
+GetEnvironmentMetricsInternalServerError internal server error
+
+swagger:response getEnvironmentMetricsInternalServerError
+*/
+type GetEnvironmentMetricsInternalServerError struct {
+}
+
+// NewGetEnvironmentMetricsInternalServerError creates GetEnvironmentMetricsInternalServerError with default headers values
+func NewGetEnvironmentMetricsInternalServerError() *GetEnvironmentMetricsInternalServerError {
+
+	return &GetEnvironmentMetricsInternalServerError{}
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(500)
+}

rest_server_zrok/operations/metadata/get_environment_metrics_urlbuilder.go

@@ -0,0 +1,113 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+)
+
+// GetEnvironmentMetricsURL generates an URL for the get environment metrics operation
+type GetEnvironmentMetricsURL struct {
+	EnvID string
+
+	Duration *string
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetEnvironmentMetricsURL) WithBasePath(bp string) *GetEnvironmentMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetEnvironmentMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetEnvironmentMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/environment/{envId}"
+
+	envID := o.EnvID
+	if envID != "" {
+		_path = strings.Replace(_path, "{envId}", envID, -1)
+	} else {
+		return nil, errors.New("envId is required on GetEnvironmentMetricsURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = *o.Duration
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetEnvironmentMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetEnvironmentMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetEnvironmentMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetEnvironmentMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetEnvironmentMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetEnvironmentMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metadata/get_frontend_detail.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetFrontendDetailHandlerFunc turns a function with the right signature into a get frontend detail handler
+type GetFrontendDetailHandlerFunc func(GetFrontendDetailParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetFrontendDetailHandlerFunc) Handle(params GetFrontendDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetFrontendDetailHandler interface for that can handle valid get frontend detail params
+type GetFrontendDetailHandler interface {
+	Handle(GetFrontendDetailParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetFrontendDetail creates a new http.Handler for the get frontend detail operation
+func NewGetFrontendDetail(ctx *middleware.Context, handler GetFrontendDetailHandler) *GetFrontendDetail {
+	return &GetFrontendDetail{Context: ctx, Handler: handler}
+}
+
+/*
+	GetFrontendDetail swagger:route GET /detail/frontend/{feId} metadata getFrontendDetail
+
+GetFrontendDetail get frontend detail API
+*/
+type GetFrontendDetail struct {
+	Context *middleware.Context
+	Handler GetFrontendDetailHandler
+}
+
+func (o *GetFrontendDetail) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetFrontendDetailParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metadata/get_frontend_detail_parameters.go

@@ -0,0 +1,77 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetFrontendDetailParams creates a new GetFrontendDetailParams object
+//
+// There are no default values defined in the spec.
+func NewGetFrontendDetailParams() GetFrontendDetailParams {
+
+	return GetFrontendDetailParams{}
+}
+
+// GetFrontendDetailParams contains all the bound params for the get frontend detail operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getFrontendDetail
+type GetFrontendDetailParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  Required: true
+	  In: path
+	*/
+	FeID int64
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetFrontendDetailParams() beforehand.
+func (o *GetFrontendDetailParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	rFeID, rhkFeID, _ := route.Params.GetOK("feId")
+	if err := o.bindFeID(rFeID, rhkFeID, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindFeID binds and validates parameter FeID from path.
+func (o *GetFrontendDetailParams) bindFeID(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+
+	value, err := swag.ConvertInt64(raw)
+	if err != nil {
+		return errors.InvalidType("feId", "path", "int64", raw)
+	}
+	o.FeID = value
+
+	return nil
+}

rest_server_zrok/operations/metadata/get_frontend_detail_responses.go

@@ -0,0 +1,134 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetFrontendDetailOKCode is the HTTP code returned for type GetFrontendDetailOK
+const GetFrontendDetailOKCode int = 200
+
+/*
+GetFrontendDetailOK ok
+
+swagger:response getFrontendDetailOK
+*/
+type GetFrontendDetailOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Frontend `json:"body,omitempty"`
+}
+
+// NewGetFrontendDetailOK creates GetFrontendDetailOK with default headers values
+func NewGetFrontendDetailOK() *GetFrontendDetailOK {
+
+	return &GetFrontendDetailOK{}
+}
+
+// WithPayload adds the payload to the get frontend detail o k response
+func (o *GetFrontendDetailOK) WithPayload(payload *rest_model_zrok.Frontend) *GetFrontendDetailOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get frontend detail o k response
+func (o *GetFrontendDetailOK) SetPayload(payload *rest_model_zrok.Frontend) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetFrontendDetailOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetFrontendDetailUnauthorizedCode is the HTTP code returned for type GetFrontendDetailUnauthorized
+const GetFrontendDetailUnauthorizedCode int = 401
+
+/*
+GetFrontendDetailUnauthorized unauthorized
+
+swagger:response getFrontendDetailUnauthorized
+*/
+type GetFrontendDetailUnauthorized struct {
+}
+
+// NewGetFrontendDetailUnauthorized creates GetFrontendDetailUnauthorized with default headers values
+func NewGetFrontendDetailUnauthorized() *GetFrontendDetailUnauthorized {
+
+	return &GetFrontendDetailUnauthorized{}
+}
+
+// WriteResponse to the client
+func (o *GetFrontendDetailUnauthorized) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(401)
+}
+
+// GetFrontendDetailNotFoundCode is the HTTP code returned for type GetFrontendDetailNotFound
+const GetFrontendDetailNotFoundCode int = 404
+
+/*
+GetFrontendDetailNotFound not found
+
+swagger:response getFrontendDetailNotFound
+*/
+type GetFrontendDetailNotFound struct {
+}
+
+// NewGetFrontendDetailNotFound creates GetFrontendDetailNotFound with default headers values
+func NewGetFrontendDetailNotFound() *GetFrontendDetailNotFound {
+
+	return &GetFrontendDetailNotFound{}
+}
+
+// WriteResponse to the client
+func (o *GetFrontendDetailNotFound) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(404)
+}
+
+// GetFrontendDetailInternalServerErrorCode is the HTTP code returned for type GetFrontendDetailInternalServerError
+const GetFrontendDetailInternalServerErrorCode int = 500
+
+/*
+GetFrontendDetailInternalServerError internal server error
+
+swagger:response getFrontendDetailInternalServerError
+*/
+type GetFrontendDetailInternalServerError struct {
+}
+
+// NewGetFrontendDetailInternalServerError creates GetFrontendDetailInternalServerError with default headers values
+func NewGetFrontendDetailInternalServerError() *GetFrontendDetailInternalServerError {
+
+	return &GetFrontendDetailInternalServerError{}
+}
+
+// WriteResponse to the client
+func (o *GetFrontendDetailInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(500)
+}

rest_server_zrok/operations/metadata/get_frontend_detail_urlbuilder.go

@@ -0,0 +1,101 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+
+	"github.com/go-openapi/swag"
+)
+
+// GetFrontendDetailURL generates an URL for the get frontend detail operation
+type GetFrontendDetailURL struct {
+	FeID int64
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetFrontendDetailURL) WithBasePath(bp string) *GetFrontendDetailURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetFrontendDetailURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetFrontendDetailURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/detail/frontend/{feId}"
+
+	feID := swag.FormatInt64(o.FeID)
+	if feID != "" {
+		_path = strings.Replace(_path, "{feId}", feID, -1)
+	} else {
+		return nil, errors.New("feId is required on GetFrontendDetailURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetFrontendDetailURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetFrontendDetailURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetFrontendDetailURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetFrontendDetailURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetFrontendDetailURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetFrontendDetailURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metadata/get_share_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsHandlerFunc turns a function with the right signature into a get share metrics handler
+type GetShareMetricsHandlerFunc func(GetShareMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetShareMetricsHandlerFunc) Handle(params GetShareMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetShareMetricsHandler interface for that can handle valid get share metrics params
+type GetShareMetricsHandler interface {
+	Handle(GetShareMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetShareMetrics creates a new http.Handler for the get share metrics operation
+func NewGetShareMetrics(ctx *middleware.Context, handler GetShareMetricsHandler) *GetShareMetrics {
+	return &GetShareMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetShareMetrics swagger:route GET /metrics/share/{shrToken} metadata getShareMetrics
+
+GetShareMetrics get share metrics API
+*/
+type GetShareMetrics struct {
+	Context *middleware.Context
+	Handler GetShareMetricsHandler
+}
+
+func (o *GetShareMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetShareMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metadata/get_share_metrics_parameters.go

@@ -0,0 +1,101 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewGetShareMetricsParams creates a new GetShareMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetShareMetricsParams() GetShareMetricsParams {
+
+	return GetShareMetricsParams{}
+}
+
+// GetShareMetricsParams contains all the bound params for the get share metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getShareMetrics
+type GetShareMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *string
+	/*
+	  Required: true
+	  In: path
+	*/
+	ShrToken string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetShareMetricsParams() beforehand.
+func (o *GetShareMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	rShrToken, rhkShrToken, _ := route.Params.GetOK("shrToken")
+	if err := o.bindShrToken(rShrToken, rhkShrToken, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetShareMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+	o.Duration = &raw
+
+	return nil
+}
+
+// bindShrToken binds and validates parameter ShrToken from path.
+func (o *GetShareMetricsParams) bindShrToken(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+	o.ShrToken = raw
+
+	return nil
+}

rest_server_zrok/operations/metadata/get_share_metrics_responses.go

@@ -0,0 +1,134 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsOKCode is the HTTP code returned for type GetShareMetricsOK
+const GetShareMetricsOKCode int = 200
+
+/*
+GetShareMetricsOK share metrics
+
+swagger:response getShareMetricsOK
+*/
+type GetShareMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetShareMetricsOK creates GetShareMetricsOK with default headers values
+func NewGetShareMetricsOK() *GetShareMetricsOK {
+
+	return &GetShareMetricsOK{}
+}
+
+// WithPayload adds the payload to the get share metrics o k response
+func (o *GetShareMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetShareMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get share metrics o k response
+func (o *GetShareMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetShareMetricsBadRequestCode is the HTTP code returned for type GetShareMetricsBadRequest
+const GetShareMetricsBadRequestCode int = 400
+
+/*
+GetShareMetricsBadRequest bad request
+
+swagger:response getShareMetricsBadRequest
+*/
+type GetShareMetricsBadRequest struct {
+}
+
+// NewGetShareMetricsBadRequest creates GetShareMetricsBadRequest with default headers values
+func NewGetShareMetricsBadRequest() *GetShareMetricsBadRequest {
+
+	return &GetShareMetricsBadRequest{}
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(400)
+}
+
+// GetShareMetricsUnauthorizedCode is the HTTP code returned for type GetShareMetricsUnauthorized
+const GetShareMetricsUnauthorizedCode int = 401
+
+/*
+GetShareMetricsUnauthorized unauthorized
+
+swagger:response getShareMetricsUnauthorized
+*/
+type GetShareMetricsUnauthorized struct {
+}
+
+// NewGetShareMetricsUnauthorized creates GetShareMetricsUnauthorized with default headers values
+func NewGetShareMetricsUnauthorized() *GetShareMetricsUnauthorized {
+
+	return &GetShareMetricsUnauthorized{}
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsUnauthorized) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(401)
+}
+
+// GetShareMetricsInternalServerErrorCode is the HTTP code returned for type GetShareMetricsInternalServerError
+const GetShareMetricsInternalServerErrorCode int = 500
+
+/*
+GetShareMetricsInternalServerError internal server error
+
+swagger:response getShareMetricsInternalServerError
+*/
+type GetShareMetricsInternalServerError struct {
+}
+
+// NewGetShareMetricsInternalServerError creates GetShareMetricsInternalServerError with default headers values
+func NewGetShareMetricsInternalServerError() *GetShareMetricsInternalServerError {
+
+	return &GetShareMetricsInternalServerError{}
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(500)
+}

rest_server_zrok/operations/metadata/get_share_metrics_urlbuilder.go

@@ -0,0 +1,113 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metadata
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+)
+
+// GetShareMetricsURL generates an URL for the get share metrics operation
+type GetShareMetricsURL struct {
+	ShrToken string
+
+	Duration *string
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetShareMetricsURL) WithBasePath(bp string) *GetShareMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetShareMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetShareMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/share/{shrToken}"
+
+	shrToken := o.ShrToken
+	if shrToken != "" {
+		_path = strings.Replace(_path, "{shrToken}", shrToken, -1)
+	} else {
+		return nil, errors.New("shrToken is required on GetShareMetricsURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = *o.Duration
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetShareMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetShareMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetShareMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetShareMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetShareMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetShareMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metadata/overview_responses.go

@@ -26,7 +26,7 @@ type OverviewOK struct {
 	/*
 	  In: Body
 	*/
-	Payload rest_model_zrok.EnvironmentSharesList `json:"body,omitempty"`
+	Payload *rest_model_zrok.Overview `json:"body,omitempty"`
 }
 
 // NewOverviewOK creates OverviewOK with default headers values
@@ -36,13 +36,13 @@ func NewOverviewOK() *OverviewOK {
 }
 
 // WithPayload adds the payload to the overview o k response
-func (o *OverviewOK) WithPayload(payload rest_model_zrok.EnvironmentSharesList) *OverviewOK {
+func (o *OverviewOK) WithPayload(payload *rest_model_zrok.Overview) *OverviewOK {
 	o.Payload = payload
 	return o
 }
 
 // SetPayload sets the payload to the overview o k response
-func (o *OverviewOK) SetPayload(payload rest_model_zrok.EnvironmentSharesList) {
+func (o *OverviewOK) SetPayload(payload *rest_model_zrok.Overview) {
 	o.Payload = payload
 }
 
@@ -50,14 +50,11 @@ func (o *OverviewOK) SetPayload(payload rest_model_zrok.EnvironmentSharesList) {
 func (o *OverviewOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
 
 	rw.WriteHeader(200)
-	payload := o.Payload
-	if payload == nil {
-		// return empty array
-		payload = rest_model_zrok.EnvironmentSharesList{}
-	}
-
-	if err := producer.Produce(rw, payload); err != nil {
-		panic(err) // let the recovery middleware deal with this
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
 	}
 }
 

rest_server_zrok/operations/metrics/get_account_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsHandlerFunc turns a function with the right signature into a get account metrics handler
+type GetAccountMetricsHandlerFunc func(GetAccountMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetAccountMetricsHandlerFunc) Handle(params GetAccountMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetAccountMetricsHandler interface for that can handle valid get account metrics params
+type GetAccountMetricsHandler interface {
+	Handle(GetAccountMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetAccountMetrics creates a new http.Handler for the get account metrics operation
+func NewGetAccountMetrics(ctx *middleware.Context, handler GetAccountMetricsHandler) *GetAccountMetrics {
+	return &GetAccountMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetAccountMetrics swagger:route GET /metrics/account metrics getAccountMetrics
+
+GetAccountMetrics get account metrics API
+*/
+type GetAccountMetrics struct {
+	Context *middleware.Context
+	Handler GetAccountMetricsHandler
+}
+
+func (o *GetAccountMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetAccountMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metrics/get_account_metrics_parameters.go

@@ -0,0 +1,83 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetAccountMetricsParams creates a new GetAccountMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetAccountMetricsParams() GetAccountMetricsParams {
+
+	return GetAccountMetricsParams{}
+}
+
+// GetAccountMetricsParams contains all the bound params for the get account metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getAccountMetrics
+type GetAccountMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *float64
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetAccountMetricsParams() beforehand.
+func (o *GetAccountMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetAccountMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+
+	value, err := swag.ConvertFloat64(raw)
+	if err != nil {
+		return errors.InvalidType("duration", "query", "float64", raw)
+	}
+	o.Duration = &value
+
+	return nil
+}

rest_server_zrok/operations/metrics/get_account_metrics_responses.go

@@ -0,0 +1,59 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetAccountMetricsOKCode is the HTTP code returned for type GetAccountMetricsOK
+const GetAccountMetricsOKCode int = 200
+
+/*
+GetAccountMetricsOK account metrics
+
+swagger:response getAccountMetricsOK
+*/
+type GetAccountMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetAccountMetricsOK creates GetAccountMetricsOK with default headers values
+func NewGetAccountMetricsOK() *GetAccountMetricsOK {
+
+	return &GetAccountMetricsOK{}
+}
+
+// WithPayload adds the payload to the get account metrics o k response
+func (o *GetAccountMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetAccountMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get account metrics o k response
+func (o *GetAccountMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetAccountMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}

rest_server_zrok/operations/metrics/get_account_metrics_urlbuilder.go

@@ -0,0 +1,105 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+
+	"github.com/go-openapi/swag"
+)
+
+// GetAccountMetricsURL generates an URL for the get account metrics operation
+type GetAccountMetricsURL struct {
+	Duration *float64
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountMetricsURL) WithBasePath(bp string) *GetAccountMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetAccountMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetAccountMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/account"
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = swag.FormatFloat64(*o.Duration)
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetAccountMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetAccountMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetAccountMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetAccountMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetAccountMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetAccountMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metrics/get_environment_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsHandlerFunc turns a function with the right signature into a get environment metrics handler
+type GetEnvironmentMetricsHandlerFunc func(GetEnvironmentMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetEnvironmentMetricsHandlerFunc) Handle(params GetEnvironmentMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetEnvironmentMetricsHandler interface for that can handle valid get environment metrics params
+type GetEnvironmentMetricsHandler interface {
+	Handle(GetEnvironmentMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetEnvironmentMetrics creates a new http.Handler for the get environment metrics operation
+func NewGetEnvironmentMetrics(ctx *middleware.Context, handler GetEnvironmentMetricsHandler) *GetEnvironmentMetrics {
+	return &GetEnvironmentMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetEnvironmentMetrics swagger:route GET /metrics/environment/{envId} metrics getEnvironmentMetrics
+
+GetEnvironmentMetrics get environment metrics API
+*/
+type GetEnvironmentMetrics struct {
+	Context *middleware.Context
+	Handler GetEnvironmentMetricsHandler
+}
+
+func (o *GetEnvironmentMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetEnvironmentMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metrics/get_environment_metrics_parameters.go

@@ -0,0 +1,107 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetEnvironmentMetricsParams creates a new GetEnvironmentMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetEnvironmentMetricsParams() GetEnvironmentMetricsParams {
+
+	return GetEnvironmentMetricsParams{}
+}
+
+// GetEnvironmentMetricsParams contains all the bound params for the get environment metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getEnvironmentMetrics
+type GetEnvironmentMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *float64
+	/*
+	  Required: true
+	  In: path
+	*/
+	EnvID string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetEnvironmentMetricsParams() beforehand.
+func (o *GetEnvironmentMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	rEnvID, rhkEnvID, _ := route.Params.GetOK("envId")
+	if err := o.bindEnvID(rEnvID, rhkEnvID, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetEnvironmentMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+
+	value, err := swag.ConvertFloat64(raw)
+	if err != nil {
+		return errors.InvalidType("duration", "query", "float64", raw)
+	}
+	o.Duration = &value
+
+	return nil
+}
+
+// bindEnvID binds and validates parameter EnvID from path.
+func (o *GetEnvironmentMetricsParams) bindEnvID(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+	o.EnvID = raw
+
+	return nil
+}

rest_server_zrok/operations/metrics/get_environment_metrics_responses.go

@@ -0,0 +1,84 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetEnvironmentMetricsOKCode is the HTTP code returned for type GetEnvironmentMetricsOK
+const GetEnvironmentMetricsOKCode int = 200
+
+/*
+GetEnvironmentMetricsOK environment metrics
+
+swagger:response getEnvironmentMetricsOK
+*/
+type GetEnvironmentMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetEnvironmentMetricsOK creates GetEnvironmentMetricsOK with default headers values
+func NewGetEnvironmentMetricsOK() *GetEnvironmentMetricsOK {
+
+	return &GetEnvironmentMetricsOK{}
+}
+
+// WithPayload adds the payload to the get environment metrics o k response
+func (o *GetEnvironmentMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetEnvironmentMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get environment metrics o k response
+func (o *GetEnvironmentMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetEnvironmentMetricsUnauthorizedCode is the HTTP code returned for type GetEnvironmentMetricsUnauthorized
+const GetEnvironmentMetricsUnauthorizedCode int = 401
+
+/*
+GetEnvironmentMetricsUnauthorized unauthorized
+
+swagger:response getEnvironmentMetricsUnauthorized
+*/
+type GetEnvironmentMetricsUnauthorized struct {
+}
+
+// NewGetEnvironmentMetricsUnauthorized creates GetEnvironmentMetricsUnauthorized with default headers values
+func NewGetEnvironmentMetricsUnauthorized() *GetEnvironmentMetricsUnauthorized {
+
+	return &GetEnvironmentMetricsUnauthorized{}
+}
+
+// WriteResponse to the client
+func (o *GetEnvironmentMetricsUnauthorized) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(401)
+}

rest_server_zrok/operations/metrics/get_environment_metrics_urlbuilder.go

@@ -0,0 +1,115 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+
+	"github.com/go-openapi/swag"
+)
+
+// GetEnvironmentMetricsURL generates an URL for the get environment metrics operation
+type GetEnvironmentMetricsURL struct {
+	EnvID string
+
+	Duration *float64
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetEnvironmentMetricsURL) WithBasePath(bp string) *GetEnvironmentMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetEnvironmentMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetEnvironmentMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/environment/{envId}"
+
+	envID := o.EnvID
+	if envID != "" {
+		_path = strings.Replace(_path, "{envId}", envID, -1)
+	} else {
+		return nil, errors.New("envId is required on GetEnvironmentMetricsURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = swag.FormatFloat64(*o.Duration)
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetEnvironmentMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetEnvironmentMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetEnvironmentMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetEnvironmentMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetEnvironmentMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetEnvironmentMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/metrics/get_share_metrics.go

@@ -0,0 +1,71 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsHandlerFunc turns a function with the right signature into a get share metrics handler
+type GetShareMetricsHandlerFunc func(GetShareMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn GetShareMetricsHandlerFunc) Handle(params GetShareMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// GetShareMetricsHandler interface for that can handle valid get share metrics params
+type GetShareMetricsHandler interface {
+	Handle(GetShareMetricsParams, *rest_model_zrok.Principal) middleware.Responder
+}
+
+// NewGetShareMetrics creates a new http.Handler for the get share metrics operation
+func NewGetShareMetrics(ctx *middleware.Context, handler GetShareMetricsHandler) *GetShareMetrics {
+	return &GetShareMetrics{Context: ctx, Handler: handler}
+}
+
+/*
+	GetShareMetrics swagger:route GET /metrics/share/{shrToken} metrics getShareMetrics
+
+GetShareMetrics get share metrics API
+*/
+type GetShareMetrics struct {
+	Context *middleware.Context
+	Handler GetShareMetricsHandler
+}
+
+func (o *GetShareMetrics) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		*r = *rCtx
+	}
+	var Params = NewGetShareMetricsParams()
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		*r = *aCtx
+	}
+	var principal *rest_model_zrok.Principal
+	if uprinc != nil {
+		principal = uprinc.(*rest_model_zrok.Principal) // this is really a rest_model_zrok.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}

rest_server_zrok/operations/metrics/get_share_metrics_parameters.go

@@ -0,0 +1,107 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// NewGetShareMetricsParams creates a new GetShareMetricsParams object
+//
+// There are no default values defined in the spec.
+func NewGetShareMetricsParams() GetShareMetricsParams {
+
+	return GetShareMetricsParams{}
+}
+
+// GetShareMetricsParams contains all the bound params for the get share metrics operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters getShareMetrics
+type GetShareMetricsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  In: query
+	*/
+	Duration *float64
+	/*
+	  Required: true
+	  In: path
+	*/
+	ShrToken string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewGetShareMetricsParams() beforehand.
+func (o *GetShareMetricsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	qs := runtime.Values(r.URL.Query())
+
+	qDuration, qhkDuration, _ := qs.GetOK("duration")
+	if err := o.bindDuration(qDuration, qhkDuration, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	rShrToken, rhkShrToken, _ := route.Params.GetOK("shrToken")
+	if err := o.bindShrToken(rShrToken, rhkShrToken, route.Formats); err != nil {
+		res = append(res, err)
+	}
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindDuration binds and validates parameter Duration from query.
+func (o *GetShareMetricsParams) bindDuration(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: false
+	// AllowEmptyValue: false
+
+	if raw == "" { // empty values pass all other validations
+		return nil
+	}
+
+	value, err := swag.ConvertFloat64(raw)
+	if err != nil {
+		return errors.InvalidType("duration", "query", "float64", raw)
+	}
+	o.Duration = &value
+
+	return nil
+}
+
+// bindShrToken binds and validates parameter ShrToken from path.
+func (o *GetShareMetricsParams) bindShrToken(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+	o.ShrToken = raw
+
+	return nil
+}

rest_server_zrok/operations/metrics/get_share_metrics_responses.go

@@ -0,0 +1,84 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/openziti/zrok/rest_model_zrok"
+)
+
+// GetShareMetricsOKCode is the HTTP code returned for type GetShareMetricsOK
+const GetShareMetricsOKCode int = 200
+
+/*
+GetShareMetricsOK share metrics
+
+swagger:response getShareMetricsOK
+*/
+type GetShareMetricsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *rest_model_zrok.Metrics `json:"body,omitempty"`
+}
+
+// NewGetShareMetricsOK creates GetShareMetricsOK with default headers values
+func NewGetShareMetricsOK() *GetShareMetricsOK {
+
+	return &GetShareMetricsOK{}
+}
+
+// WithPayload adds the payload to the get share metrics o k response
+func (o *GetShareMetricsOK) WithPayload(payload *rest_model_zrok.Metrics) *GetShareMetricsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the get share metrics o k response
+func (o *GetShareMetricsOK) SetPayload(payload *rest_model_zrok.Metrics) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+// GetShareMetricsUnauthorizedCode is the HTTP code returned for type GetShareMetricsUnauthorized
+const GetShareMetricsUnauthorizedCode int = 401
+
+/*
+GetShareMetricsUnauthorized unauthorized
+
+swagger:response getShareMetricsUnauthorized
+*/
+type GetShareMetricsUnauthorized struct {
+}
+
+// NewGetShareMetricsUnauthorized creates GetShareMetricsUnauthorized with default headers values
+func NewGetShareMetricsUnauthorized() *GetShareMetricsUnauthorized {
+
+	return &GetShareMetricsUnauthorized{}
+}
+
+// WriteResponse to the client
+func (o *GetShareMetricsUnauthorized) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses
+
+	rw.WriteHeader(401)
+}

rest_server_zrok/operations/metrics/get_share_metrics_urlbuilder.go

@@ -0,0 +1,115 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+package metrics
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+
+	"github.com/go-openapi/swag"
+)
+
+// GetShareMetricsURL generates an URL for the get share metrics operation
+type GetShareMetricsURL struct {
+	ShrToken string
+
+	Duration *float64
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetShareMetricsURL) WithBasePath(bp string) *GetShareMetricsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *GetShareMetricsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *GetShareMetricsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/metrics/share/{shrToken}"
+
+	shrToken := o.ShrToken
+	if shrToken != "" {
+		_path = strings.Replace(_path, "{shrToken}", shrToken, -1)
+	} else {
+		return nil, errors.New("shrToken is required on GetShareMetricsURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	qs := make(url.Values)
+
+	var durationQ string
+	if o.Duration != nil {
+		durationQ = swag.FormatFloat64(*o.Duration)
+	}
+	if durationQ != "" {
+		qs.Set("duration", durationQ)
+	}
+
+	_result.RawQuery = qs.Encode()
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *GetShareMetricsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *GetShareMetricsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *GetShareMetricsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on GetShareMetricsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on GetShareMetricsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *GetShareMetricsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}

rest_server_zrok/operations/zrok_api.go

@@ -70,12 +70,27 @@ func NewZrokAPI(spec *loads.Document) *ZrokAPI {
 		EnvironmentEnableHandler: environment.EnableHandlerFunc(func(params environment.EnableParams, principal *rest_model_zrok.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation environment.Enable has not yet been implemented")
 		}),
+		MetadataGetAccountDetailHandler: metadata.GetAccountDetailHandlerFunc(func(params metadata.GetAccountDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation metadata.GetAccountDetail has not yet been implemented")
+		}),
+		MetadataGetAccountMetricsHandler: metadata.GetAccountMetricsHandlerFunc(func(params metadata.GetAccountMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation metadata.GetAccountMetrics has not yet been implemented")
+		}),
 		MetadataGetEnvironmentDetailHandler: metadata.GetEnvironmentDetailHandlerFunc(func(params metadata.GetEnvironmentDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation metadata.GetEnvironmentDetail has not yet been implemented")
 		}),
+		MetadataGetEnvironmentMetricsHandler: metadata.GetEnvironmentMetricsHandlerFunc(func(params metadata.GetEnvironmentMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation metadata.GetEnvironmentMetrics has not yet been implemented")
+		}),
+		MetadataGetFrontendDetailHandler: metadata.GetFrontendDetailHandlerFunc(func(params metadata.GetFrontendDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation metadata.GetFrontendDetail has not yet been implemented")
+		}),
 		MetadataGetShareDetailHandler: metadata.GetShareDetailHandlerFunc(func(params metadata.GetShareDetailParams, principal *rest_model_zrok.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation metadata.GetShareDetail has not yet been implemented")
 		}),
+		MetadataGetShareMetricsHandler: metadata.GetShareMetricsHandlerFunc(func(params metadata.GetShareMetricsParams, principal *rest_model_zrok.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation metadata.GetShareMetrics has not yet been implemented")
+		}),
 		AccountInviteHandler: account.InviteHandlerFunc(func(params account.InviteParams) middleware.Responder {
 			return middleware.NotImplemented("operation account.Invite has not yet been implemented")
 		}),
@@ -185,10 +200,20 @@ type ZrokAPI struct {
 	EnvironmentDisableHandler environment.DisableHandler
 	// EnvironmentEnableHandler sets the operation handler for the enable operation
 	EnvironmentEnableHandler environment.EnableHandler
+	// MetadataGetAccountDetailHandler sets the operation handler for the get account detail operation
+	MetadataGetAccountDetailHandler metadata.GetAccountDetailHandler
+	// MetadataGetAccountMetricsHandler sets the operation handler for the get account metrics operation
+	MetadataGetAccountMetricsHandler metadata.GetAccountMetricsHandler
 	// MetadataGetEnvironmentDetailHandler sets the operation handler for the get environment detail operation
 	MetadataGetEnvironmentDetailHandler metadata.GetEnvironmentDetailHandler
+	// MetadataGetEnvironmentMetricsHandler sets the operation handler for the get environment metrics operation
+	MetadataGetEnvironmentMetricsHandler metadata.GetEnvironmentMetricsHandler
+	// MetadataGetFrontendDetailHandler sets the operation handler for the get frontend detail operation
+	MetadataGetFrontendDetailHandler metadata.GetFrontendDetailHandler
 	// MetadataGetShareDetailHandler sets the operation handler for the get share detail operation
 	MetadataGetShareDetailHandler metadata.GetShareDetailHandler
+	// MetadataGetShareMetricsHandler sets the operation handler for the get share metrics operation
+	MetadataGetShareMetricsHandler metadata.GetShareMetricsHandler
 	// AccountInviteHandler sets the operation handler for the invite operation
 	AccountInviteHandler account.InviteHandler
 	// AdminInviteTokenGenerateHandler sets the operation handler for the invite token generate operation
@@ -321,12 +346,27 @@ func (o *ZrokAPI) Validate() error {
 	if o.EnvironmentEnableHandler == nil {
 		unregistered = append(unregistered, "environment.EnableHandler")
 	}
+	if o.MetadataGetAccountDetailHandler == nil {
+		unregistered = append(unregistered, "metadata.GetAccountDetailHandler")
+	}
+	if o.MetadataGetAccountMetricsHandler == nil {
+		unregistered = append(unregistered, "metadata.GetAccountMetricsHandler")
+	}
 	if o.MetadataGetEnvironmentDetailHandler == nil {
 		unregistered = append(unregistered, "metadata.GetEnvironmentDetailHandler")
 	}
+	if o.MetadataGetEnvironmentMetricsHandler == nil {
+		unregistered = append(unregistered, "metadata.GetEnvironmentMetricsHandler")
+	}
+	if o.MetadataGetFrontendDetailHandler == nil {
+		unregistered = append(unregistered, "metadata.GetFrontendDetailHandler")
+	}
 	if o.MetadataGetShareDetailHandler == nil {
 		unregistered = append(unregistered, "metadata.GetShareDetailHandler")
 	}
+	if o.MetadataGetShareMetricsHandler == nil {
+		unregistered = append(unregistered, "metadata.GetShareMetricsHandler")
+	}
 	if o.AccountInviteHandler == nil {
 		unregistered = append(unregistered, "account.InviteHandler")
 	}
@@ -502,11 +542,31 @@ func (o *ZrokAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
+	o.handlers["GET"]["/detail/account"] = metadata.NewGetAccountDetail(o.context, o.MetadataGetAccountDetailHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
+	o.handlers["GET"]["/metrics/account"] = metadata.NewGetAccountMetrics(o.context, o.MetadataGetAccountMetricsHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
 	o.handlers["GET"]["/detail/environment/{envZId}"] = metadata.NewGetEnvironmentDetail(o.context, o.MetadataGetEnvironmentDetailHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
+	o.handlers["GET"]["/metrics/environment/{envId}"] = metadata.NewGetEnvironmentMetrics(o.context, o.MetadataGetEnvironmentMetricsHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
+	o.handlers["GET"]["/detail/frontend/{feId}"] = metadata.NewGetFrontendDetail(o.context, o.MetadataGetFrontendDetailHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
 	o.handlers["GET"]["/detail/share/{shrToken}"] = metadata.NewGetShareDetail(o.context, o.MetadataGetShareDetailHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
+	o.handlers["GET"]["/metrics/share/{shrToken}"] = metadata.NewGetShareMetrics(o.context, o.MetadataGetShareMetricsHandler)
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}

specs/zrok.yml

@@ -329,6 +329,21 @@ paths:
           schema:
             $ref: "#/definitions/configuration"
 
+  /detail/account:
+    get:
+      tags:
+        - metadata
+      security:
+        - key: []
+      operationId: getAccountDetail
+      responses:
+        200:
+          description: ok
+          schema:
+            $ref: "#/definitions/environments"
+        500:
+          description: internal server error
+
   /detail/environment/{envZId}:
     get:
       tags:
@@ -345,7 +360,31 @@ paths:
         200:
           description: ok
           schema:
-            $ref: "#/definitions/environmentShares"
+            $ref: "#/definitions/environmentAndResources"
+        401:
+          description: unauthorized
+        404:
+          description: not found
+        500:
+          description: internal server error
+
+  /detail/frontend/{feId}:
+    get:
+      tags:
+        - metadata
+      security:
+        - key: []
+      operationId: getFrontendDetail
+      parameters:
+        - name: feId
+          in: path
+          type: integer
+          required: true
+      responses:
+        200:
+          description: ok
+          schema:
+            $ref: "#/definitions/frontend"
         401:
           description: unauthorized
         404:
@@ -388,12 +427,89 @@ paths:
         200:
           description: overview returned
           schema:
-            $ref: "#/definitions/environmentSharesList"
+            $ref: "#/definitions/overview"
         500:
           description: internal server error
           schema:
             $ref: "#/definitions/errorMessage"
 
+  /metrics/account:
+    get:
+      tags:
+        - metadata
+      security:
+        - key: []
+      operationId: getAccountMetrics
+      parameters:
+        - name: duration
+          in: query
+          type: string
+      responses:
+        200:
+          description: account metrics
+          schema:
+            $ref: "#/definitions/metrics"
+        400:
+          description: bad request
+        500:
+          description: internal server error
+
+  /metrics/environment/{envId}:
+    get:
+      tags:
+        - metadata
+      security:
+        - key: []
+      operationId: getEnvironmentMetrics
+      parameters:
+        - name: envId
+          in: path
+          type: string
+          required: true
+        - name: duration
+          in: query
+          type: string
+      responses:
+        200:
+          description: environment metrics
+          schema:
+            $ref: "#/definitions/metrics"
+        400:
+          description: bad request
+        401:
+          description: unauthorized
+        500:
+          description: internal server error
+
+
+  /metrics/share/{shrToken}:
+    get:
+      tags:
+        - metadata
+      security:
+        - key: []
+      operationId: getShareMetrics
+      parameters:
+        - name: shrToken
+          in: path
+          type: string
+          required: true
+        - name: duration
+          in: query
+          type: string
+      responses:
+        200:
+          description: share metrics
+          schema:
+            $ref: "#/definitions/metrics"
+        400:
+          description: bad request
+        401:
+          description: unauthorized
+        500:
+          description: internal server error
+
+
   /version:
     get:
       tags:
@@ -404,6 +520,7 @@ paths:
           description: current server version
           schema:
             $ref: "#/definitions/version"
+
   #
   # share
   #
@@ -611,7 +728,9 @@ definitions:
         type: string
       zId:
         type: string
-      active:
+      activity:
+        $ref: "#/definitions/sparkData"
+      limited:
         type: boolean
       createdAt:
         type: integer
@@ -623,22 +742,38 @@ definitions:
     items:
       $ref: "#/definitions/environment"
 
-  environmentSharesList:
-    type: array
-    items:
-      $ref: "#/definitions/environmentShares"
-
-  environmentShares:
+  environmentAndResources:
     type: object
     properties:
       environment:
         $ref: "#/definitions/environment"
+      frontends:
+        $ref: "#/definitions/frontends"
       shares:
         $ref: "#/definitions/shares"
 
   errorMessage:
     type: string
 
+  frontend:
+    type: object
+    properties:
+      id:
+        type: integer
+      shrToken:
+        type: string
+      zId:
+        type: string
+      createdAt:
+        type: integer
+      updatedAt:
+        type: integer
+
+  frontends:
+    type: array
+    items:
+      $ref: "#/definitions/frontend"
+
   inviteTokenGenerateRequest:
     type: object
     properties:
@@ -666,6 +801,40 @@ definitions:
   loginResponse:
     type: string
 
+  metrics:
+    type: object
+    properties:
+      scope:
+        type: string
+      id:
+        type: string
+      period:
+        type: number
+      samples:
+        type: array
+        items:
+          $ref: "#/definitions/metricsSample"
+
+  metricsSample:
+    type: object
+    properties:
+      rx:
+        type: number
+      tx:
+        type: number
+      timestamp:
+        type: number
+
+  overview:
+    type: object
+    properties:
+      accountLimited:
+        type: boolean
+      environments:
+        type: array
+        items:
+          $ref: "#/definitions/environmentAndResources"
+
   principal:
     type: object
     properties:
@@ -742,8 +911,10 @@ definitions:
         type: string
       reserved:
         type: boolean
-      metrics:
-        $ref: "#/definitions/shareMetrics"
+      activity:
+        $ref: "#/definitions/sparkData"
+      limited:
+        type: boolean
       createdAt:
         type: integer
       updatedAt:
@@ -754,11 +925,6 @@ definitions:
     items:
       $ref: "#/definitions/share"
 
-  shareMetrics:
-    type: array
-    items:
-      type: integer
-
   shareRequest:
     type: object
     properties:
@@ -795,6 +961,19 @@ definitions:
       shrToken:
         type: string
 
+  sparkData:
+    type: array
+    items:
+      $ref: "#/definitions/sparkDataSample"
+
+  sparkDataSample:
+    type: object
+    properties:
+      rx:
+        type: number
+      tx:
+        type: number
+
   unaccessRequest:
     type: object
     properties:

ui/package-lock.json

@@ -17,14 +17,15 @@
         "dagre": "^0.8.5",
         "eslint-config-react-app": "^7.0.1",
         "humanize-duration": "^3.27.3",
+        "moment": "^2.29.4",
         "react": "^18.2.0",
         "react-bootstrap": "^2.7.0",
         "react-data-table-component": "^7.5.2",
         "react-dom": "^18.2.0",
-        "react-force-graph": "^1.41.20",
+        "react-force-graph": "^1.43.0",
         "react-router-dom": "^6.4.0",
         "react-sizeme": "^3.0.2",
-        "react-sparklines": "^1.7.0",
+        "recharts": "^2.6.1",
         "styled-components": "^5.3.5",
         "svgo": "^3.0.2"
       },
@@ -4145,6 +4146,60 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/d3-array": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
+      "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA=="
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
+      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA=="
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz",
+      "integrity": "sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg=="
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.3.tgz",
+      "integrity": "sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.1.tgz",
+      "integrity": "sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg=="
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
+      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
+    },
     "node_modules/@types/eslint": {
       "version": "8.21.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz",
@@ -6879,6 +6934,11 @@
         "postcss-value-parser": "^4.0.2"
       }
     },
+    "node_modules/css-unit-converter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="
+    },
     "node_modules/css-what": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
@@ -7153,6 +7213,14 @@
       "resolved": "https://registry.npmjs.org/d3-octree/-/d3-octree-0.2.2.tgz",
       "integrity": "sha512-ysk9uSPAhZVb0Gq4GXzghl/Yqxu80dHrq55I53qaIMdGB65+0UfO84sr4Fci2JHumcgh6H4WE0r8LwxPagkE+g=="
     },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/d3-quadtree": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
@@ -7196,6 +7264,17 @@
         "node": ">=12"
       }
     },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/d3-time": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
@@ -7322,6 +7401,11 @@
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "dev": true
     },
+    "node_modules/decimal.js-light": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
+    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -8726,8 +8810,7 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/events": {
       "version": "3.3.0",
@@ -8853,6 +8936,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "node_modules/fast-equals": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz",
+      "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg=="
+    },
     "node_modules/fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -13564,6 +13652,14 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -16162,16 +16258,19 @@
       "dev": true
     },
     "node_modules/react-force-graph": {
-      "version": "1.41.20",
-      "resolved": "https://registry.npmjs.org/react-force-graph/-/react-force-graph-1.41.20.tgz",
-      "integrity": "sha512-PdhbYTdvciKJLv2tePTHY+fTzrLEhfcji6/lijPc9GVQfJOLofssAYz+HgcWCKCRj1CIT8M/J7FICXX3ALXpbw==",
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/react-force-graph/-/react-force-graph-1.43.0.tgz",
+      "integrity": "sha512-g59ZWGrR6hkokY8RMO6FQHbltaIZ3+AGf9mrQs+s1+J26Sc2Wc6aro4cLW8PTHMIHgX/zml44yp60gRbzdFSMw==",
       "dependencies": {
-        "3d-force-graph": "^1.70",
-        "3d-force-graph-ar": "^1.7",
-        "3d-force-graph-vr": "^2.0",
-        "force-graph": "^1.42",
-        "prop-types": "^15.8",
-        "react-kapsule": "^2.2"
+        "3d-force-graph": "1",
+        "3d-force-graph-ar": "1",
+        "3d-force-graph-vr": "2",
+        "force-graph": "1",
+        "prop-types": "15",
+        "react-kapsule": "2"
+      },
+      "engines": {
+        "node": ">=12"
       },
       "peerDependencies": {
         "react": "*"
@@ -16208,6 +16307,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-resize-detector": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-8.1.0.tgz",
+      "integrity": "sha512-S7szxlaIuiy5UqLhLL1KY3aoyGHbZzsTpYal9eYMwCyKqoqoVLCmIgAgNyIM1FhnP2KyBygASJxdhejrzjMb+w==",
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-router": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.0.tgz",
@@ -16355,16 +16466,41 @@
         "throttle-debounce": "^3.0.1"
       }
     },
-    "node_modules/react-sparklines": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/react-sparklines/-/react-sparklines-1.7.0.tgz",
-      "integrity": "sha512-bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg==",
+    "node_modules/react-smooth": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.2.tgz",
+      "integrity": "sha512-pgqSp1q8rAGtF1bXQE0m3CHGLNfZZh5oA5o1tsPLXRHnKtkujMIJ8Ws5nO1mTySZf1c4vgwlEk+pHi3Ln6eYLw==",
       "dependencies": {
-        "prop-types": "^15.5.10"
+        "fast-equals": "^4.0.3",
+        "react-transition-group": "2.9.0"
       },
       "peerDependencies": {
-        "react": "*",
-        "react-dom": "*"
+        "prop-types": "^15.6.0",
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-smooth/node_modules/dom-helpers": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
+      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "dependencies": {
+        "@babel/runtime": "^7.1.2"
+      }
+    },
+    "node_modules/react-smooth/node_modules/react-transition-group": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+      "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+      "dependencies": {
+        "dom-helpers": "^3.4.0",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2",
+        "react-lifecycles-compat": "^3.0.4"
+      },
+      "peerDependencies": {
+        "react": ">=15.0.0",
+        "react-dom": ">=15.0.0"
       }
     },
     "node_modules/react-transition-group": {
@@ -16417,6 +16553,43 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/recharts": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.6.1.tgz",
+      "integrity": "sha512-eGNNqQTSg737HB0tfFkPZbPW8ji7Q8joQM0P2yAEkJkB8CO+LJPgLpx/NUxNHJsxoXvSblMFoy5RSVBYfLU+HA==",
+      "dependencies": {
+        "classnames": "^2.2.5",
+        "eventemitter3": "^4.0.1",
+        "lodash": "^4.17.19",
+        "react-is": "^16.10.2",
+        "react-resize-detector": "^8.0.4",
+        "react-smooth": "^2.0.2",
+        "recharts-scale": "^0.4.4",
+        "reduce-css-calc": "^2.1.8",
+        "victory-vendor": "^36.6.8"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "prop-types": "^15.6.0",
+        "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/recharts-scale": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
+      "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
+      "dependencies": {
+        "decimal.js-light": "^2.4.1"
+      }
+    },
+    "node_modules/recharts/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
     "node_modules/recursive-readdir": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
@@ -16429,6 +16602,20 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/reduce-css-calc": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
+      "dependencies": {
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "node_modules/reduce-css-calc/node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -18018,9 +18205,9 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "node_modules/three": {
-      "version": "0.149.0",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.149.0.tgz",
-      "integrity": "sha512-tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ=="
+      "version": "0.152.2",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.152.2.tgz",
+      "integrity": "sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw=="
     },
     "node_modules/three-bmfont-text": {
       "version": "2.4.0",
@@ -18566,6 +18753,27 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/victory-vendor": {
+      "version": "36.6.10",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.10.tgz",
+      "integrity": "sha512-7YqYGtsA4mByokBhCjk+ewwPhUfzhR1I3Da6/ZsZUv/31ceT77RKoaqrxRq5Ki+9we4uzf7+A+7aG2sfYhm7nA==",
+      "dependencies": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      }
+    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -22455,6 +22663,60 @@
         "@types/node": "*"
       }
     },
+    "@types/d3-array": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
+      "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
+    },
+    "@types/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA=="
+    },
+    "@types/d3-ease": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
+      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA=="
+    },
+    "@types/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "requires": {
+        "@types/d3-color": "*"
+      }
+    },
+    "@types/d3-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.0.0.tgz",
+      "integrity": "sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg=="
+    },
+    "@types/d3-scale": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.3.tgz",
+      "integrity": "sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==",
+      "requires": {
+        "@types/d3-time": "*"
+      }
+    },
+    "@types/d3-shape": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.1.tgz",
+      "integrity": "sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==",
+      "requires": {
+        "@types/d3-path": "*"
+      }
+    },
+    "@types/d3-time": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
+      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg=="
+    },
+    "@types/d3-timer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
+      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
+    },
     "@types/eslint": {
       "version": "8.21.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz",
@@ -24547,6 +24809,11 @@
         "postcss-value-parser": "^4.0.2"
       }
     },
+    "css-unit-converter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="
+    },
     "css-what": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
@@ -24752,6 +25019,11 @@
       "resolved": "https://registry.npmjs.org/d3-octree/-/d3-octree-0.2.2.tgz",
       "integrity": "sha512-ysk9uSPAhZVb0Gq4GXzghl/Yqxu80dHrq55I53qaIMdGB65+0UfO84sr4Fci2JHumcgh6H4WE0r8LwxPagkE+g=="
     },
+    "d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
+    },
     "d3-quadtree": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
@@ -24783,6 +25055,14 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="
     },
+    "d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "requires": {
+        "d3-path": "^3.1.0"
+      }
+    },
     "d3-time": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
@@ -24880,6 +25160,11 @@
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "dev": true
     },
+    "decimal.js-light": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
+    },
     "decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -25924,8 +26209,7 @@
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "events": {
       "version": "3.3.0",
@@ -26035,6 +26319,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
+    "fast-equals": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-4.0.3.tgz",
+      "integrity": "sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg=="
+    },
     "fast-glob": {
       "version": "3.2.12",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
@@ -29528,6 +29817,11 @@
         "minimist": "^1.2.6"
       }
     },
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -31290,16 +31584,16 @@
       "dev": true
     },
     "react-force-graph": {
-      "version": "1.41.20",
-      "resolved": "https://registry.npmjs.org/react-force-graph/-/react-force-graph-1.41.20.tgz",
-      "integrity": "sha512-PdhbYTdvciKJLv2tePTHY+fTzrLEhfcji6/lijPc9GVQfJOLofssAYz+HgcWCKCRj1CIT8M/J7FICXX3ALXpbw==",
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/react-force-graph/-/react-force-graph-1.43.0.tgz",
+      "integrity": "sha512-g59ZWGrR6hkokY8RMO6FQHbltaIZ3+AGf9mrQs+s1+J26Sc2Wc6aro4cLW8PTHMIHgX/zml44yp60gRbzdFSMw==",
       "requires": {
-        "3d-force-graph": "^1.70",
-        "3d-force-graph-ar": "^1.7",
-        "3d-force-graph-vr": "^2.0",
-        "force-graph": "^1.42",
-        "prop-types": "^15.8",
-        "react-kapsule": "^2.2"
+        "3d-force-graph": "1",
+        "3d-force-graph-ar": "1",
+        "3d-force-graph-vr": "2",
+        "force-graph": "1",
+        "prop-types": "15",
+        "react-kapsule": "2"
       }
     },
     "react-is": {
@@ -31327,6 +31621,14 @@
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
       "dev": true
     },
+    "react-resize-detector": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/react-resize-detector/-/react-resize-detector-8.1.0.tgz",
+      "integrity": "sha512-S7szxlaIuiy5UqLhLL1KY3aoyGHbZzsTpYal9eYMwCyKqoqoVLCmIgAgNyIM1FhnP2KyBygASJxdhejrzjMb+w==",
+      "requires": {
+        "lodash": "^4.17.21"
+      }
+    },
     "react-router": {
       "version": "6.8.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.0.tgz",
@@ -31437,12 +31739,34 @@
         "throttle-debounce": "^3.0.1"
       }
     },
-    "react-sparklines": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/react-sparklines/-/react-sparklines-1.7.0.tgz",
-      "integrity": "sha512-bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg==",
+    "react-smooth": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-2.0.2.tgz",
+      "integrity": "sha512-pgqSp1q8rAGtF1bXQE0m3CHGLNfZZh5oA5o1tsPLXRHnKtkujMIJ8Ws5nO1mTySZf1c4vgwlEk+pHi3Ln6eYLw==",
       "requires": {
-        "prop-types": "^15.5.10"
+        "fast-equals": "^4.0.3",
+        "react-transition-group": "2.9.0"
+      },
+      "dependencies": {
+        "dom-helpers": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
+          "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+          "requires": {
+            "@babel/runtime": "^7.1.2"
+          }
+        },
+        "react-transition-group": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+          "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+          "requires": {
+            "dom-helpers": "^3.4.0",
+            "loose-envify": "^1.4.0",
+            "prop-types": "^15.6.2",
+            "react-lifecycles-compat": "^3.0.4"
+          }
+        }
       }
     },
     "react-transition-group": {
@@ -31485,6 +31809,37 @@
         "picomatch": "^2.2.1"
       }
     },
+    "recharts": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.6.1.tgz",
+      "integrity": "sha512-eGNNqQTSg737HB0tfFkPZbPW8ji7Q8joQM0P2yAEkJkB8CO+LJPgLpx/NUxNHJsxoXvSblMFoy5RSVBYfLU+HA==",
+      "requires": {
+        "classnames": "^2.2.5",
+        "eventemitter3": "^4.0.1",
+        "lodash": "^4.17.19",
+        "react-is": "^16.10.2",
+        "react-resize-detector": "^8.0.4",
+        "react-smooth": "^2.0.2",
+        "recharts-scale": "^0.4.4",
+        "reduce-css-calc": "^2.1.8",
+        "victory-vendor": "^36.6.8"
+      },
+      "dependencies": {
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
+      }
+    },
+    "recharts-scale": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
+      "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
+      "requires": {
+        "decimal.js-light": "^2.4.1"
+      }
+    },
     "recursive-readdir": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
@@ -31494,6 +31849,22 @@
         "minimatch": "^3.0.5"
       }
     },
+    "reduce-css-calc": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
+      "requires": {
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+        }
+      }
+    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -32658,9 +33029,9 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "three": {
-      "version": "0.149.0",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.149.0.tgz",
-      "integrity": "sha512-tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ=="
+      "version": "0.152.2",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.152.2.tgz",
+      "integrity": "sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw=="
     },
     "three-bmfont-text": {
       "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733",
@@ -33077,6 +33448,27 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
+    "victory-vendor": {
+      "version": "36.6.10",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.10.tgz",
+      "integrity": "sha512-7YqYGtsA4mByokBhCjk+ewwPhUfzhR1I3Da6/ZsZUv/31ceT77RKoaqrxRq5Ki+9we4uzf7+A+7aG2sfYhm7nA==",
+      "requires": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      }
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",

ui/package.json

@@ -12,14 +12,15 @@
     "dagre": "^0.8.5",
     "eslint-config-react-app": "^7.0.1",
     "humanize-duration": "^3.27.3",
+    "moment": "^2.29.4",
     "react": "^18.2.0",
     "react-bootstrap": "^2.7.0",
     "react-data-table-component": "^7.5.2",
     "react-dom": "^18.2.0",
-    "react-force-graph": "^1.41.20",
+    "react-force-graph": "^1.43.0",
     "react-router-dom": "^6.4.0",
     "react-sizeme": "^3.0.2",
-    "react-sparklines": "^1.7.0",
+    "recharts": "^2.6.1",
     "styled-components": "^5.3.5",
     "svgo": "^3.0.2"
   },

ui/src/api/metadata.js

@@ -8,9 +8,15 @@ export function configuration() {
   return gateway.request(configurationOperation)
 }
 
+/**
+ */
+export function getAccountDetail() {
+  return gateway.request(getAccountDetailOperation)
+}
+
 /**
  * @param {string} envZId 
- * @return {Promise<module:types.environmentShares>} ok
+ * @return {Promise<module:types.environmentAndResources>} ok
  */
 export function getEnvironmentDetail(envZId) {
   const parameters = {
@@ -21,6 +27,19 @@ export function getEnvironmentDetail(envZId) {
   return gateway.request(getEnvironmentDetailOperation, parameters)
 }
 
+/**
+ * @param {number} feId 
+ * @return {Promise<module:types.frontend>} ok
+ */
+export function getFrontendDetail(feId) {
+  const parameters = {
+    path: {
+      feId
+    }
+  }
+  return gateway.request(getFrontendDetailOperation, parameters)
+}
+
 /**
  * @param {string} shrToken 
  * @return {Promise<module:types.share>} ok
@@ -40,6 +59,59 @@ export function overview() {
   return gateway.request(overviewOperation)
 }
 
+/**
+ * @param {object} options Optional options
+ * @param {string} [options.duration] 
+ * @return {Promise<module:types.metrics>} account metrics
+ */
+export function getAccountMetrics(options) {
+  if (!options) options = {}
+  const parameters = {
+    query: {
+      duration: options.duration
+    }
+  }
+  return gateway.request(getAccountMetricsOperation, parameters)
+}
+
+/**
+ * @param {string} envId 
+ * @param {object} options Optional options
+ * @param {string} [options.duration] 
+ * @return {Promise<module:types.metrics>} environment metrics
+ */
+export function getEnvironmentMetrics(envId, options) {
+  if (!options) options = {}
+  const parameters = {
+    path: {
+      envId
+    },
+    query: {
+      duration: options.duration
+    }
+  }
+  return gateway.request(getEnvironmentMetricsOperation, parameters)
+}
+
+/**
+ * @param {string} shrToken 
+ * @param {object} options Optional options
+ * @param {string} [options.duration] 
+ * @return {Promise<module:types.metrics>} share metrics
+ */
+export function getShareMetrics(shrToken, options) {
+  if (!options) options = {}
+  const parameters = {
+    path: {
+      shrToken
+    },
+    query: {
+      duration: options.duration
+    }
+  }
+  return gateway.request(getShareMetricsOperation, parameters)
+}
+
 /**
  */
 export function version() {
@@ -51,6 +123,16 @@ const configurationOperation = {
   method: 'get'
 }
 
+const getAccountDetailOperation = {
+  path: '/detail/account',
+  method: 'get',
+  security: [
+    {
+      id: 'key'
+    }
+  ]
+}
+
 const getEnvironmentDetailOperation = {
   path: '/detail/environment/{envZId}',
   method: 'get',
@@ -61,6 +143,16 @@ const getEnvironmentDetailOperation = {
   ]
 }
 
+const getFrontendDetailOperation = {
+  path: '/detail/frontend/{feId}',
+  method: 'get',
+  security: [
+    {
+      id: 'key'
+    }
+  ]
+}
+
 const getShareDetailOperation = {
   path: '/detail/share/{shrToken}',
   method: 'get',
@@ -81,6 +173,36 @@ const overviewOperation = {
   ]
 }
 
+const getAccountMetricsOperation = {
+  path: '/metrics/account',
+  method: 'get',
+  security: [
+    {
+      id: 'key'
+    }
+  ]
+}
+
+const getEnvironmentMetricsOperation = {
+  path: '/metrics/environment/{envId}',
+  method: 'get',
+  security: [
+    {
+      id: 'key'
+    }
+  ]
+}
+
+const getShareMetricsOperation = {
+  path: '/metrics/share/{shrToken}',
+  method: 'get',
+  security: [
+    {
+      id: 'key'
+    }
+  ]
+}
+
 const versionOperation = {
   path: '/version',
   method: 'get'

ui/src/api/types.js

@@ -87,19 +87,32 @@
  * @property {string} host 
  * @property {string} address 
  * @property {string} zId 
- * @property {boolean} active 
+ * @property {module:types.sparkData} activity 
+ * @property {boolean} limited 
  * @property {number} createdAt 
  * @property {number} updatedAt 
  */
 
 /**
- * @typedef environmentShares
+ * @typedef environmentAndResources
  * @memberof module:types
  * 
  * @property {module:types.environment} environment 
+ * @property {module:types.frontends} frontends 
  * @property {module:types.shares} shares 
  */
 
+/**
+ * @typedef frontend
+ * @memberof module:types
+ * 
+ * @property {number} id 
+ * @property {string} shrToken 
+ * @property {string} zId 
+ * @property {number} createdAt 
+ * @property {number} updatedAt 
+ */
+
 /**
  * @typedef inviteTokenGenerateRequest
  * @memberof module:types
@@ -123,6 +136,33 @@
  * @property {string} password 
  */
 
+/**
+ * @typedef metrics
+ * @memberof module:types
+ * 
+ * @property {string} scope 
+ * @property {string} id 
+ * @property {number} period 
+ * @property {module:types.metricsSample[]} samples 
+ */
+
+/**
+ * @typedef metricsSample
+ * @memberof module:types
+ * 
+ * @property {number} rx 
+ * @property {number} tx 
+ * @property {number} timestamp 
+ */
+
+/**
+ * @typedef overview
+ * @memberof module:types
+ * 
+ * @property {boolean} accountLimited 
+ * @property {module:types.environmentAndResources[]} environments 
+ */
+
 /**
  * @typedef principal
  * @memberof module:types
@@ -181,7 +221,8 @@
  * @property {string} frontendEndpoint 
  * @property {string} backendProxyEndpoint 
  * @property {boolean} reserved 
- * @property {module:types.shareMetrics} metrics 
+ * @property {module:types.sparkData} activity 
+ * @property {boolean} limited 
  * @property {number} createdAt 
  * @property {number} updatedAt 
  */
@@ -208,6 +249,14 @@
  * @property {string} shrToken 
  */
 
+/**
+ * @typedef sparkDataSample
+ * @memberof module:types
+ * 
+ * @property {number} rx 
+ * @property {number} tx 
+ */
+
 /**
  * @typedef unaccessRequest
  * @memberof module:types

ui/src/console/Console.js

@@ -1,4 +1,4 @@
-import {Container, Nav, Navbar, NavDropdown} from "react-bootstrap";
+import {Col, Container, Nav, Navbar, NavDropdown, Row} from "react-bootstrap";
 import {useEffect, useState} from "react";
 import Visualizer from "./visualizer/Visualizer";
 import Enable from "./modals/Enable";
@@ -15,7 +15,7 @@ const Console = (props) => {
     const openVersionModal = () => setShowVersionModal(true);
     const closeVersionModal = () => setShowVersionModal(false);
 
-    const [overview, setOverview] = useState([]);
+    const [overview, setOverview] = useState({});
 
     useEffect(() => {
         let mounted = true;
@@ -64,14 +64,22 @@ const Console = (props) => {
                     </Navbar.Collapse>
                 </Container>
             </Navbar>
-            <Visualizer
-                user={props.user}
-                overview={overview}
-                defaultSelection={defaultSelection}
-                selection={selection}
-                setSelection={setSelection}
-            />
-            <Detail user={props.user} selection={selection} />
+            <Container fluid={"xl"}>
+                <Row id={"controls-row"}>
+                    <Col lg={6}>
+                        <Visualizer
+                            user={props.user}
+                            overview={overview}
+                            defaultSelection={defaultSelection}
+                            selection={selection}
+                            setSelection={setSelection}
+                        />
+                    </Col>
+                    <Col lg={6}>
+                        <Detail user={props.user} selection={selection} />
+                    </Col>
+                </Row>
+            </Container>
             <Enable show={showEnableModal} onHide={closeEnableModal} token={props.user.token} />
             <Version show={showVersionModal} onHide={closeVersionModal} />
         </Container>

ui/src/console/detail/Detail.js

@@ -1,11 +1,16 @@
 import AccountDetail from "./account/AccountDetail";
 import ShareDetail from "./share/ShareDetail";
 import EnvironmentDetail from "./environment/EnvironmentDetail";
+import AccessDetail from "./access/AccessDetail";
 
 const Detail = (props) => {
     let detailComponent = <h1>{props.selection.id} ({props.selection.type})</h1>;
 
     switch(props.selection.type) {
+        case "frontend":
+            detailComponent = <AccessDetail selection={props.selection} />;
+            break;
+
         case "environment":
             detailComponent = <EnvironmentDetail selection={props.selection} />;
             break;

ui/src/console/detail/access/AccessDetail.js

@@ -0,0 +1,30 @@
+import {mdiAccessPointNetwork} from "@mdi/js";
+import Icon from "@mdi/react";
+import {useEffect, useState} from "react";
+import {getFrontendDetail} from "../../../api/metadata";
+import {Tab, Tabs} from "react-bootstrap";
+import DetailTab from "./DetailTab";
+
+const AccessDetail = (props) => {
+    const [detail, setDetail] = useState({});
+
+    useEffect(() => {
+        getFrontendDetail(props.selection.feId)
+            .then(resp => {
+                setDetail(resp.data);
+            });
+    }, [props.selection]);
+
+    return (
+        <div>
+            <h2><Icon path={mdiAccessPointNetwork} size={2} />{" "}{detail.shrToken} ({detail.id})</h2>
+            <Tabs defaultActiveKey={"detail"} className={"mb-3"}>
+                <Tab eventKey={"detail"} title={"Detail"}>
+                    <DetailTab frontend={detail} />
+                </Tab>
+            </Tabs>
+        </div>
+    );
+}
+
+export default AccessDetail;

ui/src/console/detail/access/DetailTab.js

@@ -0,0 +1,14 @@
+import SecretToggle from "../../SecretToggle";
+import PropertyTable from "../../PropertyTable";
+
+const DetailTab = (props) => {
+    const customProperties = {
+        zId: row => <SecretToggle secret={row.value} />
+    }
+
+    return (
+        <PropertyTable object={props.frontend} custom={customProperties} />
+    );
+};
+
+export default DetailTab;

ui/src/console/detail/account/AccountDetail.js

@@ -1,8 +1,11 @@
-import {mdiCardAccountDetails} from "@mdi/js";
+import {mdiAccountBox} from "@mdi/js";
 import Icon from "@mdi/react";
 import PropertyTable from "../../PropertyTable";
 import {Tab, Tabs} from "react-bootstrap";
 import SecretToggle from "../../SecretToggle";
+import React from "react";
+import MetricsTab from "./MetricsTab";
+import EnvironmentsTab from "./EnvironmentsTab";
 
 const AccountDetail = (props) => {
     const customProperties = {
@@ -11,14 +14,22 @@ const AccountDetail = (props) => {
 
     return (
         <div>
-            <h2><Icon path={mdiCardAccountDetails} size={2} />{" "}{props.user.email}</h2>
-            <Tabs defaultActiveKey={"detail"}>
+            <h2><Icon path={mdiAccountBox} size={2} />{" "}{props.user.email}</h2>
+            <Tabs defaultActiveKey={"environments"}>
+                <Tab eventKey={"environments"} title={"Environments"}>
+                    <EnvironmentsTab />
+                </Tab>
                 <Tab eventKey={"detail"} title={"Detail"}>
                     <PropertyTable object={props.user} custom={customProperties}/>
                 </Tab>
+                <Tab eventKey={"metrics"} title={"Metrics"}>
+                    <MetricsTab />
+                </Tab>
             </Tabs>
         </div>
     );
 }
 
+
+
 export default AccountDetail;