Merge branch 'master' into add-influxdb2-client

graph/model/models.go

@@ -9,7 +9,7 @@ type Cluster struct {
 	Name         string          `json:"name"`
 	MetricConfig []*MetricConfig `json:"metricConfig"`
 	FilterRanges *FilterRanges   `json:"filterRanges"`
-	Partitions   []*Partition    `json:"partitions"`
+	SubClusters  []*SubCluster   `json:"subClusters"`
 
 	// NOT part of the GraphQL API. This has to be a JSON object with a field `"kind"`.
 	// All other fields depend on that kind (e.g. "cc-metric-store", "influxdb-v2").

graph/model/models_gen.go

@@ -33,6 +33,11 @@ type FloatRange struct {
 	To   float64 `json:"to"`
 }
 
+type Footprints struct {
+	Nodehours []schema.Float      `json:"nodehours"`
+	Metrics   []*MetricFootprints `json:"metrics"`
+}
+
 type HistoPoint struct {
 	Count int `json:"count"`
 	Value int `json:"value"`
@@ -92,19 +97,20 @@ type JobsStatistics struct {
 }
 
 type MetricConfig struct {
-	Name     string             `json:"name"`
-	Unit     string             `json:"unit"`
-	Scope    schema.MetricScope `json:"scope"`
-	Timestep int                `json:"timestep"`
-	Peak     float64            `json:"peak"`
-	Normal   float64            `json:"normal"`
-	Caution  float64            `json:"caution"`
-	Alert    float64            `json:"alert"`
+	Name        string             `json:"name"`
+	Unit        string             `json:"unit"`
+	Scope       schema.MetricScope `json:"scope"`
+	Aggregation *string            `json:"aggregation"`
+	Timestep    int                `json:"timestep"`
+	Peak        float64            `json:"peak"`
+	Normal      float64            `json:"normal"`
+	Caution     float64            `json:"caution"`
+	Alert       float64            `json:"alert"`
 }
 
 type MetricFootprints struct {
-	Name       string         `json:"name"`
-	Footprints []schema.Float `json:"footprints"`
+	Metric string         `json:"metric"`
+	Data   []schema.Float `json:"data"`
 }
 
 type NodeMetrics struct {
@@ -122,8 +128,16 @@ type PageRequest struct {
 	Page         int `json:"page"`
 }
 
-type Partition struct {
+type StringInput struct {
+	Eq         *string `json:"eq"`
+	Contains   *string `json:"contains"`
+	StartsWith *string `json:"startsWith"`
+	EndsWith   *string `json:"endsWith"`
+}
+
+type SubCluster struct {
 	Name            string    `json:"name"`
+	Nodes           string    `json:"nodes"`
 	ProcessorType   string    `json:"processorType"`
 	SocketsPerNode  int       `json:"socketsPerNode"`
 	CoresPerSocket  int       `json:"coresPerSocket"`
@@ -134,13 +148,6 @@ type Partition struct {
 	Topology        *Topology `json:"topology"`
 }
 
-type StringInput struct {
-	Eq         *string `json:"eq"`
-	Contains   *string `json:"contains"`
-	StartsWith *string `json:"startsWith"`
-	EndsWith   *string `json:"endsWith"`
-}
-
 type TimeRange struct {
 	From *time.Time `json:"from"`
 	To   *time.Time `json:"to"`
@@ -160,6 +167,12 @@ type Topology struct {
 	Accelerators []*Accelerator `json:"accelerators"`
 }
 
+type User struct {
+	Username string `json:"username"`
+	Name     string `json:"name"`
+	Email    string `json:"email"`
+}
+
 type Aggregate string
 
 const (