Merging upstream version 1.16.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 108 insertions, 2 deletions

diff --git a/web/api/netdata-swagger.json b/web/api/netdata-swagger.json
index 2fa55c4fa..63bc5638d 100644
--- a/web/api/netdata-swagger.json
+++ b/web/api/netdata-swagger.json
@@ -77,6 +77,39 @@
         }
       }
     },
+    "/alarm_variables": {
+      "get": {
+        "summary": "List variables available to configure alarms for a chart",
+        "description": "Returns the basic information of a chart and all the variables that can be used in alarm and template health configurations for the particular chart or family",
+        "parameters": [
+          {
+            "name": "chart",
+            "in": "query",
+            "description": "The id of the chart as returned by the /charts call.",
+            "required": true,
+            "type": "string",
+            "format": "as returned by /charts"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A javascript object with information about the chart and the available variables",
+            "schema": {
+              "$ref": "#/definitions/alarm_variables"
+            }
+          },
+          "400": {
+            "description": "Bad request - the body will include a message stating what is wrong."
+          },
+          "404": {
+            "description": "No chart with the given id is found."
+          },
+          "500": {
+            "description": "Internal server error. This usually means the server is out of memory."
+          }
+        }
+      }
+    },
     "/data": {
       "get": {
         "summary": "Get collected data for a specific chart",
@@ -631,7 +664,7 @@
           {
             "name": "cmd",
             "in": "query",
-            "description": "DISABLE ALL: No alarm criteria are evaluated, nothing is written in the alarm log. SILENCE ALL: No notifications are sent. RESET: Return to the default state. DISABLE/SILENCE: Set the mode to be used for the alarms matching the criteria of the alarm selectors.",
+            "description": "DISABLE ALL: No alarm criteria are evaluated, nothing is written in the alarm log. SILENCE ALL: No notifications are sent. RESET: Return to the default state. DISABLE/SILENCE: Set the mode to be used for the alarms matching the criteria of the alarm selectors. LIST: Show active configuration.",
             "required": false,
             "type": "string",
             "enum": [
@@ -639,7 +672,8 @@
               "SILENCE ALL",
               "DISABLE",
               "SILENCE",
-              "RESET"
+              "RESET",
+              "LIST"
             ]
           },
           {
@@ -951,6 +985,70 @@
         }
       }
     },
+    "alarm_variables": {
+      "type": "object",
+      "properties": {
+        "chart": {
+          "type": "string",
+          "description": "The unique id of the chart"
+        },
+        "chart_name": {
+          "type": "string",
+          "description": "The name of the chart"
+        },
+        "cnart_context": {
+          "type": "string",
+          "description": "The context of the chart. It is shared across multiple monitored software or hardware instances and used in alarm templates"
+        },
+        "family": {
+          "type": "string",
+          "description": "The family of the chart."
+        },
+        "host": {
+          "type": "string",
+          "description": "The host containing the chart."
+        },
+        "chart_variables": {
+          "type": "object",
+          "properties": {
+            "varname1": {
+              "type": "number",
+              "format": "float"
+            },
+            "varname2": {
+              "type": "number",
+              "format": "float"
+            }
+          }
+        },
+        "family_variables": {
+          "type": "object",
+          "properties": {
+            "varname1": {
+              "type": "number",
+              "format": "float"
+            },
+            "varname2": {
+              "type": "number",
+              "format": "float"
+            }
+          }
+        },
+        "host_variables": {
+          "type": "object",
+          "properties": {
+            "varname1": {
+              "type": "number",
+              "format": "float"
+            },
+            "varname2": {
+              "type": "number",
+              "format": "float"
+            }
+          }
+        }
+      }
+    },
     "dimension": {
       "type": "object",
       "properties": {
@@ -1208,6 +1306,14 @@
                 "crit_parsed": {
                   "type": "string"
                 },
+                "warn_repeat_every": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "crit_repeat_every": {
+                  "type": "integer",
+                  "format": "int32"
+                },
                 "green": {
                   "type": "string",
                   "format": "nullable"