add depl target id to log label match (#3720)

porter-dev · Oct 3, 2023 · 4d5b847 · 4d5b847
1 parent 2c1e199
commit 4d5b847
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/api/server/handlers/porter_app/logs_apply_v2.go b/api/server/handlers/porter_app/logs_apply_v2.go
@@ -55,6 +55,7 @@ const (
 	lokiLabel_PorterAppName       = "porter_run_app_name"
 	lokiLabel_PorterServiceName   = "porter_run_service_name"
 	lokiLabel_PorterAppRevisionID = "porter_run_app_revision_id"
+	lokiLabel_DeploymentTargetId  = "porter_run_deployment_target_id"
 	lokiLabel_Namespace           = "namespace"
 )
 
@@ -158,6 +159,8 @@ func (c *AppLogsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		matchLabels[lokiLabel_PorterAppRevisionID] = request.AppRevisionID
 	}
 
+	matchLabels[lokiLabel_DeploymentTargetId] = request.DeploymentTargetID
+
 	logRequest := &types.LogRequest{
 		Limit:       request.Limit,
 		StartRange:  &request.StartRange,

diff --git a/api/server/handlers/porter_app/stream_logs.go b/api/server/handlers/porter_app/stream_logs.go
@@ -127,6 +127,7 @@ func (c *StreamLogsLokiHandler) ServeHTTP(w http.ResponseWriter, r *http.Request
 	labels := []string{
 		fmt.Sprintf("%s=%s", lokiLabel_Namespace, namespace),
 		fmt.Sprintf("%s=%s", lokiLabel_PorterAppName, request.AppName),
+		fmt.Sprintf("%s=%s", lokiLabel_DeploymentTargetId, request.DeploymentTargetID),
 	}
 
 	if request.ServiceName != "all" {