RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-04-11 03:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ui: Patch /alerts and /receivers to use api v1"

Browse Source 
This reverts commit fb86df6add.

Signed-off-by: Max Leonard Inden <IndenML@gmail.com>
This commit is contained in:
Max Leonard Inden 2018-11-15 17:22:27 +01:00
parent 2026e4a01f
commit 8c19b96bd6
No known key found for this signature in database
GPG Key ID: 5403C5464810BC26
7 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asset/assets_vfsdata.go
View File

File diff suppressed because one or more lines are too long

22
ui/app/src/Alerts/Api.elm
View File

@ -18,19 +18,19 @@ escapeRegExp text =
fetchReceivers : String -> Cmd (ApiData (List Receiver)) fetchReceivers : String -> Cmd (ApiData (List Receiver))
fetchReceivers basePath = fetchReceivers apiUrl =
Utils.Api.send Utils.Api.send
(Utils.Api.get (Utils.Api.get
(makeApiUrl basePath ++ "/receivers") (apiUrl ++ "/receivers")
(field "data" (list (Json.map (\receiver -> Receiver receiver (escapeRegExp receiver)) string))) (field "data" (list (Json.map (\receiver -> Receiver receiver (escapeRegExp receiver)) string)))
) )
fetchAlerts : String -> Filter -> Cmd (ApiData (List Alert)) fetchAlerts : String -> Filter -> Cmd (ApiData (List Alert))
fetchAlerts basePath filter = fetchAlerts apiUrl filter =
let let
url = url =
String.join "/" [ makeApiUrl basePath, "alerts" ++ generateQueryString filter ] String.join "/" [ apiUrl, "alerts" ++ generateQueryString filter ]
in in
Utils.Api.send (Utils.Api.get url alertsDecoder) Utils.Api.send (Utils.Api.get url alertsDecoder)
@ -58,17 +58,3 @@ alertDecoder =
) )
(field "startsAt" iso8601Time) (field "startsAt" iso8601Time)
(field "generatorURL" Json.string) (field "generatorURL" Json.string)
makeApiUrl : String -> String
makeApiUrl externalUrl =
let
url =
if String.endsWith "/" externalUrl then
String.dropRight 1 externalUrl
else
externalUrl
in
-- For now alerts are still fetched from the v1 API.
url ++ "/api/v1"

4
ui/app/src/Updates.elm
View File

@ -41,7 +41,7 @@ update msg ({ basePath, apiUrl } as model) =
NavigateToSilenceView silenceId -> NavigateToSilenceView silenceId ->
let let
( silenceView, cmd ) = ( silenceView, cmd ) =
Views.SilenceView.Updates.update (SilenceViewTypes.InitSilenceView silenceId) model.silenceView basePath apiUrl Views.SilenceView.Updates.update (SilenceViewTypes.InitSilenceView silenceId) model.silenceView apiUrl
in in
( { model | route = SilenceViewRoute silenceId, silenceView = silenceView } ( { model | route = SilenceViewRoute silenceId, silenceView = silenceView }
, Cmd.map MsgForSilenceView cmd , Cmd.map MsgForSilenceView cmd
@ -104,7 +104,7 @@ update msg ({ basePath, apiUrl } as model) =
MsgForSilenceView subMsg -> MsgForSilenceView subMsg ->
let let
( silenceView, cmd ) = ( silenceView, cmd ) =
Views.SilenceView.Updates.update subMsg model.silenceView basePath apiUrl Views.SilenceView.Updates.update subMsg model.silenceView apiUrl
in in
( { model | silenceView = silenceView }, Cmd.map MsgForSilenceView cmd ) ( { model | silenceView = silenceView }, Cmd.map MsgForSilenceView cmd )

2
ui/app/src/Utils/Api.elm
View File

@ -126,7 +126,7 @@ makeApiUrl externalUrl =
else else
externalUrl externalUrl
in in
url ++ "/api/v2" url ++ "/api/v1"
andMap : Json.Decoder a -> Json.Decoder (a -> b) -> Json.Decoder b andMap : Json.Decoder a -> Json.Decoder (a -> b) -> Json.Decoder b

4
ui/app/src/Views/AlertList/Updates.elm
View File

@ -48,8 +48,8 @@ update msg ({ groupBar, filterBar, receiverBar } as model) filter apiUrl basePat
in in
( { model | alerts = Loading, filterBar = newFilterBar, groupBar = newGroupBar, activeId = Nothing } ( { model | alerts = Loading, filterBar = newFilterBar, groupBar = newGroupBar, activeId = Nothing }
, Cmd.batch , Cmd.batch
[ Api.fetchAlerts basePath filter |> Cmd.map (AlertsFetched >> MsgForAlertList) [ Api.fetchAlerts apiUrl filter |> Cmd.map (AlertsFetched >> MsgForAlertList)
, ReceiverBar.fetchReceivers basePath |> Cmd.map (MsgForReceiverBar >> MsgForAlertList) , ReceiverBar.fetchReceivers apiUrl |> Cmd.map (MsgForReceiverBar >> MsgForAlertList)
] ]
) )

2
ui/app/src/Views/SilenceForm/Updates.elm
View File

@ -236,7 +236,7 @@ update msg model basePath apiUrl =
Just silence -> Just silence ->
( { model | alerts = Loading } ( { model | alerts = Loading }
, Alerts.Api.fetchAlerts , Alerts.Api.fetchAlerts
basePath apiUrl
{ nullFilter | text = Just (Utils.List.mjoin silence.matchers) } { nullFilter | text = Just (Utils.List.mjoin silence.matchers) }
|> Cmd.map (AlertGroupsPreview >> MsgForSilenceForm) |> Cmd.map (AlertGroupsPreview >> MsgForSilenceForm)
) )

6
ui/app/src/Views/SilenceView/Updates.elm
View File

@ -9,8 +9,8 @@ import Utils.Types exposing (ApiData(..))
import Views.SilenceView.Types exposing (Model, SilenceViewMsg(..)) import Views.SilenceView.Types exposing (Model, SilenceViewMsg(..))
update : SilenceViewMsg -> Model -> String -> String -> ( Model, Cmd SilenceViewMsg ) update : SilenceViewMsg -> Model -> String -> ( Model, Cmd SilenceViewMsg )
update msg model basePath apiUrl = update msg model apiUrl =
case msg of case msg of
FetchSilence id -> FetchSilence id ->
( model, getSilence apiUrl id SilenceFetched ) ( model, getSilence apiUrl id SilenceFetched )
@ -31,7 +31,7 @@ update msg model basePath apiUrl =
, alerts = Loading , alerts = Loading
} }
, Alerts.Api.fetchAlerts , Alerts.Api.fetchAlerts
basePath apiUrl
{ nullFilter | text = Just (Utils.List.mjoin silence.matchers), showSilenced = Just True } { nullFilter | text = Just (Utils.List.mjoin silence.matchers), showSilenced = Just True }
|> Cmd.map AlertGroupsPreview |> Cmd.map AlertGroupsPreview
) )