diff --git a/pkg/services/live/features/broadcast.go b/pkg/services/live/features/broadcast.go index 262ea795df0..0c246bcdcdb 100644 --- a/pkg/services/live/features/broadcast.go +++ b/pkg/services/live/features/broadcast.go @@ -65,5 +65,5 @@ func (b *BroadcastRunner) OnPublish(_ context.Context, u *models.SignedInUser, e if err := b.liveMessageStore.SaveLiveMessage(query); err != nil { return models.PublishReply{}, 0, err } - return models.PublishReply{}, backend.PublishStreamStatusOK, nil + return models.PublishReply{Data: e.Data}, backend.PublishStreamStatusOK, nil } diff --git a/pkg/services/live/features/broadcast_test.go b/pkg/services/live/features/broadcast_test.go index bd0f5be41ef..afc5b350541 100644 --- a/pkg/services/live/features/broadcast_test.go +++ b/pkg/services/live/features/broadcast_test.go @@ -81,5 +81,5 @@ func TestBroadcastRunner_OnPublish(t *testing.T) { ) require.NoError(t, err) require.Equal(t, backend.PublishStreamStatusOK, status) - require.Nil(t, reply.Data) + require.Equal(t, data, reply.Data) } diff --git a/pkg/services/live/live.go b/pkg/services/live/live.go index 791e0c91200..eabee22374f 100644 --- a/pkg/services/live/live.go +++ b/pkg/services/live/live.go @@ -746,7 +746,7 @@ func (g *GrafanaLive) HandleHTTPPublish(ctx *models.ReqContext, cmd dtos.LivePub return response.Error(code, text, nil) } if reply.Data != nil { - _, err = g.node.Publish(cmd.Channel, cmd.Data) + err = g.Publish(ctx.OrgId, cmd.Channel, cmd.Data) if err != nil { logger.Error("Error publish to channel", "error", err, "channel", cmd.Channel) return response.Error(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError), nil)