From 947e30b4de30dc900fbc73c1dd81d11fd2b300b7 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Mon, 28 Dec 2020 14:03:33 +0300 Subject: [PATCH] PMM-7222 Remove NOT_EQUAL and NOT_REGEXP filters (#647) --- .../client/alerts/list_alerts_responses.go | 12 +- .../rules/create_alert_rule_responses.go | 12 +- .../rules/list_alert_rules_responses.go | 12 +- api/managementpb/ia/json/ia.json | 24 ++-- api/managementpb/ia/rules.pb.go | 106 ++++++++---------- api/managementpb/ia/rules.proto | 6 +- 6 files changed, 66 insertions(+), 106 deletions(-) diff --git a/api/managementpb/ia/json/client/alerts/list_alerts_responses.go b/api/managementpb/ia/json/client/alerts/list_alerts_responses.go index a71b14714c..a55de5ebdf 100644 --- a/api/managementpb/ia/json/client/alerts/list_alerts_responses.go +++ b/api/managementpb/ia/json/client/alerts/list_alerts_responses.go @@ -1131,10 +1131,8 @@ type AlertsItems0RuleFiltersItems0 struct { // FilterType represents filter matching type. // // - EQUAL: = - // - NOT_EQUAL: != // - REGEX: =~ - // - NOT_REGEX: !~ - // Enum: [FILTER_TYPE_INVALID EQUAL NOT_EQUAL REGEX NOT_REGEX] + // Enum: [FILTER_TYPE_INVALID EQUAL REGEX] Type *string `json:"type,omitempty"` // key @@ -1162,7 +1160,7 @@ var alertsItems0RuleFiltersItems0TypeTypePropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","NOT_EQUAL","REGEX","NOT_REGEX"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","REGEX"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -1178,14 +1176,8 @@ const ( // AlertsItems0RuleFiltersItems0TypeEQUAL captures enum value "EQUAL" AlertsItems0RuleFiltersItems0TypeEQUAL string = "EQUAL" - // AlertsItems0RuleFiltersItems0TypeNOTEQUAL captures enum value "NOT_EQUAL" - AlertsItems0RuleFiltersItems0TypeNOTEQUAL string = "NOT_EQUAL" - // AlertsItems0RuleFiltersItems0TypeREGEX captures enum value "REGEX" AlertsItems0RuleFiltersItems0TypeREGEX string = "REGEX" - - // AlertsItems0RuleFiltersItems0TypeNOTREGEX captures enum value "NOT_REGEX" - AlertsItems0RuleFiltersItems0TypeNOTREGEX string = "NOT_REGEX" ) // prop value enum diff --git a/api/managementpb/ia/json/client/rules/create_alert_rule_responses.go b/api/managementpb/ia/json/client/rules/create_alert_rule_responses.go index 283322cd51..64b3cc1fdb 100644 --- a/api/managementpb/ia/json/client/rules/create_alert_rule_responses.go +++ b/api/managementpb/ia/json/client/rules/create_alert_rule_responses.go @@ -458,10 +458,8 @@ type FiltersItems0 struct { // FilterType represents filter matching type. // // - EQUAL: = - // - NOT_EQUAL: != // - REGEX: =~ - // - NOT_REGEX: !~ - // Enum: [FILTER_TYPE_INVALID EQUAL NOT_EQUAL REGEX NOT_REGEX] + // Enum: [FILTER_TYPE_INVALID EQUAL REGEX] Type *string `json:"type,omitempty"` // key @@ -489,7 +487,7 @@ var filtersItems0TypeTypePropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","NOT_EQUAL","REGEX","NOT_REGEX"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","REGEX"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -505,14 +503,8 @@ const ( // FiltersItems0TypeEQUAL captures enum value "EQUAL" FiltersItems0TypeEQUAL string = "EQUAL" - // FiltersItems0TypeNOTEQUAL captures enum value "NOT_EQUAL" - FiltersItems0TypeNOTEQUAL string = "NOT_EQUAL" - // FiltersItems0TypeREGEX captures enum value "REGEX" FiltersItems0TypeREGEX string = "REGEX" - - // FiltersItems0TypeNOTREGEX captures enum value "NOT_REGEX" - FiltersItems0TypeNOTREGEX string = "NOT_REGEX" ) // prop value enum diff --git a/api/managementpb/ia/json/client/rules/list_alert_rules_responses.go b/api/managementpb/ia/json/client/rules/list_alert_rules_responses.go index e45a5a9cab..0fc0f6a49f 100644 --- a/api/managementpb/ia/json/client/rules/list_alert_rules_responses.go +++ b/api/managementpb/ia/json/client/rules/list_alert_rules_responses.go @@ -1025,10 +1025,8 @@ type RulesItems0FiltersItems0 struct { // FilterType represents filter matching type. // // - EQUAL: = - // - NOT_EQUAL: != // - REGEX: =~ - // - NOT_REGEX: !~ - // Enum: [FILTER_TYPE_INVALID EQUAL NOT_EQUAL REGEX NOT_REGEX] + // Enum: [FILTER_TYPE_INVALID EQUAL REGEX] Type *string `json:"type,omitempty"` // key @@ -1056,7 +1054,7 @@ var rulesItems0FiltersItems0TypeTypePropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","NOT_EQUAL","REGEX","NOT_REGEX"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["FILTER_TYPE_INVALID","EQUAL","REGEX"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -1072,14 +1070,8 @@ const ( // RulesItems0FiltersItems0TypeEQUAL captures enum value "EQUAL" RulesItems0FiltersItems0TypeEQUAL string = "EQUAL" - // RulesItems0FiltersItems0TypeNOTEQUAL captures enum value "NOT_EQUAL" - RulesItems0FiltersItems0TypeNOTEQUAL string = "NOT_EQUAL" - // RulesItems0FiltersItems0TypeREGEX captures enum value "REGEX" RulesItems0FiltersItems0TypeREGEX string = "REGEX" - - // RulesItems0FiltersItems0TypeNOTREGEX captures enum value "NOT_REGEX" - RulesItems0FiltersItems0TypeNOTREGEX string = "NOT_REGEX" ) // prop value enum diff --git a/api/managementpb/ia/json/ia.json b/api/managementpb/ia/json/ia.json index 7271427852..972447ee66 100644 --- a/api/managementpb/ia/json/ia.json +++ b/api/managementpb/ia/json/ia.json @@ -263,15 +263,13 @@ "x-order": 1 }, "type": { - "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - NOT_EQUAL: !=\n - REGEX: =~\n - NOT_REGEX: !~", + "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - REGEX: =~", "type": "string", "default": "FILTER_TYPE_INVALID", "enum": [ "FILTER_TYPE_INVALID", "EQUAL", - "NOT_EQUAL", - "REGEX", - "NOT_REGEX" + "REGEX" ], "x-order": 0 }, @@ -1536,15 +1534,13 @@ "x-order": 1 }, "type": { - "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - NOT_EQUAL: !=\n - REGEX: =~\n - NOT_REGEX: !~", + "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - REGEX: =~", "type": "string", "default": "FILTER_TYPE_INVALID", "enum": [ "FILTER_TYPE_INVALID", "EQUAL", - "NOT_EQUAL", - "REGEX", - "NOT_REGEX" + "REGEX" ], "x-order": 0 }, @@ -1990,15 +1986,13 @@ "x-order": 1 }, "type": { - "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - NOT_EQUAL: !=\n - REGEX: =~\n - NOT_REGEX: !~", + "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - REGEX: =~", "type": "string", "default": "FILTER_TYPE_INVALID", "enum": [ "FILTER_TYPE_INVALID", "EQUAL", - "NOT_EQUAL", - "REGEX", - "NOT_REGEX" + "REGEX" ], "x-order": 0 }, @@ -2470,15 +2464,13 @@ "x-order": 1 }, "type": { - "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - NOT_EQUAL: !=\n - REGEX: =~\n - NOT_REGEX: !~", + "description": "FilterType represents filter matching type.\n\n - EQUAL: =\n - REGEX: =~", "type": "string", "default": "FILTER_TYPE_INVALID", "enum": [ "FILTER_TYPE_INVALID", "EQUAL", - "NOT_EQUAL", - "REGEX", - "NOT_REGEX" + "REGEX" ], "x-order": 0 }, diff --git a/api/managementpb/ia/rules.pb.go b/api/managementpb/ia/rules.pb.go index 9b3a1ee8d6..e58d013898 100644 --- a/api/managementpb/ia/rules.pb.go +++ b/api/managementpb/ia/rules.pb.go @@ -41,12 +41,8 @@ const ( FilterType_FILTER_TYPE_INVALID FilterType = 0 // = FilterType_EQUAL FilterType = 1 - // != - FilterType_NOT_EQUAL FilterType = 2 // =~ FilterType_REGEX FilterType = 3 - // !~ - FilterType_NOT_REGEX FilterType = 4 ) // Enum value maps for FilterType. @@ -54,16 +50,12 @@ var ( FilterType_name = map[int32]string{ 0: "FILTER_TYPE_INVALID", 1: "EQUAL", - 2: "NOT_EQUAL", 3: "REGEX", - 4: "NOT_REGEX", } FilterType_value = map[string]int32{ "FILTER_TYPE_INVALID": 0, "EQUAL": 1, - "NOT_EQUAL": 2, "REGEX": 3, - "NOT_REGEX": 4, } ) @@ -1159,58 +1151,56 @@ var file_managementpb_ia_rules_proto_rawDesc = []byte{ 0x1f, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x06, 0xe2, 0xdf, 0x1f, 0x02, 0x58, 0x01, 0x52, 0x06, 0x72, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, - 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x59, 0x0a, 0x0a, 0x46, + 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x3b, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x46, 0x49, 0x4c, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x49, 0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, - 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0d, 0x0a, - 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, - 0x52, 0x45, 0x47, 0x45, 0x58, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x52, - 0x45, 0x47, 0x45, 0x58, 0x10, 0x04, 0x32, 0xaa, 0x05, 0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x73, - 0x12, 0x80, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, - 0x6c, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, - 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, - 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x4c, 0x69, 0x73, 0x74, - 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x6c, - 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, - 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, - 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, - 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, - 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x2f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, - 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, - 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x41, 0x6c, - 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, - 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, - 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x41, - 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, - 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x2f, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, - 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, - 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x3a, 0x01, 0x2a, 0x42, 0x1f, 0x5a, 0x1d, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x70, 0x62, 0x2f, 0x69, 0x61, 0x3b, 0x69, 0x61, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x09, 0x0a, + 0x05, 0x52, 0x45, 0x47, 0x45, 0x58, 0x10, 0x03, 0x32, 0xaa, 0x05, 0x0a, 0x05, 0x52, 0x75, 0x6c, + 0x65, 0x73, 0x12, 0x80, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x21, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, + 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, + 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, + 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, + 0x75, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x4c, 0x69, + 0x73, 0x74, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, + 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, + 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, + 0x6c, 0x65, 0x73, 0x2f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, + 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, + 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, + 0x61, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, + 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, 0x0a, 0x0f, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, + 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x41, 0x6c, 0x65, + 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, + 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x54, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, + 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, + 0x6c, 0x65, 0x73, 0x2f, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x85, 0x01, + 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, + 0x65, 0x12, 0x22, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x69, 0x61, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, + 0x61, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x52, 0x75, + 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x23, 0x22, 0x1e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x2f, 0x69, 0x61, 0x2f, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x3a, 0x01, 0x2a, 0x42, 0x1f, 0x5a, 0x1d, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, + 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x70, 0x62, 0x2f, 0x69, 0x61, 0x3b, 0x69, 0x61, 0x76, + 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/managementpb/ia/rules.proto b/api/managementpb/ia/rules.proto index 1a8743bde7..526d7da521 100644 --- a/api/managementpb/ia/rules.proto +++ b/api/managementpb/ia/rules.proto @@ -22,11 +22,13 @@ enum FilterType { // = EQUAL = 1; // != - NOT_EQUAL = 2; + // NOT_EQUAL = 2; + // =~ REGEX = 3; // !~ - NOT_REGEX = 4; + // NOT_REGEX = 4; + } // Filter repsents a single filter condition.