IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 23:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Playlist: cleanup object store implementation (#58201)

Browse Source
This commit is contained in:
Ryan McKinley 2022-11-03 16:35:20 -07:00 committed by GitHub
parent 376f4b0cc7
commit 3dfa49b376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/export/object_store.go
View File

@ -113,6 +113,8 @@ func (e *objectStoreJob) start() {
e.status.Status = "error: " + err.Error()
return
}
e.status.Last = fmt.Sprintf("export %d dashboards", len(dashInfo))
e.broadcaster(e.status)
for _, dash := range dashInfo {
rowUser.OrgID = dash.OrgID
@ -261,7 +263,7 @@ func (e *objectStoreJob) getDashboards(ctx context.Context) ([]dashInfo, error)
e.broadcaster(e.status)
dash := make([]dashInfo, 0)
rows, err := e.sess.Query(ctx, "SELECT org_id,uid,data,updated_by FROM dashboard WHERE is_folder=0")
rows, err := e.sess.Query(ctx, "SELECT org_id,uid,data,updated_by FROM dashboard WHERE is_folder=false")
if err != nil {
return nil, err
}

47
pkg/services/playlist/playlistimpl/object_store.go
View File

@ -27,7 +27,12 @@ type objectStoreImpl struct {
var _ playlist.Service = &objectStoreImpl{}
func (s *objectStoreImpl) sync() {
rows, err := s.sess.Query(context.Background(), "SELECT org_id,uid FROM playlist ORDER BY org_id asc")
type Info struct {
OrgID int64 `db:"org_id"`
UID string `db:"uid"`
}
results := []Info{}
err := s.sess.Select(context.Background(), &results, "SELECT org_id,uid FROM playlist ORDER BY org_id asc")
if err != nil {
fmt.Printf("error loading playlists")
return
@ -35,22 +40,15 @@ func (s *objectStoreImpl) sync() {
// Change the org_id with each row
rowUser := &user.SignedInUser{
Login: "?",
OrgID: 0, // gets filled in from each row
UserID: 0,
OrgID: 0, // gets filled in from each row
UserID: 0, // Admin user
IsGrafanaAdmin: true,
}
ctx := objectstore.ContextWithUser(context.Background(), rowUser)
uid := ""
for rows.Next() {
err = rows.Scan(&rowUser.OrgID, &uid)
if err != nil {
fmt.Printf("error loading playlists: %v", err)
return
}
for _, info := range results {
dto, err := s.sqlimpl.Get(ctx, &playlist.GetPlaylistByUidQuery{
OrgId: rowUser.OrgID,
UID: uid,
OrgId: info.OrgID,
UID: info.UID,
})
if err != nil {
fmt.Printf("error loading playlist: %v", err)
@ -59,8 +57,10 @@ func (s *objectStoreImpl) sync() {
body, _ := json.Marshal(dto)
_, _ = s.objectstore.Write(ctx, &object.WriteObjectRequest{
GRN: &object.GRN{
UID: uid,
Kind: models.StandardKindPlaylist,
TenantId: info.OrgID,
UID: info.UID,
Kind: models.StandardKindPlaylist,
Scope: models.ObjectStoreScopeEntity,
},
Body: body,
})
@ -98,8 +98,9 @@ func (s *objectStoreImpl) Update(ctx context.Context, cmd *playlist.UpdatePlayli
}
_, err = s.objectstore.Write(ctx, &object.WriteObjectRequest{
GRN: &object.GRN{
UID: rsp.Uid,
Kind: models.StandardKindPlaylist,
UID: rsp.Uid,
Kind: models.StandardKindPlaylist,
Scope: models.ObjectStoreScopeEntity,
},
Body: body,
})
@ -115,8 +116,9 @@ func (s *objectStoreImpl) Delete(ctx context.Context, cmd *playlist.DeletePlayli
if err == nil {
_, err = s.objectstore.Delete(ctx, &object.DeleteObjectRequest{
GRN: &object.GRN{
UID: cmd.UID,
Kind: models.StandardKindPlaylist,
UID: cmd.UID,
Kind: models.StandardKindPlaylist,
Scope: models.ObjectStoreScopeEntity,
},
})
if err != nil {
@ -146,8 +148,9 @@ func (s *objectStoreImpl) GetWithoutItems(ctx context.Context, q *playlist.GetPl
func (s *objectStoreImpl) Get(ctx context.Context, q *playlist.GetPlaylistByUidQuery) (*playlist.PlaylistDTO, error) {
rsp, err := s.objectstore.Read(ctx, &object.ReadObjectRequest{
GRN: &object.GRN{
UID: q.UID,
Kind: models.StandardKindPlaylist,
UID: q.UID,
Kind: models.StandardKindPlaylist,
Scope: models.ObjectStoreScopeEntity,
},
WithBody: true,
})

6
pkg/services/store/auth.go
View File

@ -44,6 +44,12 @@ func GetUserIDString(user *user.SignedInUser) string {
if user == nil {
return ""
}
if user.IsAnonymous {
return "anon"
}
if user.ApiKeyID > 0 {
return fmt.Sprintf("key:%d", user.UserID)
}
if user.IsRealUser() {
return fmt.Sprintf("user:%d:%s", user.UserID, user.Login)
}

17
public/app/features/playlist/PlaylistForm.tsx
View File

@ -1,4 +1,4 @@
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';
import { selectors } from '@grafana/e2e-selectors';
import { config } from '@grafana/runtime';
@ -18,6 +18,7 @@ interface Props {
}
export const PlaylistForm = ({ onSubmit, playlist }: Props) => {
const [saving, setSaving] = useState(false);
const { name, interval, items: propItems } = playlist;
const tagOptions = useMemo(() => {
return () => getGrafanaSearcher().tags({ kind: ['dashboard'] });
@ -25,9 +26,14 @@ export const PlaylistForm = ({ onSubmit, playlist }: Props) => {
const { items, addById, addByTag, deleteItem, moveItem } = usePlaylistItems(propItems);
const doSubmit = (list: Playlist) => {
setSaving(true);
onSubmit({ ...list, items });
};
return (
<div>
<Form onSubmit={(list: Playlist) => onSubmit({ ...list, items })} validateOn={'onBlur'}>
<Form onSubmit={doSubmit} validateOn={'onBlur'}>
{({ register, errors }) => {
const isDisabled = items.length === 0 || Object.keys(errors).length > 0;
return (
@ -73,7 +79,12 @@ export const PlaylistForm = ({ onSubmit, playlist }: Props) => {
</div>
<HorizontalGroup>
<Button type="submit" variant="primary" disabled={isDisabled}>
<Button
type="submit"
variant="primary"
disabled={isDisabled}
icon={saving ? 'fa fa-spinner' : undefined}
>
Save
</Button>
<LinkButton variant="secondary" href={`${config.appSubUrl}/playlists`}>