@grafana/openapi 13.1.0-24259948092 → 13.1.0-24260605480

package/dist/apis/playlist.grafana.app-v0alpha1.json

@@ -1028,11 +1028,6 @@
             "group": "playlist.grafana.app",
             "kind": "Playlist",
             "version": "v0alpha1"
-          },
-          {
-            "group": "playlist.grafana.app",
-            "kind": "Playlist",
-            "version": "v1"
           }
         ]
       },
@@ -1076,11 +1071,6 @@
             "group": "playlist.grafana.app",
             "kind": "PlaylistList",
             "version": "v0alpha1"
-          },
-          {
-            "group": "playlist.grafana.app",
-            "kind": "PlaylistList",
-            "version": "v1"
           }
         ]
       },

package/dist/apis/playlist.grafana.app-v1.json

@@ -1024,11 +1024,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "playlist.grafana.app",
-            "kind": "Playlist",
-            "version": "v0alpha1"
-          },
           {
             "group": "playlist.grafana.app",
             "kind": "Playlist",
@@ -1072,11 +1067,6 @@
           }
         },
         "x-kubernetes-group-version-kind": [
-          {
-            "group": "playlist.grafana.app",
-            "kind": "PlaylistList",
-            "version": "v0alpha1"
-          },
           {
             "group": "playlist.grafana.app",
             "kind": "PlaylistList",

package/dist/apis/rules.alerting.grafana.app-v0alpha1.json

@@ -1997,7 +1997,12 @@
         ]
       },
       "AlertRuleDatasourceUID": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^[a-zA-Z0-9_-]+$"
+      },
+      "AlertRuleExecErrState": {
+        "type": "string",
+        "enum": ["Error", "Ok", "Alerting", "KeepLast"]
       },
       "AlertRuleExpression": {
         "type": "object",
@@ -2081,6 +2086,48 @@
           }
         ]
       },
+      "AlertRuleNoDataState": {
+        "type": "string",
+        "enum": ["NoData", "Ok", "Alerting", "KeepLast"]
+      },
+      "AlertRuleNotificationSettings": {
+        "description": "TODO(@moustafab): this should be imported from the notifications package",
+        "type": "object",
+        "required": ["receiver"],
+        "properties": {
+          "activeTimeIntervals": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AlertRuleTimeIntervalRef"
+            }
+          },
+          "groupBy": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "groupInterval": {
+            "$ref": "#/components/schemas/AlertRulePromDuration"
+          },
+          "groupWait": {
+            "$ref": "#/components/schemas/AlertRulePromDuration"
+          },
+          "muteTimeIntervals": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AlertRuleTimeIntervalRef"
+            }
+          },
+          "receiver": {
+            "type": "string"
+          },
+          "repeatInterval": {
+            "$ref": "#/components/schemas/AlertRulePromDuration"
+          }
+        },
+        "additionalProperties": false
+      },
       "AlertRuleOperatorState": {
         "type": "object",
         "required": ["lastEvaluation", "state"],
@@ -2106,11 +2153,32 @@
         },
         "additionalProperties": false
       },
+      "AlertRulePanelRef": {
+        "type": "object",
+        "required": ["dashboardUID", "panelID"],
+        "properties": {
+          "dashboardUID": {
+            "type": "string",
+            "minLength": 1,
+            "pattern": "^[a-zA-Z0-9_-]+$"
+          },
+          "panelID": {
+            "type": "integer",
+            "minimum": 0
+          }
+        },
+        "additionalProperties": false
+      },
       "AlertRulePromDuration": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^((([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?|0)$",
+        "not": {
+          "pattern": "hmuµn"
+        }
       },
       "AlertRulePromDurationWMillis": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^((([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?|0)$"
       },
       "AlertRuleRelativeTimeRange": {
         "type": "object",
@@ -2136,8 +2204,7 @@
             }
           },
           "execErrState": {
-            "type": "string",
-            "default": "Error"
+            "$ref": "#/components/schemas/AlertRuleExecErrState"
           },
           "expressions": {
             "$ref": "#/components/schemas/AlertRuleExpressionMap"
@@ -2159,60 +2226,13 @@
             "minimum": 0
           },
           "noDataState": {
-            "type": "string",
-            "default": "NoData"
+            "$ref": "#/components/schemas/AlertRuleNoDataState"
           },
           "notificationSettings": {
-            "type": "object",
-            "required": ["receiver"],
-            "properties": {
-              "activeTimeIntervals": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/AlertRuleTimeIntervalRef"
-                }
-              },
-              "groupBy": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "groupInterval": {
-                "$ref": "#/components/schemas/AlertRulePromDuration"
-              },
-              "groupWait": {
-                "$ref": "#/components/schemas/AlertRulePromDuration"
-              },
-              "muteTimeIntervals": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/AlertRuleTimeIntervalRef"
-                }
-              },
-              "receiver": {
-                "type": "string"
-              },
-              "repeatInterval": {
-                "$ref": "#/components/schemas/AlertRulePromDuration"
-              }
-            },
-            "additionalProperties": false
+            "$ref": "#/components/schemas/AlertRuleNotificationSettings"
           },
           "panelRef": {
-            "type": "object",
-            "required": ["dashboardUID", "panelID"],
-            "properties": {
-              "dashboardUID": {
-                "type": "string",
-                "minLength": 1
-              },
-              "panelID": {
-                "type": "integer",
-                "minimum": 0
-              }
-            },
-            "additionalProperties": false
+            "$ref": "#/components/schemas/AlertRulePanelRef"
           },
           "paused": {
             "type": "boolean"
@@ -2287,7 +2307,8 @@
         ]
       },
       "RecordingRuleDatasourceUID": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^[a-zA-Z0-9_-]+$"
       },
       "RecordingRuleExpression": {
         "type": "object",
@@ -2371,6 +2392,11 @@
           }
         ]
       },
+      "RecordingRuleMetricName": {
+        "description": "TODO(@moustafab): validate the metric name regex",
+        "type": "string",
+        "pattern": "^[a-zA-Z_:][a-zA-Z0-9_:]*$"
+      },
       "RecordingRuleOperatorState": {
         "type": "object",
         "required": ["lastEvaluation", "state"],
@@ -2397,10 +2423,15 @@
         "additionalProperties": false
       },
       "RecordingRulePromDuration": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^((([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?|0)$",
+        "not": {
+          "pattern": "hmuµn"
+        }
       },
       "RecordingRulePromDurationWMillis": {
-        "type": "string"
+        "type": "string",
+        "pattern": "^((([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?|0)$"
       },
       "RecordingRuleRelativeTimeRange": {
         "type": "object",
@@ -2429,13 +2460,13 @@
             }
           },
           "metric": {
-            "type": "string"
+            "$ref": "#/components/schemas/RecordingRuleMetricName"
           },
           "paused": {
             "type": "boolean"
           },
           "targetDatasourceUID": {
-            "type": "string"
+            "$ref": "#/components/schemas/RecordingRuleDatasourceUID"
           },
           "title": {
             "type": "string"

package/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/openapi",
-  "version": "13.1.0-24259948092",
+  "version": "13.1.0-24260605480",
   "description": "Grafana OpenApi Library",
   "keywords": [
     "grafana",