Allow filtering silences by creator

api/v2/api.go

@@ -511,6 +511,9 @@ func (api *API) getSilencesHandler(params silence_ops.GetSilencesParams) middlew
 		if !CheckSilenceMatchesFilterLabels(ps, matchers) {
 			continue
 		}
+		if !CheckSilenceCreator(ps, params.Creator) {
+			continue
+		}
 		silence, err := GettableSilenceFromProto(ps)
 		if err != nil {
 			level.Error(logger).Log("msg", "Failed to unmarshal silence from proto", "err", err)
@@ -589,6 +592,20 @@ func CheckSilenceMatchesFilterLabels(s *silencepb.Silence, matchers []*labels.Ma
 	return true
 }
 
+// CheckSilenceCreator returns true if a given silence
+// matches a list of creators.
+func CheckSilenceCreator(s *silencepb.Silence, creators []string) bool {
+	if len(creators) < 1 {
+		return true
+	}
+	for _, creator := range creators {
+		if creator == s.CreatedBy {
+			return true
+		}
+	}
+	return false
+}
+
 func (api *API) getSilenceHandler(params silence_ops.GetSilenceParams) middleware.Responder {
 	logger := api.requestLogger(params.HTTPRequest)
 

api/v2/openapi.yaml

@@ -62,6 +62,14 @@ paths:
           collectionFormat: multi
           items:
             type: string
+        - name: creator
+          in: query
+          description: A list of creators to filter silences by
+          required: false
+          type: array
+          collectionFormat: multi
+          items:
+            type: string
     post:
       tags:
         - silence

ui/app/src/Utils/Filter.elm

@@ -8,6 +8,8 @@ module Utils.Filter exposing
     , fromApiMatcher
     , generateAPIQueryString
     , nullFilter
+    , parseCreatedBy
+    , parseCreatedByList
     , parseFilter
     , parseGroup
     , parseMatcher
@@ -17,7 +19,7 @@ module Utils.Filter exposing
     , stringifyMatcher
     , toApiMatcher
     , toUrl
-    , withMatchers
+    , withMatchersAndCreatedBy
     )
 
 import Char
@@ -29,6 +31,7 @@ import Url exposing (percentEncode)
 
 type alias Filter =
     { text : Maybe String
+    , createdByList : Maybe String
     , group : Maybe String
     , customGrouping : Bool
     , receiver : Maybe String
@@ -41,6 +44,7 @@ type alias Filter =
 nullFilter : Filter
 nullFilter =
     { text = Nothing
+    , createdByList = Nothing
     , group = Nothing
     , customGrouping = False
     , receiver = Nothing
@@ -56,13 +60,14 @@ generateQueryParam name =
 
 
 toUrl : String -> Filter -> String
-toUrl baseUrl { receiver, customGrouping, showSilenced, showInhibited, showActive, text, group } =
+toUrl baseUrl { receiver, customGrouping, showSilenced, showInhibited, showActive, text, createdByList, group } =
     let
         parts =
             [ ( "silenced", Maybe.withDefault False showSilenced |> boolToString |> Just )
             , ( "inhibited", Maybe.withDefault False showInhibited |> boolToString |> Just )
             , ( "active", Maybe.withDefault True showActive |> boolToString |> Just )
             , ( "filter", emptyToNothing text )
+            , ( "creator", emptyToNothing createdByList )
             , ( "receiver", emptyToNothing receiver )
             , ( "group", group )
             , ( "customGrouping", boolToMaybeString customGrouping )
@@ -81,7 +86,7 @@ toUrl baseUrl { receiver, customGrouping, showSilenced, showInhibited, showActiv
 
 
 generateAPIQueryString : Filter -> String
-generateAPIQueryString { receiver, showSilenced, showInhibited, showActive, text, group } =
+generateAPIQueryString { receiver, showSilenced, showInhibited, showActive, text, createdByList, group } =
     let
         filter_ =
             case parseFilter (Maybe.withDefault "" text) of
@@ -91,8 +96,17 @@ generateAPIQueryString { receiver, showSilenced, showInhibited, showActive, text
                 Nothing ->
                     []
 
+        createdByList_ =
+            case parseCreatedByList (Maybe.withDefault "" createdByList) of
+                Just createdByList__ ->
+                    List.map (Just >> Tuple.pair "creator") createdByList__
+
+                Nothing ->
+                    []
+
         parts =
             filter_
+                ++ createdByList_
                 ++ [ ( "silenced", Maybe.withDefault False showSilenced |> boolToString |> Just )
                    , ( "inhibited", Maybe.withDefault False showInhibited |> boolToString |> Just )
                    , ( "active", Maybe.withDefault True showActive |> boolToString |> Just )
@@ -227,6 +241,18 @@ parseMatcher =
         >> Result.toMaybe
 
 
+parseCreatedByList : String -> Maybe (List String)
+parseCreatedByList =
+    Parser.run creators
+        >> Result.toMaybe
+
+
+parseCreatedBy : String -> Maybe String
+parseCreatedBy =
+    Parser.run creator
+        >> Result.toMaybe
+
+
 stringifyGroup : List String -> Maybe String
 stringifyGroup list =
     if List.isEmpty list then
@@ -265,6 +291,20 @@ stringifyFilter matchers_ =
                 ++ "}"
 
 
+stringifyCreatedByList : List String -> String
+stringifyCreatedByList createdByList_ =
+    case createdByList_ of
+        [] ->
+            ""
+
+        list ->
+            (list
+                |> String.join ", "
+                |> (++) "{"
+            )
+                ++ "}"
+
+
 stringifyMatcher : Matcher -> String
 stringifyMatcher { key, op, value } =
     key
@@ -311,6 +351,29 @@ matcher =
         |. Parser.end
 
 
+creators : Parser (List String)
+creators =
+    Parser.succeed identity
+        |= Parser.sequence
+            { start = "{"
+            , separator = ","
+            , end = "}"
+            , spaces = Parser.spaces
+            , item = itemCreator
+            , trailing = Forbidden
+            }
+        |. Parser.end
+
+
+creator : Parser String
+creator =
+    Parser.succeed identity
+        |. Parser.spaces
+        |= itemCreator
+        |. Parser.spaces
+        |. Parser.end
+
+
 item : Parser Matcher
 item =
     Parser.succeed Matcher
@@ -330,6 +393,15 @@ item =
         |= string '"'
 
 
+itemCreator : Parser String
+itemCreator =
+    Parser.variable
+        { start = isVarCharAndSymbol
+        , inner = isVarCharAndSymbol
+        , reserved = Set.empty
+        }
+
+
 string : Char -> Parser String
 string separator =
     Parser.succeed ()
@@ -361,9 +433,17 @@ isVarChar char =
         || Char.isDigit char
 
 
-withMatchers : List Matcher -> Filter -> Filter
-withMatchers matchers_ filter_ =
-    { filter_ | text = Just (stringifyFilter matchers_) }
+isVarCharAndSymbol : Char -> Bool
+isVarCharAndSymbol char =
+    Char.isLower char
+        || Char.isUpper char
+        || String.contains (String.fromChar char) "_ .&-^[]:;*+?!#$%&()"
+        || Char.isDigit char
+
+
+withMatchersAndCreatedBy : List Matcher -> List String -> Filter -> Filter
+withMatchersAndCreatedBy matchers_ createdByList_ filter_ =
+    { filter_ | text = Just (stringifyFilter matchers_), createdByList = Just (stringifyCreatedByList createdByList_) }
 
 
 silencePreviewFilter : List Data.Matcher.Matcher -> Filter