refactor: Refactor pods queries to use query builder

Author: tiithansen

src/common/promql.ts

@@ -1,5 +1,4 @@
 
-
 export enum MatchOperators {
     EQUALS = '=',
     NOT_EQUALS = '!=',
@@ -16,6 +15,8 @@ export interface OperatorAndValue {
     value: string;
 }
 
+export type Labels = Record<string, OperatorAndValue>;
+
 enum MatchingModifiers {
     IGNORING = 'ignoring',
     ON = 'on',
@@ -72,6 +73,26 @@ class PromQLBinaryExpression extends PromQLExpression {
     }
 }
 
+export enum ComparisonOperators {
+    EQUALS = '==',
+    NOT_EQUALS = '!=',
+    GREATER_THAN = '>',
+    LESS_THAN = '<',
+    GREATER_THAN_OR_EQUALS = '>=',
+    LESS_THAN_OR_EQUALS = '<=',
+}
+
+class PromQLComparisonExpression extends PromQLExpression {
+    
+    constructor(private operator: ComparisonOperators, private left: PromQLExpression, private right: PromQLExpression) {
+        super();
+    }
+
+    stringify() {
+        return `${this.left.stringify()} ${this.operator} ${this.right.stringify()} `;
+    }
+}
+
 enum LogicalOperators {
     AND = 'and',
     OR = 'or',
@@ -87,7 +108,8 @@ class PromQLLogicalExpression extends PromQLExpression {
     }
 }
 
-abstract class PromQLVectorExpression extends PromQLExpression {
+
+export abstract class PromQLVectorExpression extends PromQLExpression {
 
     add() {
         return new PromQLBinaryExpression(BinaryOperators.ADD, this);
@@ -120,15 +142,19 @@ abstract class PromQLVectorExpression extends PromQLExpression {
     and(vectorExpr: PromQLVectorExpression) {
         return new PromQLLogicalExpression(LogicalOperators.AND, this, vectorExpr);
     }
+
+    equals(value: number) {
+        return new PromQLComparisonExpression(ComparisonOperators.EQUALS, this, new PromQLScalarExpression(value));
+    }
 }
 
 class PromQLScalarExpression extends PromQLVectorExpression {
-    constructor(private scalar: number, private left: PromQLExpression) {
+    constructor(private scalar: number, private left?: PromQLExpression) {
         super();
     }
 
     stringify() {
-        return `${this.left.stringify()} ${this.scalar}`;
+        return this.left ? `${this.left.stringify()} ${this.scalar}` : `${this.scalar}`;
     }
 }
 
@@ -170,7 +196,23 @@ class PromQLMetric extends PromQLVectorExpression {
         return this.withLabel(label, MatchOperators.NOT_MATCHES, value);
     }
 
-    withLabels(labels: Record<string, OperatorAndValue>) {
+    withLabelEqualsIf(label: string, value: string, condition: boolean) {
+        return condition ? this.withLabelEquals(label, value) : this;
+    }
+
+    withLabelMatchesIf(label: string, value: string, condition: boolean) {
+        return condition ? this.withLabelMatches(label, value) : this;
+    }
+
+    withLabelNotEqualsIf(label: string, value: string, condition: boolean) {
+        return condition ? this.withLabelNotEquals(label, value) : this;
+    }
+
+    withLabelNotMatchesIf(label: string, value: string, condition: boolean) {
+        return condition ? this.withLabelNotMatches(label, value) : this;
+    }
+
+    withLabels(labels: Labels) {
         this.labels = { ...this.labels, ...labels };
         return this;
     }
@@ -226,16 +268,20 @@ class PromQLFunction extends PromQLVectorExpression {
 
     stringify() {
         return `${this.name}(
-            ${this.subExpression.stringify()}
+            ${this.subExpression.stringify()}${this.stringifyInner()}
         )`;
     }
+
+    stringifyInner() {
+        return ''
+    }
 }
 
 class PromQLAggregationFunction extends PromQLFunction {
 
     private groupingExperssion: PromByExpression | PromQLWithoutExpression | undefined;
 
-    by(...labels: string[]) {
+    by(labels: string[]) {
         this.groupingExperssion = new PromByExpression(labels);
         return this;
     }
@@ -290,8 +336,8 @@ class PromQLRateFunction extends PromQLFunction {
         super('rate', subExpression);
     }
 
-    stringify() {
-        return `${super.stringify()}[${this.range}]`;
+    stringifyInner() {
+        return `[${this.range}]`;
     }
 }
 
@@ -308,7 +354,7 @@ export class PromQL {
         return new PromQLSortFunction(direction, subExpression);
     }
 
-    static rate(range: string, subExpression: PromQLExpression) {
+    static rate(subExpression: PromQLExpression, range: string) {
         return new PromQLRateFunction(range, subExpression);
     }
 

src/pages/Workloads/tabs/Deployments/Queries.ts

@@ -28,10 +28,10 @@ function createReplicasQuery(cluster: string, additionalLabels: Record<string, O
         PromQL.metric(Metrics.kubeDeploymentStatusReplicas.name)
             .withLabels(additionalLabels)
             .withLabelEquals('cluster', cluster)
-    ).by(
+    ).by([
         Metrics.kubeDeploymentStatusReplicas.labels.deployment,
         Metrics.kubeDeploymentStatusReplicas.labels.namespace
-    )
+    ])
 }
 
 function createReplicasReadyQuery(cluster: string, deployments: string) {
@@ -40,10 +40,10 @@ function createReplicasReadyQuery(cluster: string, deployments: string) {
         PromQL.metric(Metrics.kubeDeploymentStatusReplicasReady.name)
             .withLabelMatches(Metrics.kubeDeploymentStatusReplicasReady.labels.deployment, deployments)
             .withLabelEquals('cluster', cluster)
-    ).by(
+    ).by([
         Metrics.kubeDeploymentStatusReplicasReady.labels.deployment,
         Metrics.kubeDeploymentStatusReplicasReady.labels.namespace
-    )
+    ])
 }
 
 function createRowQueries(rows: TableRow[], sceneVariables: SceneVariables) {
@@ -88,10 +88,10 @@ export class DeploymentQueryBuilder implements QueryBuilder<TableRow> {
                 .withLabelEquals('cluster', '$cluster')
                 .withLabelMatches(Metrics.kubeDeploymentCreated.labels.namespace, '$namespace')
                 .withLabelMatches(Metrics.kubeDeploymentCreated.labels.deployment, '.*$search.*')
-        ).by(
+        ).by([
             Metrics.kubeDeploymentCreated.labels.deployment,
             Metrics.kubeDeploymentCreated.labels.namespace
-        )
+        ])
 
         const remoteSort = sortingConfig && sortingConfig.local === false
 
@@ -113,7 +113,7 @@ export class DeploymentQueryBuilder implements QueryBuilder<TableRow> {
                                             value: ''
                                         }
                                     })
-                                ).by('namespace', 'deployment')
+                                ).by(['namespace', 'deployment'])
                             ).or(
                                 baseQuery.multiply().withScalar(0)
                             )