Merge pull request #32 from GaMeRaM/alerts_state_fix

Fix: Alert state type and value

Author: samber

dist/prometheus-query.cjs.js

@@ -52,9 +52,9 @@ export declare class Alert {
     activeAt: Date;
     annotations: object;
     labels: object;
-    state: TargetState;
+    state: AlertState;
     value: number;
-    constructor(activeAt: Date, annotations: object, labels: object, state: TargetState, value: number);
+    constructor(activeAt: Date, annotations: object, labels: object, state: AlertState, value: number);
     static fromJSON(obj: any): Alert;
 }
 export declare class Rule {
@@ -79,3 +79,4 @@ export declare class RuleGroup {
 }
 export declare type SerieSelector = string | string[];
 export declare type TargetState = 'active' | 'dropped' | 'any';
+export declare type AlertState = 'firing' | 'pending' | 'inactive';

dist/prometheus-query.esm.js

@@ -1,7 +1,7 @@
 {
     "name": "prometheus-query",
     "description": "A Javascript client for Prometheus query API",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "main": "dist/prometheus-query.cjs.js",
     "module": "dist/prometheus-query.esm.js",
     "browser": "dist/prometheus-query.umd.js",

dist/prometheus-query.umd.js

@@ -199,18 +199,18 @@ export class Alert {
     public activeAt: Date;
     public annotations: object;
     public labels: object;
-    public state: TargetState;
+    public state: AlertState;
     public value: number;
 
-    constructor(activeAt: Date, annotations: object, labels: object, state: TargetState, value: number) {
+    constructor(activeAt: Date, annotations: object, labels: object, state: AlertState, value: number) {
         if (!!activeAt && (typeof (activeAt) != 'object' || activeAt.constructor.name != 'Date'))
             throw new Error(`Unexpected format for activeAt. Got ${typeof (activeAt)} instead of object`);
         if (!!annotations && typeof (annotations) != 'object')
             throw new Error(`Unexpected format for annotations. Got ${typeof (annotations)} instead of object`);
         if (!!labels && typeof (labels) != 'object')
             throw new Error(`Unexpected format for labels. Got ${typeof (labels)} instead of object`);
-        // if (!!state && typeof (state) != 'TargetState')
-        //     throw new Error(`Unexpected format for state. Got ${typeof (state)} instead of string`);
+        // if (!!state && typeof (state) != 'AlertState')
+            // throw new Error(`Unexpected format for state. Got ${typeof (state)} instead of string`);
         if (!!value && typeof (value) != 'number')
             throw new Error(`Unexpected format for value. Got ${typeof (value)} instead of number`);
 
@@ -226,7 +226,7 @@ export class Alert {
             !!obj['activeAt'] ? new Date(obj['activeAt']) : null,
             obj['annotations'],
             obj['labels'],
-            ResponseType[obj['state']],
+            obj['state'],
             !!obj['value'] ? parseFloat(obj['value']) : null,
         );
     }
@@ -296,4 +296,5 @@ export class RuleGroup {
 };
 
 export type SerieSelector = string | string[];
-export type TargetState = 'active' | 'dropped' | 'any';
+export type TargetState = 'active' | 'dropped' | 'any';
+export type AlertState = 'firing' | 'pending' | 'inactive';