feat(admin): add admin page containing a workers table

docker-compose.yml

@@ -34,7 +34,7 @@ services:
   # https://go-vela.github.io/docs/administration/server/
   server:
     container_name: server
-    image: target/vela-server:latest
+    image: server:local
     networks:
       - vela
     environment:
@@ -79,8 +79,8 @@ services:
   # queue and executing them based off their configuration.
   #
   # https://go-vela.github.io/docs/administration/worker/
-  worker:
-    container_name: worker
+  worker_1:
+    container_name: worker_1
     image: target/vela-worker:latest
     networks:
       - vela
@@ -89,15 +89,15 @@ services:
       QUEUE_DRIVER: redis
       QUEUE_ADDR: 'redis://redis:6379'
       QUEUE_PUBLIC_KEY: 'DXsJkoTSkHlG26d75LyHJG+KQsXPr8VKPpmH/78zmko='
-      VELA_BUILD_LIMIT: 1
+      VELA_BUILD_LIMIT: 3
       VELA_BUILD_TIMEOUT: 30m
       VELA_LOG_LEVEL: trace
       VELA_RUNTIME_DRIVER: docker
       VELA_RUNTIME_PRIVILEGED_IMAGES: 'target/vela-docker'
       VELA_SERVER_ADDR: 'http://server:8080'
       # comment the line below to use registration flow
       VELA_SERVER_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh'
-      WORKER_ADDR: 'http://worker:8080'
+      WORKER_ADDR: 'http://worker_1:8080'
       WORKER_CHECK_IN: 5m
     restart: always
     ports:
@@ -107,6 +107,62 @@ services:
     depends_on:
       - server
 
+  worker_2:
+    container_name: worker_2
+    image: target/vela-worker:latest
+    networks:
+      - vela
+    environment:
+      EXECUTOR_DRIVER: linux
+      QUEUE_DRIVER: redis
+      QUEUE_ADDR: 'redis://redis:6379'
+      QUEUE_PUBLIC_KEY: 'DXsJkoTSkHlG26d75LyHJG+KQsXPr8VKPpmH/78zmko='
+      VELA_BUILD_LIMIT: 5
+      VELA_BUILD_TIMEOUT: 30m
+      VELA_LOG_LEVEL: trace
+      VELA_RUNTIME_DRIVER: docker
+      VELA_RUNTIME_PRIVILEGED_IMAGES: 'target/vela-docker'
+      VELA_SERVER_ADDR: 'http://server:8080'
+      # comment the line below to use registration flow
+      VELA_SERVER_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh'
+      WORKER_ADDR: 'http://worker_2:8081'
+      WORKER_CHECK_IN: 5m
+    restart: always
+    ports:
+      - '8082:8081'
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    depends_on:
+      - server
+
+  worker_3:
+    container_name: worker_3
+    image: target/vela-worker:latest
+    networks:
+      - vela
+    environment:
+      EXECUTOR_DRIVER: linux
+      QUEUE_DRIVER: redis
+      QUEUE_ADDR: 'redis://redis:6379'
+      QUEUE_PUBLIC_KEY: 'DXsJkoTSkHlG26d75LyHJG+KQsXPr8VKPpmH/78zmko='
+      VELA_BUILD_LIMIT: 1
+      VELA_BUILD_TIMEOUT: 30m
+      VELA_LOG_LEVEL: trace
+      VELA_RUNTIME_DRIVER: docker
+      VELA_RUNTIME_PRIVILEGED_IMAGES: 'target/vela-docker'
+      VELA_SERVER_ADDR: 'http://server:8080'
+      # comment the line below to use registration flow
+      VELA_SERVER_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh'
+      WORKER_ADDR: 'http://worker_3:8082'
+      WORKER_CHECK_IN: 5m
+    restart: always
+    ports:
+      - '8083:8082'
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+    depends_on:
+      - server
+
   # The `redis` compose service hosts the Redis database.
   #
   # This component is used for publishing builds to a FIFO queue.

src/elm/Api.elm

@@ -39,6 +39,7 @@ module Api exposing
     , getSourceRepositories
     , getStepLogs
     , getToken
+    , getWorkers
     , redeliverHook
     , repairRepo
     , restartBuild
@@ -93,6 +94,7 @@ import Vela
         , StepNumber
         , Templates
         , Type
+        , Worker
         , decodeBuild
         , decodeBuilds
         , decodeCurrentUser
@@ -112,6 +114,8 @@ import Vela
         , decodeService
         , decodeSourceRepositories
         , decodeStep
+        , decodeWorker
+        , decodeWorkers
         )
 
 
@@ -751,3 +755,11 @@ deleteSchedule : PartialModel a -> Org -> Repo -> ScheduleName -> Request String
 deleteSchedule model org repo id =
     delete model.velaAPI (Endpoint.Schedule org repo (Just id) Nothing Nothing) Json.Decode.string
         |> withAuth model.session
+
+
+{-| getWorkers : fetches workers for admin page
+-}
+getWorkers : PartialModel a -> Request (List Worker)
+getWorkers model =
+    get model.velaAPI Endpoint.Workers decodeWorkers
+        |> withAuth model.session

src/elm/Api/Endpoint.elm

@@ -65,6 +65,7 @@ type Endpoint
     | PipelineConfig Org Repo Ref
     | ExpandPipelineConfig Org Repo Ref
     | PipelineTemplates Org Repo Ref
+    | Workers
 
 
 {-| toUrl : turns and Endpoint into a URL string
@@ -169,6 +170,9 @@ toUrl api endpoint =
         Deployments maybePage maybePerPage org repo ->
             url api [ "deployments", org, repo ] <| Pagination.toQueryParams maybePage maybePerPage
 
+        Workers ->
+            url api [ "workers" ] <| [ UB.string "links" "true" ]
+
 
 {-| url : creates a URL string with the given path segments and query parameters
 -}

src/elm/Crumbs.elm

@@ -397,6 +397,9 @@ toPath page =
                     in
                     [ overviewCrumbLink, settingsCrumbStatic ]
 
+                Pages.Admin ->
+                    []
+
                 Pages.NotFound ->
                     let
                         notFoundCrumbStatic =

src/elm/Help/Commands.elm

@@ -156,6 +156,9 @@ commands page =
         Pages.Settings ->
             []
 
+        Pages.Admin ->
+            []
+
         Pages.Login ->
             [ authenticate ]
 
@@ -938,6 +941,9 @@ resourceLoaded args =
         Pages.Settings ->
             True
 
+        Pages.Admin ->
+            True
+
         Pages.Login ->
             True
 
@@ -1034,6 +1040,9 @@ resourceLoading args =
         Pages.Settings ->
             False
 
+        Pages.Admin ->
+            False
+
         Pages.Login ->
             False
 

src/elm/Main.elm

@@ -75,6 +75,7 @@ import Maybe.Extra exposing (unwrap)
 import Nav exposing (viewUtil)
 import Pager
 import Pages exposing (Page)
+import Pages.Admin
 import Pages.Build.Logs
     exposing
         ( addLog
@@ -173,6 +174,8 @@ import Vela
         , Type
         , UpdateRepositoryPayload
         , UpdateUserPayload
+        , Worker
+        , WorkerModel
         , buildUpdateFavoritesPayload
         , buildUpdateRepoBoolPayload
         , buildUpdateRepoIntPayload
@@ -183,6 +186,7 @@ import Vela
         , defaultPipeline
         , defaultPipelineTemplates
         , defaultRepoModel
+        , defaultWorkerModel
         , encodeEnableRepository
         , encodeTheme
         , encodeUpdateRepository
@@ -283,6 +287,7 @@ type alias Model =
     , pipeline : PipelineModel
     , templates : PipelineTemplates
     , buildMenuOpen : List Int
+    , workers : WorkerModel
     }
 
 
@@ -338,6 +343,7 @@ init flags url navKey =
             , deploymentModel = initDeploymentsModel
             , pipeline = defaultPipeline
             , templates = defaultPipelineTemplates
+            , workers = defaultWorkerModel
             }
 
         ( newModel, newPage ) =
@@ -429,6 +435,7 @@ type Msg
     | ExpandPipelineConfig Org Repo BuildNumber Ref FocusFragment Bool
       -- Inbound HTTP responses
     | LogoutResponse (Result (Http.Detailed.Error String) ( Http.Metadata, String ))
+    | WorkersResponse (Result (Http.Detailed.Error String) ( Http.Metadata, List Worker ))
     | TokenResponse (Result (Http.Detailed.Error String) ( Http.Metadata, JwtAccessToken ))
     | CurrentUserResponse (Result (Http.Detailed.Error String) ( Http.Metadata, CurrentUser ))
     | SourceRepositoriesResponse (Result (Http.Detailed.Error String) ( Http.Metadata, SourceRepositories ))
@@ -498,6 +505,9 @@ update msg model =
         rm =
             model.repo
 
+        wm =
+            model.workers
+
         sm =
             model.schedulesModel
 
@@ -1409,6 +1419,14 @@ update msg model =
                 Err error ->
                     ( { model | repo = updateRepo (toFailure error) rm }, addError error )
 
+        WorkersResponse response ->
+            case response of
+                Ok ( _, workerResponse ) ->
+                    ( { model | workers = { wm | workers = RemoteData.succeed workerResponse } }, Cmd.none )
+
+                Err error ->
+                    ( model, addError error )
+
         OrgRepositoriesResponse response ->
             case response of
                 Ok ( meta, repoResponse ) ->
@@ -2331,7 +2349,14 @@ refreshPage model =
             getRepoSecrets model maybePage maybePerPage engine org repo
 
         Pages.SharedSecrets engine org team maybePage maybePerPage ->
-            getSharedSecrets model maybePage maybePerPage engine org team
+            Cmd.batch
+                [ getSharedSecrets model maybePage maybePerPage engine org team
+                ]
+
+        Pages.Admin ->
+            Cmd.batch
+                [ getWorkers model
+                ]
 
         _ ->
             Cmd.none
@@ -2885,6 +2910,16 @@ viewContent model =
             , Pages.Settings.view model.session model.time (Pages.Settings.Msgs Copy)
             )
 
+        Pages.Admin ->
+            ( "Admin"
+            , div []
+                [ Pages.Admin.view
+                    { workers = model.workers
+                    , time = model.time
+                    }
+                ]
+            )
+
         Pages.Login ->
             ( "Login"
             , viewLogin
@@ -3007,6 +3042,8 @@ viewHeader session { feedbackLink, docsLink, theme, help, showId } =
                         , ul [ class "identity-menu", attribute "aria-hidden" "true", attribute "role" "menu" ]
                             [ li [ class "identity-menu-item" ]
                                 [ a [ Routes.href Routes.Settings, Util.testAttribute "settings-link", attribute "role" "menuitem" ] [ text "Settings" ] ]
+                            , li [ class "identity-menu-item" ]
+                                [ a [ Routes.href Routes.Admin, Util.testAttribute "admin-link", attribute "role" "menuitem" ] [ text "Admin Page" ] ]
                             , li [ class "identity-menu-item" ]
                                 [ a [ Routes.href Routes.Logout, Util.testAttribute "logout-link", attribute "role" "menuitem" ] [ text "Logout" ] ]
                             ]
@@ -3192,6 +3229,9 @@ setNewPage route model =
         ( Routes.Settings, Authenticated _ ) ->
             ( { model | page = Pages.Settings, showIdentity = False }, Cmd.none )
 
+        ( Routes.Admin, Authenticated _ ) ->
+            ( { model | page = Pages.Admin, showIdentity = False }, getWorkers model )
+
         ( Routes.Logout, Authenticated _ ) ->
             ( model, getLogout model )
 
@@ -4575,6 +4615,11 @@ getLogout model =
     Api.try LogoutResponse <| Api.getLogout model
 
 
+getWorkers : Model -> Cmd Msg
+getWorkers model =
+    Api.try WorkersResponse <| Api.getWorkers model
+
+
 getCurrentUser : Model -> Cmd Msg
 getCurrentUser model =
     case model.user of

src/elm/Nav.elm

@@ -219,6 +219,9 @@ navButtons model { fetchSourceRepos, toggleFavorite, restartBuild, cancelBuild }
         Pages.Login ->
             text ""
 
+        Pages.Admin ->
+            text ""
+
         Pages.NotFound ->
             text ""
 
@@ -320,6 +323,9 @@ viewUtil model =
             Pages.Login ->
                 text ""
 
+            Pages.Admin ->
+                text ""
+
             Pages.NotFound ->
                 text ""
         ]

src/elm/Pages.elm

@@ -39,6 +39,7 @@ type Page
     | AddSchedule Org Repo
     | Schedule Org Repo ScheduleName
     | Schedules Org Repo (Maybe Pagination.Page) (Maybe Pagination.PerPage)
+    | Admin
     | Settings
     | Login
     | NotFound
@@ -137,6 +138,9 @@ toRoute page =
         Settings ->
             Routes.Settings
 
+        Admin ->
+            Routes.Admin
+
         Login ->
             Routes.Login
 
@@ -233,6 +237,9 @@ strip page =
         Settings ->
             Settings
 
+        Admin ->
+            Admin
+
         Login ->
             Login