switch to event list system

api/server/handlers/cluster/get_k8s_events.go

@@ -0,0 +1,64 @@
+package cluster
+
+import (
+	"net/http"
+
+	"github.com/porter-dev/porter/api/server/authz"
+	"github.com/porter-dev/porter/api/server/handlers"
+	"github.com/porter-dev/porter/api/server/shared"
+	"github.com/porter-dev/porter/api/server/shared/apierrors"
+	"github.com/porter-dev/porter/api/server/shared/config"
+	"github.com/porter-dev/porter/api/types"
+	porter_agent "github.com/porter-dev/porter/internal/kubernetes/porter_agent/v2"
+	"github.com/porter-dev/porter/internal/models"
+)
+
+type GetKubernetesEventsHandler struct {
+	handlers.PorterHandlerReadWriter
+	authz.KubernetesAgentGetter
+}
+
+func NewGetKubernetesEventsHandler(
+	config *config.Config,
+	decoderValidator shared.RequestDecoderValidator,
+	writer shared.ResultWriter,
+) *GetKubernetesEventsHandler {
+	return &GetKubernetesEventsHandler{
+		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
+		KubernetesAgentGetter:   authz.NewOutOfClusterAgentGetter(config),
+	}
+}
+
+func (c *GetKubernetesEventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	cluster, _ := r.Context().Value(types.ClusterScope).(*models.Cluster)
+
+	request := &types.GetKubernetesEventRequest{}
+
+	if ok := c.DecodeAndValidate(w, r, request); !ok {
+		return
+	}
+
+	agent, err := c.GetAgent(r, cluster, "")
+
+	if err != nil {
+		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
+		return
+	}
+
+	// get agent service
+	agentSvc, err := porter_agent.GetAgentService(agent.Clientset)
+
+	if err != nil {
+		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
+		return
+	}
+
+	logs, err := porter_agent.GetHistoricalKubernetesEvents(agent.Clientset, agentSvc, request)
+
+	if err != nil {
+		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
+		return
+	}
+
+	c.WriteResult(w, r, logs)
+}

api/server/handlers/cluster/get_events.go → api/server/handlers/cluster/get_porter_events.go

@@ -9,30 +9,31 @@ import (
 	"github.com/porter-dev/porter/api/server/shared/apierrors"
 	"github.com/porter-dev/porter/api/server/shared/config"
 	"github.com/porter-dev/porter/api/types"
-	porter_agent "github.com/porter-dev/porter/internal/kubernetes/porter_agent/v2"
 	"github.com/porter-dev/porter/internal/models"
+
+	porter_agent "github.com/porter-dev/porter/internal/kubernetes/porter_agent/v2"
 )
 
-type GetEventsHandler struct {
+type GetPorterEventsHandler struct {
 	handlers.PorterHandlerReadWriter
 	authz.KubernetesAgentGetter
 }
 
-func NewGetEventsHandler(
+func NewGetPorterEventsHandler(
 	config *config.Config,
 	decoderValidator shared.RequestDecoderValidator,
 	writer shared.ResultWriter,
-) *GetEventsHandler {
-	return &GetEventsHandler{
+) *GetPorterEventsHandler {
+	return &GetPorterEventsHandler{
 		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
 		KubernetesAgentGetter:   authz.NewOutOfClusterAgentGetter(config),
 	}
 }
 
-func (c *GetEventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (c *GetPorterEventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cluster, _ := r.Context().Value(types.ClusterScope).(*models.Cluster)
 
-	request := &types.GetEventRequest{}
+	request := &types.ListEventsRequest{}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return
@@ -53,12 +54,12 @@ func (c *GetEventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	logs, err := porter_agent.GetHistoricalEvents(agent.Clientset, agentSvc, request)
+	events, err := porter_agent.ListPorterEvents(agent.Clientset, agentSvc, request)
 
 	if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
 		return
 	}
 
-	c.WriteResult(w, r, logs)
+	c.WriteResult(w, r, events)
 }

api/server/router/cluster.go

@@ -1179,7 +1179,7 @@ func getClusterRoutes(
 	})
 
 	// GET /api/projects/{project_id}/clusters/{cluster_id}/events -> cluster.NewGetEventsHandler
-	getEventsEndpoint := factory.NewAPIEndpoint(
+	getPorterEventsEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbGet,
 			Method: types.HTTPVerbGet,
@@ -1195,15 +1195,44 @@ func getClusterRoutes(
 		},
 	)
 
-	getEventsHandler := cluster.NewGetEventsHandler(
+	getPorterEventsHandler := cluster.NewGetPorterEventsHandler(
 		config,
 		factory.GetDecoderValidator(),
 		factory.GetResultWriter(),
 	)
 
 	routes = append(routes, &router.Route{
-		Endpoint: getEventsEndpoint,
-		Handler:  getEventsHandler,
+		Endpoint: getPorterEventsEndpoint,
+		Handler:  getPorterEventsHandler,
+		Router:   r,
+	})
+
+	// GET /api/projects/{project_id}/clusters/{cluster_id}/k8s_events -> cluster.NewGetEventsHandler
+	getK8sEventsEndpoint := factory.NewAPIEndpoint(
+		&types.APIRequestMetadata{
+			Verb:   types.APIVerbGet,
+			Method: types.HTTPVerbGet,
+			Path: &types.Path{
+				Parent:       basePath,
+				RelativePath: fmt.Sprintf("%s/k8s_events", relPath),
+			},
+			Scopes: []types.PermissionScope{
+				types.UserScope,
+				types.ProjectScope,
+				types.ClusterScope,
+			},
+		},
+	)
+
+	getK8sEventsHandler := cluster.NewGetKubernetesEventsHandler(
+		config,
+		factory.GetDecoderValidator(),
+		factory.GetResultWriter(),
+	)
+
+	routes = append(routes, &router.Route{
+		Endpoint: getK8sEventsEndpoint,
+		Handler:  getK8sEventsHandler,
 		Router:   r,
 	})
 

api/types/incident.go

@@ -131,20 +131,52 @@ type GetLogResponse struct {
 	Logs                 []LogLine  `json:"logs"`
 }
 
-type GetEventRequest struct {
+type GetKubernetesEventRequest struct {
 	Limit       uint       `schema:"limit"`
 	StartRange  *time.Time `schema:"start_range"`
 	EndRange    *time.Time `schema:"end_range"`
+	Revision    string     `schema:"revision"`
 	PodSelector string     `schema:"pod_selector" form:"required"`
 	Namespace   string     `schema:"namespace" form:"required"`
 }
 
-type EventLine struct {
+type KubernetesEventLine struct {
 	Timestamp *time.Time `json:"timestamp"`
 	Event     string     `json:"event"`
 }
 
-type GetEventResponse struct {
-	ContinueTime *time.Time  `json:"continue_time"`
-	Events       []EventLine `json:"events"`
+type GetKubernetesEventResponse struct {
+	ContinueTime *time.Time            `json:"continue_time"`
+	Events       []KubernetesEventLine `json:"events"`
+}
+
+type EventType string
+
+const (
+	EventTypeIncident           EventType = "incident"
+	EventTypeIncidentResolved   EventType = "incident_resolved"
+	EventTypeDeploymentStarted  EventType = "deployment_started"
+	EventTypeDeploymentFinished EventType = "deployment_finished"
+	EventTypeDeploymentErrored  EventType = "deployment_errored"
+)
+
+type Event struct {
+	Type             EventType              `json:"type"`
+	Version          string                 `json:"version"`
+	ReleaseName      string                 `json:"release_name"`
+	ReleaseNamespace string                 `json:"release_namespace"`
+	Timestamp        *time.Time             `json:"timestamp"`
+	Data             map[string]interface{} `json:"data"`
+}
+
+type ListEventsRequest struct {
+	*PaginationRequest
+	ReleaseName      *string `schema:"release_name"`
+	ReleaseNamespace *string `schema:"release_namespace"`
+	Type             *string `schema:"type"`
+}
+
+type ListEventsResponse struct {
+	Events     []*Event            `json:"events" form:"required"`
+	Pagination *PaginationResponse `json:"pagination"`
 }

dashboard/src/main/home/cluster-dashboard/expanded-chart/events/EventList.tsx

@@ -5,6 +5,7 @@ import styled from "styled-components";
 import EventTable from "./EventTable";
 import Loading from "components/Loading";
 import danger from "assets/danger.svg";
+import rocket from "assets/rocket.png";
 import document from "assets/document.svg";
 import info from "assets/info-outlined.svg";
 import status from "assets/info-circle.svg";
@@ -30,12 +31,12 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
 
   useEffect(() => {
     api
-      .listIncidents("<token>", filters, {
+      .listPorterEvents("<token>", filters, {
         project_id: currentProject.id,
         cluster_id: currentCluster.id,
       })
       .then((res) => {
-        setEvents(res.data.incidents);
+        setEvents(res.data.events);
         setIsLoading(false);
       });
   }, []);
@@ -97,6 +98,29 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
     );
   };
 
+  const renderIncidentSummaryCell = (incident: any) => {
+    return (
+      <NameWrapper>
+        <AlertIcon src={danger} />
+        {incident.short_summary}
+        {incident.severity === "normal" ? (
+          <></>
+        ) : (
+          <Status color="#cc3d42">Critical</Status>
+        )}
+      </NameWrapper>
+    );
+  };
+
+  const renderDeploymentFinishedCell = (release: any) => {
+    return (
+      <NameWrapper>
+        <AlertIcon src={rocket} />
+        Revision {release.revision} was successfully deployed
+      </NameWrapper>
+    );
+  };
+
   const columns = React.useMemo(
     () => [
       {
@@ -104,28 +128,24 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
         columns: [
           {
             Header: "Description",
-            accessor: "short_summary",
+            accessor: "type",
             width: 500,
             Cell: ({ row }: CellProps<any>) => {
-              return (
-                <NameWrapper>
-                  <AlertIcon src={danger} />
-                  {row.original.short_summary}
-                  {row?.original && row.original.severity === "normal" ? (
-                    <></>
-                  ) : (
-                    <Status color="#cc3d42">Critical</Status>
-                  )}
-                </NameWrapper>
-              );
+              if (row.original.type == "incident") {
+                return renderIncidentSummaryCell(row.original.data);
+              } else if (row.original.type == "deployment_finished") {
+                return renderDeploymentFinishedCell(row.original.data);
+              }
+
+              return null;
             },
           },
           {
-            Header: "Last seen",
-            accessor: "updated_at",
+            Header: "Last Seen",
+            accessor: "timestamp",
             width: 140,
             Cell: ({ row }: CellProps<any>) => {
-              return <Flex>{relativeDate(row.original.updated_at)}</Flex>;
+              return <Flex>{relativeDate(row.original.timestamp)}</Flex>;
             },
           },
           {
@@ -133,16 +153,20 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
             accessor: "",
             width: 20,
             Cell: ({ row }: CellProps<any>) => {
-              return (
-                <TableButton
-                  onClick={() => {
-                    setExpandedEvent(row.original);
-                  }}
-                >
-                  <Icon src={info} />
-                  Details
-                </TableButton>
-              );
+              if (row.original.type == "incident") {
+                return (
+                  <TableButton
+                    onClick={() => {
+                      setExpandedEvent(row.original.data);
+                    }}
+                  >
+                    <Icon src={info} />
+                    Details
+                  </TableButton>
+                );
+              }
+
+              return null;
             },
           },
           {
@@ -150,7 +174,11 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
             accessor: "",
             width: 30,
             Cell: ({ row }: CellProps<any>) => {
-              if (!row.original.should_view_logs) {
+              if (row.original.type != "incident") {
+                return null;
+              }
+
+              if (!row.original.data.should_view_logs) {
                 return null;
               }
 
@@ -158,7 +186,7 @@ const EventList: React.FC<Props> = ({ filters, setLogData }) => {
                 <TableButton
                   width="102px"
                   onClick={() => {
-                    redirectToLogs(row.original);
+                    redirectToLogs(row.original.data);
                   }}
                 >
                   <Icon src={document} />

dashboard/src/shared/api.tsx

@@ -1988,6 +1988,22 @@ const getLogs = baseApi<
     `/api/projects/${project_id}/clusters/${cluster_id}/logs`
 );
 
+const listPorterEvents = baseApi<
+  {
+    release_name?: number;
+    release_namespace?: string;
+    type?: string;
+  },
+  {
+    project_id: number;
+    cluster_id: number;
+  }
+>(
+  "GET",
+  ({ project_id, cluster_id }) =>
+    `/api/projects/${project_id}/clusters/${cluster_id}/events`
+);
+
 const listIncidents = baseApi<
   {
     release_name?: number;
@@ -2390,6 +2406,7 @@ export default {
   getGitlabFolderContent,
   getLogPodValues,
   getLogs,
+  listPorterEvents,
   listIncidents,
   getIncident,
   getIncidentEvents,

internal/kubernetes/porter_agent/v2/agent_server.go

@@ -21,6 +21,52 @@ func GetAgentService(clientset kubernetes.Interface) (*v1.Service, error) {
 	)
 }
 
+func ListPorterEvents(
+	clientset kubernetes.Interface,
+	service *v1.Service,
+	req *types.ListEventsRequest,
+) (*types.ListEventsResponse, error) {
+	vals := make(map[string]string)
+
+	if req.Type != nil {
+		vals["type"] = *req.Type
+	}
+
+	if req.ReleaseName != nil {
+		vals["release_name"] = *req.ReleaseName
+	}
+
+	if req.ReleaseNamespace != nil {
+		vals["release_namespace"] = *req.ReleaseNamespace
+	}
+
+	if req.PaginationRequest != nil {
+		vals["page"] = fmt.Sprintf("%d", req.PaginationRequest.Page)
+	}
+
+	resp := clientset.CoreV1().Services(service.Namespace).ProxyGet(
+		"http",
+		service.Name,
+		fmt.Sprintf("%d", service.Spec.Ports[0].Port),
+		"/events",
+		vals,
+	)
+
+	rawQuery, err := resp.DoRaw(context.Background())
+	if err != nil {
+		return nil, err
+	}
+
+	eventsResp := &types.ListEventsResponse{}
+
+	err = json.Unmarshal(rawQuery, eventsResp)
+	if err != nil {
+		return nil, err
+	}
+
+	return eventsResp, nil
+}
+
 func ListIncidents(
 	clientset kubernetes.Interface,
 	service *v1.Service,
@@ -310,11 +356,11 @@ func GetRevisionValues(
 	return valsResp, nil
 }
 
-func GetHistoricalEvents(
+func GetHistoricalKubernetesEvents(
 	clientset kubernetes.Interface,
 	service *v1.Service,
-	req *types.GetEventRequest,
-) (*types.GetEventResponse, error) {
+	req *types.GetKubernetesEventRequest,
+) (*types.GetKubernetesEventResponse, error) {
 	vals := make(map[string]string)
 
 	if req.Limit != 0 {
@@ -357,7 +403,7 @@ func GetHistoricalEvents(
 		return nil, err
 	}
 
-	eventsResp := &types.GetEventResponse{}
+	eventsResp := &types.GetKubernetesEventResponse{}
 
 	err = json.Unmarshal(rawQuery, eventsResp)
 	if err != nil {