Merge branch 'cloudforet-io:master' into master

Author: kang2453

dist/gateway/spaceone/api/inventory_v2/v1/asset.pb.gw.go

@@ -117,7 +117,7 @@
               "defaultValue": ""
             },
             {
-              "name": "TRIGGERRED",
+              "name": "TRIGGERED",
               "description": "",
               "label": "",
               "type": "AlertStats",

dist/go/spaceone/api/alert-manager/v1/service.pb.go

@@ -9,29 +9,6 @@
       "hasMessages": true,
       "hasServices": true,
       "enums": [
-        {
-          "name": "DateFormat",
-          "longName": "AddOptions.DateFormat",
-          "fullName": "spaceone.api.dashboard.v1.AddOptions.DateFormat",
-          "description": "",
-          "values": [
-            {
-              "name": "DATE_FORMAT_NONE",
-              "number": "0",
-              "description": ""
-            },
-            {
-              "name": "SINGLE",
-              "number": "1",
-              "description": ""
-            },
-            {
-              "name": "SEPARATE",
-              "number": "2",
-              "description": ""
-            }
-          ]
-        },
         {
           "name": "DataType",
           "longName": "DataType",
@@ -422,30 +399,6 @@
               "oneofdecl": "",
               "defaultValue": ""
             },
-            {
-              "name": "date_format",
-              "description": "+optional",
-              "label": "",
-              "type": "DateFormat",
-              "longType": "AddOptions.DateFormat",
-              "fullType": "spaceone.api.dashboard.v1.AddOptions.DateFormat",
-              "ismap": false,
-              "isoneof": false,
-              "oneofdecl": "",
-              "defaultValue": ""
-            },
-            {
-              "name": "additional_labels",
-              "description": "+optional",
-              "label": "",
-              "type": "Struct",
-              "longType": "google.protobuf.Struct",
-              "fullType": "google.protobuf.Struct",
-              "ismap": false,
-              "isoneof": false,
-              "oneofdecl": "",
-              "defaultValue": ""
-            },
             {
               "name": "timediff",
               "description": "+optional",
@@ -1513,6 +1466,18 @@
               "isoneof": true,
               "oneofdecl": "timediff",
               "defaultValue": ""
+            },
+            {
+              "name": "data_name",
+              "description": "",
+              "label": "",
+              "type": "string",
+              "longType": "string",
+              "fullType": "string",
+              "ismap": false,
+              "isoneof": false,
+              "oneofdecl": "",
+              "defaultValue": ""
             }
           ]
         },