Update to cc-backend version 1.0.0

interfaces/graphql/schema.graphqls

@@ -26,32 +26,43 @@ type Job {
   state:            JobState!
   tags:             [Tag!]!
   resources:        [Resource!]!
+  concurrentJobs:   JobLinkResultList
 
   metaData:         Any
   userData:         User
 }
 
+type JobLink {
+  id:               ID!
+  jobId:            Int!
+}
+
 type Cluster {
   name:         String!
   partitions:   [String!]!        # Slurm partitions
   metricConfig: [MetricConfig!]!
-  filterRanges: FilterRanges!
   subClusters:  [SubCluster!]!    # Hardware partitions/subclusters
 }
 
 type SubCluster {
   name:            String!
   nodes:           String!
+  numberOfNodes:   Int!
   processorType:   String!
   socketsPerNode:  Int!
   coresPerSocket:  Int!
   threadsPerCore:  Int!
-  flopRateScalar:  Int!
-  flopRateSimd:    Int!
-  memoryBandwidth: Int!
+  flopRateScalar:  MetricValue!
+  flopRateSimd:    MetricValue!
+  memoryBandwidth: MetricValue!
   topology:        Topology!
 }
 
+type MetricValue {
+  unit: Unit!
+  value: Float!
+}
+
 type Topology {
   node:         [Int!]
   socket:       [[Int!]!]
@@ -67,15 +78,26 @@ type Accelerator {
   model: String!
 }
 
+type SubClusterConfig {
+  name:    String!
+  peak:    Float
+  normal:  Float
+  caution: Float
+  alert:   Float
+  remove:  Boolean
+}
+
 type MetricConfig {
-  name:     String!
-  unit:     String!
-  scope:    MetricScope!
-  timestep: Int!
-  peak:     Float!
-  normal:   Float!
-  caution:  Float!
-  alert:    Float!
+  name:        String!
+  unit:        Unit!
+  scope:       MetricScope!
+  aggregation: String!
+  timestep:    Int!
+  peak:    Float!
+  normal:  Float
+  caution: Float!
+  alert:   Float!
+  subClusters: [SubClusterConfig!]!
 }
 
 type Tag {
@@ -87,18 +109,18 @@ type Tag {
 type Resource {
   hostname:      String!
   hwthreads:     [Int!]
-  accelerators:  [Int!]
+  accelerators:  [String!]
   configuration: String
 }
 
 type JobMetricWithName {
   name:   String!
+  scope:  MetricScope!
   metric: JobMetric!
 }
 
 type JobMetric {
-  unit:             String!
-  scope:            MetricScope!
+  unit:             Unit
   timestep:         Int!
   series:           [Series!]
   statisticsSeries: StatsSeries
@@ -106,11 +128,16 @@ type JobMetric {
 
 type Series {
   hostname:   String!
-  id:         Int
+  id:         String
   statistics: MetricStatistics
   data:       [NullableFloat!]!
 }
 
+type Unit {
+  base: String!
+  prefix: String
+}
+
 type MetricStatistics {
   avg: Float!
   min: Float!
@@ -134,10 +161,12 @@ type Footprints {
 }
 
 enum Aggregate { USER, PROJECT, CLUSTER }
+enum Weights { NODE_COUNT, NODE_HOURS }
 
 type NodeMetrics {
-  host:    String!
-  metrics: [JobMetricWithName!]!
+  host:       String!
+  subCluster: String!
+  metrics:    [JobMetricWithName!]!
 }
 
 type Count {
@@ -156,6 +185,7 @@ type Query {
   tags:         [Tag!]!       # List of all tags
 
   user(username: String!): User
+  allocatedNodes(cluster: String!): [Count!]!
 
   job(id: ID!): Job
   jobMetrics(id: ID!, metrics: [String!], scopes: [MetricScope!]): [JobMetricWithName!]!
@@ -163,11 +193,11 @@ type Query {
 
   jobs(filter: [JobFilter!], page: PageRequest, order: OrderByInput): JobResultList!
   jobsStatistics(filter: [JobFilter!], groupBy: Aggregate): [JobsStatistics!]!
-  jobsCount(filter: [JobFilter]!, groupBy: Aggregate!, limit: Int): [Count!]!
+  jobsCount(filter: [JobFilter]!, groupBy: Aggregate!, weight: Weights, limit: Int): [Count!]!
 
   rooflineHeatmap(filter: [JobFilter!]!, rows: Int!, cols: Int!, minX: Float!, minY: Float!, maxX: Float!, maxY: Float!): [[Float!]!]!
 
-  nodeMetrics(cluster: String!, partition: String, nodes: [String!], scopes: [MetricScope!], metrics: [String!], from: Time!, to: Time!): [NodeMetrics!]!
+  nodeMetrics(cluster: String!, nodes: [String!], scopes: [MetricScope!], metrics: [String!], from: Time!, to: Time!): [NodeMetrics!]!
 }
 
 type Mutation {
@@ -182,18 +212,13 @@ type Mutation {
 type IntRangeOutput { from: Int!, to: Int! }
 type TimeRangeOutput { from: Time!, to: Time! }
 
-type FilterRanges {
-  duration:  IntRangeOutput!
-  numNodes:  IntRangeOutput!
-  startTime: TimeRangeOutput!
-}
-
 input JobFilter {
   tags:        [ID!]
   jobId:       StringInput
   arrayJobId:  Int
   user:        StringInput
   project:     StringInput
+  jobName:     StringInput
   cluster:     StringInput
   partition:   StringInput
   duration:    IntRange
@@ -210,6 +235,12 @@ input JobFilter {
   memBwAvg:    FloatRange
   loadAvg:     FloatRange
   memUsedMax:  FloatRange
+
+  exclusive:     Int
+  sharedNode:    StringInput
+  selfJobId:     StringInput
+  selfStartTime: Time
+  selfDuration:  Int
 }
 
 input OrderByInput {
@@ -224,9 +255,11 @@ enum SortDirectionEnum {
 
 input StringInput {
   eq:         String
+  neq:        String
   contains:   String
   startsWith: String
   endsWith:   String
+  in:         [String!]
 }
 
 input IntRange   { from: Int!,   to: Int! }
@@ -240,6 +273,11 @@ type JobResultList {
   count:  Int
 }
 
+type JobLinkResultList {
+  items:  [JobLink!]!
+  count:  Int
+}
+
 type HistoPoint {
   count: Int!
   value: Int!
@@ -247,11 +285,15 @@ type HistoPoint {
 
 type JobsStatistics  {
   id:             ID!            # If `groupBy` was used, ID of the user/project/cluster
-  totalJobs:      Int!           # Number of jobs that matched
-  shortJobs:      Int!           # Number of jobs with a duration of less than 2 minutes
+  name:           String!        # if User-Statistics: Given Name of Account (ID) Owner
+  totalJobs:      Int!           # Number of jobs
+  runningJobs:    Int!           # Number of running jobs
+  shortJobs:      Int!           # Number of jobs with a duration of less than duration
   totalWalltime:  Int!           # Sum of the duration of all matched jobs in hours
+  totalNodeHours: Int!           # Sum of the node hours of all matched jobs
   totalCoreHours: Int!           # Sum of the core hours of all matched jobs
-  histWalltime:   [HistoPoint!]! # value: hour, count: number of jobs with a rounded duration of value
+  totalAccHours:  Int!           # Sum of the gpu hours of all matched jobs
+  histDuration:   [HistoPoint!]! # value: hour, count: number of jobs with a rounded duration of value
   histNumNodes:   [HistoPoint!]! # value: number of nodes, count: number of jobs with that number of nodes
 }