(({ icon, color, text, tooltip, class
const styles = useStyles2(useCallback((theme) => getStyles(theme, color), [color]));
const badge = (
-
- {icon && }
- {text}
-
+ {icon && }
+ {text}
);
@@ -59,7 +56,6 @@ const getStyles = (theme: GrafanaTheme2, color: BadgeColor) => {
return {
wrapper: css`
- font-size: ${theme.typography.size.sm};
display: inline-flex;
padding: 1px 4px;
border-radius: ${theme.shape.radius.default};
@@ -67,12 +63,10 @@ const getStyles = (theme: GrafanaTheme2, color: BadgeColor) => {
border: 1px solid ${borderColor};
color: ${textColor};
font-weight: ${theme.typography.fontWeightRegular};
-
- > span {
- position: relative;
- top: 1px;
- margin-left: 2px;
- }
+ gap: 2px;
+ font-size: ${theme.typography.bodySmall.fontSize};
+ line-height: ${theme.typography.bodySmall.lineHeight};
+ align-items: center;
`,
};
};
diff --git a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
index 4bc664e75aa..21f1e28ed8c 100644
--- a/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
+++ b/packages/grafana-ui/src/components/Dropdown/Dropdown.tsx
@@ -11,7 +11,7 @@ import { TooltipPlacement } from '../Tooltip/types';
export interface Props {
overlay: React.ReactElement | (() => React.ReactElement);
placement?: TooltipPlacement;
- children: React.ReactElement | ((isOpen: boolean) => React.ReactElement);
+ children: React.ReactElement;
/** Amount in pixels to nudge the dropdown vertically and horizontally, respectively. */
offset?: [number, number];
onVisibleChange?: (state: boolean) => void;
@@ -51,7 +51,7 @@ export const Dropdown = React.memo(({ children, overlay, placement, offset, onVi
return (
<>
- {React.cloneElement(typeof children === 'function' ? children(visible) : children, {
+ {React.cloneElement(children, {
ref: setTriggerRef,
})}
{visible && (
diff --git a/packages/grafana-ui/src/components/Segment/Segment.tsx b/packages/grafana-ui/src/components/Segment/Segment.tsx
index 5c7d2e1e881..fd8401c6c82 100644
--- a/packages/grafana-ui/src/components/Segment/Segment.tsx
+++ b/packages/grafana-ui/src/components/Segment/Segment.tsx
@@ -11,7 +11,7 @@ import { getSegmentStyles } from './styles';
import { SegmentSelect, useExpandableLabel, SegmentProps } from './';
-export interface SegmentSyncProps extends SegmentProps, Omit, 'value' | 'onChange'> {
+export interface SegmentSyncProps extends SegmentProps, Omit, 'value' | 'onChange'> {
value?: T | SelectableValue;
onChange: (item: SelectableValue) => void;
options: Array>;
diff --git a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx b/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
index 99e485027a3..5d9e90c8fbc 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentAsync.tsx
@@ -15,7 +15,7 @@ import { getSegmentStyles } from './styles';
import { useExpandableLabel, SegmentProps } from '.';
-export interface SegmentAsyncProps extends SegmentProps, Omit, 'value' | 'onChange'> {
+export interface SegmentAsyncProps extends SegmentProps, Omit, 'value' | 'onChange'> {
value?: T | SelectableValue;
loadOptions: (query?: string) => Promise>>;
/**
diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
index 68958c0e6cd..5f5516c86ad 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentInput.story.tsx
@@ -100,12 +100,10 @@ export const InputWithAutoFocus = () => {
);
};
-export const Basic: ComponentStory>> = (
- args: SegmentInputProps
-) => {
+export const Basic: ComponentStory> = (args: SegmentInputProps) => {
const [value, setValue] = useState(args.value);
- const props: SegmentInputProps = {
+ const props: SegmentInputProps = {
...args,
value,
onChange: (value) => {
@@ -117,7 +115,7 @@ export const Basic: ComponentStory
- {...props} />
+
);
};
diff --git a/packages/grafana-ui/src/components/Segment/SegmentInput.tsx b/packages/grafana-ui/src/components/Segment/SegmentInput.tsx
index acfaef89d9d..d4d3d581b00 100644
--- a/packages/grafana-ui/src/components/Segment/SegmentInput.tsx
+++ b/packages/grafana-ui/src/components/Segment/SegmentInput.tsx
@@ -10,8 +10,8 @@ import { getSegmentStyles } from './styles';
import { useExpandableLabel, SegmentProps } from '.';
-export interface SegmentInputProps
- extends Omit, 'allowCustomValue' | 'allowEmptyValue'>,
+export interface SegmentInputProps
+ extends Omit,
Omit, 'value' | 'onChange'> {
value: string | number;
onChange: (text: string | number) => void;
@@ -19,7 +19,7 @@ export interface SegmentInputProps
const FONT_SIZE = 14;
-export function SegmentInput({
+export function SegmentInput({
value: initialValue,
onChange,
Component,
@@ -30,7 +30,7 @@ export function SegmentInput({
autofocus = false,
onExpandedChange,
...rest
-}: React.PropsWithChildren>) {
+}: React.PropsWithChildren) {
const ref = useRef(null);
const [value, setValue] = useState(initialValue);
const [inputWidth, setInputWidth] = useState(measureText((initialValue || '').toString(), FONT_SIZE).width);
diff --git a/packages/grafana-ui/src/components/Segment/types.ts b/packages/grafana-ui/src/components/Segment/types.ts
index 06cb23bef32..ec2d8756e82 100644
--- a/packages/grafana-ui/src/components/Segment/types.ts
+++ b/packages/grafana-ui/src/components/Segment/types.ts
@@ -1,6 +1,6 @@
import { ReactElement } from 'react';
-export interface SegmentProps {
+export interface SegmentProps {
Component?: ReactElement;
className?: string;
allowCustomValue?: boolean;
diff --git a/packages/grafana-ui/src/components/VizLegend/SeriesIcon.tsx b/packages/grafana-ui/src/components/VizLegend/SeriesIcon.tsx
index e65e8885687..937f61bf836 100644
--- a/packages/grafana-ui/src/components/VizLegend/SeriesIcon.tsx
+++ b/packages/grafana-ui/src/components/VizLegend/SeriesIcon.tsx
@@ -30,7 +30,7 @@ export const SeriesIcon = React.memo(
background: cssColor,
width: '14px',
height: '4px',
- borderRadius: theme.shape.radius.default,
+ borderRadius: theme.shape.radius.pill,
display: 'inline-block',
marginRight: '8px',
};
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
index dd7bb67e13c..f07a9c8c0cd 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
@@ -156,6 +156,11 @@ export class UPlotScaleBuilder extends PlotConfigBuilder {
let minMax: uPlot.Range.MinMax = [dataMin, dataMax];
+ // don't pad numeric x scales
+ if (scaleKey === 'x' && !isTime) {
+ return minMax;
+ }
+
// happens when all series on a scale are `show: false`, re-returning nulls will auto-disable axis
if (!hasFixedRange && dataMin == null && dataMax == null) {
return minMax;
diff --git a/packages/grafana-ui/tsconfig.build.json b/packages/grafana-ui/tsconfig.build.json
index 2ce1fd65c43..291f5a514af 100644
--- a/packages/grafana-ui/tsconfig.build.json
+++ b/packages/grafana-ui/tsconfig.build.json
@@ -5,6 +5,14 @@
"@grafana/ui": ["."]
}
},
- "exclude": ["**/*.story.tsx", "**/*.test.ts*", "**/*.tmpl.ts", "dist", "node_modules", "src/utils/storybook"],
+ "exclude": [
+ "**/*.story.tsx",
+ "**/*.story.internal.tsx",
+ "**/*.test.ts*",
+ "**/*.tmpl.ts",
+ "dist",
+ "node_modules",
+ "src/utils/storybook"
+ ],
"extends": "./tsconfig.json"
}
diff --git a/pkg/api/plugin_resource_test.go b/pkg/api/plugin_resource_test.go
index cc37131b0a8..7c990f8a7e7 100644
--- a/pkg/api/plugin_resource_test.go
+++ b/pkg/api/plugin_resource_test.go
@@ -18,7 +18,6 @@ import (
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
- "github.com/grafana/grafana/pkg/plugins/config"
pluginClient "github.com/grafana/grafana/pkg/plugins/manager/client"
"github.com/grafana/grafana/pkg/plugins/manager/fakes"
"github.com/grafana/grafana/pkg/plugins/manager/loader"
@@ -34,6 +33,7 @@ import (
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/oauthtoken/oauthtokentest"
"github.com/grafana/grafana/pkg/services/pluginsintegration"
+ "github.com/grafana/grafana/pkg/services/pluginsintegration/config"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginaccesscontrol"
"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
@@ -59,13 +59,12 @@ func TestCallResource(t *testing.T) {
coreRegistry := coreplugin.ProvideCoreRegistry(nil, &cloudwatch.CloudWatchService{}, nil, nil, nil, nil,
nil, nil, nil, nil, testdatasource.ProvideService(cfg, featuremgmt.WithFeatures()), nil, nil, nil, nil, nil, nil)
- var pCfg *config.Cfg
- pCfg, err = config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
+ pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
require.NoError(t, err)
reg := registry.ProvideService()
- cdn := pluginscdn.ProvideService(pCfg)
l := loader.ProvideService(pCfg, fakes.NewFakeLicensingService(), signature.NewUnsignedAuthorizer(pCfg),
- reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(), cdn, assetpath.ProvideService(cdn))
+ reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
+ assetpath.ProvideService(pluginscdn.ProvideService(pCfg)))
srcs := sources.ProvideService(cfg, pCfg)
ps, err := store.ProvideService(reg, srcs, l)
require.NoError(t, err)
diff --git a/pkg/build/packaging/grafana.go b/pkg/build/packaging/grafana.go
index 4239af6f6f7..d752feed724 100644
--- a/pkg/build/packaging/grafana.go
+++ b/pkg/build/packaging/grafana.go
@@ -771,8 +771,7 @@ func realPackageVariant(ctx context.Context, v config.Variant, edition config.Ed
defaultFileSrc: filepath.Join(grafanaDir, "packaging", "rpm", "sysconfig", "grafana-server"),
systemdFileSrc: filepath.Join(grafanaDir, "packaging", "rpm", "systemd", "grafana-server.service"),
wrapperFilePath: filepath.Join(grafanaDir, "packaging", "wrappers"),
- // chkconfig is depended on since our systemd service wraps a SysV init script, and that requires chkconfig
- depends: []string{"/sbin/service", "chkconfig", "fontconfig", "freetype", "urw-fonts"},
+ depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"},
}); err != nil {
return err
}
diff --git a/pkg/infra/db/sqlbuilder.go b/pkg/infra/db/sqlbuilder.go
index 1b3c8427879..8d55f41fa7c 100644
--- a/pkg/infra/db/sqlbuilder.go
+++ b/pkg/infra/db/sqlbuilder.go
@@ -5,20 +5,26 @@ import (
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
)
-func NewSqlBuilder(cfg *setting.Cfg, dialect migrator.Dialect) SQLBuilder {
- return SQLBuilder{cfg: cfg, dialect: dialect}
+func NewSqlBuilder(cfg *setting.Cfg, features featuremgmt.FeatureToggles, dialect migrator.Dialect, recursiveQueriesAreSupported bool) SQLBuilder {
+ return SQLBuilder{cfg: cfg, features: features, dialect: dialect, recursiveQueriesAreSupported: recursiveQueriesAreSupported}
}
type SQLBuilder struct {
- cfg *setting.Cfg
- sql bytes.Buffer
- params []interface{}
+ cfg *setting.Cfg
+ features featuremgmt.FeatureToggles
+ sql bytes.Buffer
+ params []interface{}
+ recQry string
+ recQryParams []interface{}
+ recursiveQueriesAreSupported bool
+
dialect migrator.Dialect
}
@@ -31,10 +37,22 @@ func (sb *SQLBuilder) Write(sql string, params ...interface{}) {
}
func (sb *SQLBuilder) GetSQLString() string {
- return sb.sql.String()
+ if sb.recQry == "" {
+ return sb.sql.String()
+ }
+
+ var bf bytes.Buffer
+ bf.WriteString(sb.recQry)
+ bf.WriteString(sb.sql.String())
+ return bf.String()
}
func (sb *SQLBuilder) GetParams() []interface{} {
+ if len(sb.recQryParams) == 0 {
+ return sb.params
+ }
+
+ sb.params = append(sb.recQryParams, sb.params...)
return sb.params
}
@@ -44,11 +62,15 @@ func (sb *SQLBuilder) AddParams(params ...interface{}) {
func (sb *SQLBuilder) WriteDashboardPermissionFilter(user *user.SignedInUser, permission dashboards.PermissionType) {
var (
- sql string
- params []interface{}
+ sql string
+ params []interface{}
+ recQry string
+ recQryParams []interface{}
)
if !ac.IsDisabled(sb.cfg) {
- sql, params = permissions.NewAccessControlDashboardPermissionFilter(user, permission, "").Where()
+ filterRBAC := permissions.NewAccessControlDashboardPermissionFilter(user, permission, "", sb.features, sb.recursiveQueriesAreSupported)
+ sql, params = filterRBAC.Where()
+ recQry, recQryParams = filterRBAC.With()
} else {
sql, params = permissions.DashboardPermissionFilter{
OrgRole: user.OrgRole,
@@ -61,4 +83,6 @@ func (sb *SQLBuilder) WriteDashboardPermissionFilter(user *user.SignedInUser, pe
sb.sql.WriteString(" AND " + sql)
sb.params = append(sb.params, params...)
+ sb.recQry = recQry
+ sb.recQryParams = recQryParams
}
diff --git a/pkg/infra/db/sqlbuilder_test.go b/pkg/infra/db/sqlbuilder_test.go
index ce88c870a56..0d1f3e45ba4 100644
--- a/pkg/infra/db/sqlbuilder_test.go
+++ b/pkg/infra/db/sqlbuilder_test.go
@@ -14,6 +14,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/services/dashboards"
dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/user"
@@ -24,6 +25,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
+
t.Run("WriteDashboardPermissionFilter", func(t *testing.T) {
t.Run("user ACL", func(t *testing.T) {
test(t,
@@ -31,6 +33,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -38,6 +41,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldNotFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -45,6 +49,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{User: true, Permission: dashboards.PERMISSION_EDIT},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -52,6 +57,41 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
Search{RequiredPermission: dashboards.PERMISSION_VIEW},
shouldNotFind,
+ featuremgmt.WithFeatures(),
+ )
+ })
+
+ t.Run("user ACL with nested folders", func(t *testing.T) {
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{User: true, Permission: dashboards.PERMISSION_EDIT},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{User: true, Permission: dashboards.PERMISSION_VIEW},
+ Search{RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
)
})
@@ -61,6 +101,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Role: org.RoleViewer, Permission: dashboards.PERMISSION_VIEW},
Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -68,6 +109,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Role: org.RoleViewer, Permission: dashboards.PERMISSION_VIEW},
Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldNotFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -75,6 +117,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Role: org.RoleEditor, Permission: dashboards.PERMISSION_VIEW},
Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldNotFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -82,6 +125,41 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Role: org.RoleEditor, Permission: dashboards.PERMISSION_VIEW},
Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldNotFind,
+ featuremgmt.WithFeatures(),
+ )
+ })
+
+ t.Run("role ACL with nested folders", func(t *testing.T) {
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Role: org.RoleViewer, Permission: dashboards.PERMISSION_VIEW},
+ Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Role: org.RoleViewer, Permission: dashboards.PERMISSION_VIEW},
+ Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Role: org.RoleEditor, Permission: dashboards.PERMISSION_VIEW},
+ Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Role: org.RoleEditor, Permission: dashboards.PERMISSION_VIEW},
+ Search{UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
)
})
@@ -91,6 +169,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Team: true, Permission: dashboards.PERMISSION_VIEW},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -98,6 +177,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Team: true, Permission: dashboards.PERMISSION_VIEW},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldNotFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -105,6 +185,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Team: true, Permission: dashboards.PERMISSION_EDIT},
Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -112,6 +193,41 @@ func TestIntegrationSQLBuilder(t *testing.T) {
&DashboardPermission{Team: true, Permission: dashboards.PERMISSION_EDIT},
Search{UserFromACL: false, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldNotFind,
+ featuremgmt.WithFeatures(),
+ )
+ })
+
+ t.Run("team ACL with nested folders", func(t *testing.T) {
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Team: true, Permission: dashboards.PERMISSION_VIEW},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Team: true, Permission: dashboards.PERMISSION_VIEW},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Team: true, Permission: dashboards.PERMISSION_EDIT},
+ Search{UserFromACL: true, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{},
+ &DashboardPermission{Team: true, Permission: dashboards.PERMISSION_EDIT},
+ Search{UserFromACL: false, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
)
})
@@ -121,6 +237,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
nil,
Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldNotFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -128,6 +245,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
nil,
Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -135,6 +253,7 @@ func TestIntegrationSQLBuilder(t *testing.T) {
nil,
Search{OrgId: -1, UsersOrgRole: org.RoleEditor, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldFind,
+ featuremgmt.WithFeatures(),
)
test(t,
@@ -142,6 +261,41 @@ func TestIntegrationSQLBuilder(t *testing.T) {
nil,
Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_EDIT},
shouldNotFind,
+ featuremgmt.WithFeatures(),
+ )
+ })
+
+ t.Run("defaults for user ACL with nested folders", func(t *testing.T) {
+ test(t,
+ DashboardProps{},
+ nil,
+ Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{OrgId: -1},
+ nil,
+ Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_VIEW},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{OrgId: -1},
+ nil,
+ Search{OrgId: -1, UsersOrgRole: org.RoleEditor, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
+ )
+
+ test(t,
+ DashboardProps{OrgId: -1},
+ nil,
+ Search{OrgId: -1, UsersOrgRole: org.RoleViewer, RequiredPermission: dashboards.PERMISSION_EDIT},
+ shouldNotFind,
+ featuremgmt.WithFeatures(featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)),
)
})
})
@@ -172,7 +326,7 @@ type dashboardResponse struct {
Id int64
}
-func test(t *testing.T, dashboardProps DashboardProps, dashboardPermission *DashboardPermission, search Search, shouldFind bool) {
+func test(t *testing.T, dashboardProps DashboardProps, dashboardPermission *DashboardPermission, search Search, shouldFind bool, features featuremgmt.FeatureToggles) {
t.Helper()
t.Run("", func(t *testing.T) {
@@ -186,7 +340,7 @@ func test(t *testing.T, dashboardProps DashboardProps, dashboardPermission *Dash
aclUserID = createDummyACL(t, sqlStore, dashboardPermission, search, dashboard.ID)
t.Logf("Created ACL with user ID %d\n", aclUserID)
}
- dashboards := getDashboards(t, sqlStore, search, aclUserID)
+ dashboards := getDashboards(t, sqlStore, search, aclUserID, features)
if shouldFind {
require.Len(t, dashboards, 1, "Should return one dashboard")
@@ -292,7 +446,7 @@ func createDummyACL(t *testing.T, sqlStore *sqlstore.SQLStore, dashboardPermissi
return 0
}
-func getDashboards(t *testing.T, sqlStore *sqlstore.SQLStore, search Search, aclUserID int64) []*dashboardResponse {
+func getDashboards(t *testing.T, sqlStore *sqlstore.SQLStore, search Search, aclUserID int64, features featuremgmt.FeatureToggles) []*dashboardResponse {
t.Helper()
old := sqlStore.Cfg.RBACEnabled
@@ -301,7 +455,10 @@ func getDashboards(t *testing.T, sqlStore *sqlstore.SQLStore, search Search, acl
sqlStore.Cfg.RBACEnabled = old
}()
- builder := NewSqlBuilder(sqlStore.Cfg, sqlStore.GetDialect())
+ recursiveQueriesAreSupported, err := sqlStore.RecursiveQueriesAreSupported()
+ require.NoError(t, err)
+
+ builder := NewSqlBuilder(sqlStore.Cfg, features, sqlStore.GetDialect(), recursiveQueriesAreSupported)
signedInUser := &user.SignedInUser{
UserID: 9999999999,
}
@@ -325,7 +482,7 @@ func getDashboards(t *testing.T, sqlStore *sqlstore.SQLStore, search Search, acl
builder.Write("SELECT * FROM dashboard WHERE true")
builder.WriteDashboardPermissionFilter(signedInUser, search.RequiredPermission)
t.Logf("Searching for dashboards, SQL: %q\n", builder.GetSQLString())
- err := sqlStore.GetEngine().SQL(builder.GetSQLString(), builder.params...).Find(&res)
+ err = sqlStore.GetEngine().SQL(builder.GetSQLString(), builder.params...).Find(&res)
require.NoError(t, err)
return res
}
diff --git a/pkg/infra/remotecache/memcached_storage_integration_test.go b/pkg/infra/remotecache/memcached_storage_integration_test.go
index 87fffe182eb..38bf6fc12ea 100644
--- a/pkg/infra/remotecache/memcached_storage_integration_test.go
+++ b/pkg/infra/remotecache/memcached_storage_integration_test.go
@@ -1,16 +1,23 @@
-//go:build memcached
-// +build memcached
-
package remotecache
import (
+ "os"
"testing"
"github.com/grafana/grafana/pkg/setting"
)
-func TestMemcachedCacheStorage(t *testing.T) {
- opts := &setting.RemoteCacheOptions{Name: memcachedCacheType, ConnStr: "localhost:11211"}
+func TestIntegrationMemcachedCacheStorage(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
+
+ u, ok := os.LookupEnv("MEMCACHED_HOSTS")
+ if !ok || u == "" {
+ t.Skip("No Memcached hosts provided")
+ }
+
+ opts := &setting.RemoteCacheOptions{Name: memcachedCacheType, ConnStr: u}
client := createTestClient(t, opts, nil)
runTestsForClient(t, client)
runCountTestsForClient(t, opts, nil)
diff --git a/pkg/infra/remotecache/redis_storage_integration_test.go b/pkg/infra/remotecache/redis_storage_integration_test.go
index d360feb3ce8..392d3bb8b44 100644
--- a/pkg/infra/remotecache/redis_storage_integration_test.go
+++ b/pkg/infra/remotecache/redis_storage_integration_test.go
@@ -1,17 +1,40 @@
-//go:build redis
-// +build redis
-
package remotecache
import (
+ "fmt"
+ "os"
+ "strings"
"testing"
+ "github.com/go-redis/redis/v8"
"github.com/grafana/grafana/pkg/setting"
)
-func TestRedisCacheStorage(t *testing.T) {
+func TestIntegrationRedisCacheStorage(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
- opts := &setting.RemoteCacheOptions{Name: redisCacheType, ConnStr: "addr=localhost:6379"}
+ u, ok := os.LookupEnv("REDIS_URL")
+ if !ok || u == "" {
+ t.Skip("No redis URL supplied")
+ }
+
+ addr := u
+ db := 0
+ parsed, err := redis.ParseURL(u)
+ if err == nil {
+ addr = parsed.Addr
+ db = parsed.DB
+ }
+
+ b := strings.Builder{}
+ b.WriteString(fmt.Sprintf("addr=%s", addr))
+ if db != 0 {
+ b.WriteString(fmt.Sprintf(",db=%d", db))
+ }
+
+ opts := &setting.RemoteCacheOptions{Name: redisCacheType, ConnStr: b.String()}
client := createTestClient(t, opts, nil)
runTestsForClient(t, client)
runCountTestsForClient(t, opts, nil)
diff --git a/pkg/infra/remotecache/remotecache_test.go b/pkg/infra/remotecache/remotecache_test.go
index 9ad5acbe7a8..9732e8474cd 100644
--- a/pkg/infra/remotecache/remotecache_test.go
+++ b/pkg/infra/remotecache/remotecache_test.go
@@ -95,7 +95,8 @@ func canPutGetAndDeleteCachedObjects(t *testing.T, client CacheStorage) {
assert.Equal(t, err, nil)
_, err = client.Get(context.Background(), "key1")
- assert.Equal(t, err, ErrCacheItemNotFound)
+ // redis client returns redis.Nil error when key does not exist.
+ assert.Error(t, err)
}
func canNotFetchExpiredItems(t *testing.T, client CacheStorage) {
@@ -109,7 +110,8 @@ func canNotFetchExpiredItems(t *testing.T, client CacheStorage) {
// should not be able to read that value since its expired
_, err = client.Get(context.Background(), "key1")
- assert.Equal(t, err, ErrCacheItemNotFound)
+ // redis client returns redis.Nil error when key does not exist.
+ assert.Error(t, err)
}
func TestCollectUsageStats(t *testing.T) {
diff --git a/pkg/infra/tracing/opentelemetry_tracing.go b/pkg/infra/tracing/opentelemetry_tracing.go
index 17620b922a4..8535233b8eb 100644
--- a/pkg/infra/tracing/opentelemetry_tracing.go
+++ b/pkg/infra/tracing/opentelemetry_tracing.go
@@ -105,6 +105,10 @@ func (ots *Opentelemetry) parseSettingsOpentelemetry() error {
return nil
}
+func (ots *Opentelemetry) OTelExporterEnabled() bool {
+ return ots.Enabled == otlpExporter
+}
+
func splitCustomAttribs(s string) ([]attribute.KeyValue, error) {
res := []attribute.KeyValue{}
@@ -320,3 +324,15 @@ func (s OpentelemetrySpan) AddEvents(keys []string, values []EventValue) {
}
}
}
+
+func (s OpentelemetrySpan) contextWithSpan(ctx context.Context) context.Context {
+ if s.span != nil {
+ ctx = trace.ContextWithSpan(ctx, s.span)
+ // Grafana also manages its own separate traceID in the context in addition to what opentracing handles.
+ // It's derived from the span. Ensure that we propagate this too.
+ if traceID := s.span.SpanContext().TraceID(); traceID.IsValid() {
+ ctx = context.WithValue(ctx, traceKey{}, traceValue{traceID.String(), s.span.SpanContext().IsSampled()})
+ }
+ }
+ return ctx
+}
diff --git a/pkg/infra/tracing/test_helper.go b/pkg/infra/tracing/test_helper.go
index c8e4a646409..19894f2adce 100644
--- a/pkg/infra/tracing/test_helper.go
+++ b/pkg/infra/tracing/test_helper.go
@@ -92,6 +92,10 @@ func (t *FakeSpan) AddEvents(keys []string, values []EventValue) {
}
}
+func (t *FakeSpan) contextWithSpan(ctx context.Context) context.Context {
+ return ctx
+}
+
type FakeTracer struct {
Spans []*FakeSpan
}
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
index 7463931847e..145f540b1a4 100644
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -76,6 +76,10 @@ type Span interface {
//
// Panics if the length of keys is shorter than the length of values.
AddEvents(keys []string, values []EventValue)
+
+ // contextWithSpan returns a context.Context that holds the parent
+ // context plus a reference to this span.
+ contextWithSpan(ctx context.Context) context.Context
}
func ProvideService(cfg *setting.Cfg) (Tracer, error) {
@@ -146,6 +150,29 @@ func TraceIDFromContext(c context.Context, requireSampled bool) string {
return ""
}
+// SpanFromContext returns the Span previously associated with ctx, or nil, if no such span could be found.
+// It is the equivalent of opentracing.SpanFromContext and trace.SpanFromContext.
+func SpanFromContext(ctx context.Context) Span {
+ // Look for both opentracing and opentelemetry spans.
+ if span := opentracing.SpanFromContext(ctx); span != nil {
+ return OpentracingSpan{span: span}
+ }
+ if span := trace.SpanFromContext(ctx); span != nil {
+ return OpentelemetrySpan{span: span}
+ }
+ return nil
+}
+
+// ContextWithSpan returns a new context.Context that holds a reference to the given span.
+// If span is nil, a new context without an active span is returned.
+// It is the equivalent of opentracing.ContextWithSpan and trace.ContextWithSpan.
+func ContextWithSpan(ctx context.Context, span Span) context.Context {
+ if span != nil {
+ return span.contextWithSpan(ctx)
+ }
+ return ctx
+}
+
type Opentracing struct {
enabled bool
address string
@@ -324,6 +351,18 @@ func (s OpentracingSpan) AddEvents(keys []string, values []EventValue) {
s.span.LogFields(fields...)
}
+func (s OpentracingSpan) contextWithSpan(ctx context.Context) context.Context {
+ if s.span != nil {
+ ctx = opentracing.ContextWithSpan(ctx, s.span)
+ // Grafana also manages its own separate traceID in the context in addition to what opentracing handles.
+ // It's derived from the span. Ensure that we propagate this too.
+ if sctx, ok := s.span.Context().(jaeger.SpanContext); ok {
+ ctx = context.WithValue(ctx, traceKey{}, traceValue{sctx.TraceID().String(), sctx.IsSampled()})
+ }
+ }
+ return ctx
+}
+
func splitTagSettings(input string) map[string]string {
res := map[string]string{}
diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go
index 3eb9e76490e..637d0b6f765 100644
--- a/pkg/login/social/generic_oauth.go
+++ b/pkg/login/social/generic_oauth.go
@@ -76,6 +76,7 @@ func (s *SocialGenericOAuth) IsOrganizationMember(client *http.Client) bool {
}
type UserInfoJson struct {
+ Sub string `json:"sub"`
Name string `json:"name"`
DisplayName string `json:"display_name"`
Login string `json:"login"`
@@ -108,31 +109,16 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token)
for _, data := range toCheck {
s.log.Debug("Processing external user info", "source", data.source, "data", data)
+ if userInfo.Id == "" {
+ userInfo.Id = data.Sub
+ }
+
if userInfo.Name == "" {
userInfo.Name = s.extractUserName(data)
}
if userInfo.Login == "" {
- if data.Login != "" {
- s.log.Debug("Setting user info login from login field", "login", data.Login)
- userInfo.Login = data.Login
- } else {
- if s.loginAttributePath != "" {
- s.log.Debug("Searching for login among JSON", "loginAttributePath", s.loginAttributePath)
- login, err := s.searchJSONForStringAttr(s.loginAttributePath, data.rawJSON)
- if err != nil {
- s.log.Error("Failed to search JSON for login attribute", "error", err)
- } else if login != "" {
- userInfo.Login = login
- s.log.Debug("Setting user info login from login field", "login", login)
- }
- }
-
- if userInfo.Login == "" && data.Username != "" {
- s.log.Debug("Setting user info login from username field", "username", data.Username)
- userInfo.Login = data.Username
- }
- }
+ userInfo.Login = s.extractLogin(data)
}
if userInfo.Email == "" {
@@ -338,6 +324,32 @@ func (s *SocialGenericOAuth) extractEmail(data *UserInfoJson) string {
return ""
}
+func (s *SocialGenericOAuth) extractLogin(data *UserInfoJson) string {
+ if data.Login != "" {
+ s.log.Debug("Setting user info login from login field", "login", data.Login)
+ return data.Login
+ }
+
+ if s.loginAttributePath != "" {
+ s.log.Debug("Searching for login among JSON", "loginAttributePath", s.loginAttributePath)
+ login, err := s.searchJSONForStringAttr(s.loginAttributePath, data.rawJSON)
+ if err != nil {
+ s.log.Error("Failed to search JSON for login attribute", "error", err)
+ }
+
+ if login != "" {
+ return login
+ }
+ }
+
+ if data.Username != "" {
+ s.log.Debug("Setting user info login from username field", "username", data.Username)
+ return data.Username
+ }
+
+ return ""
+}
+
func (s *SocialGenericOAuth) extractUserName(data *UserInfoJson) string {
if s.nameAttributePath != "" {
name, err := s.searchJSONForStringAttr(s.nameAttributePath, data.rawJSON)
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 4980d7cb2a4..eb4861dbbeb 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -4,6 +4,7 @@ import (
"fmt"
"strings"
+ "github.com/grafana/grafana/pkg/infra/tracing"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/setting"
@@ -29,12 +30,18 @@ func AddDefaultResponseHeaders(cfg *setting.Cfg) web.Handler {
t := web.NewTree()
t.Add("/api/datasources/uid/:uid/resources/*", nil)
t.Add("/api/datasources/:id/resources/*", nil)
+
return func(c *web.Context) {
c.Resp.Before(func(w web.ResponseWriter) { // if response has already been written, skip.
if w.Written() {
return
}
+ traceId := tracing.TraceIDFromContext(c.Req.Context(), false)
+ if traceId != "" {
+ w.Header().Set("grafana-trace-id", traceId)
+ }
+
_, _, resourceURLMatch := t.Match(c.Req.URL.Path)
resourceCachable := resourceURLMatch && allowCacheControl(c.Resp)
if !strings.HasPrefix(c.Req.URL.Path, "/public/plugins/") &&
diff --git a/pkg/plugins/config/config.go b/pkg/plugins/config/config.go
index e2797f79e93..c1509453d47 100644
--- a/pkg/plugins/config/config.go
+++ b/pkg/plugins/config/config.go
@@ -1,9 +1,6 @@
package config
import (
- "fmt"
- "strings"
-
"github.com/grafana/grafana-azure-sdk-go/azsettings"
"github.com/grafana/grafana/pkg/plugins/log"
@@ -33,63 +30,24 @@ type Cfg struct {
PluginsCDNURLTemplate string
- Opentelemetry OpentelemetryCfg
+ Tracing Tracing
}
-func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*Cfg, error) {
- return NewCfg(settingProvider, grafanaCfg)
-}
-
-func NewCfg(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*Cfg, error) {
- logger := log.New("plugin.cfg")
-
- aws := settingProvider.Section("aws")
- plugins := settingProvider.Section("plugins")
-
- allowedUnsigned := grafanaCfg.PluginsAllowUnsigned
- if len(plugins.KeyValue("allow_loading_unsigned_plugins").Value()) > 0 {
- allowedUnsigned = strings.Split(plugins.KeyValue("allow_loading_unsigned_plugins").Value(), ",")
- }
-
- allowedAuth := grafanaCfg.AWSAllowedAuthProviders
- if len(aws.KeyValue("allowed_auth_providers").Value()) > 0 {
- allowedUnsigned = strings.Split(settingProvider.KeyValue("plugins", "allow_loading_unsigned_plugins").Value(), ",")
- }
-
- otelCfg, err := NewOpentelemetryCfg(grafanaCfg)
- if err != nil {
- return nil, fmt.Errorf("new opentelemetry cfg: %w", err)
- }
+func NewCfg(devMode bool, pluginsPath string, pluginSettings setting.PluginSettings, pluginsAllowUnsigned []string,
+ awsAllowedAuthProviders []string, awsAssumeRoleEnabled bool, azure *azsettings.AzureSettings, grafanaVersion string,
+ logDatasourceRequests bool, pluginsCDNURLTemplate string, tracing Tracing) *Cfg {
return &Cfg{
- log: logger,
- PluginsPath: grafanaCfg.PluginsPath,
- BuildVersion: grafanaCfg.BuildVersion,
- DevMode: settingProvider.KeyValue("", "app_mode").MustBool(grafanaCfg.Env == setting.Dev),
- PluginSettings: extractPluginSettings(settingProvider),
- PluginsAllowUnsigned: allowedUnsigned,
- AWSAllowedAuthProviders: allowedAuth,
- AWSAssumeRoleEnabled: aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled),
- Azure: grafanaCfg.Azure,
- LogDatasourceRequests: grafanaCfg.PluginLogBackendRequests,
- PluginsCDNURLTemplate: grafanaCfg.PluginsCDNURLTemplate,
- Opentelemetry: otelCfg,
- }, nil
-}
-
-func extractPluginSettings(settingProvider setting.Provider) setting.PluginSettings {
- ps := setting.PluginSettings{}
- for sectionName, sectionCopy := range settingProvider.Current() {
- if !strings.HasPrefix(sectionName, "plugin.") {
- continue
- }
- // Calling Current() returns a redacted version of section. We need to replace the map values with the unredacted values.
- section := settingProvider.Section(sectionName)
- for k := range sectionCopy {
- sectionCopy[k] = section.KeyValue(k).MustString("")
- }
- pluginID := strings.Replace(sectionName, "plugin.", "", 1)
- ps[pluginID] = sectionCopy
+ log: log.New("plugin.cfg"),
+ PluginsPath: pluginsPath,
+ BuildVersion: grafanaVersion,
+ DevMode: devMode,
+ PluginSettings: pluginSettings,
+ PluginsAllowUnsigned: pluginsAllowUnsigned,
+ AWSAllowedAuthProviders: awsAllowedAuthProviders,
+ AWSAssumeRoleEnabled: awsAssumeRoleEnabled,
+ Azure: azure,
+ LogDatasourceRequests: logDatasourceRequests,
+ PluginsCDNURLTemplate: pluginsCDNURLTemplate,
+ Tracing: tracing,
}
-
- return ps
}
diff --git a/pkg/plugins/config/tracing.go b/pkg/plugins/config/tracing.go
index 704ff0b6927..8ea7615d332 100644
--- a/pkg/plugins/config/tracing.go
+++ b/pkg/plugins/config/tracing.go
@@ -1,38 +1,17 @@
package config
-import (
- "fmt"
+type Tracing struct {
+ OpenTelemetry OpenTelemetryCfg
+}
- "github.com/grafana/grafana/pkg/infra/tracing"
- "github.com/grafana/grafana/pkg/setting"
-)
-
-const otlpExporter string = "otlp"
-
-// OpentelemetryCfg contains the Opentelemetry address and propagation config values.
-// This is used to export the Opentelemetry (OTLP) config without exposing the whole *setting.Cfg.
-type OpentelemetryCfg struct {
+// OpenTelemetryCfg contains the OpenTelemetry address and propagation config values.
+// This is used to export the OpenTelemetry (OTLP) config without exposing the whole *setting.Cfg.
+type OpenTelemetryCfg struct {
Address string
Propagation string
}
// IsEnabled returns true if OTLP tracing is enabled (address set)
-func (c OpentelemetryCfg) IsEnabled() bool {
- return c.Address != ""
-}
-
-// NewOpentelemetryCfg creates a new OpentelemetryCfg based on the provided Grafana config.
-// If Opentelemetry (OTLP) is disabled, a zero-value OpentelemetryCfg is returned.
-func NewOpentelemetryCfg(grafanaCfg *setting.Cfg) (OpentelemetryCfg, error) {
- ots, err := tracing.ParseSettingsOpentelemetry(grafanaCfg)
- if err != nil {
- return OpentelemetryCfg{}, fmt.Errorf("parse settings: %w", err)
- }
- if ots.Enabled != otlpExporter {
- return OpentelemetryCfg{}, nil
- }
- return OpentelemetryCfg{
- Address: ots.Address,
- Propagation: ots.Propagation,
- }, nil
+func (t Tracing) IsEnabled() bool {
+ return t.OpenTelemetry.Address != ""
}
diff --git a/pkg/plugins/manager/loader/initializer/initializer.go b/pkg/plugins/manager/loader/initializer/initializer.go
index 1b7c8b7c795..39afb5be578 100644
--- a/pkg/plugins/manager/loader/initializer/initializer.go
+++ b/pkg/plugins/manager/loader/initializer/initializer.go
@@ -70,14 +70,14 @@ func (i *Initializer) envVars(plugin *plugins.Plugin) []string {
if v, exists := i.cfg.PluginSettings[plugin.ID]["tracing"]; exists {
pluginTracingEnabled = v == "true"
}
- if i.cfg.Opentelemetry.IsEnabled() && pluginTracingEnabled {
+ if i.cfg.Tracing.IsEnabled() && pluginTracingEnabled {
if plugin.Info.Version != "" {
hostEnv = append(hostEnv, fmt.Sprintf("GF_PLUGIN_VERSION=%s", plugin.Info.Version))
}
hostEnv = append(
hostEnv,
- fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Opentelemetry.Address),
- fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Opentelemetry.Propagation),
+ fmt.Sprintf("GF_INSTANCE_OTLP_ADDRESS=%s", i.cfg.Tracing.OpenTelemetry.Address),
+ fmt.Sprintf("GF_INSTANCE_OTLP_PROPAGATION=%s", i.cfg.Tracing.OpenTelemetry.Propagation),
)
}
diff --git a/pkg/plugins/manager/loader/initializer/initializer_test.go b/pkg/plugins/manager/loader/initializer/initializer_test.go
index d9d7a49692a..010998da890 100644
--- a/pkg/plugins/manager/loader/initializer/initializer_test.go
+++ b/pkg/plugins/manager/loader/initializer/initializer_test.go
@@ -185,7 +185,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
JSONData: plugins.JSONData{ID: pluginID},
}
- defaultOtelCfg := config.OpentelemetryCfg{
+ defaultOTelCfg := config.OpenTelemetryCfg{
Address: "127.0.0.1:4317",
Propagation: "",
}
@@ -250,7 +250,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otel not configured",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{},
+ Tracing: config.Tracing{},
},
plugin: defaultPlugin,
exp: expNoTracing,
@@ -258,7 +258,7 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otel not configured but plugin-tracing enabled",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{},
+ Tracing: config.Tracing{},
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -267,7 +267,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp no propagation plugin enabled",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
PluginSettings: map[string]map[string]string{
pluginID: {"tracing": "true"},
},
@@ -278,7 +280,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp no propagation disabled by default",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
},
plugin: defaultPlugin,
exp: expNoTracing,
@@ -286,9 +290,11 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "otlp propagation plugin enabled",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{
- Address: "127.0.0.1:4317",
- Propagation: "w3c",
+ Tracing: config.Tracing{
+ OpenTelemetry: config.OpenTelemetryCfg{
+ Address: "127.0.0.1:4317",
+ Propagation: "w3c",
+ },
},
PluginSettings: map[string]map[string]string{
pluginID: {"tracing": "true"},
@@ -304,12 +310,37 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c", envVars[4])
},
},
+ {
+ name: "otlp enabled composite propagation",
+ cfg: &config.Cfg{
+ Tracing: config.Tracing{
+ OpenTelemetry: config.OpenTelemetryCfg{
+ Address: "127.0.0.1:4317",
+ Propagation: "w3c,jaeger",
+ },
+ },
+ PluginSettings: map[string]map[string]string{
+ pluginID: {"tracing": "true"},
+ },
+ },
+ plugin: defaultPlugin,
+ exp: func(t *testing.T, envVars []string) {
+ assert.Len(t, envVars, 5)
+ assert.Equal(t, "GF_PLUGIN_TRACING=true", envVars[0])
+ assert.Equal(t, "GF_VERSION=", envVars[1])
+ assert.Equal(t, "GF_PLUGIN_VERSION=1.0.0", envVars[2])
+ assert.Equal(t, "GF_INSTANCE_OTLP_ADDRESS=127.0.0.1:4317", envVars[3])
+ assert.Equal(t, "GF_INSTANCE_OTLP_PROPAGATION=w3c,jaeger", envVars[4])
+ },
+ },
{
name: "otlp no propagation disabled by default",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{
- Address: "127.0.0.1:4317",
- Propagation: "w3c",
+ Tracing: config.Tracing{
+ OpenTelemetry: config.OpenTelemetryCfg{
+ Address: "127.0.0.1:4317",
+ Propagation: "w3c",
+ },
},
},
plugin: defaultPlugin,
@@ -318,7 +349,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "disabled on plugin",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
PluginSettings: setting.PluginSettings{
pluginID: map[string]string{"tracing": "false"},
},
@@ -329,7 +362,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "disabled on plugin with other plugin settings",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
PluginSettings: map[string]map[string]string{
pluginID: {"some_other_option": "true"},
},
@@ -340,7 +375,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "enabled on plugin with other plugin settings",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
PluginSettings: map[string]map[string]string{
pluginID: {"some_other_option": "true", "tracing": "true"},
},
@@ -351,7 +388,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is not present if tracing is disabled",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{}, // no OTEL config
+ Tracing: config.Tracing{
+ OpenTelemetry: config.OpenTelemetryCfg{},
+ },
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -360,7 +399,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is present if tracing is enabled and plugin has version",
cfg: &config.Cfg{
- Opentelemetry: defaultOtelCfg,
+ Tracing: config.Tracing{
+ OpenTelemetry: defaultOTelCfg,
+ },
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: defaultPlugin,
@@ -369,7 +410,9 @@ func TestInitializer_tracingEnvironmentVariables(t *testing.T) {
{
name: "GF_PLUGIN_VERSION is not present if tracing is enabled but plugin doesn't have a version",
cfg: &config.Cfg{
- Opentelemetry: config.OpentelemetryCfg{},
+ Tracing: config.Tracing{
+ OpenTelemetry: config.OpenTelemetryCfg{},
+ },
PluginSettings: map[string]map[string]string{pluginID: {"tracing": "true"}},
},
plugin: pluginWithoutVersion,
diff --git a/pkg/plugins/manager/loader/loader.go b/pkg/plugins/manager/loader/loader.go
index adfa11d1742..2349b4d255e 100644
--- a/pkg/plugins/manager/loader/loader.go
+++ b/pkg/plugins/manager/loader/loader.go
@@ -18,7 +18,6 @@ import (
"github.com/grafana/grafana/pkg/plugins/manager/process"
"github.com/grafana/grafana/pkg/plugins/manager/registry"
"github.com/grafana/grafana/pkg/plugins/manager/signature"
- "github.com/grafana/grafana/pkg/plugins/pluginscdn"
"github.com/grafana/grafana/pkg/plugins/storage"
"github.com/grafana/grafana/pkg/util"
)
@@ -33,7 +32,6 @@ type Loader struct {
pluginInitializer initializer.Initializer
signatureValidator signature.Validator
pluginStorage storage.Manager
- pluginsCDN *pluginscdn.Service
assetPath *assetpath.Service
log log.Logger
cfg *config.Cfg
@@ -43,16 +41,16 @@ type Loader struct {
func ProvideService(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider, pluginFinder finder.Finder,
- roleRegistry plugins.RoleRegistry, pluginsCDNService *pluginscdn.Service, assetPath *assetpath.Service) *Loader {
+ roleRegistry plugins.RoleRegistry, assetPath *assetpath.Service) *Loader {
return New(cfg, license, authorizer, pluginRegistry, backendProvider, process.NewManager(pluginRegistry),
- storage.FileSystem(log.NewPrettyLogger("loader.fs"), cfg.PluginsPath), roleRegistry, pluginsCDNService,
- assetPath, pluginFinder)
+ storage.FileSystem(log.NewPrettyLogger("loader.fs"), cfg.PluginsPath), roleRegistry, assetPath,
+ pluginFinder)
}
func New(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLoaderAuthorizer,
pluginRegistry registry.Service, backendProvider plugins.BackendFactoryProvider,
processManager process.Service, pluginStorage storage.Manager, roleRegistry plugins.RoleRegistry,
- pluginsCDNService *pluginscdn.Service, assetPath *assetpath.Service, pluginFinder finder.Finder) *Loader {
+ assetPath *assetpath.Service, pluginFinder finder.Finder) *Loader {
return &Loader{
pluginFinder: pluginFinder,
pluginRegistry: pluginRegistry,
@@ -64,7 +62,6 @@ func New(cfg *config.Cfg, license plugins.Licensing, authorizer plugins.PluginLo
log: log.New("plugin.loader"),
roleRegistry: roleRegistry,
cfg: cfg,
- pluginsCDN: pluginsCDNService,
assetPath: assetPath,
}
}
@@ -86,20 +83,12 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
continue
}
- var sig plugins.Signature
- if l.pluginsCDN.PluginSupported(p.Primary.JSONData.ID) {
- // CDN plugins have no signature checks for now.
- sig = plugins.Signature{Status: plugins.SignatureValid}
- } else {
- var err error
- sig, err = signature.Calculate(ctx, l.log, src, p.Primary)
- if err != nil {
- l.log.Warn("Could not calculate plugin signature state", "pluginID", p.Primary.JSONData.ID, "err", err)
- continue
- }
+ sig, err := signature.Calculate(ctx, l.log, src, p.Primary)
+ if err != nil {
+ l.log.Warn("Could not calculate plugin signature state", "pluginID", p.Primary.JSONData.ID, "err", err)
+ continue
}
- class := src.PluginClass(ctx)
- plugin, err := l.createPluginBase(p.Primary.JSONData, class, p.Primary.FS)
+ plugin, err := l.createPluginBase(p.Primary.JSONData, src.PluginClass(ctx), p.Primary.FS)
if err != nil {
l.log.Error("Could not create primary plugin base", "pluginID", p.Primary.JSONData.ID, "err", err)
continue
@@ -117,7 +106,7 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
continue
}
- cp, err := l.createPluginBase(c.JSONData, class, c.FS)
+ cp, err := l.createPluginBase(c.JSONData, plugin.Class, c.FS)
if err != nil {
l.log.Error("Could not create child plugin base", "pluginID", p.Primary.JSONData.ID, "err", err)
continue
@@ -154,7 +143,7 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
if !plugin.IsRenderer() && !plugin.IsCorePlugin() {
_, err := plugin.FS.Open("module.js")
if err != nil {
- if errors.Is(err, plugins.ErrFileNotExist) && !l.pluginsCDN.PluginSupported(plugin.ID) {
+ if errors.Is(err, plugins.ErrFileNotExist) {
l.log.Warn("Plugin missing module.js", "pluginID", plugin.ID,
"warning", "Missing module.js, If you loaded this plugin from git, make sure to compile it.")
}
@@ -177,8 +166,6 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
if err != nil {
return nil, err
}
- metrics.SetPluginBuildInformation(p.ID, string(p.Type), p.Info.Version, string(p.Signature))
-
if errDeclareRoles := l.roleRegistry.DeclarePluginRoles(ctx, p.ID, p.Name, p.Roles); errDeclareRoles != nil {
l.log.Warn("Declare plugin roles failed.", "pluginID", p.ID, "err", errDeclareRoles)
}
@@ -188,6 +175,10 @@ func (l *Loader) loadPlugins(ctx context.Context, src plugins.PluginSource, foun
if err := l.load(ctx, p); err != nil {
l.log.Error("Could not start plugin", "pluginId", p.ID, "err", err)
}
+
+ if !p.IsCorePlugin() && !p.IsBundledPlugin() {
+ metrics.SetPluginBuildInformation(p.ID, string(p.Type), p.Info.Version, string(p.Signature))
+ }
}
return verifiedPlugins, nil
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index 9fbaf13f295..81e09f76813 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -447,63 +447,6 @@ func TestLoader_Load(t *testing.T) {
},
},
},
- {
- name: "Load CDN plugin",
- class: plugins.External,
- cfg: &config.Cfg{
- PluginsCDNURLTemplate: "https://cdn.example.com",
- PluginSettings: setting.PluginSettings{
- "grafana-worldmap-panel": {"cdn": "true"},
- },
- },
- pluginPaths: []string{"../testdata/cdn"},
- want: []*plugins.Plugin{
- {
- JSONData: plugins.JSONData{
- ID: "grafana-worldmap-panel",
- Type: "panel",
- Name: "Worldmap Panel",
- Info: plugins.Info{
- Version: "0.3.3",
- Links: []plugins.InfoLink{
- {Name: "Project site", URL: "https://github.com/grafana/worldmap-panel"},
- {Name: "MIT License", URL: "https://github.com/grafana/worldmap-panel/blob/master/LICENSE"},
- },
- Logos: plugins.Logos{
- // Path substitution
- Small: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap_logo.svg",
- Large: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap_logo.svg",
- },
- Screenshots: []plugins.Screenshots{
- {
- Name: "World",
- Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-world.png",
- },
- {
- Name: "USA",
- Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-usa.png",
- },
- {
- Name: "Light Theme",
- Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-light-theme.png",
- },
- },
- },
- Dependencies: plugins.Dependencies{
- GrafanaVersion: "3.x.x",
- Plugins: []plugins.Dependency{},
- },
- },
- FS: plugins.NewLocalFS(map[string]struct{}{
- filepath.Join(parentDir, "testdata/cdn/plugin", "plugin.json"): {},
- }, filepath.Join(parentDir, "testdata/cdn/plugin")),
- Class: plugins.External,
- Signature: plugins.SignatureValid,
- BaseURL: "plugin-cdn/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel",
- Module: "plugin-cdn/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/module",
- },
- },
- },
}
for _, tt := range tests {
reg := fakes.NewFakePluginRegistry()
@@ -535,6 +478,89 @@ func TestLoader_Load(t *testing.T) {
}
}
+func TestLoader_Load_CustomSource(t *testing.T) {
+ t.Run("Load a plugin", func(t *testing.T) {
+ parentDir, err := filepath.Abs("../")
+ if err != nil {
+ t.Errorf("could not construct absolute path of current dir")
+ return
+ }
+
+ cfg := &config.Cfg{
+ PluginsCDNURLTemplate: "https://cdn.example.com",
+ PluginSettings: setting.PluginSettings{
+ "grafana-worldmap-panel": {"cdn": "true"},
+ },
+ }
+
+ pluginPaths := []string{"../testdata/cdn"}
+ expected := []*plugins.Plugin{{
+ JSONData: plugins.JSONData{
+ ID: "grafana-worldmap-panel",
+ Type: "panel",
+ Name: "Worldmap Panel",
+ Info: plugins.Info{
+ Version: "0.3.3",
+ Links: []plugins.InfoLink{
+ {Name: "Project site", URL: "https://github.com/grafana/worldmap-panel"},
+ {Name: "MIT License", URL: "https://github.com/grafana/worldmap-panel/blob/master/LICENSE"},
+ },
+ Logos: plugins.Logos{
+ // Path substitution
+ Small: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap_logo.svg",
+ Large: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap_logo.svg",
+ },
+ Screenshots: []plugins.Screenshots{
+ {
+ Name: "World",
+ Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-world.png",
+ },
+ {
+ Name: "USA",
+ Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-usa.png",
+ },
+ {
+ Name: "Light Theme",
+ Path: "https://cdn.example.com/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/images/worldmap-light-theme.png",
+ },
+ },
+ },
+ Dependencies: plugins.Dependencies{
+ GrafanaVersion: "3.x.x",
+ Plugins: []plugins.Dependency{},
+ },
+ },
+ FS: plugins.NewLocalFS(map[string]struct{}{
+ filepath.Join(parentDir, "testdata/cdn/plugin", "plugin.json"): {},
+ }, filepath.Join(parentDir, "testdata/cdn/plugin")),
+ Class: plugins.Bundled,
+ Signature: plugins.SignatureValid,
+ BaseURL: "plugin-cdn/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel",
+ Module: "plugin-cdn/grafana-worldmap-panel/0.3.3/public/plugins/grafana-worldmap-panel/module",
+ }}
+
+ l := newLoader(cfg)
+ got, err := l.Load(context.Background(), &fakes.FakePluginSource{
+ PluginClassFunc: func(ctx context.Context) plugins.Class {
+ return plugins.Bundled
+ },
+ PluginURIsFunc: func(ctx context.Context) []string {
+ return pluginPaths
+ },
+ DefaultSignatureFunc: func(ctx context.Context) (plugins.Signature, bool) {
+ return plugins.Signature{
+ Status: plugins.SignatureValid,
+ }, true
+ },
+ })
+
+ require.NoError(t, err)
+ if !cmp.Equal(got, expected, compareOpts...) {
+ t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, expected, compareOpts...))
+ }
+ })
+}
+
func TestLoader_setDefaultNavURL(t *testing.T) {
t.Run("When including a dashboard with DefaultNav: true", func(t *testing.T) {
pluginWithDashboard := &plugins.Plugin{
@@ -1304,10 +1330,9 @@ func Test_setPathsBasedOnApp(t *testing.T) {
}
func newLoader(cfg *config.Cfg, cbs ...func(loader *Loader)) *Loader {
- cdn := pluginscdn.ProvideService(cfg)
l := New(cfg, &fakes.FakeLicensingService{}, signature.NewUnsignedAuthorizer(cfg), fakes.NewFakePluginRegistry(),
fakes.NewFakeBackendProcessProvider(), fakes.NewFakeProcessManager(), fakes.NewFakePluginStorage(),
- fakes.NewFakeRoleRegistry(), cdn, assetpath.ProvideService(cdn), finder.NewLocalFinder())
+ fakes.NewFakeRoleRegistry(), assetpath.ProvideService(pluginscdn.ProvideService(cfg)), finder.NewLocalFinder())
for _, cb := range cbs {
cb(l)
diff --git a/pkg/plugins/manager/manager_integration_test.go b/pkg/plugins/manager/manager_integration_test.go
index 2e8c9c56cec..56899d80ec4 100644
--- a/pkg/plugins/manager/manager_integration_test.go
+++ b/pkg/plugins/manager/manager_integration_test.go
@@ -18,7 +18,6 @@ import (
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
- "github.com/grafana/grafana/pkg/plugins/config"
"github.com/grafana/grafana/pkg/plugins/manager/client"
"github.com/grafana/grafana/pkg/plugins/manager/fakes"
"github.com/grafana/grafana/pkg/plugins/manager/loader"
@@ -31,6 +30,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/pluginscdn"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/licensing"
+ "github.com/grafana/grafana/pkg/services/pluginsintegration/config"
plicensing "github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
"github.com/grafana/grafana/pkg/services/searchV2"
"github.com/grafana/grafana/pkg/setting"
@@ -114,12 +114,10 @@ func TestIntegrationPluginManager(t *testing.T) {
pCfg, err := config.ProvideConfig(setting.ProvideProvider(cfg), cfg)
require.NoError(t, err)
reg := registry.ProvideService()
- cdn := pluginscdn.ProvideService(pCfg)
-
lic := plicensing.ProvideLicensing(cfg, &licensing.OSSLicensingService{Cfg: cfg})
l := loader.ProvideService(pCfg, lic, signature.NewUnsignedAuthorizer(pCfg),
reg, provider.ProvideService(coreRegistry), finder.NewLocalFinder(), fakes.NewFakeRoleRegistry(),
- cdn, assetpath.ProvideService(cdn))
+ assetpath.ProvideService(pluginscdn.ProvideService(pCfg)))
srcs := sources.ProvideService(cfg, pCfg)
ps, err := store.ProvideService(reg, srcs, l)
require.NoError(t, err)
@@ -191,6 +189,7 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *store.Serv
"table-old": {},
"text": {},
"timeseries": {},
+ "trend": {},
"welcome": {},
"xychart": {},
}
diff --git a/pkg/plugins/pfs/corelist/corelist_load_gen.go b/pkg/plugins/pfs/corelist/corelist_load_gen.go
index e9f631cec22..6215b3177b1 100644
--- a/pkg/plugins/pfs/corelist/corelist_load_gen.go
+++ b/pkg/plugins/pfs/corelist/corelist_load_gen.go
@@ -79,6 +79,7 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin {
parsePluginOrPanic("public/app/plugins/panel/text", "text", rt),
parsePluginOrPanic("public/app/plugins/panel/timeseries", "timeseries", rt),
parsePluginOrPanic("public/app/plugins/panel/traces", "traces", rt),
+ parsePluginOrPanic("public/app/plugins/panel/trend", "trend", rt),
parsePluginOrPanic("public/app/plugins/panel/welcome", "welcome", rt),
parsePluginOrPanic("public/app/plugins/panel/xychart", "xychart", rt),
}
diff --git a/pkg/plugins/plugindef/plugindef.cue b/pkg/plugins/plugindef/plugindef.cue
index 69c53b9a1c2..75f75f5d94d 100644
--- a/pkg/plugins/plugindef/plugindef.cue
+++ b/pkg/plugins/plugindef/plugindef.cue
@@ -17,7 +17,7 @@ seqs: [
// grafana.com, then the plugin `id` has to follow the naming
// conventions.
id: string & strings.MinRunes(1)
- id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
+ id: =~"^([0-9a-z]+\\-([0-9a-z]+\\-)?(\(strings.Join([ for t in _types {t}], "|"))))|(alertGroups|alertlist|annolist|barchart|bargauge|candlestick|canvas|dashlist|debug|gauge|geomap|gettingstarted|graph|heatmap|histogram|icon|live|logs|news|nodeGraph|piechart|pluginlist|stat|state-timeline|status-history|table|table-old|text|timeseries|trend|traces|welcome|xychart|alertmanager|cloudwatch|dashboard|elasticsearch|grafana|grafana-azure-monitor-datasource|graphite|influxdb|jaeger|loki|mixed|mssql|mysql|opentsdb|postgres|prometheus|stackdriver|tempo|testdata|zipkin|phlare|parca)$"
// Human-readable name of the plugin that is shown to the user in
// the UI.
diff --git a/pkg/services/alerting/conditions/query_interval_test.go b/pkg/services/alerting/conditions/query_interval_test.go
index 289a769ebde..443b0f74d83 100644
--- a/pkg/services/alerting/conditions/query_interval_test.go
+++ b/pkg/services/alerting/conditions/query_interval_test.go
@@ -12,6 +12,7 @@ import (
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/datasources"
fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/validations"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/intervalv2"
@@ -141,7 +142,7 @@ func (rh fakeIntervalTestReqHandler) HandleRequest(ctx context.Context, dsInfo *
func applyScenario(t *testing.T, timeRange string, dataSourceJsonData *simplejson.Json, queryModel string, verifier func(query legacydata.DataSubQuery)) {
t.Run("desc", func(t *testing.T) {
db := dbtest.NewFakeDB()
- store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil)
+ store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil, featuremgmt.WithFeatures())
ctx := &queryIntervalTestContext{}
ctx.result = &alerting.EvalContext{
diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go
index d3dcea599d6..11e98da1aca 100644
--- a/pkg/services/alerting/conditions/query_test.go
+++ b/pkg/services/alerting/conditions/query_test.go
@@ -18,6 +18,7 @@ import (
"github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/services/datasources"
fd "github.com/grafana/grafana/pkg/services/datasources/fakes"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/validations"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/legacydata"
@@ -38,7 +39,7 @@ func TestQueryCondition(t *testing.T) {
setup := func() *queryConditionTestContext {
ctx := &queryConditionTestContext{}
db := dbtest.NewFakeDB()
- store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil)
+ store := alerting.ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil, featuremgmt.WithFeatures())
ctx.reducer = `{"type":"avg"}`
ctx.evaluator = `{"type":"gt","params":[100]}`
ctx.result = &alerting.EvalContext{
diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go
index 9e2db68b0bc..fa15c9190c3 100644
--- a/pkg/services/alerting/extractor_test.go
+++ b/pkg/services/alerting/extractor_test.go
@@ -17,6 +17,7 @@ import (
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/datasources/permissions"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting"
)
@@ -42,7 +43,8 @@ func TestAlertRuleExtraction(t *testing.T) {
dsService := &fakeDatasourceService{ExpectedDatasource: defaultDs}
db := dbtest.NewFakeDB()
- store := ProvideAlertStore(db, localcache.ProvideService(), &setting.Cfg{}, nil)
+ cfg := &setting.Cfg{}
+ store := ProvideAlertStore(db, localcache.ProvideService(), cfg, nil, featuremgmt.WithFeatures())
extractor := ProvideDashAlertExtractorService(dsPermissions, dsService, store)
t.Run("Parsing alert rules from dashboard json", func(t *testing.T) {
diff --git a/pkg/services/alerting/store.go b/pkg/services/alerting/store.go
index 5f764131dfd..26613090fb4 100644
--- a/pkg/services/alerting/store.go
+++ b/pkg/services/alerting/store.go
@@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/infra/log"
alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/tag"
"github.com/grafana/grafana/pkg/setting"
@@ -39,17 +40,19 @@ type sqlStore struct {
log *log.ConcreteLogger
cfg *setting.Cfg
tagService tag.Service
+ features featuremgmt.FeatureToggles
}
func ProvideAlertStore(
db db.DB,
- cacheService *localcache.CacheService, cfg *setting.Cfg, tagService tag.Service) AlertStore {
+ cacheService *localcache.CacheService, cfg *setting.Cfg, tagService tag.Service, features featuremgmt.FeatureToggles) AlertStore {
return &sqlStore{
db: db,
cache: cacheService,
log: log.New("alerting.store"),
cfg: cfg,
tagService: tagService,
+ features: features,
}
}
@@ -107,8 +110,13 @@ func deleteAlertByIdInternal(alertId int64, reason string, sess *db.Session, log
}
func (ss *sqlStore) HandleAlertsQuery(ctx context.Context, query *alertmodels.GetAlertsQuery) (res []*alertmodels.AlertListItemDTO, err error) {
+ recursiveQueriesAreSupported, err := ss.db.RecursiveQueriesAreSupported()
+ if err != nil {
+ return res, err
+ }
+
err = ss.db.WithDbSession(ctx, func(sess *db.Session) error {
- builder := db.NewSqlBuilder(ss.cfg, ss.db.GetDialect())
+ builder := db.NewSqlBuilder(ss.cfg, ss.features, ss.db.GetDialect(), recursiveQueriesAreSupported)
builder.Write(`SELECT
alert.id,
diff --git a/pkg/services/annotations/annotationsimpl/annotations.go b/pkg/services/annotations/annotationsimpl/annotations.go
index fd1bfa4e8f6..9929984db1f 100644
--- a/pkg/services/annotations/annotationsimpl/annotations.go
+++ b/pkg/services/annotations/annotationsimpl/annotations.go
@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/annotations"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/tag"
"github.com/grafana/grafana/pkg/setting"
)
@@ -14,10 +15,11 @@ type RepositoryImpl struct {
store store
}
-func ProvideService(db db.DB, cfg *setting.Cfg, tagService tag.Service) *RepositoryImpl {
+func ProvideService(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles, tagService tag.Service) *RepositoryImpl {
return &RepositoryImpl{
store: &xormRepositoryImpl{
cfg: cfg,
+ features: features,
db: db,
log: log.New("annotations"),
tagService: tagService,
diff --git a/pkg/services/annotations/annotationsimpl/cleanup.go b/pkg/services/annotations/annotationsimpl/cleanup.go
index af275c97314..a3380d9b4df 100644
--- a/pkg/services/annotations/annotationsimpl/cleanup.go
+++ b/pkg/services/annotations/annotationsimpl/cleanup.go
@@ -5,6 +5,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
)
@@ -13,12 +14,13 @@ type CleanupServiceImpl struct {
store store
}
-func ProvideCleanupService(db db.DB, cfg *setting.Cfg) *CleanupServiceImpl {
+func ProvideCleanupService(db db.DB, cfg *setting.Cfg, features featuremgmt.FeatureToggles) *CleanupServiceImpl {
return &CleanupServiceImpl{
store: &xormRepositoryImpl{
- cfg: cfg,
- db: db,
- log: log.New("annotations"),
+ cfg: cfg,
+ features: features,
+ db: db,
+ log: log.New("annotations"),
},
}
}
diff --git a/pkg/services/annotations/annotationsimpl/cleanup_test.go b/pkg/services/annotations/annotationsimpl/cleanup_test.go
index feb11585914..b072224d446 100644
--- a/pkg/services/annotations/annotationsimpl/cleanup_test.go
+++ b/pkg/services/annotations/annotationsimpl/cleanup_test.go
@@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/annotations"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/setting"
)
@@ -91,7 +92,7 @@ func TestAnnotationCleanUp(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
cfg := setting.NewCfg()
cfg.AnnotationCleanupJobBatchSize = 1
- cleaner := ProvideCleanupService(fakeSQL, cfg)
+ cleaner := ProvideCleanupService(fakeSQL, cfg, featuremgmt.WithFeatures())
affectedAnnotations, affectedAnnotationTags, err := cleaner.Run(context.Background(), test.cfg)
require.NoError(t, err)
@@ -146,7 +147,7 @@ func TestOldAnnotationsAreDeletedFirst(t *testing.T) {
// run the clean up task to keep one annotation.
cfg := setting.NewCfg()
cfg.AnnotationCleanupJobBatchSize = 1
- cleaner := &xormRepositoryImpl{cfg: cfg, log: log.New("test-logger"), db: fakeSQL}
+ cleaner := &xormRepositoryImpl{cfg: cfg, log: log.New("test-logger"), db: fakeSQL, features: featuremgmt.WithFeatures()}
_, err = cleaner.CleanAnnotations(context.Background(), setting.AnnotationCleanupSettings{MaxCount: 1}, alertAnnotationType)
require.NoError(t, err)
diff --git a/pkg/services/annotations/annotationsimpl/xorm_store.go b/pkg/services/annotations/annotationsimpl/xorm_store.go
index 7d74fd529f8..a78584f07a2 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store.go
@@ -13,6 +13,7 @@ import (
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
@@ -42,6 +43,7 @@ func validateTimeRange(item *annotations.Item) error {
type xormRepositoryImpl struct {
cfg *setting.Cfg
+ features featuremgmt.FeatureToggles
db db.DB
log log.Logger
maximumTagsLength int64
@@ -299,13 +301,15 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
}
}
+ var acFilter acFilter
if !ac.IsDisabled(r.cfg) {
- acFilter, acArgs, err := getAccessControlFilter(query.SignedInUser)
+ var err error
+ acFilter, err = r.getAccessControlFilter(query.SignedInUser)
if err != nil {
return err
}
- sql.WriteString(fmt.Sprintf(" AND (%s)", acFilter))
- params = append(params, acArgs...)
+ sql.WriteString(fmt.Sprintf(" AND (%s)", acFilter.where))
+ params = append(params, acFilter.whereParams...)
}
if query.Limit == 0 {
@@ -314,6 +318,14 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
// order of ORDER BY arguments match the order of a sql index for performance
sql.WriteString(" ORDER BY a.org_id, a.epoch_end DESC, a.epoch DESC" + r.db.GetDialect().Limit(query.Limit) + " ) dt on dt.id = annotation.id")
+ if acFilter.recQueries != "" {
+ var sb bytes.Buffer
+ sb.WriteString(acFilter.recQueries)
+ sb.WriteString(sql.String())
+ sql = sb
+ params = append(acFilter.recParams, params...)
+ }
+
if err := sess.SQL(sql.String(), params...).Find(&items); err != nil {
items = nil
return err
@@ -325,13 +337,23 @@ func (r *xormRepositoryImpl) Get(ctx context.Context, query *annotations.ItemQue
return items, err
}
-func getAccessControlFilter(user *user.SignedInUser) (string, []interface{}, error) {
+type acFilter struct {
+ where string
+ whereParams []interface{}
+ recQueries string
+ recParams []interface{}
+}
+
+func (r *xormRepositoryImpl) getAccessControlFilter(user *user.SignedInUser) (acFilter, error) {
+ var recQueries string
+ var recQueriesParams []interface{}
+
if user == nil || user.Permissions[user.OrgID] == nil {
- return "", nil, errors.New("missing permissions")
+ return acFilter{}, errors.New("missing permissions")
}
scopes, has := user.Permissions[user.OrgID][ac.ActionAnnotationsRead]
if !has {
- return "", nil, errors.New("missing permissions")
+ return acFilter{}, errors.New("missing permissions")
}
types, hasWildcardScope := ac.ParseScopes(ac.ScopeAnnotationsProvider.GetResourceScopeType(""), scopes)
if hasWildcardScope {
@@ -347,13 +369,27 @@ func getAccessControlFilter(user *user.SignedInUser) (string, []interface{}, err
}
// annotation read permission with scope annotations:type:dashboard allows listing annotations from dashboards which the user can view
if t == annotations.Dashboard.String() {
- dashboardFilter, dashboardParams := permissions.NewAccessControlDashboardPermissionFilter(user, dashboards.PERMISSION_VIEW, searchstore.TypeDashboard).Where()
+ recursiveQueriesAreSupported, err := r.db.RecursiveQueriesAreSupported()
+ if err != nil {
+ return acFilter{}, err
+ }
+
+ filterRBAC := permissions.NewAccessControlDashboardPermissionFilter(user, dashboards.PERMISSION_VIEW, searchstore.TypeDashboard, r.features, recursiveQueriesAreSupported)
+ dashboardFilter, dashboardParams := filterRBAC.Where()
+ recQueries, recQueriesParams = filterRBAC.With()
filter := fmt.Sprintf("a.dashboard_id IN(SELECT id FROM dashboard WHERE %s)", dashboardFilter)
filters = append(filters, filter)
params = dashboardParams
}
}
- return strings.Join(filters, " OR "), params, nil
+
+ f := acFilter{
+ where: strings.Join(filters, " OR "),
+ whereParams: params,
+ recQueries: recQueries,
+ recParams: recQueriesParams,
+ }
+ return f, nil
}
func (r *xormRepositoryImpl) Delete(ctx context.Context, params *annotations.DeleteParams) error {
diff --git a/pkg/services/annotations/annotationsimpl/xorm_store_test.go b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
index 3f949efb763..630e266911e 100644
--- a/pkg/services/annotations/annotationsimpl/xorm_store_test.go
+++ b/pkg/services/annotations/annotationsimpl/xorm_store_test.go
@@ -2,6 +2,7 @@ package annotationsimpl
import (
"context"
+ "errors"
"fmt"
"strings"
"testing"
@@ -10,14 +11,20 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
+ "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/accesscontrol"
+ "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/dashboards"
dashboardstore "github.com/grafana/grafana/pkg/services/dashboards/database"
"github.com/grafana/grafana/pkg/services/featuremgmt"
+ "github.com/grafana/grafana/pkg/services/folder"
+ "github.com/grafana/grafana/pkg/services/folder/folderimpl"
+ "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/quota/quotatest"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/tag/tagimpl"
@@ -495,7 +502,7 @@ func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
sql := db.InitTestDB(t)
var maximumTagsLength int64 = 60
- repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength}
+ repo := xormRepositoryImpl{db: sql, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(sql, sql.Cfg), maximumTagsLength: maximumTagsLength, features: featuremgmt.WithFeatures()}
quotaService := quotatest.New(false, nil)
dashboardStore, err := dashboardstore.ProvideDashboardStore(sql, sql.Cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sql, sql.Cfg), quotaService)
require.NoError(t, err)
@@ -550,7 +557,7 @@ func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
UserID: 1,
OrgID: 1,
}
- role := setupRBACRole(t, repo, user)
+ role := setupRBACRole(t, sql, user)
type testStruct struct {
description string
@@ -611,7 +618,7 @@ func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
user.Permissions = map[int64]map[string][]string{1: tc.permissions}
- setupRBACPermission(t, repo, role, user)
+ setupRBACPermission(t, sql, role, user)
results, err := repo.Get(context.Background(), &annotations.ItemQuery{
OrgID: 1,
@@ -630,10 +637,163 @@ func TestIntegrationAnnotationListingWithRBAC(t *testing.T) {
}
}
-func setupRBACRole(t *testing.T, repo xormRepositoryImpl, user *user.SignedInUser) *accesscontrol.Role {
+func TestIntegrationAnnotationListingWithInheritedRBAC(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
+
+ orgID := int64(1)
+ permissions := []accesscontrol.Permission{
+ {
+ Action: dashboards.ActionFoldersCreate,
+ }, {
+ Action: dashboards.ActionFoldersWrite,
+ Scope: dashboards.ScopeFoldersAll,
+ },
+ }
+ usr := &user.SignedInUser{
+ UserID: 1,
+ OrgID: orgID,
+ Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(permissions)},
+ }
+
+ var role *accesscontrol.Role
+
+ dashboardIDs := make([]int64, 0, folder.MaxNestedFolderDepth+1)
+ annotationsTexts := make([]string, 0, folder.MaxNestedFolderDepth+1)
+
+ setupFolderStructure := func() *sqlstore.SQLStore {
+ db := db.InitTestDB(t)
+
+ // enable nested folders so that the folder table is populated for all the tests
+ features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+
+ origNewGuardian := guardian.New
+ guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
+ t.Cleanup(func() {
+ guardian.New = origNewGuardian
+ })
+
+ // dashboard store commands that should be called.
+ dashStore, err := dashboardstore.ProvideDashboardStore(db, db.Cfg, features, tagimpl.ProvideService(db, db.Cfg), quotatest.New(false, nil))
+ require.NoError(t, err)
+
+ folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), db.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(db), db, features)
+
+ var maximumTagsLength int64 = 60
+ repo := xormRepositoryImpl{db: db, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(db, db.Cfg), maximumTagsLength: maximumTagsLength, features: features}
+
+ parentUID := ""
+ for i := 0; ; i++ {
+ uid := fmt.Sprintf("f%d", i)
+ f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: uid,
+ OrgID: orgID,
+ Title: uid,
+ SignedInUser: usr,
+ ParentUID: parentUID,
+ })
+ if err != nil {
+ if errors.Is(err, folder.ErrMaximumDepthReached) {
+ break
+ }
+
+ t.Log("unexpected error", "error", err)
+ t.Fail()
+ }
+
+ dashInFolder := dashboards.SaveDashboardCommand{
+ UserID: usr.UserID,
+ OrgID: orgID,
+ IsFolder: false,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": fmt.Sprintf("Dashboard under %s", f.UID),
+ }),
+ FolderID: f.ID,
+ FolderUID: f.UID,
+ }
+ dashboard, err := dashStore.SaveDashboard(context.Background(), dashInFolder)
+ require.NoError(t, err)
+
+ dashboardIDs = append(dashboardIDs, dashboard.ID)
+
+ parentUID = f.UID
+
+ annotationTxt := fmt.Sprintf("annotation %d", i)
+ dash1Annotation := &annotations.Item{
+ OrgID: orgID,
+ DashboardID: dashboard.ID,
+ Epoch: 10,
+ Text: annotationTxt,
+ }
+ err = repo.Add(context.Background(), dash1Annotation)
+ require.NoError(t, err)
+
+ annotationsTexts = append(annotationsTexts, annotationTxt)
+ }
+
+ role = setupRBACRole(t, db, usr)
+ return db
+ }
+
+ db := setupFolderStructure()
+
+ testCases := []struct {
+ desc string
+ features featuremgmt.FeatureToggles
+ permissions map[string][]string
+ expectedAnnotationText []string
+ expectedError bool
+ }{
+ {
+ desc: "Should find only annotations from dashboards under folders that user can read",
+ features: featuremgmt.WithFeatures(),
+ permissions: map[string][]string{
+ accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+ dashboards.ActionDashboardsRead: {"folders:uid:f0"},
+ },
+ expectedAnnotationText: annotationsTexts[:1],
+ },
+ {
+ desc: "Should find only annotations from dashboards under inherited folders if nested folder are enabled",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+ permissions: map[string][]string{
+ accesscontrol.ActionAnnotationsRead: {accesscontrol.ScopeAnnotationsTypeDashboard},
+ dashboards.ActionDashboardsRead: {"folders:uid:f0"},
+ },
+ expectedAnnotationText: annotationsTexts[:],
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.desc, func(t *testing.T) {
+ var maximumTagsLength int64 = 60
+ repo := xormRepositoryImpl{db: db, cfg: setting.NewCfg(), log: log.New("annotation.test"), tagService: tagimpl.ProvideService(db, db.Cfg), maximumTagsLength: maximumTagsLength, features: tc.features}
+
+ usr.Permissions = map[int64]map[string][]string{1: tc.permissions}
+ setupRBACPermission(t, db, role, usr)
+
+ results, err := repo.Get(context.Background(), &annotations.ItemQuery{
+ OrgID: 1,
+ SignedInUser: usr,
+ })
+ if tc.expectedError {
+ require.Error(t, err)
+ return
+ }
+ require.NoError(t, err)
+ require.Len(t, results, len(tc.expectedAnnotationText))
+ for _, r := range results {
+ assert.Contains(t, tc.expectedAnnotationText, r.Text)
+ }
+ })
+ }
+}
+
+func setupRBACRole(t *testing.T, db *sqlstore.SQLStore, user *user.SignedInUser) *accesscontrol.Role {
t.Helper()
var role *accesscontrol.Role
- err := repo.db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
role = &accesscontrol.Role{
OrgID: user.OrgID,
UID: "test_role",
@@ -662,9 +822,9 @@ func setupRBACRole(t *testing.T, repo xormRepositoryImpl, user *user.SignedInUse
return role
}
-func setupRBACPermission(t *testing.T, repo xormRepositoryImpl, role *accesscontrol.Role, user *user.SignedInUser) {
+func setupRBACPermission(t *testing.T, db *sqlstore.SQLStore, role *accesscontrol.Role, user *user.SignedInUser) {
t.Helper()
- err := repo.db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
if _, err := sess.Exec("DELETE FROM permission WHERE role_id = ?", role.ID); err != nil {
return err
}
diff --git a/pkg/services/dashboards/database/acl.go b/pkg/services/dashboards/database/acl.go
index 66408182727..f5b29c069a6 100644
--- a/pkg/services/dashboards/database/acl.go
+++ b/pkg/services/dashboards/database/acl.go
@@ -5,6 +5,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/services/org"
)
@@ -103,8 +104,14 @@ func (d *dashboardStore) HasEditPermissionInFolders(ctx context.Context, query *
queryResult = true
return queryResult, nil
}
- err := d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
- builder := db.NewSqlBuilder(d.cfg, d.store.GetDialect())
+
+ recursiveQueriesAreSupported, err := d.store.RecursiveQueriesAreSupported()
+ if err != nil {
+ return queryResult, err
+ }
+
+ err = d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
+ builder := db.NewSqlBuilder(d.cfg, featuremgmt.WithFeatures(), d.store.GetDialect(), recursiveQueriesAreSupported)
builder.Write("SELECT COUNT(dashboard.id) AS count FROM dashboard WHERE dashboard.org_id = ? AND dashboard.is_folder = ?",
query.SignedInUser.OrgID, d.store.GetDialect().BooleanStr(true))
builder.WriteDashboardPermissionFilter(query.SignedInUser, dashboards.PERMISSION_EDIT)
@@ -131,13 +138,18 @@ func (d *dashboardStore) HasEditPermissionInFolders(ctx context.Context, query *
func (d *dashboardStore) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error) {
var queryResult bool
- err := d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
+ recursiveQueriesAreSupported, err := d.store.RecursiveQueriesAreSupported()
+ if err != nil {
+ return queryResult, err
+ }
+
+ err = d.store.WithDbSession(ctx, func(dbSession *db.Session) error {
if query.SignedInUser.HasRole(org.RoleAdmin) {
queryResult = true
return nil
}
- builder := db.NewSqlBuilder(d.cfg, d.store.GetDialect())
+ builder := db.NewSqlBuilder(d.cfg, featuremgmt.WithFeatures(), d.store.GetDialect(), recursiveQueriesAreSupported)
builder.Write("SELECT COUNT(dashboard.id) AS count FROM dashboard WHERE dashboard.org_id = ?", query.SignedInUser.OrgID)
builder.WriteDashboardPermissionFilter(query.SignedInUser, dashboards.PERMISSION_ADMIN)
diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index a6b5725f68b..979de85fe25 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -934,9 +934,14 @@ func (d *dashboardStore) FindDashboards(ctx context.Context, query *dashboards.F
}
if !ac.IsDisabled(d.cfg) {
+ recursiveQueriesAreSupported, err := d.store.RecursiveQueriesAreSupported()
+ if err != nil {
+ return nil, err
+ }
+
// if access control is enabled, overwrite the filters so far
filters = []interface{}{
- permissions.NewAccessControlDashboardPermissionFilter(query.SignedInUser, query.Permission, query.Type),
+ permissions.NewAccessControlDashboardPermissionFilter(query.SignedInUser, query.Permission, query.Type, d.features, recursiveQueriesAreSupported),
}
}
diff --git a/pkg/services/dashboards/database/database_folder_test.go b/pkg/services/dashboards/database/database_folder_test.go
index efb4785899e..615f87e6694 100644
--- a/pkg/services/dashboards/database/database_folder_test.go
+++ b/pkg/services/dashboards/database/database_folder_test.go
@@ -2,21 +2,33 @@ package database
import (
"context"
+ "errors"
+ "fmt"
"testing"
+ "time"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
+ "github.com/grafana/grafana/pkg/infra/tracing"
+ "github.com/grafana/grafana/pkg/services/accesscontrol"
+ "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/folder"
+ "github.com/grafana/grafana/pkg/services/folder/folderimpl"
+ "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/org"
+ "github.com/grafana/grafana/pkg/services/org/orgimpl"
"github.com/grafana/grafana/pkg/services/quota/quotatest"
"github.com/grafana/grafana/pkg/services/sqlstore"
+ "github.com/grafana/grafana/pkg/services/supportbundles/supportbundlestest"
"github.com/grafana/grafana/pkg/services/tag/tagimpl"
"github.com/grafana/grafana/pkg/services/user"
- "github.com/grafana/grafana/pkg/setting"
+ "github.com/grafana/grafana/pkg/services/user/userimpl"
)
var testFeatureToggles = featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch)
@@ -36,7 +48,7 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
sqlStore.Cfg.RBACEnabled = false
quotaService := quotatest.New(false, nil)
var err error
- dashboardStore, err = ProvideDashboardStore(sqlStore, &setting.Cfg{}, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+ dashboardStore, err = ProvideDashboardStore(sqlStore, sqlStore.Cfg, testFeatureToggles, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
require.NoError(t, err)
flder = insertTestDashboard(t, dashboardStore, "1 test dash folder", 1, 0, true, "prod", "webapp")
dashInRoot = insertTestDashboard(t, dashboardStore, "test dash 67", 1, 0, false, "prod", "webapp")
@@ -477,6 +489,216 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
})
}
+func TestIntegrationDashboardInheritedFolderRBAC(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
+
+ // the maximux nested folder hierarchy starting from parent down to subfolders
+ nestedFolders := make([]*folder.Folder, 0, folder.MaxNestedFolderDepth+1)
+
+ var sqlStore *sqlstore.SQLStore
+ const (
+ dashInRootTitle = "dashboard in root"
+ dashInParentTitle = "dashboard in parent"
+ dashInSubfolderTitle = "dashboard in subfolder"
+ )
+ var viewer user.SignedInUser
+ var role *accesscontrol.Role
+
+ setup := func() {
+ sqlStore = db.InitTestDB(t)
+ sqlStore.Cfg.RBACEnabled = true
+ quotaService := quotatest.New(false, nil)
+
+ // enable nested folders so that the folder table is populated for all the tests
+ features := featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+
+ var err error
+ dashboardWriteStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotaService)
+ require.NoError(t, err)
+
+ usr := createUser(t, sqlStore, "viewer", "Viewer", false)
+ viewer = user.SignedInUser{
+ UserID: usr.ID,
+ OrgID: usr.OrgID,
+ OrgRole: org.RoleViewer,
+ }
+
+ orgService, err := orgimpl.ProvideService(sqlStore, sqlStore.Cfg, quotaService)
+ require.NoError(t, err)
+ usrSvc, err := userimpl.ProvideService(sqlStore, orgService, sqlStore.Cfg, nil, nil, quotaService, supportbundlestest.NewFakeBundleService())
+ require.NoError(t, err)
+
+ // create admin user in the same org
+ currentUserCmd := user.CreateUserCommand{Login: "admin", Email: "admin@test.com", Name: "an admin", IsAdmin: false, OrgID: viewer.OrgID}
+ u, err := usrSvc.Create(context.Background(), ¤tUserCmd)
+ require.NoError(t, err)
+ admin := user.SignedInUser{
+ UserID: u.ID,
+ OrgID: u.OrgID,
+ OrgRole: org.RoleAdmin,
+ Permissions: map[int64]map[string][]string{u.OrgID: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
+ {
+ Action: dashboards.ActionFoldersCreate,
+ }, {
+ Action: dashboards.ActionFoldersWrite,
+ Scope: dashboards.ScopeFoldersAll,
+ }}),
+ },
+ }
+ require.NotEqual(t, viewer.UserID, admin.UserID)
+
+ origNewGuardian := guardian.New
+ guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
+ t.Cleanup(func() {
+ guardian.New = origNewGuardian
+ })
+
+ folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), sqlStore.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(sqlStore), sqlStore, features)
+
+ parentUID := ""
+ for i := 0; ; i++ {
+ uid := fmt.Sprintf("f%d", i)
+ f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: uid,
+ OrgID: admin.OrgID,
+ Title: uid,
+ SignedInUser: &admin,
+ ParentUID: parentUID,
+ })
+ if err != nil {
+ if errors.Is(err, folder.ErrMaximumDepthReached) {
+ break
+ }
+
+ t.Log("unexpected error", "error", err)
+ t.Fail()
+ }
+
+ nestedFolders = append(nestedFolders, f)
+
+ parentUID = f.UID
+ }
+ require.LessOrEqual(t, 2, len(nestedFolders))
+
+ saveDashboardCmd := dashboards.SaveDashboardCommand{
+ UserID: admin.UserID,
+ OrgID: admin.OrgID,
+ IsFolder: false,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": dashInRootTitle,
+ }),
+ }
+ _, err = dashboardWriteStore.SaveDashboard(context.Background(), saveDashboardCmd)
+ require.NoError(t, err)
+
+ saveDashboardCmd = dashboards.SaveDashboardCommand{
+ UserID: admin.UserID,
+ OrgID: admin.OrgID,
+ IsFolder: false,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": dashInParentTitle,
+ }),
+ FolderID: nestedFolders[0].ID,
+ FolderUID: nestedFolders[0].UID,
+ }
+ _, err = dashboardWriteStore.SaveDashboard(context.Background(), saveDashboardCmd)
+ require.NoError(t, err)
+
+ saveDashboardCmd = dashboards.SaveDashboardCommand{
+ UserID: admin.UserID,
+ OrgID: admin.OrgID,
+ IsFolder: false,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": dashInSubfolderTitle,
+ }),
+ FolderID: nestedFolders[1].ID,
+ FolderUID: nestedFolders[1].UID,
+ }
+ _, err = dashboardWriteStore.SaveDashboard(context.Background(), saveDashboardCmd)
+ require.NoError(t, err)
+
+ role = setupRBACRole(t, *sqlStore, &viewer)
+ }
+
+ setup()
+
+ nestedFolderTitles := make([]string, 0, len(nestedFolders))
+ for _, f := range nestedFolders {
+ nestedFolderTitles = append(nestedFolderTitles, f.Title)
+ }
+
+ testCases := []struct {
+ desc string
+ features featuremgmt.FeatureToggles
+ permissions map[string][]string
+ expectedTitles []string
+ }{
+ {
+ desc: "it should not return folder if ACL is not set for parent folder",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
+ permissions: nil,
+ expectedTitles: nil,
+ },
+ {
+ desc: "it should not return dashboard in subfolder if nested folders are disabled and the user has permission to read dashboards under parent folder",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
+ permissions: map[string][]string{
+ dashboards.ActionDashboardsRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
+ },
+ expectedTitles: []string{dashInParentTitle},
+ },
+ {
+ desc: "it should return dashboard in subfolder if nested folders are enabled and the user has permission to read dashboards under parent folder",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch, featuremgmt.FlagNestedFolders),
+ permissions: map[string][]string{
+ dashboards.ActionDashboardsRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
+ },
+ expectedTitles: []string{dashInParentTitle, dashInSubfolderTitle},
+ },
+ {
+ desc: "it should not return subfolder if nested folders are disabled and the user has permission to read folders under parent folder",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch),
+ permissions: map[string][]string{
+ dashboards.ActionFoldersRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
+ },
+ expectedTitles: []string{nestedFolders[0].Title},
+ },
+ {
+ desc: "it should return subfolder if nested folders are enabled and the user has permission to read folders under parent folder",
+ features: featuremgmt.WithFeatures(featuremgmt.FlagPanelTitleSearch, featuremgmt.FlagNestedFolders),
+ permissions: map[string][]string{
+ dashboards.ActionFoldersRead: {fmt.Sprintf("folders:uid:%s", nestedFolders[0].UID)},
+ },
+ expectedTitles: nestedFolderTitles,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.desc, func(t *testing.T) {
+ dashboardReadStore, err := ProvideDashboardStore(sqlStore, sqlStore.Cfg, tc.features, tagimpl.ProvideService(sqlStore, sqlStore.Cfg), quotatest.New(false, nil))
+ require.NoError(t, err)
+
+ viewer.Permissions = map[int64]map[string][]string{viewer.OrgID: tc.permissions}
+ setupRBACPermission(t, *sqlStore, role, &viewer)
+
+ query := &dashboards.FindPersistedDashboardsQuery{
+ SignedInUser: &viewer,
+ OrgId: viewer.OrgID,
+ }
+
+ res, err := testSearchDashboards(dashboardReadStore, query)
+ require.NoError(t, err)
+
+ require.Equal(t, len(tc.expectedTitles), len(res))
+ for i, tlt := range tc.expectedTitles {
+ assert.Equal(t, tlt, res[i].Title)
+ }
+ })
+ }
+}
+
func moveDashboard(t *testing.T, dashboardStore dashboards.Store, orgId int64, dashboard *simplejson.Json,
newFolderId int64) *dashboards.Dashboard {
t.Helper()
@@ -492,3 +714,61 @@ func moveDashboard(t *testing.T, dashboardStore dashboards.Store, orgId int64, d
return dash
}
+
+func setupRBACRole(t *testing.T, db sqlstore.SQLStore, user *user.SignedInUser) *accesscontrol.Role {
+ t.Helper()
+ var role *accesscontrol.Role
+ err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ role = &accesscontrol.Role{
+ OrgID: user.OrgID,
+ UID: "test_role",
+ Name: "test:role",
+ Updated: time.Now(),
+ Created: time.Now(),
+ }
+ _, err := sess.Insert(role)
+ if err != nil {
+ return err
+ }
+
+ _, err = sess.Insert(accesscontrol.UserRole{
+ OrgID: role.OrgID,
+ RoleID: role.ID,
+ UserID: user.UserID,
+ Created: time.Now(),
+ })
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+
+ require.NoError(t, err)
+ return role
+}
+
+func setupRBACPermission(t *testing.T, db sqlstore.SQLStore, role *accesscontrol.Role, user *user.SignedInUser) {
+ t.Helper()
+ err := db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ if _, err := sess.Exec("DELETE FROM permission WHERE role_id = ?", role.ID); err != nil {
+ return err
+ }
+
+ var acPermission []accesscontrol.Permission
+ for action, scopes := range user.Permissions[user.OrgID] {
+ for _, scope := range scopes {
+ acPermission = append(acPermission, accesscontrol.Permission{
+ RoleID: role.ID, Action: action, Scope: scope, Created: time.Now(), Updated: time.Now(),
+ })
+ }
+ }
+
+ if _, err := sess.InsertMulti(&acPermission); err != nil {
+ return err
+ }
+
+ return nil
+ })
+
+ require.NoError(t, err)
+}
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index b4b8e57d68d..dd8d6e5241f 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -9,12 +9,6 @@ package featuremgmt
var (
// Register each toggle here
standardFeatureFlags = []FeatureFlag{
- {
- Name: "alertingBigTransactions",
- Description: "Use big transactions for alerting database writes",
- State: FeatureStateAlpha,
- Owner: grafanaAlertingSquad,
- },
{
Name: "trimDefaults",
Description: "Use cue schema to remove values that will be applied automatically",
@@ -237,11 +231,10 @@ var (
Owner: grafanaUserEssentialsSquad,
},
{
- Name: "grpcServer",
- Description: "Run GRPC server",
- State: FeatureStateAlpha,
- RequiresDevMode: true,
- Owner: grafanaAppPlatformSquad,
+ Name: "grpcServer",
+ Description: "Run the GRPC server",
+ State: FeatureStateBeta,
+ Owner: grafanaAppPlatformSquad,
},
{
Name: "entityStore",
@@ -316,6 +309,12 @@ var (
State: FeatureStateAlpha,
Owner: grafanaObservabilityLogsSquad,
},
+ {
+ Name: "showTraceId",
+ Description: "Show trace ids for requests",
+ State: FeatureStateAlpha,
+ Owner: grafanaObservabilityLogsSquad,
+ },
{
Name: "datasourceOnboarding",
Description: "Enable data source onboarding page",
@@ -500,5 +499,11 @@ var (
State: FeatureStateBeta,
Owner: grafanaAsCodeSquad,
},
+ {
+ Name: "pyroscopeFlameGraph",
+ Description: "Changes flame graph to pyroscope one",
+ State: FeatureStateAlpha,
+ Owner: grafanaObservabilityTracesAndProfilingSquad,
+ },
}
)
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 576b6897651..43e42e059e5 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -1,5 +1,4 @@
Name,State,Owner,requiresDevMode,RequiresLicense,RequiresRestart,FrontendOnly
-alertingBigTransactions,alpha,@grafana/alerting-squad,false,false,false,false
trimDefaults,beta,@grafana/grafana-as-code,false,false,false,false
disableEnvelopeEncryption,stable,@grafana/grafana-as-code,false,false,false,false
database_metrics,stable,@grafana/hosted-grafana-team,false,false,false,false
@@ -34,7 +33,7 @@ logRequestsInstrumentedAsUnknown,alpha,@grafana/hosted-grafana-team,false,false,
dataConnectionsConsole,stable,@grafana/plugins-platform-backend,false,false,false,false
internationalization,stable,@grafana/user-essentials,false,false,false,false
topnav,stable,@grafana/user-essentials,false,false,false,false
-grpcServer,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
+grpcServer,beta,@grafana/grafana-app-platform-squad,false,false,false,false
entityStore,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
cloudWatchCrossAccountQuerying,stable,@grafana/aws-plugins,false,false,false,false
redshiftAsyncQueryDataSupport,alpha,@grafana/aws-plugins,false,false,false,true
@@ -46,6 +45,7 @@ accessControlOnCall,beta,@grafana/grafana-authnz-team,false,false,false,false
nestedFolders,alpha,@grafana/backend-platform,true,false,false,false
accessTokenExpirationCheck,stable,@grafana/grafana-authnz-team,false,false,false,false
elasticsearchBackendMigration,alpha,@grafana/observability-logs,false,false,false,false
+showTraceId,alpha,@grafana/observability-logs,false,false,false,false
datasourceOnboarding,alpha,@grafana/dashboards-squad,false,false,false,false
emptyDashboardPage,stable,@grafana/dashboards-squad,false,false,false,true
secureSocksDatasourceProxy,alpha,@grafana/hosted-grafana-team,false,false,false,false
@@ -74,3 +74,4 @@ alertStateHistoryLokiPrimary,alpha,@grafana/alerting-squad,false,false,false,fal
alertStateHistoryLokiOnly,alpha,@grafana/alerting-squad,false,false,false,false
unifiedRequestLog,alpha,@grafana/backend-platform,false,false,false,false
renderAuthJWT,beta,@grafana/grafana-as-code,false,false,false,false
+pyroscopeFlameGraph,alpha,@grafana/observability-traces-and-profiling,false,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index a18c1c22196..90fad46a56f 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -7,10 +7,6 @@
package featuremgmt
const (
- // FlagAlertingBigTransactions
- // Use big transactions for alerting database writes
- FlagAlertingBigTransactions = "alertingBigTransactions"
-
// FlagTrimDefaults
// Use cue schema to remove values that will be applied automatically
FlagTrimDefaults = "trimDefaults"
@@ -148,7 +144,7 @@ const (
FlagTopnav = "topnav"
// FlagGrpcServer
- // Run GRPC server
+ // Run the GRPC server
FlagGrpcServer = "grpcServer"
// FlagEntityStore
@@ -195,6 +191,10 @@ const (
// Use Elasticsearch as backend data source
FlagElasticsearchBackendMigration = "elasticsearchBackendMigration"
+ // FlagShowTraceId
+ // Show trace ids for requests
+ FlagShowTraceId = "showTraceId"
+
// FlagDatasourceOnboarding
// Enable data source onboarding page
FlagDatasourceOnboarding = "datasourceOnboarding"
@@ -306,4 +306,8 @@ const (
// FlagRenderAuthJWT
// Uses JWT-based auth for rendering instead of relying on remote cache
FlagRenderAuthJWT = "renderAuthJWT"
+
+ // FlagPyroscopeFlameGraph
+ // Changes flame graph to pyroscope one
+ FlagPyroscopeFlameGraph = "pyroscopeFlameGraph"
)
diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index 15fe4406a33..79262251670 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -12,6 +12,7 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/kinds/librarypanel"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/libraryelements/model"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/search"
@@ -227,10 +228,16 @@ func (l *LibraryElementService) deleteLibraryElement(c context.Context, signedIn
}
// getLibraryElements gets a Library Element where param == value
-func getLibraryElements(c context.Context, store db.DB, cfg *setting.Cfg, signedInUser *user.SignedInUser, params []Pair) ([]model.LibraryElementDTO, error) {
+func getLibraryElements(c context.Context, store db.DB, cfg *setting.Cfg, signedInUser *user.SignedInUser, params []Pair, features featuremgmt.FeatureToggles) ([]model.LibraryElementDTO, error) {
libraryElements := make([]model.LibraryElementWithMeta, 0)
- err := store.WithDbSession(c, func(session *db.Session) error {
- builder := db.NewSqlBuilder(cfg, store.GetDialect())
+
+ recursiveQueriesAreSupported, err := store.RecursiveQueriesAreSupported()
+ if err != nil {
+ return nil, err
+ }
+
+ err = store.WithDbSession(c, func(session *db.Session) error {
+ builder := db.NewSqlBuilder(cfg, features, store.GetDialect(), recursiveQueriesAreSupported)
builder.Write(selectLibraryElementDTOWithMeta)
builder.Write(", 'General' as folder_name ")
builder.Write(", '' as folder_uid ")
@@ -299,7 +306,7 @@ func getLibraryElements(c context.Context, store db.DB, cfg *setting.Cfg, signed
// getLibraryElementByUid gets a Library Element by uid.
func (l *LibraryElementService) getLibraryElementByUid(c context.Context, signedInUser *user.SignedInUser, UID string) (model.LibraryElementDTO, error) {
- libraryElements, err := getLibraryElements(c, l.SQLStore, l.Cfg, signedInUser, []Pair{{key: "org_id", value: signedInUser.OrgID}, {key: "uid", value: UID}})
+ libraryElements, err := getLibraryElements(c, l.SQLStore, l.Cfg, signedInUser, []Pair{{key: "org_id", value: signedInUser.OrgID}, {key: "uid", value: UID}}, l.features)
if err != nil {
return model.LibraryElementDTO{}, err
}
@@ -312,13 +319,19 @@ func (l *LibraryElementService) getLibraryElementByUid(c context.Context, signed
// getLibraryElementByName gets a Library Element by name.
func (l *LibraryElementService) getLibraryElementsByName(c context.Context, signedInUser *user.SignedInUser, name string) ([]model.LibraryElementDTO, error) {
- return getLibraryElements(c, l.SQLStore, l.Cfg, signedInUser, []Pair{{"org_id", signedInUser.OrgID}, {"name", name}})
+ return getLibraryElements(c, l.SQLStore, l.Cfg, signedInUser, []Pair{{"org_id", signedInUser.OrgID}, {"name", name}}, l.features)
}
// getAllLibraryElements gets all Library Elements.
func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedInUser *user.SignedInUser, query model.SearchLibraryElementsQuery) (model.LibraryElementSearchResult, error) {
elements := make([]model.LibraryElementWithMeta, 0)
result := model.LibraryElementSearchResult{}
+
+ recursiveQueriesAreSupported, err := l.SQLStore.RecursiveQueriesAreSupported()
+ if err != nil {
+ return result, err
+ }
+
if query.PerPage <= 0 {
query.PerPage = 100
}
@@ -333,8 +346,8 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI
if folderFilter.parseError != nil {
return model.LibraryElementSearchResult{}, folderFilter.parseError
}
- err := l.SQLStore.WithDbSession(c, func(session *db.Session) error {
- builder := db.NewSqlBuilder(l.Cfg, l.SQLStore.GetDialect())
+ err = l.SQLStore.WithDbSession(c, func(session *db.Session) error {
+ builder := db.NewSqlBuilder(l.Cfg, l.features, l.SQLStore.GetDialect(), recursiveQueriesAreSupported)
if folderFilter.includeGeneralFolder {
builder.Write(selectLibraryElementDTOWithMeta)
builder.Write(", 'General' as folder_name ")
@@ -563,13 +576,18 @@ func (l *LibraryElementService) patchLibraryElement(c context.Context, signedInU
// getConnections gets all connections for a Library Element.
func (l *LibraryElementService) getConnections(c context.Context, signedInUser *user.SignedInUser, uid string) ([]model.LibraryElementConnectionDTO, error) {
connections := make([]model.LibraryElementConnectionDTO, 0)
- err := l.SQLStore.WithDbSession(c, func(session *db.Session) error {
+ recursiveQueriesAreSupported, err := l.SQLStore.RecursiveQueriesAreSupported()
+ if err != nil {
+ return nil, err
+ }
+
+ err = l.SQLStore.WithDbSession(c, func(session *db.Session) error {
element, err := getLibraryElement(l.SQLStore.GetDialect(), session, uid, signedInUser.OrgID)
if err != nil {
return err
}
var libraryElementConnections []model.LibraryElementConnectionWithMeta
- builder := db.NewSqlBuilder(l.Cfg, l.SQLStore.GetDialect())
+ builder := db.NewSqlBuilder(l.Cfg, l.features, l.SQLStore.GetDialect(), recursiveQueriesAreSupported)
builder.Write("SELECT lec.*, u1.login AS created_by_name, u1.email AS created_by_email, dashboard.uid AS connection_uid")
builder.Write(" FROM " + model.LibraryElementConnectionTableName + " AS lec")
builder.Write(" LEFT JOIN " + l.SQLStore.GetDialect().Quote("user") + " AS u1 ON lec.created_by = u1.id")
diff --git a/pkg/services/libraryelements/libraryelements.go b/pkg/services/libraryelements/libraryelements.go
index 53a3998a41a..562bc4b2160 100644
--- a/pkg/services/libraryelements/libraryelements.go
+++ b/pkg/services/libraryelements/libraryelements.go
@@ -6,19 +6,21 @@ import (
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/services/libraryelements/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
)
-func ProvideService(cfg *setting.Cfg, sqlStore db.DB, routeRegister routing.RouteRegister, folderService folder.Service) *LibraryElementService {
+func ProvideService(cfg *setting.Cfg, sqlStore db.DB, routeRegister routing.RouteRegister, folderService folder.Service, features featuremgmt.FeatureToggles) *LibraryElementService {
l := &LibraryElementService{
Cfg: cfg,
SQLStore: sqlStore,
RouteRegister: routeRegister,
folderService: folderService,
log: log.New("library-elements"),
+ features: features,
}
l.registerAPIEndpoints()
return l
@@ -41,6 +43,7 @@ type LibraryElementService struct {
RouteRegister routing.RouteRegister
folderService folder.Service
log log.Logger
+ features featuremgmt.FeatureToggles
}
// CreateElement creates a Library Element.
diff --git a/pkg/services/librarypanels/librarypanels_test.go b/pkg/services/librarypanels/librarypanels_test.go
index 4c5c07e9f37..8c3f363e3f7 100644
--- a/pkg/services/librarypanels/librarypanels_test.go
+++ b/pkg/services/librarypanels/librarypanels_test.go
@@ -843,7 +843,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
folderService := folderimpl.ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), cfg, dashboardStore, folderStore, nil, features)
- elementService := libraryelements.ProvideService(cfg, sqlStore, routing.NewRouteRegister(), folderService)
+ elementService := libraryelements.ProvideService(cfg, sqlStore, routing.NewRouteRegister(), folderService, featuremgmt.WithFeatures())
service := LibraryPanelService{
Cfg: cfg,
SQLStore: sqlStore,
diff --git a/pkg/services/live/managedstream/cache_redis_test.go b/pkg/services/live/managedstream/cache_redis_test.go
index df650ded044..d7c3f9fddbb 100644
--- a/pkg/services/live/managedstream/cache_redis_test.go
+++ b/pkg/services/live/managedstream/cache_redis_test.go
@@ -1,18 +1,34 @@
-//go:build redis
-// +build redis
-
package managedstream
import (
+ "os"
"testing"
"github.com/go-redis/redis/v8"
"github.com/stretchr/testify/require"
)
-func TestRedisCacheStorage(t *testing.T) {
+func TestIntegrationRedisCacheStorage(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
+
+ u, ok := os.LookupEnv("REDIS_URL")
+ if !ok || u == "" {
+ t.Skip("No redis URL supplied")
+ }
+
+ addr := u
+ db := 0
+ parsed, err := redis.ParseURL(u)
+ if err == nil {
+ addr = parsed.Addr
+ db = parsed.DB
+ }
+
redisClient := redis.NewClient(&redis.Options{
- Addr: "localhost:6379",
+ Addr: addr,
+ DB: db,
})
c := NewRedisFrameCache(redisClient)
require.NotNil(t, c)
diff --git a/pkg/services/ngalert/api/api_alertmanager.go b/pkg/services/ngalert/api/api_alertmanager.go
index 663a6c38f50..2884433551a 100644
--- a/pkg/services/ngalert/api/api_alertmanager.go
+++ b/pkg/services/ngalert/api/api_alertmanager.go
@@ -228,6 +228,38 @@ func (srv AlertmanagerSrv) RouteGetSilences(c *contextmodel.ReqContext) response
return response.JSON(http.StatusOK, gettableSilences)
}
+func (srv AlertmanagerSrv) RoutePostGrafanaAlertingConfigHistoryActivate(c *contextmodel.ReqContext, id string) response.Response {
+ confId, err := strconv.ParseInt(id, 10, 64)
+ if err != nil {
+ return ErrResp(http.StatusBadRequest, err, "failed to parse config id")
+ }
+
+ err = srv.mam.ActivateHistoricalConfiguration(c.Req.Context(), c.OrgID, confId)
+ if err != nil {
+ var unknownReceiverError notifier.UnknownReceiverError
+ if errors.As(err, &unknownReceiverError) {
+ return ErrResp(http.StatusBadRequest, unknownReceiverError, "")
+ }
+ var configRejectedError notifier.AlertmanagerConfigRejectedError
+ if errors.As(err, &configRejectedError) {
+ return ErrResp(http.StatusBadRequest, configRejectedError, "")
+ }
+ if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
+ return response.Error(http.StatusNotFound, err.Error(), err)
+ }
+ if errors.Is(err, notifier.ErrNoAlertmanagerForOrg) {
+ return response.Error(http.StatusNotFound, err.Error(), err)
+ }
+ if errors.Is(err, notifier.ErrAlertmanagerNotReady) {
+ return response.Error(http.StatusConflict, err.Error(), err)
+ }
+
+ return ErrResp(http.StatusInternalServerError, err, "")
+ }
+
+ return response.JSON(http.StatusAccepted, util.DynMap{"message": "configuration activated"})
+}
+
func (srv AlertmanagerSrv) RoutePostAlertingConfig(c *contextmodel.ReqContext, body apimodels.PostableUserConfig) response.Response {
currentConfig, err := srv.mam.GetAlertmanagerConfiguration(c.Req.Context(), c.OrgID)
// If a config is present and valid we proceed with the guard, otherwise we
diff --git a/pkg/services/ngalert/api/api_alertmanager_test.go b/pkg/services/ngalert/api/api_alertmanager_test.go
index e5e3b6f2160..8cbe6168bb4 100644
--- a/pkg/services/ngalert/api/api_alertmanager_test.go
+++ b/pkg/services/ngalert/api/api_alertmanager_test.go
@@ -381,6 +381,46 @@ func TestRouteGetAlertingConfigHistory(t *testing.T) {
})
}
+func TestRoutePostGrafanaAlertingConfigHistoryActivate(t *testing.T) {
+ sut := createSut(t, nil)
+
+ t.Run("assert 404 when no historical configurations are found", func(tt *testing.T) {
+ req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+ require.NoError(tt, err)
+ q := req.URL.Query()
+ req.URL.RawQuery = q.Encode()
+
+ rc := createRequestCtxInOrg(10)
+
+ response := sut.RoutePostGrafanaAlertingConfigHistoryActivate(rc, "0")
+ require.Equal(tt, 404, response.Status())
+ })
+
+ t.Run("assert 202 for a valid org and id", func(tt *testing.T) {
+ req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+ require.NoError(tt, err)
+ q := req.URL.Query()
+ req.URL.RawQuery = q.Encode()
+
+ rc := createRequestCtxInOrg(1)
+
+ response := sut.RoutePostGrafanaAlertingConfigHistoryActivate(rc, "0")
+ require.Equal(tt, 202, response.Status())
+ })
+
+ t.Run("assert 400 when id is not parseable", func(tt *testing.T) {
+ req, err := http.NewRequest(http.MethodGet, "https://grafana.net", nil)
+ require.NoError(tt, err)
+ q := req.URL.Query()
+ req.URL.RawQuery = q.Encode()
+
+ rc := createRequestCtxInOrg(1)
+
+ response := sut.RoutePostGrafanaAlertingConfigHistoryActivate(rc, "abc")
+ require.Equal(tt, 400, response.Status())
+ })
+}
+
func TestSilenceCreate(t *testing.T) {
makeSilence := func(comment string, createdBy string,
startsAt, endsAt strfmt.DateTime, matchers amv2.Matchers) amv2.Silence {
diff --git a/pkg/services/ngalert/api/api_ruler.go b/pkg/services/ngalert/api/api_ruler.go
index ca9aa225a34..fd82c004a57 100644
--- a/pkg/services/ngalert/api/api_ruler.go
+++ b/pkg/services/ngalert/api/api_ruler.go
@@ -303,7 +303,7 @@ func (srv RulerSrv) RoutePostNameRulesConfig(c *contextmodel.ReqContext, ruleGro
}
rules, err := validateRuleGroup(&ruleGroupConfig, c.SignedInUser.OrgID, namespace, func(condition ngmodels.Condition) error {
- return srv.conditionValidator.Validate(eval.Context(c.Req.Context(), c.SignedInUser), condition)
+ return srv.conditionValidator.Validate(eval.NewContext(c.Req.Context(), c.SignedInUser), condition)
}, srv.cfg)
if err != nil {
return ErrResp(http.StatusBadRequest, err, "")
diff --git a/pkg/services/ngalert/api/api_testing.go b/pkg/services/ngalert/api/api_testing.go
index 83728417e80..f5dd34c03b2 100644
--- a/pkg/services/ngalert/api/api_testing.go
+++ b/pkg/services/ngalert/api/api_testing.go
@@ -52,7 +52,7 @@ func (srv TestingApiSrv) RouteTestGrafanaRuleConfig(c *contextmodel.ReqContext,
Condition: body.GrafanaManagedCondition.Condition,
Data: queries,
}
- ctx := eval.Context(c.Req.Context(), c.SignedInUser)
+ ctx := eval.NewContext(c.Req.Context(), c.SignedInUser)
conditionEval, err := srv.evaluator.Create(ctx, evalCond)
if err != nil {
@@ -128,7 +128,7 @@ func (srv TestingApiSrv) RouteEvalQueries(c *contextmodel.ReqContext, cmd apimod
if len(cmd.Data) > 0 {
cond.Condition = cmd.Data[0].RefID
}
- evaluator, err := srv.evaluator.Create(eval.Context(c.Req.Context(), c.SignedInUser), cond)
+ evaluator, err := srv.evaluator.Create(eval.NewContext(c.Req.Context(), c.SignedInUser), cond)
if err != nil {
return ErrResp(http.StatusBadRequest, err, "Failed to build evaluator for queries and expressions")
diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go
index 8157ea0ebf1..418b5692634 100644
--- a/pkg/services/ngalert/api/authorization.go
+++ b/pkg/services/ngalert/api/authorization.go
@@ -166,6 +166,8 @@ func (api *API) authorize(method, path string) web.Handler {
case http.MethodPost + "/api/alertmanager/grafana/config/api/v1/alerts":
// additional authorization is done in the request handler
eval = ac.EvalAny(ac.EvalPermission(ac.ActionAlertingNotificationsWrite))
+ case http.MethodPost + "/api/alertmanager/grafana/config/history/{id}/_activate":
+ eval = ac.EvalAny(ac.EvalPermission(ac.ActionAlertingNotificationsWrite))
case http.MethodGet + "/api/alertmanager/grafana/config/api/v1/receivers":
eval = ac.EvalPermission(ac.ActionAlertingNotificationsRead)
case http.MethodPost + "/api/alertmanager/grafana/config/api/v1/receivers/test":
diff --git a/pkg/services/ngalert/api/authorization_test.go b/pkg/services/ngalert/api/authorization_test.go
index e9cdab1a24a..528644021af 100644
--- a/pkg/services/ngalert/api/authorization_test.go
+++ b/pkg/services/ngalert/api/authorization_test.go
@@ -49,7 +49,7 @@ func TestAuthorize(t *testing.T) {
}
paths[p] = methods
}
- require.Len(t, paths, 46)
+ require.Len(t, paths, 47)
ac := acmock.New()
api := &API{AccessControl: ac}
diff --git a/pkg/services/ngalert/api/forking_alertmanager.go b/pkg/services/ngalert/api/forking_alertmanager.go
index a1762ee64fb..78b87ded9a0 100644
--- a/pkg/services/ngalert/api/forking_alertmanager.go
+++ b/pkg/services/ngalert/api/forking_alertmanager.go
@@ -163,6 +163,10 @@ func (f *AlertmanagerApiHandler) handleRouteGetGrafanaAlertingConfigHistory(ctx
return f.GrafanaSvc.RouteGetAlertingConfigHistory(ctx)
}
+func (f *AlertmanagerApiHandler) handleRoutePostGrafanaAlertingConfigHistoryActivate(ctx *contextmodel.ReqContext, id string) response.Response {
+ return f.GrafanaSvc.RoutePostGrafanaAlertingConfigHistoryActivate(ctx, id)
+}
+
func (f *AlertmanagerApiHandler) handleRouteGetGrafanaSilence(ctx *contextmodel.ReqContext, id string) response.Response {
return f.GrafanaSvc.RouteGetSilence(ctx, id)
}
diff --git a/pkg/services/ngalert/api/generated_base_api_alertmanager.go b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
index d474837b9ec..c4fff9c3238 100644
--- a/pkg/services/ngalert/api/generated_base_api_alertmanager.go
+++ b/pkg/services/ngalert/api/generated_base_api_alertmanager.go
@@ -42,6 +42,7 @@ type AlertmanagerApi interface {
RoutePostAMAlerts(*contextmodel.ReqContext) response.Response
RoutePostAlertingConfig(*contextmodel.ReqContext) response.Response
RoutePostGrafanaAlertingConfig(*contextmodel.ReqContext) response.Response
+ RoutePostGrafanaAlertingConfigHistoryActivate(*contextmodel.ReqContext) response.Response
RoutePostTestGrafanaReceivers(*contextmodel.ReqContext) response.Response
}
@@ -167,6 +168,11 @@ func (f *AlertmanagerApiHandler) RoutePostGrafanaAlertingConfig(ctx *contextmode
}
return f.handleRoutePostGrafanaAlertingConfig(ctx, conf)
}
+func (f *AlertmanagerApiHandler) RoutePostGrafanaAlertingConfigHistoryActivate(ctx *contextmodel.ReqContext) response.Response {
+ // Parse Path Parameters
+ idParam := web.Params(ctx.Req)[":id"]
+ return f.handleRoutePostGrafanaAlertingConfigHistoryActivate(ctx, idParam)
+}
func (f *AlertmanagerApiHandler) RoutePostTestGrafanaReceivers(ctx *contextmodel.ReqContext) response.Response {
// Parse Request Body
conf := apimodels.TestReceiversConfigBodyParams{}
@@ -408,6 +414,16 @@ func (api *API) RegisterAlertmanagerApiEndpoints(srv AlertmanagerApi, m *metrics
m,
),
)
+ group.Post(
+ toMacaronPath("/api/alertmanager/grafana/config/history/{id}/_activate"),
+ api.authorize(http.MethodPost, "/api/alertmanager/grafana/config/history/{id}/_activate"),
+ metrics.Instrument(
+ http.MethodPost,
+ "/api/alertmanager/grafana/config/history/{id}/_activate",
+ srv.RoutePostGrafanaAlertingConfigHistoryActivate,
+ m,
+ ),
+ )
group.Post(
toMacaronPath("/api/alertmanager/grafana/config/api/v1/receivers/test"),
api.authorize(http.MethodPost, "/api/alertmanager/grafana/config/api/v1/receivers/test"),
diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index 4f5222b196c..d989685b0b8 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -3644,6 +3644,7 @@
"type": "object"
},
"alertGroup": {
+ "description": "AlertGroup alert group",
"properties": {
"alerts": {
"description": "alerts",
@@ -3667,6 +3668,7 @@
"type": "object"
},
"alertGroups": {
+ "description": "AlertGroups alert groups",
"items": {
"$ref": "#/definitions/alertGroup"
},
@@ -3771,6 +3773,7 @@
"type": "object"
},
"gettableAlert": {
+ "description": "GettableAlert gettable alert",
"properties": {
"annotations": {
"$ref": "#/definitions/labelSet"
@@ -3826,13 +3829,13 @@
"type": "object"
},
"gettableAlerts": {
- "description": "GettableAlerts gettable alerts",
"items": {
"$ref": "#/definitions/gettableAlert"
},
"type": "array"
},
"gettableSilence": {
+ "description": "GettableSilence gettable silence",
"properties": {
"comment": {
"description": "comment",
@@ -3881,12 +3884,14 @@
"type": "object"
},
"gettableSilences": {
+ "description": "GettableSilences gettable silences",
"items": {
"$ref": "#/definitions/gettableSilence"
},
"type": "array"
},
"integration": {
+ "description": "Integration integration",
"properties": {
"lastNotifyAttempt": {
"description": "A timestamp indicating the last attempt to deliver a notification regardless of the outcome.\nFormat: date-time",
@@ -4068,7 +4073,6 @@
"type": "object"
},
"receiver": {
- "description": "Receiver receiver",
"properties": {
"active": {
"description": "active",
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
index da55966efdd..720eb99cf4c 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go
@@ -61,6 +61,15 @@ import (
// Responses:
// 200: GettableHistoricUserConfigs
+// swagger:route POST /api/alertmanager/grafana/config/history/{id}/_activate alertmanager RoutePostGrafanaAlertingConfigHistoryActivate
+//
+// revert Alerting configuration to the historical configuration specified by the given id
+//
+// Responses:
+// 202: Ack
+// 400: ValidationError
+// 404: NotFound
+
// swagger:route DELETE /api/alertmanager/grafana/config/api/v1/alerts alertmanager RouteDeleteGrafanaAlertingConfig
//
// deletes the Alerting config for a tenant
@@ -458,6 +467,13 @@ type BodyAlertingConfig struct {
Body PostableUserConfig
}
+// swagger:parameters RoutePostGrafanaAlertingConfigHistoryActivate
+type HistoricalConfigId struct {
+ // Id should be the id of the GettableHistoricUserConfig
+ // in:path
+ Id int64 `json:"id"`
+}
+
// alertmanager routes
// swagger:parameters RoutePostAlertingConfig RouteGetAlertingConfig RouteDeleteAlertingConfig RouteGetAMStatus RouteGetAMAlerts RoutePostAMAlerts RouteGetAMAlertGroups RouteGetSilences RouteCreateSilence RouteGetSilence RouteDeleteSilence RoutePostAlertingConfig
// testing routes
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index 206e5e4e113..a4f647fe6b0 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -3432,7 +3432,6 @@
"type": "object"
},
"URL": {
- "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
"properties": {
"ForceQuery": {
"type": "boolean"
@@ -3468,7 +3467,7 @@
"$ref": "#/definitions/Userinfo"
}
},
- "title": "A URL represents a parsed URL (technically, a URI reference).",
+ "title": "URL is a custom URL type that allows validation at configuration load time.",
"type": "object"
},
"Userinfo": {
@@ -3882,6 +3881,7 @@
"type": "object"
},
"gettableSilences": {
+ "description": "GettableSilences gettable silences",
"items": {
"$ref": "#/definitions/gettableSilence"
},
@@ -4629,6 +4629,45 @@
]
}
},
+ "/api/alertmanager/grafana/config/history/{id}/_activate": {
+ "post": {
+ "description": "revert Alerting configuration to the historical configuration specified by the given id",
+ "operationId": "RoutePostGrafanaAlertingConfigHistoryActivate",
+ "parameters": [
+ {
+ "description": "Id should be the id of the GettableHistoricUserConfig",
+ "format": "int64",
+ "in": "path",
+ "name": "id",
+ "required": true,
+ "type": "integer"
+ }
+ ],
+ "responses": {
+ "202": {
+ "description": "Ack",
+ "schema": {
+ "$ref": "#/definitions/Ack"
+ }
+ },
+ "400": {
+ "description": "ValidationError",
+ "schema": {
+ "$ref": "#/definitions/ValidationError"
+ }
+ },
+ "404": {
+ "description": "NotFound",
+ "schema": {
+ "$ref": "#/definitions/NotFound"
+ }
+ }
+ },
+ "tags": [
+ "alertmanager"
+ ]
+ }
+ },
"/api/alertmanager/{DatasourceUID}/api/v2/alerts": {
"get": {
"description": "get alertmanager alerts",
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index aebd5a0bf1c..65794ac1b02 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -458,6 +458,45 @@
}
}
},
+ "/api/alertmanager/grafana/config/history/{id}/_activate": {
+ "post": {
+ "description": "revert Alerting configuration to the historical configuration specified by the given id",
+ "tags": [
+ "alertmanager"
+ ],
+ "operationId": "RoutePostGrafanaAlertingConfigHistoryActivate",
+ "parameters": [
+ {
+ "type": "integer",
+ "format": "int64",
+ "description": "Id should be the id of the GettableHistoricUserConfig",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "202": {
+ "description": "Ack",
+ "schema": {
+ "$ref": "#/definitions/Ack"
+ }
+ },
+ "400": {
+ "description": "ValidationError",
+ "schema": {
+ "$ref": "#/definitions/ValidationError"
+ }
+ },
+ "404": {
+ "description": "NotFound",
+ "schema": {
+ "$ref": "#/definitions/NotFound"
+ }
+ }
+ }
+ }
+ },
"/api/alertmanager/{DatasourceUID}/api/v2/alerts": {
"get": {
"description": "get alertmanager alerts",
@@ -6107,9 +6146,8 @@
}
},
"URL": {
- "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use the EscapedPath method, which preserves\nthe original encoding of Path.\n\nThe RawPath field is an optional field which is only set when the default\nencoding of Path is different from the escaped path. See the EscapedPath method\nfor more details.\n\nURL's String method uses the EscapedPath method to obtain the path.",
"type": "object",
- "title": "A URL represents a parsed URL (technically, a URI reference).",
+ "title": "URL is a custom URL type that allows validation at configuration load time.",
"properties": {
"ForceQuery": {
"type": "boolean"
@@ -6562,6 +6600,7 @@
"$ref": "#/definitions/gettableSilence"
},
"gettableSilences": {
+ "description": "GettableSilences gettable silences",
"type": "array",
"items": {
"$ref": "#/definitions/gettableSilence"
diff --git a/pkg/services/ngalert/eval/context.go b/pkg/services/ngalert/eval/context.go
index f84a0e607f6..3cdaefceb22 100644
--- a/pkg/services/ngalert/eval/context.go
+++ b/pkg/services/ngalert/eval/context.go
@@ -12,7 +12,7 @@ type EvaluationContext struct {
User *user.SignedInUser
}
-func Context(ctx context.Context, user *user.SignedInUser) EvaluationContext {
+func NewContext(ctx context.Context, user *user.SignedInUser) EvaluationContext {
return EvaluationContext{
Ctx: ctx,
User: user,
diff --git a/pkg/services/ngalert/eval/eval.go b/pkg/services/ngalert/eval/eval.go
index c08bbec75e0..fd9f4b6084b 100644
--- a/pkg/services/ngalert/eval/eval.go
+++ b/pkg/services/ngalert/eval/eval.go
@@ -220,7 +220,7 @@ func (s State) String() string {
return [...]string{"Normal", "Alerting", "Pending", "NoData", "Error"}[s]
}
-func buildDatasourceHeaders(ctx EvaluationContext) map[string]string {
+func buildDatasourceHeaders(ctx context.Context) map[string]string {
headers := map[string]string{
// Many data sources check this in query method as sometimes alerting needs special considerations.
// Several existing systems also compare against the value of this header. Altering this constitutes a breaking change.
@@ -233,7 +233,7 @@ func buildDatasourceHeaders(ctx EvaluationContext) map[string]string {
models.CacheSkipHeaderName: "true",
}
- key, ok := models.RuleKeyFromContext(ctx.Ctx)
+ key, ok := models.RuleKeyFromContext(ctx)
if ok {
headers["X-Rule-Uid"] = key.UID
headers["X-Grafana-Org-Id"] = strconv.FormatInt(key.OrgID, 10)
@@ -246,7 +246,7 @@ func buildDatasourceHeaders(ctx EvaluationContext) map[string]string {
func getExprRequest(ctx EvaluationContext, data []models.AlertQuery, dsCacheService datasources.CacheService) (*expr.Request, error) {
req := &expr.Request{
OrgId: ctx.User.OrgID,
- Headers: buildDatasourceHeaders(ctx),
+ Headers: buildDatasourceHeaders(ctx.Ctx),
}
datasources := make(map[string]*datasources.DataSource, len(data))
@@ -295,7 +295,8 @@ func getExprRequest(ctx EvaluationContext, data []models.AlertQuery, dsCacheServ
type NumberValueCapture struct {
Var string // RefID
Labels data.Labels
- Value *float64
+
+ Value *float64
}
func queryDataResponseToExecutionResults(c models.Condition, execResp *backend.QueryDataResponse) ExecutionResults {
diff --git a/pkg/services/ngalert/eval/eval_test.go b/pkg/services/ngalert/eval/eval_test.go
index 14fdd65cb54..a69c54e31e7 100644
--- a/pkg/services/ngalert/eval/eval_test.go
+++ b/pkg/services/ngalert/eval/eval_test.go
@@ -533,7 +533,7 @@ func TestValidate(t *testing.T) {
})
evaluator := NewEvaluatorFactory(setting.UnifiedAlertingSettings{}, cacheService, expr.ProvideService(&setting.Cfg{ExpressionsEnabled: true}, nil, nil), store)
- evalCtx := Context(context.Background(), u)
+ evalCtx := NewContext(context.Background(), u)
err := evaluator.Validate(evalCtx, condition)
if testCase.error {
diff --git a/pkg/services/ngalert/models/alert_query.go b/pkg/services/ngalert/models/alert_query.go
index 0d4d1410a9f..6f6c437e72a 100644
--- a/pkg/services/ngalert/models/alert_query.go
+++ b/pkg/services/ngalert/models/alert_query.go
@@ -97,6 +97,10 @@ type AlertQuery struct {
modelProps map[string]interface{}
}
+func (aq *AlertQuery) String() string {
+ return fmt.Sprintf("refID: %s, queryType: %s, datasourceUID: %s", aq.RefID, aq.QueryType, aq.DatasourceUID)
+}
+
func (aq *AlertQuery) setModelProps() error {
aq.modelProps = make(map[string]interface{})
err := json.Unmarshal(aq.Model, &aq.modelProps)
diff --git a/pkg/services/ngalert/notifier/alertmanager_config.go b/pkg/services/ngalert/notifier/alertmanager_config.go
index 09c02081b54..2f900d9d7c6 100644
--- a/pkg/services/ngalert/notifier/alertmanager_config.go
+++ b/pkg/services/ngalert/notifier/alertmanager_config.go
@@ -43,6 +43,36 @@ func (moa *MultiOrgAlertmanager) GetAlertmanagerConfiguration(ctx context.Contex
return moa.gettableUserConfigFromAMConfigString(ctx, org, amConfig.AlertmanagerConfiguration)
}
+// ActivateHistoricalConfiguration will set the current alertmanager configuration to a previous value based on the provided
+// alert_configuration_history id.
+func (moa *MultiOrgAlertmanager) ActivateHistoricalConfiguration(ctx context.Context, orgId int64, id int64) error {
+ config, err := moa.configStore.GetHistoricalConfiguration(ctx, orgId, id)
+ if err != nil {
+ return fmt.Errorf("failed to get historical alertmanager configuration: %w", err)
+ }
+
+ cfg, err := Load([]byte(config.AlertmanagerConfiguration))
+ if err != nil {
+ return fmt.Errorf("failed to unmarshal historical alertmanager configuration: %w", err)
+ }
+
+ am, err := moa.AlertmanagerFor(orgId)
+ if err != nil {
+ // It's okay if the alertmanager isn't ready yet, we're changing its config anyway.
+ if !errors.Is(err, ErrAlertmanagerNotReady) {
+ return err
+ }
+ }
+
+ if err := am.SaveAndApplyConfig(ctx, cfg); err != nil {
+ moa.logger.Error("unable to save and apply historical alertmanager configuration", "error", err, "org", orgId, "id", id)
+ return AlertmanagerConfigRejectedError{err}
+ }
+ moa.logger.Info("applied historical alertmanager configuration", "org", orgId, "id", id)
+
+ return nil
+}
+
// GetAppliedAlertmanagerConfigurations returns the last n configurations marked as applied for a given org.
func (moa *MultiOrgAlertmanager) GetAppliedAlertmanagerConfigurations(ctx context.Context, org int64, limit int) ([]*definitions.GettableHistoricUserConfig, error) {
configs, err := moa.configStore.GetAppliedConfigurations(ctx, org, limit)
diff --git a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
index a9153587a88..7710a0783d1 100644
--- a/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
@@ -18,6 +18,7 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/metrics"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
+ "github.com/grafana/grafana/pkg/services/ngalert/store"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/setting"
@@ -298,6 +299,76 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) {
}
}
+func TestMultiOrgAlertmanager_ActivateHistoricalConfiguration(t *testing.T) {
+ configStore := NewFakeConfigStore(t, map[int64]*models.AlertConfiguration{})
+ orgStore := &FakeOrgStore{
+ orgs: []int64{1, 2, 3},
+ }
+ tmpDir := t.TempDir()
+ defaultConfig := `{"template_files":null,"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"templates":null,"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"","name":"email receiver","type":"email","disableResolveMessage":false,"settings":{"addresses":"\u003cexample@email.com\u003e"},"secureSettings":null}]}]}}`
+ cfg := &setting.Cfg{
+ DataPath: tmpDir,
+ UnifiedAlerting: setting.UnifiedAlertingSettings{AlertmanagerConfigPollInterval: 3 * time.Minute, DefaultConfiguration: defaultConfig}, // do not poll in tests.
+ }
+ kvStore := NewFakeKVStore(t)
+ provStore := provisioning.NewFakeProvisioningStore()
+ secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
+ decryptFn := secretsService.GetDecryptedValue
+ reg := prometheus.NewPedanticRegistry()
+ m := metrics.NewNGAlert(reg)
+ mam, err := NewMultiOrgAlertmanager(cfg, configStore, orgStore, kvStore, provStore, decryptFn, m.GetMultiOrgAlertmanagerMetrics(), nil, log.New("testlogger"), secretsService)
+ require.NoError(t, err)
+ ctx := context.Background()
+
+ // Ensure that one Alertmanager is created per org.
+ {
+ require.NoError(t, mam.LoadAndSyncAlertmanagersForOrgs(ctx))
+ require.Len(t, mam.alertmanagers, 3)
+ }
+
+ // First, let's confirm the default configs are active.
+ cfgs, err := mam.getLatestConfigs(ctx)
+ require.NoError(t, err)
+ require.Equal(t, defaultConfig, cfgs[1].AlertmanagerConfiguration)
+ require.Equal(t, defaultConfig, cfgs[2].AlertmanagerConfiguration)
+ // Store id for later use.
+ originalId := cfgs[2].ID
+ require.Equal(t, defaultConfig, cfgs[3].AlertmanagerConfiguration)
+
+ // Now let's save a new config for org 2.
+ newConfig := `{"template_files":null,"alertmanager_config":{"route":{"receiver":"grafana-default-email","group_by":["grafana_folder","alertname"]},"templates":null,"receivers":[{"name":"grafana-default-email","grafana_managed_receiver_configs":[{"uid":"","name":"some other name","type":"email","disableResolveMessage":false,"settings":{"addresses":"\u003cexample@email.com\u003e"},"secureSettings":null}]}]}}`
+ am, err := mam.AlertmanagerFor(2)
+ require.NoError(t, err)
+
+ postable, err := Load([]byte(newConfig))
+ require.NoError(t, err)
+
+ err = am.SaveAndApplyConfig(ctx, postable)
+ require.NoError(t, err)
+
+ // Verify that the org has the new config.
+ cfgs, err = mam.getLatestConfigs(ctx)
+ require.NoError(t, err)
+ require.Equal(t, newConfig, cfgs[2].AlertmanagerConfiguration)
+
+ // First, let's try to activate a historical alertmanager config that doesn't exist.
+ {
+ err := mam.ActivateHistoricalConfiguration(ctx, 1, 42)
+ require.Error(t, err, store.ErrNoAlertmanagerConfiguration)
+ }
+
+ // Finally, we activate the default config for org 2.
+ {
+ err := mam.ActivateHistoricalConfiguration(ctx, 2, originalId)
+ require.NoError(t, err)
+ }
+
+ // Verify that the org has the old default config.
+ cfgs, err = mam.getLatestConfigs(ctx)
+ require.NoError(t, err)
+ require.Equal(t, defaultConfig, cfgs[2].AlertmanagerConfiguration)
+}
+
var brokenConfig = `
"alertmanager_config": {
"route": {
diff --git a/pkg/services/ngalert/notifier/testing.go b/pkg/services/ngalert/notifier/testing.go
index 22e1cef7c52..8dd7e111765 100644
--- a/pkg/services/ngalert/notifier/testing.go
+++ b/pkg/services/ngalert/notifier/testing.go
@@ -154,6 +154,21 @@ func (f *fakeConfigStore) GetAppliedConfigurations(_ context.Context, orgID int6
return configs, nil
}
+func (f *fakeConfigStore) GetHistoricalConfiguration(_ context.Context, orgID int64, id int64) (*models.HistoricAlertConfiguration, error) {
+ configsByOrg, ok := f.historicConfigs[orgID]
+ if !ok {
+ return &models.HistoricAlertConfiguration{}, store.ErrNoAlertmanagerConfiguration
+ }
+
+ for _, conf := range configsByOrg {
+ if conf.ID == id && conf.OrgID == orgID {
+ return conf, nil
+ }
+ }
+
+ return &models.HistoricAlertConfiguration{}, store.ErrNoAlertmanagerConfiguration
+}
+
type FakeOrgStore struct {
orgs []int64
}
diff --git a/pkg/services/ngalert/schedule/schedule.go b/pkg/services/ngalert/schedule/schedule.go
index a57bf6c133d..eefed6e9a4c 100644
--- a/pkg/services/ngalert/schedule/schedule.go
+++ b/pkg/services/ngalert/schedule/schedule.go
@@ -373,21 +373,7 @@ func (sch *schedule) ruleRoutine(grafanaCtx context.Context, key ngmodels.AlertR
logger := logger.New("version", e.rule.Version, "attempt", attempt, "now", e.scheduledAt)
start := sch.clock.Now()
- schedulerUser := &user.SignedInUser{
- UserID: -1,
- IsServiceAccount: true,
- Login: "grafana_scheduler",
- OrgID: e.rule.OrgID,
- OrgRole: org.RoleAdmin,
- Permissions: map[int64]map[string][]string{
- e.rule.OrgID: {
- datasources.ActionQuery: []string{
- datasources.ScopeAll,
- },
- },
- },
- }
- evalCtx := eval.Context(ctx, schedulerUser)
+ evalCtx := eval.NewContext(ctx, SchedulerUserFor(e.rule.OrgID))
ruleEval, err := sch.evaluatorFactory.Create(evalCtx, e.rule.GetEvalCondition())
var results eval.Results
var dur time.Duration
@@ -580,3 +566,20 @@ func (sch *schedule) getRuleExtraLabels(evalCtx *evaluation) map[string]string {
}
return extraLabels
}
+
+func SchedulerUserFor(orgID int64) *user.SignedInUser {
+ return &user.SignedInUser{
+ UserID: -1,
+ IsServiceAccount: true,
+ Login: "grafana_scheduler",
+ OrgID: orgID,
+ OrgRole: org.RoleAdmin,
+ Permissions: map[int64]map[string][]string{
+ orgID: {
+ datasources.ActionQuery: []string{
+ datasources.ScopeAll,
+ },
+ },
+ },
+ }
+}
diff --git a/pkg/services/ngalert/state/historian/annotation.go b/pkg/services/ngalert/state/historian/annotation.go
index d4c45ca7418..12a3a15ea03 100644
--- a/pkg/services/ngalert/state/historian/annotation.go
+++ b/pkg/services/ngalert/state/historian/annotation.go
@@ -14,6 +14,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
+ "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/ngalert/eval"
@@ -67,10 +68,23 @@ func (h *AnnotationBackend) Record(ctx context.Context, rule history_model.RuleM
return errCh
}
- go func() {
+ // This is a new background job, so let's create a brand new context for it.
+ // We want it to be isolated, i.e. we don't want grafana shutdowns to interrupt this work
+ // immediately but rather try to flush writes.
+ // This also prevents timeouts or other lingering objects (like transactions) from being
+ // incorrectly propagated here from other areas.
+ writeCtx := context.Background()
+ writeCtx, cancel := context.WithTimeout(writeCtx, StateHistoryWriteTimeout)
+ writeCtx = history_model.WithRuleData(writeCtx, rule)
+ writeCtx = tracing.ContextWithSpan(writeCtx, tracing.SpanFromContext(ctx))
+
+ go func(ctx context.Context) {
+ defer cancel()
defer close(errCh)
+ logger := h.log.FromContext(ctx)
+
errCh <- h.recordAnnotations(ctx, panel, annotations, rule.OrgID, logger)
- }()
+ }(writeCtx)
return errCh
}
diff --git a/pkg/services/ngalert/state/historian/core.go b/pkg/services/ngalert/state/historian/core.go
index 35b9e3ba40a..5fff26fdfd8 100644
--- a/pkg/services/ngalert/state/historian/core.go
+++ b/pkg/services/ngalert/state/historian/core.go
@@ -2,6 +2,7 @@ package historian
import (
"strings"
+ "time"
"github.com/grafana/grafana-plugin-sdk-go/data"
@@ -12,6 +13,8 @@ import (
history_model "github.com/grafana/grafana/pkg/services/ngalert/state/historian/model"
)
+const StateHistoryWriteTimeout = time.Minute
+
func shouldRecord(transition state.StateTransition) bool {
if !transition.Changed() {
return false
diff --git a/pkg/services/ngalert/state/historian/loki.go b/pkg/services/ngalert/state/historian/loki.go
index 0223010475b..99364a788ad 100644
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -14,6 +14,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
+ "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/ngalert/eval"
"github.com/grafana/grafana/pkg/services/ngalert/metrics"
"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -80,8 +81,20 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
return errCh
}
- go func() {
+ // This is a new background job, so let's create a brand new context for it.
+ // We want it to be isolated, i.e. we don't want grafana shutdowns to interrupt this work
+ // immediately but rather try to flush writes.
+ // This also prevents timeouts or other lingering objects (like transactions) from being
+ // incorrectly propagated here from other areas.
+ writeCtx := context.Background()
+ writeCtx, cancel := context.WithTimeout(writeCtx, StateHistoryWriteTimeout)
+ writeCtx = history_model.WithRuleData(writeCtx, rule)
+ writeCtx = tracing.ContextWithSpan(writeCtx, tracing.SpanFromContext(ctx))
+
+ go func(ctx context.Context) {
+ defer cancel()
defer close(errCh)
+ logger := h.log.FromContext(ctx)
org := fmt.Sprint(rule.OrgID)
h.metrics.WritesTotal.WithLabelValues(org, "loki").Inc()
@@ -93,7 +106,7 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
h.metrics.TransitionsFailed.WithLabelValues(org).Add(float64(len(logStream.Values)))
errCh <- fmt.Errorf("failed to save alert state history batch: %w", err)
}
- }()
+ }(writeCtx)
return errCh
}
diff --git a/pkg/services/ngalert/state/historian/loki_http.go b/pkg/services/ngalert/state/historian/loki_http.go
index 67ecdca2477..ff482397154 100644
--- a/pkg/services/ngalert/state/historian/loki_http.go
+++ b/pkg/services/ngalert/state/historian/loki_http.go
@@ -17,12 +17,8 @@ import (
"github.com/weaveworks/common/http/client"
)
-const defaultClientTimeout = 30 * time.Second
-
func NewRequester() client.Requester {
- return &http.Client{
- Timeout: defaultClientTimeout,
- }
+ return &http.Client{}
}
// encoder serializes log streams to some byte format.
diff --git a/pkg/services/ngalert/state/historian/model/rule.go b/pkg/services/ngalert/state/historian/model/rule.go
index a63656c7560..5a76d60c9ce 100644
--- a/pkg/services/ngalert/state/historian/model/rule.go
+++ b/pkg/services/ngalert/state/historian/model/rule.go
@@ -1,6 +1,7 @@
package model
import (
+ "context"
"strconv"
"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
@@ -44,3 +45,7 @@ func NewRuleMeta(r *models.AlertRule, log log.Logger) RuleMeta {
PanelID: panelID,
}
}
+
+func WithRuleData(ctx context.Context, rule RuleMeta) context.Context {
+ return models.WithRuleKey(ctx, models.AlertRuleKey{OrgID: rule.OrgID, UID: rule.UID})
+}
diff --git a/pkg/services/ngalert/state/manager.go b/pkg/services/ngalert/state/manager.go
index 8b523828cb6..5161ba957cf 100644
--- a/pkg/services/ngalert/state/manager.go
+++ b/pkg/services/ngalert/state/manager.go
@@ -351,8 +351,6 @@ func (st *Manager) saveAlertStates(ctx context.Context, logger log.Logger, state
}
logger.Debug("Saving alert states", "count", len(states))
- instances := make([]ngModels.AlertInstance, 0, len(states))
-
for _, s := range states {
// Do not save normal state to database and remove transition to Normal state but keep mapped states
if st.doNotSaveNormalState && IsNormalStateWithNoReason(s.State) && !s.Changed() {
@@ -364,7 +362,7 @@ func (st *Manager) saveAlertStates(ctx context.Context, logger log.Logger, state
logger.Error("Failed to create a key for alert state to save it to database. The state will be ignored ", "cacheID", s.CacheID, "error", err, "labels", s.Labels.String())
continue
}
- fields := ngModels.AlertInstance{
+ instance := ngModels.AlertInstance{
AlertInstanceKey: key,
Labels: ngModels.InstanceLabels(s.Labels),
CurrentState: ngModels.InstanceStateType(s.State.State.String()),
@@ -373,23 +371,11 @@ func (st *Manager) saveAlertStates(ctx context.Context, logger log.Logger, state
CurrentStateSince: s.StartsAt,
CurrentStateEnd: s.EndsAt,
}
- instances = append(instances, fields)
- }
- if len(instances) == 0 {
- return
- }
-
- if err := st.instanceStore.SaveAlertInstances(ctx, instances...); err != nil {
- type debugInfo struct {
- State string
- Labels string
+ err = st.instanceStore.SaveAlertInstance(ctx, instance)
+ if err != nil {
+ logger.Error("Failed to save alert state", "labels", s.Labels.String(), "state", s.State, "error", err)
}
- debug := make([]debugInfo, 0)
- for _, inst := range instances {
- debug = append(debug, debugInfo{string(inst.CurrentState), data.Labels(inst.Labels).String()})
- }
- logger.Error("Failed to save alert states", "states", debug, "error", err)
}
}
diff --git a/pkg/services/ngalert/state/manager_test.go b/pkg/services/ngalert/state/manager_test.go
index 67b82976d1a..b4abfee70f1 100644
--- a/pkg/services/ngalert/state/manager_test.go
+++ b/pkg/services/ngalert/state/manager_test.go
@@ -113,9 +113,11 @@ func TestWarmStateCache(t *testing.T) {
},
}
+ instances := make([]models.AlertInstance, 0)
+
labels := models.InstanceLabels{"test1": "testValue1"}
_, hash, _ := labels.StringAndHash()
- instance1 := models.AlertInstance{
+ instances = append(instances, models.AlertInstance{
AlertInstanceKey: models.AlertInstanceKey{
RuleOrgID: rule.OrgID,
RuleUID: rule.UID,
@@ -126,11 +128,11 @@ func TestWarmStateCache(t *testing.T) {
CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
CurrentStateEnd: evaluationTime.Add(1 * time.Minute),
Labels: labels,
- }
+ })
labels = models.InstanceLabels{"test2": "testValue2"}
_, hash, _ = labels.StringAndHash()
- instance2 := models.AlertInstance{
+ instances = append(instances, models.AlertInstance{
AlertInstanceKey: models.AlertInstanceKey{
RuleOrgID: rule.OrgID,
RuleUID: rule.UID,
@@ -141,11 +143,11 @@ func TestWarmStateCache(t *testing.T) {
CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
CurrentStateEnd: evaluationTime.Add(1 * time.Minute),
Labels: labels,
- }
+ })
labels = models.InstanceLabels{"test3": "testValue3"}
_, hash, _ = labels.StringAndHash()
- instance3 := models.AlertInstance{
+ instances = append(instances, models.AlertInstance{
AlertInstanceKey: models.AlertInstanceKey{
RuleOrgID: rule.OrgID,
RuleUID: rule.UID,
@@ -156,11 +158,11 @@ func TestWarmStateCache(t *testing.T) {
CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
CurrentStateEnd: evaluationTime.Add(1 * time.Minute),
Labels: labels,
- }
+ })
labels = models.InstanceLabels{"test4": "testValue4"}
_, hash, _ = labels.StringAndHash()
- instance4 := models.AlertInstance{
+ instances = append(instances, models.AlertInstance{
AlertInstanceKey: models.AlertInstanceKey{
RuleOrgID: rule.OrgID,
RuleUID: rule.UID,
@@ -171,11 +173,11 @@ func TestWarmStateCache(t *testing.T) {
CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
CurrentStateEnd: evaluationTime.Add(1 * time.Minute),
Labels: labels,
- }
+ })
labels = models.InstanceLabels{"test5": "testValue5"}
_, hash, _ = labels.StringAndHash()
- instance5 := models.AlertInstance{
+ instances = append(instances, models.AlertInstance{
AlertInstanceKey: models.AlertInstanceKey{
RuleOrgID: rule.OrgID,
RuleUID: rule.UID,
@@ -186,8 +188,10 @@ func TestWarmStateCache(t *testing.T) {
CurrentStateSince: evaluationTime.Add(-1 * time.Minute),
CurrentStateEnd: evaluationTime.Add(1 * time.Minute),
Labels: labels,
+ })
+ for _, instance := range instances {
+ _ = dbstore.SaveAlertInstance(ctx, instance)
}
- _ = dbstore.SaveAlertInstances(ctx, instance1, instance2, instance3, instance4, instance5)
cfg := state.ManagerCfg{
Metrics: testMetrics.GetStateMetrics(),
@@ -2370,7 +2374,9 @@ func TestStaleResultsHandler(t *testing.T) {
},
}
- _ = dbstore.SaveAlertInstances(ctx, instances...)
+ for _, instance := range instances {
+ _ = dbstore.SaveAlertInstance(ctx, instance)
+ }
testCases := []struct {
desc string
@@ -2621,7 +2627,9 @@ func TestDeleteStateByRuleUID(t *testing.T) {
},
}
- _ = dbstore.SaveAlertInstances(ctx, instances...)
+ for _, instance := range instances {
+ _ = dbstore.SaveAlertInstance(ctx, instance)
+ }
testCases := []struct {
desc string
@@ -2755,7 +2763,9 @@ func TestResetStateByRuleUID(t *testing.T) {
},
}
- _ = dbstore.SaveAlertInstances(ctx, instances...)
+ for _, instance := range instances {
+ _ = dbstore.SaveAlertInstance(ctx, instance)
+ }
testCases := []struct {
desc string
diff --git a/pkg/services/ngalert/state/persist.go b/pkg/services/ngalert/state/persist.go
index c6a23980fbc..b12deba5af6 100644
--- a/pkg/services/ngalert/state/persist.go
+++ b/pkg/services/ngalert/state/persist.go
@@ -11,7 +11,7 @@ import (
type InstanceStore interface {
FetchOrgIds(ctx context.Context) ([]int64, error)
ListAlertInstances(ctx context.Context, cmd *models.ListAlertInstancesQuery) ([]*models.AlertInstance, error)
- SaveAlertInstances(ctx context.Context, cmd ...models.AlertInstance) error
+ SaveAlertInstance(ctx context.Context, instance models.AlertInstance) error
DeleteAlertInstances(ctx context.Context, keys ...models.AlertInstanceKey) error
DeleteAlertInstancesByRule(ctx context.Context, key models.AlertRuleKey) error
}
diff --git a/pkg/services/ngalert/state/testing.go b/pkg/services/ngalert/state/testing.go
index e14b8e88d78..1b9a6fa694c 100644
--- a/pkg/services/ngalert/state/testing.go
+++ b/pkg/services/ngalert/state/testing.go
@@ -28,12 +28,10 @@ func (f *FakeInstanceStore) ListAlertInstances(_ context.Context, q *models.List
return nil, nil
}
-func (f *FakeInstanceStore) SaveAlertInstances(_ context.Context, q ...models.AlertInstance) error {
+func (f *FakeInstanceStore) SaveAlertInstance(_ context.Context, q models.AlertInstance) error {
f.mtx.Lock()
defer f.mtx.Unlock()
- for _, inst := range q {
- f.RecordedOps = append(f.RecordedOps, inst)
- }
+ f.RecordedOps = append(f.RecordedOps, q)
return nil
}
diff --git a/pkg/services/ngalert/store/alertmanager.go b/pkg/services/ngalert/store/alertmanager.go
index 99552442ee9..b4d3ee81735 100644
--- a/pkg/services/ngalert/store/alertmanager.go
+++ b/pkg/services/ngalert/store/alertmanager.go
@@ -189,6 +189,26 @@ func (st *DBstore) GetAppliedConfigurations(ctx context.Context, orgID int64, li
return configs, nil
}
+// GetHistoricalConfiguration returns a single historical configuration based on provided org and id.
+func (st *DBstore) GetHistoricalConfiguration(ctx context.Context, orgID int64, id int64) (*models.HistoricAlertConfiguration, error) {
+ var config models.HistoricAlertConfiguration
+ if err := st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
+ ok, err := sess.Table("alert_configuration_history").
+ Where("id = ? AND org_id = ?", id, orgID).
+ Get(&config)
+ if err != nil {
+ return err
+ }
+ if !ok {
+ return ErrNoAlertmanagerConfiguration
+ }
+ return nil
+ }); err != nil {
+ return nil, err
+ }
+ return &config, nil
+}
+
func (st *DBstore) deleteOldConfigurations(ctx context.Context, orgID int64, limit int) (int64, error) {
if limit < 1 {
return 0, fmt.Errorf("failed to delete old configurations: limit is set to '%d' but needs to be > 0", limit)
@@ -219,11 +239,11 @@ func (st *DBstore) deleteOldConfigurations(ctx context.Context, orgID int64, lim
}
res, err := sess.Exec(`
- DELETE FROM
+ DELETE FROM
alert_configuration_history
WHERE
org_id = ?
- AND
+ AND
id < ?
`, orgID, threshold)
if err != nil {
diff --git a/pkg/services/ngalert/store/alertmanager_test.go b/pkg/services/ngalert/store/alertmanager_test.go
index 150adc9104d..306bbbc243f 100644
--- a/pkg/services/ngalert/store/alertmanager_test.go
+++ b/pkg/services/ngalert/store/alertmanager_test.go
@@ -425,6 +425,61 @@ func TestIntegrationGetAppliedConfigurations(t *testing.T) {
})
}
+func TestIntegrationGetHistoricalConfiguration(t *testing.T) {
+ if testing.Short() {
+ t.Skip("skipping integration test")
+ }
+ sqlStore := db.InitTestDB(t)
+ store := &DBstore{
+ SQLStore: sqlStore,
+ Logger: log.NewNopLogger(),
+ }
+
+ // Tracks the autogenerated PK for the history table.
+ var historyTablePK int64 = 0
+
+ t.Run("no configurations = error", func(tt *testing.T) {
+ _, err := store.GetHistoricalConfiguration(context.Background(), 10, 10)
+ require.Error(tt, err)
+ })
+
+ t.Run("correct configurations should be returned", func(tt *testing.T) {
+ ctx := context.Background()
+ var org int64 = 1
+ setupConfigInOrg(t, "testa", org, store)
+ historyTablePK += 1
+ setupConfigInOrg(t, "testb", org, store)
+ historyTablePK += 1
+
+ cfg, err := store.GetHistoricalConfiguration(ctx, org, historyTablePK)
+ require.NoError(tt, err)
+
+ // Check that the returned configuration is the one that we're expecting.
+ require.Equal(tt, "testb", cfg.AlertmanagerConfiguration)
+ })
+
+ t.Run("configurations from other orgs should not be retrievable by id", func(tt *testing.T) {
+ ctx := context.Background()
+ var org int64 = 1
+ setupConfigInOrg(t, "test1", org, store)
+ historyTablePK += 1
+
+ // Create a config in a different org.
+ var otherOrg int64 = 2
+ setupConfigInOrg(t, "test2", otherOrg, store)
+ historyTablePK += 1
+
+ // Sanity check that config is retrievable with correct org and id.
+ cfg, err := store.GetHistoricalConfiguration(ctx, otherOrg, historyTablePK)
+ require.NoError(tt, err)
+ require.Equal(tt, "test2", cfg.AlertmanagerConfiguration)
+
+ // Verify that we cannot retrieve the config from org=2 when passing in org=1.
+ _, err = store.GetHistoricalConfiguration(ctx, org, historyTablePK)
+ require.Error(tt, err, ErrNoAlertmanagerConfiguration)
+ })
+}
+
func setupConfig(t *testing.T, config string, store *DBstore) (string, string) {
t.Helper()
return setupConfigInOrg(t, config, 1, store)
diff --git a/pkg/services/ngalert/store/database.go b/pkg/services/ngalert/store/database.go
index f91ac4788f7..16a170ae23e 100644
--- a/pkg/services/ngalert/store/database.go
+++ b/pkg/services/ngalert/store/database.go
@@ -29,6 +29,7 @@ type AlertingStore interface {
UpdateAlertmanagerConfiguration(ctx context.Context, cmd *models.SaveAlertmanagerConfigurationCmd) error
MarkConfigurationAsApplied(ctx context.Context, cmd *models.MarkConfigurationAsAppliedCmd) error
GetAppliedConfigurations(ctx context.Context, orgID int64, limit int) ([]*models.HistoricAlertConfiguration, error)
+ GetHistoricalConfiguration(ctx context.Context, orgID int64, id int64) (*models.HistoricAlertConfiguration, error)
}
// DBstore stores the alert definitions and instances in the database.
diff --git a/pkg/services/ngalert/store/instance_database.go b/pkg/services/ngalert/store/instance_database.go
index 8583a40e474..0c31bc620fe 100644
--- a/pkg/services/ngalert/store/instance_database.go
+++ b/pkg/services/ngalert/store/instance_database.go
@@ -43,99 +43,6 @@ func (st DBstore) ListAlertInstances(ctx context.Context, cmd *models.ListAlertI
return result, err
}
-// SaveAlertInstances saves all the provided alert instances to the store.
-func (st DBstore) SaveAlertInstances(ctx context.Context, cmd ...models.AlertInstance) error {
- if !st.FeatureToggles.IsEnabled(featuremgmt.FlagAlertingBigTransactions) {
- // This mimics the replace code-path by calling SaveAlertInstance in a loop, with a transaction per call.
- for _, c := range cmd {
- err := st.SaveAlertInstance(ctx, c)
- if err != nil {
- return err
- }
- }
- return nil
- } else {
- // Batches write into statements with `maxRows` instances per statements.
- // This makes sure we don't create statements that are too long for some
- // databases to process. For example, SQLite has a limit of 999 variables
- // per write.
- keyNames := []string{"rule_org_id", "rule_uid", "labels_hash"}
- fieldNames := []string{
- "rule_org_id", "rule_uid", "labels", "labels_hash", "current_state",
- "current_reason", "current_state_since", "current_state_end", "last_eval_time",
- }
- fieldsPerRow := len(fieldNames)
- maxRows := 20
- maxArgs := maxRows * fieldsPerRow
-
- bigUpsertSQL, err := st.SQLStore.GetDialect().UpsertMultipleSQL(
- "alert_instance", keyNames, fieldNames, maxRows)
- if err != nil {
- return err
- }
-
- // Args contains the SQL statement, and the values to fill into the SQL statement.
- args := make([]interface{}, 0, maxArgs)
- args = append(args, bigUpsertSQL)
- values := func(a []interface{}) int {
- return len(a) - 1
- }
-
- // Generate batches of `maxRows` and write the statements when full.
- for _, alertInstance := range cmd {
- labelTupleJSON, err := alertInstance.Labels.StringKey()
- if err != nil {
- return err
- }
-
- if err := models.ValidateAlertInstance(alertInstance); err != nil {
- return err
- }
-
- args = append(args,
- alertInstance.RuleOrgID, alertInstance.RuleUID, labelTupleJSON, alertInstance.LabelsHash,
- alertInstance.CurrentState, alertInstance.CurrentReason, alertInstance.CurrentStateSince.Unix(),
- alertInstance.CurrentStateEnd.Unix(), alertInstance.LastEvalTime.Unix())
-
- // If we've reached the maximum batch size, write to the database.
- if values(args) >= maxArgs {
- err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
- _, err := sess.Exec(args...)
- return err
- })
- if err != nil {
- return fmt.Errorf("failed to save alert instances: %w", err)
- }
-
- // Reset args so we can re-use the allocated interface pointers.
- args = args[:1]
- }
- }
-
- // Write the final batch of up to maxRows in size.
- if values(args) != 0 && values(args)%fieldsPerRow == 0 {
- upsertSQL, err := st.SQLStore.GetDialect().UpsertMultipleSQL(
- "alert_instance", keyNames, fieldNames, values(args)/fieldsPerRow)
- if err != nil {
- return err
- }
-
- args[0] = upsertSQL
- err = st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
- _, err := sess.Exec(args...)
- return err
- })
- if err != nil {
- return fmt.Errorf("failed to save alert instances: %w", err)
- }
- } else if values(args) != 0 {
- return fmt.Errorf("failed to upsert alert instances. Last statements had %v fields, which is not a multiple of the number of fields, %v", len(args), fieldsPerRow)
- }
-
- return nil
- }
-}
-
// SaveAlertInstance is a handler for saving a new alert instance.
func (st DBstore) SaveAlertInstance(ctx context.Context, alertInstance models.AlertInstance) error {
return st.SQLStore.WithDbSession(ctx, func(sess *db.Session) error {
diff --git a/pkg/services/ngalert/store/instance_database_test.go b/pkg/services/ngalert/store/instance_database_test.go
index 5cb8088bcf9..3a055dab3cc 100644
--- a/pkg/services/ngalert/store/instance_database_test.go
+++ b/pkg/services/ngalert/store/instance_database_test.go
@@ -19,7 +19,6 @@ func BenchmarkAlertInstanceOperations(b *testing.B) {
b.StopTimer()
ctx := context.Background()
_, dbstore := tests.SetupTestEnv(b, baseIntervalSeconds)
- dbstore.FeatureToggles = featuremgmt.WithFeatures(featuremgmt.FlagAlertingBigTransactions)
const mainOrgID int64 = 1
@@ -48,78 +47,13 @@ func BenchmarkAlertInstanceOperations(b *testing.B) {
b.StartTimer()
for i := 0; i < b.N; i++ {
- _ = dbstore.SaveAlertInstances(ctx, instances...)
+ for _, instance := range instances {
+ _ = dbstore.SaveAlertInstance(ctx, instance)
+ }
_ = dbstore.DeleteAlertInstances(ctx, keys...)
}
}
-func TestIntegrationAlertInstanceBulkWrite(t *testing.T) {
- if testing.Short() {
- t.Skip("skipping integration test")
- }
- ctx := context.Background()
- _, dbstore := tests.SetupTestEnv(t, baseIntervalSeconds)
-
- orgIDs := []int64{1, 2, 3, 4, 5}
- counts := []int{10_000, 200, 503, 0, 1256}
- instances := make([]models.AlertInstance, 0, 10_000+200+503+0+1256)
- keys := make([]models.AlertInstanceKey, 0, 10_000+200+503+0+1256)
-
- for i, id := range orgIDs {
- alertRule := tests.CreateTestAlertRule(t, ctx, dbstore, 60, id)
-
- // Create some instances to write down and then delete.
- for j := 0; j < counts[i]; j++ {
- labels := models.InstanceLabels{"test": fmt.Sprint(j)}
- _, labelsHash, _ := labels.StringAndHash()
- instance := models.AlertInstance{
- AlertInstanceKey: models.AlertInstanceKey{
- RuleOrgID: alertRule.OrgID,
- RuleUID: alertRule.UID,
- LabelsHash: labelsHash,
- },
- CurrentState: models.InstanceStateFiring,
- CurrentReason: string(models.InstanceStateError),
- Labels: labels,
- }
- instances = append(instances, instance)
- keys = append(keys, instance.AlertInstanceKey)
- }
- }
-
- for _, bigStmts := range []bool{false, true} {
- dbstore.FeatureToggles = featuremgmt.WithFeatures([]interface{}{featuremgmt.FlagAlertingBigTransactions, bigStmts})
- t.Log("Saving")
- err := dbstore.SaveAlertInstances(ctx, instances...)
- require.NoError(t, err)
- t.Log("Finished database write")
-
- // List our instances. Make sure we have the right count.
- for i, id := range orgIDs {
- q := &models.ListAlertInstancesQuery{
- RuleOrgID: id,
- }
- alerts, err := dbstore.ListAlertInstances(ctx, q)
- require.NoError(t, err)
- require.Equal(t, counts[i], len(alerts), "Org %v: Expected %v instances but got %v", id, counts[i], len(alerts))
- }
- t.Log("Finished database read")
-
- err = dbstore.DeleteAlertInstances(ctx, keys...)
- require.NoError(t, err)
- t.Log("Finished database delete")
-
- for _, id := range orgIDs {
- q := &models.ListAlertInstancesQuery{
- RuleOrgID: id,
- }
- alerts, err := dbstore.ListAlertInstances(ctx, q)
- require.NoError(t, err)
- require.Zero(t, len(alerts), "Org %v: Deleted instances but still had %v", id, len(alerts))
- }
- }
-}
-
func TestIntegrationAlertInstanceOperations(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
@@ -164,7 +98,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
CurrentReason: string(models.InstanceStateError),
Labels: labels,
}
- err := dbstore.SaveAlertInstances(ctx, instance)
+ err := dbstore.SaveAlertInstance(ctx, instance)
require.NoError(t, err)
listCmd := &models.ListAlertInstancesQuery{
@@ -193,7 +127,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
CurrentState: models.InstanceStateNormal,
Labels: labels,
}
- err := dbstore.SaveAlertInstances(ctx, instance)
+ err := dbstore.SaveAlertInstance(ctx, instance)
require.NoError(t, err)
listCmd := &models.ListAlertInstancesQuery{
@@ -223,7 +157,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
Labels: labels,
}
- err := dbstore.SaveAlertInstances(ctx, instance1)
+ err := dbstore.SaveAlertInstance(ctx, instance1)
require.NoError(t, err)
labels = models.InstanceLabels{"test": "testValue2"}
@@ -237,7 +171,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
CurrentState: models.InstanceStateFiring,
Labels: labels,
}
- err = dbstore.SaveAlertInstances(ctx, instance2)
+ err = dbstore.SaveAlertInstance(ctx, instance2)
require.NoError(t, err)
listQuery := &models.ListAlertInstancesQuery{
@@ -284,7 +218,9 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
CurrentReason: models.StateReasonError,
Labels: labels,
}
- err := dbstore.SaveAlertInstances(ctx, instance1, instance2)
+ err := dbstore.SaveAlertInstance(ctx, instance1)
+ require.NoError(t, err)
+ err = dbstore.SaveAlertInstance(ctx, instance2)
require.NoError(t, err)
listQuery := &models.ListAlertInstancesQuery{
@@ -327,7 +263,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
Labels: labels,
}
- err := dbstore.SaveAlertInstances(ctx, instance1)
+ err := dbstore.SaveAlertInstance(ctx, instance1)
require.NoError(t, err)
instance2 := models.AlertInstance{
@@ -339,7 +275,7 @@ func TestIntegrationAlertInstanceOperations(t *testing.T) {
CurrentState: models.InstanceStateNormal,
Labels: instance1.Labels,
}
- err = dbstore.SaveAlertInstances(ctx, instance2)
+ err = dbstore.SaveAlertInstance(ctx, instance2)
require.NoError(t, err)
listQuery := &models.ListAlertInstancesQuery{
diff --git a/pkg/services/pluginsintegration/config/config.go b/pkg/services/pluginsintegration/config/config.go
new file mode 100644
index 00000000000..24d1e5c2f03
--- /dev/null
+++ b/pkg/services/pluginsintegration/config/config.go
@@ -0,0 +1,59 @@
+package config
+
+import (
+ "fmt"
+ "strings"
+
+ pCfg "github.com/grafana/grafana/pkg/plugins/config"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+func ProvideConfig(settingProvider setting.Provider, grafanaCfg *setting.Cfg) (*pCfg.Cfg, error) {
+ plugins := settingProvider.Section("plugins")
+ allowedUnsigned := grafanaCfg.PluginsAllowUnsigned
+ if len(plugins.KeyValue("allow_loading_unsigned_plugins").Value()) > 0 {
+ allowedUnsigned = strings.Split(plugins.KeyValue("allow_loading_unsigned_plugins").Value(), ",")
+ }
+
+ aws := settingProvider.Section("aws")
+ allowedAuth := grafanaCfg.AWSAllowedAuthProviders
+ if len(aws.KeyValue("allowed_auth_providers").Value()) > 0 {
+ allowedUnsigned = strings.Split(settingProvider.KeyValue("plugins", "allow_loading_unsigned_plugins").Value(), ",")
+ }
+
+ tracingCfg, err := newTracingCfg(grafanaCfg)
+ if err != nil {
+ return nil, fmt.Errorf("new opentelemetry cfg: %w", err)
+ }
+ return pCfg.NewCfg(
+ settingProvider.KeyValue("", "app_mode").MustBool(grafanaCfg.Env == setting.Dev),
+ grafanaCfg.PluginsPath,
+ extractPluginSettings(settingProvider),
+ allowedUnsigned,
+ allowedAuth,
+ aws.KeyValue("assume_role_enabled").MustBool(grafanaCfg.AWSAssumeRoleEnabled),
+ grafanaCfg.Azure,
+ grafanaCfg.BuildVersion,
+ grafanaCfg.PluginLogBackendRequests,
+ grafanaCfg.PluginsCDNURLTemplate,
+ tracingCfg,
+ ), nil
+}
+
+func extractPluginSettings(settingProvider setting.Provider) setting.PluginSettings {
+ ps := setting.PluginSettings{}
+ for sectionName, sectionCopy := range settingProvider.Current() {
+ if !strings.HasPrefix(sectionName, "plugin.") {
+ continue
+ }
+ // Calling Current() returns a redacted version of section. We need to replace the map values with the unredacted values.
+ section := settingProvider.Section(sectionName)
+ for k := range sectionCopy {
+ sectionCopy[k] = section.KeyValue(k).MustString("")
+ }
+ pluginID := strings.Replace(sectionName, "plugin.", "", 1)
+ ps[pluginID] = sectionCopy
+ }
+
+ return ps
+}
diff --git a/pkg/plugins/config/config_test.go b/pkg/services/pluginsintegration/config/config_test.go
similarity index 100%
rename from pkg/plugins/config/config_test.go
rename to pkg/services/pluginsintegration/config/config_test.go
diff --git a/pkg/services/pluginsintegration/config/tracing.go b/pkg/services/pluginsintegration/config/tracing.go
new file mode 100644
index 00000000000..1f5ad963a83
--- /dev/null
+++ b/pkg/services/pluginsintegration/config/tracing.go
@@ -0,0 +1,27 @@
+package config
+
+import (
+ "fmt"
+
+ "github.com/grafana/grafana/pkg/infra/tracing"
+ pCfg "github.com/grafana/grafana/pkg/plugins/config"
+ "github.com/grafana/grafana/pkg/setting"
+)
+
+// newTracingCfg creates a plugins tracing configuration based on the provided Grafana tracing config.
+// If OpenTelemetry (OTLP) is disabled, a zero-value OpenTelemetryCfg is returned.
+func newTracingCfg(grafanaCfg *setting.Cfg) (pCfg.Tracing, error) {
+ ots, err := tracing.ParseSettingsOpentelemetry(grafanaCfg)
+ if err != nil {
+ return pCfg.Tracing{}, fmt.Errorf("parse settings: %w", err)
+ }
+ if !ots.OTelExporterEnabled() {
+ return pCfg.Tracing{}, nil
+ }
+ return pCfg.Tracing{
+ OpenTelemetry: pCfg.OpenTelemetryCfg{
+ Address: ots.Address,
+ Propagation: ots.Propagation,
+ },
+ }, nil
+}
diff --git a/pkg/plugins/config/tracing_test.go b/pkg/services/pluginsintegration/config/tracing_test.go
similarity index 61%
rename from pkg/plugins/config/tracing_test.go
rename to pkg/services/pluginsintegration/config/tracing_test.go
index cc24b7162a7..6f5367da02c 100644
--- a/pkg/plugins/config/tracing_test.go
+++ b/pkg/services/pluginsintegration/config/tracing_test.go
@@ -8,15 +8,15 @@ import (
"github.com/stretchr/testify/require"
)
-func TestNewOpentelemetryCfg(t *testing.T) {
+func TestNewTracingCfg(t *testing.T) {
t.Run("empty", func(t *testing.T) {
cfg := setting.NewCfg()
- otelCfg, err := NewOpentelemetryCfg(cfg)
+ tracingCfg, err := newTracingCfg(cfg)
require.NoError(t, err)
- assert.False(t, otelCfg.IsEnabled(), "otel should be disabled")
- assert.Empty(t, otelCfg.Address)
- assert.Empty(t, otelCfg.Propagation)
+ assert.False(t, tracingCfg.IsEnabled(), "tracing should be disabled")
+ assert.Empty(t, tracingCfg.OpenTelemetry.Address)
+ assert.Empty(t, tracingCfg.OpenTelemetry.Propagation)
})
t.Run("enabled", func(t *testing.T) {
@@ -39,11 +39,11 @@ func TestNewOpentelemetryCfg(t *testing.T) {
otlpSect.Key("propagation").SetValue(tc.propagation)
}
- otelCfg, err := NewOpentelemetryCfg(cfg)
+ tracingCfg, err := newTracingCfg(cfg)
require.NoError(t, err)
- assert.True(t, otelCfg.IsEnabled(), "otel should be enabled")
- assert.Equal(t, address, otelCfg.Address)
- assert.Equal(t, tc.propagation, otelCfg.Propagation)
+ assert.True(t, tracingCfg.IsEnabled(), "tracing should be enabled")
+ assert.Equal(t, address, tracingCfg.OpenTelemetry.Address)
+ assert.Equal(t, tc.propagation, tracingCfg.OpenTelemetry.Propagation)
})
}
})
diff --git a/pkg/services/pluginsintegration/pluginsintegration.go b/pkg/services/pluginsintegration/pluginsintegration.go
index 535c5e41913..1434b9a2dbb 100644
--- a/pkg/services/pluginsintegration/pluginsintegration.go
+++ b/pkg/services/pluginsintegration/pluginsintegration.go
@@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
- "github.com/grafana/grafana/pkg/plugins/config"
+ pCfg "github.com/grafana/grafana/pkg/plugins/config"
"github.com/grafana/grafana/pkg/plugins/manager"
"github.com/grafana/grafana/pkg/plugins/manager/client"
"github.com/grafana/grafana/pkg/plugins/manager/filestore"
@@ -23,6 +23,7 @@ import (
"github.com/grafana/grafana/pkg/plugins/repo"
"github.com/grafana/grafana/pkg/services/oauthtoken"
"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
+ "github.com/grafana/grafana/pkg/services/pluginsintegration/config"
"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
@@ -76,14 +77,14 @@ var WireExtensionSet = wire.NewSet(
finder.NewLocalFinder,
)
-func ProvideClientDecorator(cfg *setting.Cfg, pCfg *config.Cfg,
+func ProvideClientDecorator(cfg *setting.Cfg, pCfg *pCfg.Cfg,
pluginRegistry registry.Service,
oAuthTokenService oauthtoken.OAuthTokenService,
tracer tracing.Tracer) (*client.Decorator, error) {
return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer)
}
-func NewClientDecorator(cfg *setting.Cfg, pCfg *config.Cfg,
+func NewClientDecorator(cfg *setting.Cfg, pCfg *pCfg.Cfg,
pluginRegistry registry.Service,
oAuthTokenService oauthtoken.OAuthTokenService,
tracer tracing.Tracer) (*client.Decorator, error) {
diff --git a/pkg/services/publicdashboards/service/query.go b/pkg/services/publicdashboards/service/query.go
index 35180debcfb..22c6fd4f96c 100644
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -213,7 +213,10 @@ func getUniqueDashboardDatasourceUids(dashboard *simplejson.Json) []string {
var datasourceUids []string
exists := map[string]bool{}
- for _, panelObj := range dashboard.Get("panels").MustArray() {
+ // collapsed rows contain panels in a nested structure, so we need to flatten them before calculate unique uids
+ flattenedPanels := getFlattenedPanels(dashboard)
+
+ for _, panelObj := range flattenedPanels {
panel := simplejson.NewFromAny(panelObj)
uid := getDataSourceUidFromJson(panel)
@@ -238,6 +241,23 @@ func getUniqueDashboardDatasourceUids(dashboard *simplejson.Json) []string {
return datasourceUids
}
+func getFlattenedPanels(dashboard *simplejson.Json) []interface{} {
+ var flatPanels []interface{}
+ for _, panelObj := range dashboard.Get("panels").MustArray() {
+ panel := simplejson.NewFromAny(panelObj)
+ // if the panel is a row and it is collapsed, get the queries from the panels inside the row
+ // if it is not collapsed, the row does not have any panels
+ if panel.Get("type").MustString() == "row" {
+ if panel.Get("collapsed").MustBool() {
+ flatPanels = append(flatPanels, panel.Get("panels").MustArray()...)
+ }
+ } else {
+ flatPanels = append(flatPanels, panelObj)
+ }
+ }
+ return flatPanels
+}
+
func groupQueriesByPanelId(dashboard *simplejson.Json) map[int64][]*simplejson.Json {
result := make(map[int64][]*simplejson.Json)
diff --git a/pkg/services/publicdashboards/service/query_test.go b/pkg/services/publicdashboards/service/query_test.go
index 1d8ccf2e8bd..ecc0aff01db 100644
--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -432,6 +432,218 @@ const (
],
"schemaVersion": 35
}`
+
+ dashboardWithCollapsedRows = `
+{
+"panels": [
+ {
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 12,
+ "title": "Row title",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "qCbTUC37k"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 8,
+ "w": 12,
+ "x": 0,
+ "y": 1
+ },
+ "id": 11,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "qCbTUC37k"
+ },
+ "editorMode": "builder",
+ "expr": "access_evaluation_duration_bucket",
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A"
+ }
+ ],
+ "title": "Panel Title",
+ "type": "timeseries"
+ },
+ {
+ "collapsed": true,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 9
+ },
+ "id": 10,
+ "panels": [
+ {
+ "datasource": {
+ "type": "influxdb",
+ "uid": "P49A45DF074423DFB"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green"
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 9,
+ "w": 12,
+ "x": 0,
+ "y": 10
+ },
+ "id": 8,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "pluginVersion": "9.4.0-pre",
+ "targets": [
+ {
+ "datasource": {
+ "type": "influxdb",
+ "uid": "P49A45DF074423DFB"
+ },
+ "query": "// v.bucket, v.timeRangeStart, and v.timeRange stop are all variables supported by the flux plugin and influxdb\nfrom(bucket: v.bucket)\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn: (r) => r[\"_value\"] >= 10 and r[\"_value\"] <= 20)",
+ "refId": "A"
+ }
+ ],
+ "title": "Panel Title",
+ "type": "timeseries"
+ }
+ ],
+ "title": "Row title 1",
+ "type": "row"
+ }
+ ]
+}`
)
func TestGetQueryDataResponse(t *testing.T) {
@@ -500,7 +712,7 @@ func TestFindAnnotations(t *testing.T) {
sqlStore := sqlstore.InitTestDB(t)
config := setting.NewCfg()
tagService := tagimpl.ProvideService(sqlStore, sqlStore.Cfg)
- annotationsRepo := annotationsimpl.ProvideService(sqlStore, config, tagService)
+ annotationsRepo := annotationsimpl.ProvideService(sqlStore, config, featuremgmt.WithFeatures(), tagService)
fakeStore := FakePublicDashboardStore{}
service := &PublicDashboardServiceImpl{
log: log.New("test.logger"),
@@ -951,6 +1163,16 @@ func TestGetUniqueDashboardDatasourceUids(t *testing.T) {
uids := getUniqueDashboardDatasourceUids(json)
require.Len(t, uids, 0)
})
+
+ t.Run("can get unique datasource ids from dashboard with rows", func(t *testing.T) {
+ json, err := simplejson.NewJson([]byte(dashboardWithCollapsedRows))
+ require.NoError(t, err)
+
+ uids := getUniqueDashboardDatasourceUids(json)
+ require.Len(t, uids, 2)
+ require.Equal(t, "qCbTUC37k", uids[0])
+ require.Equal(t, "P49A45DF074423DFB", uids[1])
+ })
}
func TestBuildMetricRequest(t *testing.T) {
diff --git a/pkg/services/sqlstore/permissions/dashboard.go b/pkg/services/sqlstore/permissions/dashboard.go
index bb50a034061..0a1501795c1 100644
--- a/pkg/services/sqlstore/permissions/dashboard.go
+++ b/pkg/services/sqlstore/permissions/dashboard.go
@@ -1,16 +1,23 @@
package permissions
import (
+ "bytes"
+ "fmt"
"strings"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
+ "github.com/grafana/grafana/pkg/services/folder"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
"github.com/grafana/grafana/pkg/services/user"
)
+// maximum possible capacity for recursive queries array: one query for folder and one for dashboard actions
+const maximumRecursiveQueries = 2
+
type DashboardPermissionFilter struct {
OrgRole org.RoleType
Dialect migrator.Dialect
@@ -78,14 +85,25 @@ func (d DashboardPermissionFilter) Where() (string, []interface{}) {
return sql, params
}
-type AccessControlDashboardPermissionFilter struct {
+type clause struct {
+ string
+ params []interface{}
+}
+
+type accessControlDashboardPermissionFilter struct {
user *user.SignedInUser
dashboardActions []string
folderActions []string
+ features featuremgmt.FeatureToggles
+
+ where clause
+ // any recursive CTE queries (if supported)
+ recQueries []clause
+ recursiveQueriesAreSupported bool
}
// NewAccessControlDashboardPermissionFilter creates a new AccessControlDashboardPermissionFilter that is configured with specific actions calculated based on the dashboards.PermissionType and query type
-func NewAccessControlDashboardPermissionFilter(user *user.SignedInUser, permissionLevel dashboards.PermissionType, queryType string) AccessControlDashboardPermissionFilter {
+func NewAccessControlDashboardPermissionFilter(user *user.SignedInUser, permissionLevel dashboards.PermissionType, queryType string, features featuremgmt.FeatureToggles, recursiveQueriesAreSupported bool) *accessControlDashboardPermissionFilter {
needEdit := permissionLevel > dashboards.PERMISSION_VIEW
var folderActions []string
@@ -121,12 +139,26 @@ func NewAccessControlDashboardPermissionFilter(user *user.SignedInUser, permissi
}
}
- return AccessControlDashboardPermissionFilter{user: user, folderActions: folderActions, dashboardActions: dashboardActions}
+ f := accessControlDashboardPermissionFilter{user: user, folderActions: folderActions, dashboardActions: dashboardActions, features: features,
+ recursiveQueriesAreSupported: recursiveQueriesAreSupported,
+ }
+
+ f.buildClauses()
+
+ return &f
}
-func (f AccessControlDashboardPermissionFilter) Where() (string, []interface{}) {
+// Where returns:
+// - a where clause for filtering dashboards with expected permissions
+// - an array with the query parameters
+func (f *accessControlDashboardPermissionFilter) Where() (string, []interface{}) {
+ return f.where.string, f.where.params
+}
+
+func (f *accessControlDashboardPermissionFilter) buildClauses() {
if f.user == nil || f.user.Permissions == nil || f.user.Permissions[f.user.OrgID] == nil {
- return "(1 = 0)", nil
+ f.where = clause{string: "(1 = 0)"}
+ return
}
dashWildcards := accesscontrol.WildcardsFromPrefix(dashboards.ScopeDashboardsPrefix)
folderWildcards := accesscontrol.WildcardsFromPrefix(dashboards.ScopeFoldersPrefix)
@@ -136,6 +168,10 @@ func (f AccessControlDashboardPermissionFilter) Where() (string, []interface{})
var args []interface{}
builder := strings.Builder{}
builder.WriteRune('(')
+
+ permSelector := strings.Builder{}
+ var permSelectorArgs []interface{}
+
if len(f.dashboardActions) > 0 {
toCheck := actionsToCheck(f.dashboardActions, f.user.Permissions[f.user.OrgID], dashWildcards, folderWildcards)
@@ -155,24 +191,50 @@ func (f AccessControlDashboardPermissionFilter) Where() (string, []interface{})
builder.WriteString(") AND NOT dashboard.is_folder)")
builder.WriteString(" OR ")
- builder.WriteString("(dashboard.folder_id IN (SELECT id FROM dashboard as d WHERE d.uid IN (SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%' ")
- builder.WriteString(rolesFilter)
- args = append(args, params...)
+ permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%' ")
+ permSelector.WriteString(rolesFilter)
+ permSelectorArgs = append(permSelectorArgs, params...)
if len(toCheck) == 1 {
- builder.WriteString(" AND action = ?")
- args = append(args, toCheck[0])
+ permSelector.WriteString(" AND action = ?")
+ permSelectorArgs = append(permSelectorArgs, toCheck[0])
} else {
- builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
- args = append(args, toCheck...)
- args = append(args, len(toCheck))
+ permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+ permSelectorArgs = append(permSelectorArgs, toCheck...)
+ permSelectorArgs = append(permSelectorArgs, len(toCheck))
}
- builder.WriteString(")) AND NOT dashboard.is_folder)")
+ permSelector.WriteRune(')')
+
+ switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+ case true:
+ switch f.recursiveQueriesAreSupported {
+ case true:
+ recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
+ f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
+ builder.WriteString("(dashboard.folder_id IN (SELECT d.id FROM dashboard as d ")
+ builder.WriteString(fmt.Sprintf("WHERE d.uid IN (SELECT uid FROM %s)", recQueryName))
+ default:
+ nestedFoldersSelectors, nestedFoldersArgs := nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "folder_id", "id")
+ builder.WriteRune('(')
+ builder.WriteString(nestedFoldersSelectors)
+ args = append(args, nestedFoldersArgs...)
+ }
+ default:
+ builder.WriteString("(dashboard.folder_id IN (SELECT d.id FROM dashboard as d ")
+ builder.WriteString("WHERE d.uid IN ")
+ builder.WriteString(permSelector.String())
+ args = append(args, permSelectorArgs...)
+ }
+ builder.WriteString(") AND NOT dashboard.is_folder)")
} else {
builder.WriteString("NOT dashboard.is_folder")
}
}
+ // recycle and reuse
+ permSelector.Reset()
+ permSelectorArgs = permSelectorArgs[:0]
+
if len(f.folderActions) > 0 {
if len(f.dashboardActions) > 0 {
builder.WriteString(" OR ")
@@ -180,24 +242,80 @@ func (f AccessControlDashboardPermissionFilter) Where() (string, []interface{})
toCheck := actionsToCheck(f.folderActions, f.user.Permissions[f.user.OrgID], folderWildcards)
if len(toCheck) > 0 {
- builder.WriteString("(dashboard.uid IN (SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%'")
- builder.WriteString(rolesFilter)
- args = append(args, params...)
+ permSelector.WriteString("(SELECT substr(scope, 13) FROM permission WHERE scope LIKE 'folders:uid:%'")
+ permSelector.WriteString(rolesFilter)
+ permSelectorArgs = append(permSelectorArgs, params...)
if len(toCheck) == 1 {
- builder.WriteString(" AND action = ?")
- args = append(args, toCheck[0])
+ permSelector.WriteString(" AND action = ?")
+ permSelectorArgs = append(permSelectorArgs, toCheck[0])
} else {
- builder.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
- args = append(args, toCheck...)
- args = append(args, len(toCheck))
+ permSelector.WriteString(" AND action IN (?" + strings.Repeat(", ?", len(toCheck)-1) + ") GROUP BY role_id, scope HAVING COUNT(action) = ?")
+ permSelectorArgs = append(permSelectorArgs, toCheck...)
+ permSelectorArgs = append(permSelectorArgs, len(toCheck))
}
- builder.WriteString(") AND dashboard.is_folder)")
+ permSelector.WriteRune(')')
+
+ switch f.features.IsEnabled(featuremgmt.FlagNestedFolders) {
+ case true:
+ switch f.recursiveQueriesAreSupported {
+ case true:
+ recQueryName := fmt.Sprintf("RecQry%d", len(f.recQueries))
+ f.addRecQry(recQueryName, permSelector.String(), permSelectorArgs)
+ builder.WriteString("(dashboard.uid IN ")
+ builder.WriteString(fmt.Sprintf("(SELECT uid FROM %s)", recQueryName))
+ default:
+ nestedFoldersSelectors, nestedFoldersArgs := nestedFoldersSelectors(permSelector.String(), permSelectorArgs, "uid", "uid")
+ builder.WriteRune('(')
+ builder.WriteString(nestedFoldersSelectors)
+ builder.WriteRune(')')
+ args = append(args, nestedFoldersArgs...)
+ }
+ default:
+ builder.WriteString("(dashboard.uid IN ")
+ builder.WriteString(permSelector.String())
+ args = append(args, permSelectorArgs...)
+ }
+ builder.WriteString(" AND dashboard.is_folder)")
} else {
builder.WriteString("dashboard.is_folder")
}
}
builder.WriteRune(')')
- return builder.String(), args
+
+ f.where = clause{string: builder.String(), params: args}
+}
+
+// With returns:
+// - a with clause for fetching folders with inherited permissions if nested folders are enabled or an empty string
+func (f *accessControlDashboardPermissionFilter) With() (string, []interface{}) {
+ var sb bytes.Buffer
+ var params []interface{}
+ if len(f.recQueries) > 0 {
+ sb.WriteString("WITH RECURSIVE ")
+ sb.WriteString(f.recQueries[0].string)
+ params = append(params, f.recQueries[0].params...)
+ for _, r := range f.recQueries[1:] {
+ sb.WriteRune(',')
+ sb.WriteString(r.string)
+ params = append(params, r.params...)
+ }
+ }
+ return sb.String(), params
+}
+
+func (f *accessControlDashboardPermissionFilter) addRecQry(queryName string, whereUIDSelect string, whereParams []interface{}) {
+ if f.recQueries == nil {
+ f.recQueries = make([]clause, 0, maximumRecursiveQueries)
+ }
+ c := make([]interface{}, len(whereParams))
+ copy(c, whereParams)
+ f.recQueries = append(f.recQueries, clause{
+ string: fmt.Sprintf(`%s AS (
+ SELECT uid, parent_uid, org_id FROM folder WHERE uid IN %s
+ UNION ALL SELECT f.uid, f.parent_uid, f.org_id FROM folder f INNER JOIN %s r ON f.parent_uid = r.uid and f.org_id = r.org_id
+ )`, queryName, whereUIDSelect, queryName),
+ params: c,
+ })
}
func actionsToCheck(actions []string, permissions map[string][]string, wildcards ...accesscontrol.Wildcards) []interface{} {
@@ -222,3 +340,28 @@ func actionsToCheck(actions []string, permissions map[string][]string, wildcards
}
return toCheck
}
+
+func nestedFoldersSelectors(permSelector string, permSelectorArgs []interface{}, leftTableCol string, rightTableCol string) (string, []interface{}) {
+ wheres := make([]string, 0, folder.MaxNestedFolderDepth+1)
+ args := make([]interface{}, 0, len(permSelectorArgs)*(folder.MaxNestedFolderDepth+1))
+
+ joins := make([]string, 0, folder.MaxNestedFolderDepth+2)
+
+ tmpl := "INNER JOIN folder %s ON %s.%s = %s.uid AND %s.org_id = %s.org_id "
+
+ prev := "d"
+ onCol := "uid"
+ for i := 1; i <= folder.MaxNestedFolderDepth+2; i++ {
+ t := fmt.Sprintf("f%d", i)
+ s := fmt.Sprintf(tmpl, t, prev, onCol, t, prev, t)
+ joins = append(joins, s)
+
+ wheres = append(wheres, fmt.Sprintf("(dashboard.%s IN (SELECT d.%s FROM dashboard d %s WHERE %s.uid IN %s)", leftTableCol, rightTableCol, strings.Join(joins, " "), t, permSelector))
+ args = append(args, permSelectorArgs...)
+
+ prev = t
+ onCol = "parent_uid"
+ }
+
+ return strings.Join(wheres, ") OR "), args
+}
diff --git a/pkg/services/sqlstore/permissions/dashboard_test.go b/pkg/services/sqlstore/permissions/dashboard_test.go
index d9552da351c..071e6ace713 100644
--- a/pkg/services/sqlstore/permissions/dashboard_test.go
+++ b/pkg/services/sqlstore/permissions/dashboard_test.go
@@ -9,14 +9,24 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
+ "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/accesscontrol"
+ "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/dashboards/database"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
+ "github.com/grafana/grafana/pkg/services/folder"
+ "github.com/grafana/grafana/pkg/services/folder/folderimpl"
+ "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/org"
+ "github.com/grafana/grafana/pkg/services/quota/quotatest"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
+ "github.com/grafana/grafana/pkg/services/tag/tagimpl"
"github.com/grafana/grafana/pkg/services/user"
)
@@ -129,13 +139,18 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
for _, tt := range tests {
t.Run(tt.desc, func(t *testing.T) {
store := setupTest(t, 10, 100, tt.permissions)
+ recursiveQueriesAreSupported, err := store.RecursiveQueriesAreSupported()
+ require.NoError(t, err)
+
usr := &user.SignedInUser{OrgID: 1, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}
- filter := permissions.NewAccessControlDashboardPermissionFilter(usr, tt.permission, tt.queryType)
+ filter := permissions.NewAccessControlDashboardPermissionFilter(usr, tt.permission, tt.queryType, featuremgmt.WithFeatures(), recursiveQueriesAreSupported)
var result int
- err := store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ err = store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
q, params := filter.Where()
- _, err := sess.SQL("SELECT COUNT(*) FROM dashboard WHERE "+q, params...).Get(&result)
+ recQry, recQryParams := filter.With()
+ params = append(recQryParams, params...)
+ _, err := sess.SQL(recQry+"\nSELECT COUNT(*) FROM dashboard WHERE "+q, params...).Get(&result)
return err
})
require.NoError(t, err)
@@ -145,7 +160,115 @@ func TestIntegration_DashboardPermissionFilter(t *testing.T) {
}
}
+func TestIntegration_DashboardNestedPermissionFilter(t *testing.T) {
+ testCases := []struct {
+ desc string
+ queryType string
+ permission dashboards.PermissionType
+ permissions []accesscontrol.Permission
+ expectedResult []string
+ features featuremgmt.FeatureToggles
+ }{
+ {
+ desc: "Should be able to view dashboards under inherited folders if nested folders are enabled",
+ queryType: searchstore.TypeDashboard,
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+ expectedResult: []string{"dashboard under parent folder", "dashboard under subfolder"},
+ },
+ {
+ desc: "Should not be able to view dashboards under inherited folders if nested folders are not enabled",
+ queryType: searchstore.TypeDashboard,
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(),
+ expectedResult: []string{"dashboard under parent folder"},
+ },
+ {
+ desc: "Should be able to view inherited folders if nested folders are enabled",
+ queryType: searchstore.TypeFolder,
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+ expectedResult: []string{"parent", "subfolder"},
+ },
+ {
+ desc: "Should not be able to view inherited folders if nested folders are not enabled",
+ queryType: searchstore.TypeFolder,
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(),
+ expectedResult: []string{"parent"},
+ },
+ {
+ desc: "Should be able to view inherited dashboards and folders if nested folders are enabled",
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+ {Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+ expectedResult: []string{"parent", "subfolder", "dashboard under parent folder", "dashboard under subfolder"},
+ },
+ {
+ desc: "Should not be able to view inherited dashboards and folders if nested folders are not enabled",
+ permission: dashboards.PERMISSION_VIEW,
+ permissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionFoldersRead, Scope: "folders:uid:parent"},
+ {Action: dashboards.ActionDashboardsRead, Scope: "folders:uid:parent"},
+ },
+ features: featuremgmt.WithFeatures(),
+ expectedResult: []string{"parent", "dashboard under parent folder"},
+ },
+ }
+
+ origNewGuardian := guardian.New
+ guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
+ t.Cleanup(func() {
+ guardian.New = origNewGuardian
+ })
+
+ var orgID int64 = 1
+
+ for _, tc := range testCases {
+ t.Run(tc.desc, func(t *testing.T) {
+ tc.permissions = append(tc.permissions, accesscontrol.Permission{
+ Action: dashboards.ActionFoldersCreate,
+ }, accesscontrol.Permission{
+ Action: dashboards.ActionFoldersWrite,
+ Scope: dashboards.ScopeFoldersAll,
+ })
+ usr := &user.SignedInUser{OrgID: orgID, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{orgID: accesscontrol.GroupScopesByAction(tc.permissions)}}
+ db := setupNestedTest(t, usr, tc.permissions, orgID, tc.features)
+ recursiveQueriesAreSupported, err := db.RecursiveQueriesAreSupported()
+ require.NoError(t, err)
+ filter := permissions.NewAccessControlDashboardPermissionFilter(usr, tc.permission, tc.queryType, tc.features, recursiveQueriesAreSupported)
+ var result []string
+ err = db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ q, params := filter.Where()
+ recQry, recQryParams := filter.With()
+ params = append(recQryParams, params...)
+ err := sess.SQL(recQry+"\nSELECT title FROM dashboard WHERE "+q, params...).Find(&result)
+ return err
+ })
+ require.NoError(t, err)
+ assert.Equal(t, tc.expectedResult, result)
+ })
+ }
+}
+
func setupTest(t *testing.T, numFolders, numDashboards int, permissions []accesscontrol.Permission) db.DB {
+ t.Helper()
+
store := db.InitTestDB(t)
err := store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
dashes := make([]dashboards.Dashboard, 0, numFolders+numDashboards)
@@ -227,3 +350,95 @@ func setupTest(t *testing.T, numFolders, numDashboards int, permissions []access
require.NoError(t, err)
return store
}
+
+func setupNestedTest(t *testing.T, usr *user.SignedInUser, perms []accesscontrol.Permission, orgID int64, features featuremgmt.FeatureToggles) db.DB {
+ t.Helper()
+
+ db := sqlstore.InitTestDB(t)
+
+ // dashboard store commands that should be called.
+ dashStore, err := database.ProvideDashboardStore(db, db.Cfg, features, tagimpl.ProvideService(db, db.Cfg), quotatest.New(false, nil))
+ require.NoError(t, err)
+
+ folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), db.Cfg, dashStore, folderimpl.ProvideDashboardFolderStore(db), db, features)
+
+ // create parent folder
+ parent, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: "parent",
+ OrgID: orgID,
+ Title: "parent",
+ SignedInUser: usr,
+ })
+ require.NoError(t, err)
+
+ // create subfolder
+ subfolder, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: "subfolder",
+ ParentUID: "parent",
+ OrgID: orgID,
+ Title: "subfolder",
+ SignedInUser: usr,
+ })
+ require.NoError(t, err)
+
+ // create dashboard under parent folder
+ _, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
+ OrgID: orgID,
+ FolderID: parent.ID,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": "dashboard under parent folder",
+ }),
+ })
+ require.NoError(t, err)
+
+ // create dashboard under subfolder
+ _, err = dashStore.SaveDashboard(context.Background(), dashboards.SaveDashboardCommand{
+ OrgID: orgID,
+ FolderID: subfolder.ID,
+ Dashboard: simplejson.NewFromAny(map[string]interface{}{
+ "title": "dashboard under subfolder",
+ }),
+ })
+ require.NoError(t, err)
+
+ err = db.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ role := &accesscontrol.Role{
+ OrgID: 0,
+ UID: "basic_viewer",
+ Name: "basic:viewer",
+ Updated: time.Now(),
+ Created: time.Now(),
+ }
+ _, err = sess.Insert(role)
+ if err != nil {
+ return err
+ }
+ _, err = sess.Insert(accesscontrol.BuiltinRole{
+ OrgID: 0,
+ RoleID: role.ID,
+ Role: "Viewer",
+ Created: time.Now(),
+ Updated: time.Now(),
+ })
+ if err != nil {
+ return err
+ }
+
+ for i := range perms {
+ perms[i].RoleID = role.ID
+ perms[i].Created = time.Now()
+ perms[i].Updated = time.Now()
+ }
+ if len(perms) > 0 {
+ _, err = sess.InsertMulti(&perms)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+ })
+ require.NoError(t, err)
+
+ return db
+}
diff --git a/pkg/services/sqlstore/permissions/dashboards_bench_test.go b/pkg/services/sqlstore/permissions/dashboards_bench_test.go
index d213fee5ac8..84e8cb94718 100644
--- a/pkg/services/sqlstore/permissions/dashboards_bench_test.go
+++ b/pkg/services/sqlstore/permissions/dashboards_bench_test.go
@@ -10,26 +10,59 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+ "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
+ "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/accesscontrol"
+ "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/dashboards/database"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
+ "github.com/grafana/grafana/pkg/services/folder"
+ "github.com/grafana/grafana/pkg/services/folder/folderimpl"
+ "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/org"
+ "github.com/grafana/grafana/pkg/services/quota/quotatest"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
+ "github.com/grafana/grafana/pkg/services/tag/tagimpl"
"github.com/grafana/grafana/pkg/services/user"
)
-func benchmarkDashboardPermissionFilter(b *testing.B, numUsers, numDashboards int) {
- store := setupBenchMark(b, numUsers, numDashboards)
+func benchmarkDashboardPermissionFilter(b *testing.B, numUsers, numDashboards, numFolders, nestingLevel int) {
+ usr := user.SignedInUser{UserID: 1, OrgID: 1, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{
+ 1: accesscontrol.GroupScopesByAction([]accesscontrol.Permission{
+ {
+ Action: dashboards.ActionFoldersCreate,
+ },
+ {
+ Action: dashboards.ActionFoldersWrite,
+ Scope: dashboards.ScopeFoldersAll,
+ },
+ }),
+ }}
+
+ features := featuremgmt.WithFeatures()
+ // if nestingLevel > 0 enable nested folders
+ if nestingLevel > 0 {
+ features = featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders)
+ }
+
+ store := setupBenchMark(b, usr, features, numUsers, numDashboards, numFolders, nestingLevel)
+
+ recursiveQueriesAreSupported, err := store.RecursiveQueriesAreSupported()
+ require.NoError(b, err)
+
b.ResetTimer()
for i := 0; i < b.N; i++ {
- usr := &user.SignedInUser{UserID: 1, OrgID: 1, OrgRole: org.RoleViewer, Permissions: map[int64]map[string][]string{1: {}}}
- filter := permissions.NewAccessControlDashboardPermissionFilter(usr, dashboards.PERMISSION_VIEW, "")
+ filter := permissions.NewAccessControlDashboardPermissionFilter(&usr, dashboards.PERMISSION_VIEW, "", features, recursiveQueriesAreSupported)
var result int
err := store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
q, params := filter.Where()
- _, err := sess.SQL("SELECT COUNT(*) FROM dashboard WHERE "+q, params...).Get(&result)
+ recQry, recQryParams := filter.With()
+ params = append(recQryParams, params...)
+ _, err := sess.SQL(recQry+"SELECT COUNT(*) FROM dashboard WHERE "+q, params...).Get(&result)
return err
})
require.NoError(b, err)
@@ -37,15 +70,78 @@ func benchmarkDashboardPermissionFilter(b *testing.B, numUsers, numDashboards in
}
}
-func setupBenchMark(b *testing.B, numUsers, numDashboards int) db.DB {
+func setupBenchMark(b *testing.B, usr user.SignedInUser, features featuremgmt.FeatureToggles, numUsers, numDashboards, numFolders, nestingLevel int) db.DB {
+ if nestingLevel > folder.MaxNestedFolderDepth {
+ nestingLevel = folder.MaxNestedFolderDepth
+ }
+
store := db.InitTestDB(b)
- now := time.Now()
- err := store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
- dashes := make([]dashboards.Dashboard, 0, numDashboards)
- for i := 1; i <= numDashboards; i++ {
+
+ quotaService := quotatest.New(false, nil)
+
+ dashboardWriteStore, err := database.ProvideDashboardStore(store, store.Cfg, features, tagimpl.ProvideService(store, store.Cfg), quotaService)
+ require.NoError(b, err)
+
+ folderSvc := folderimpl.ProvideService(mock.New(), bus.ProvideBus(tracing.InitializeTracerForTest()), store.Cfg, dashboardWriteStore, folderimpl.ProvideDashboardFolderStore(store), store, features)
+
+ origNewGuardian := guardian.New
+ guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanViewValue: true, CanSaveValue: true})
+ b.Cleanup(func() {
+ guardian.New = origNewGuardian
+ })
+
+ rootFolders := make([]*folder.Folder, 0, numFolders)
+ dashes := make([]dashboards.Dashboard, 0, numDashboards)
+ parentUID := ""
+ for i := 0; i < numFolders; i++ {
+ uid := fmt.Sprintf("f%d", i)
+ f, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: uid,
+ OrgID: usr.OrgID,
+ Title: uid,
+ SignedInUser: &usr,
+ ParentUID: parentUID,
+ })
+ require.NoError(b, err)
+ rootFolders = append(rootFolders, f)
+
+ parentUID := f.UID
+ var leaf *folder.Folder
+ for j := 1; j <= nestingLevel; j++ {
+ uid := fmt.Sprintf("f%d_%d", i, j)
+ sf, err := folderSvc.Create(context.Background(), &folder.CreateFolderCommand{
+ UID: uid,
+ OrgID: usr.OrgID,
+ Title: uid,
+ SignedInUser: &usr,
+ ParentUID: parentUID,
+ })
+ require.NoError(b, err)
+ parentUID = sf.UID
+ leaf = sf
+ }
+
+ str := fmt.Sprintf("dashboard under folder %s", leaf.Title)
+ now := time.Now()
+ dashes = append(dashes, dashboards.Dashboard{
+ OrgID: usr.OrgID,
+ IsFolder: false,
+ UID: str,
+ Slug: str,
+ Title: str,
+ Data: simplejson.New(),
+ Created: now,
+ Updated: now,
+ FolderID: leaf.ID,
+ })
+ }
+
+ err = store.WithDbSession(context.Background(), func(sess *sqlstore.DBSession) error {
+ now := time.Now()
+ for i := len(dashes); i < numDashboards; i++ {
str := strconv.Itoa(i)
dashes = append(dashes, dashboards.Dashboard{
- OrgID: 1,
+ OrgID: usr.OrgID,
IsFolder: false,
UID: str,
Slug: str,
@@ -79,10 +175,24 @@ func setupBenchMark(b *testing.B, numUsers, numDashboards int) db.DB {
Created: now,
})
for _, dash := range dashes {
+ // add permission to read dashboards under the general
+ if dash.FolderID == 0 {
+ permissions = append(permissions, accesscontrol.Permission{
+ RoleID: int64(i),
+ Action: dashboards.ActionDashboardsRead,
+ Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash.UID),
+ Updated: now,
+ Created: now,
+ })
+ }
+ }
+
+ for _, f := range rootFolders {
+ // add permission to read folders under specific folders
permissions = append(permissions, accesscontrol.Permission{
RoleID: int64(i),
Action: dashboards.ActionDashboardsRead,
- Scope: dashboards.ScopeDashboardsProvider.GetResourceScopeUID(dash.UID),
+ Scope: dashboards.ScopeFoldersProvider.GetResourceScopeUID(f.UID),
Updated: now,
Created: now,
})
@@ -113,16 +223,52 @@ func setupBenchMark(b *testing.B, numUsers, numDashboards int) db.DB {
return store
}
-func BenchmarkDashboardPermissionFilter_100_100(b *testing.B) {
- benchmarkDashboardPermissionFilter(b, 100, 100)
+func BenchmarkDashboardPermissionFilter_100_100_0_0(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 100, 0, 0)
}
-func BenchmarkDashboardPermissionFilter_100_1000(b *testing.B) {
- benchmarkDashboardPermissionFilter(b, 100, 1000)
+func BenchmarkDashboardPermissionFilter_100_100_10_2(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 100, 10, 2)
}
-func BenchmarkDashboardPermissionFilter_300_10000(b *testing.B) {
- benchmarkDashboardPermissionFilter(b, 300, 10000)
+func BenchmarkDashboardPermissionFilter_100_100_10_4(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 100, 10, 4)
+}
+
+func BenchmarkDashboardPermissionFilter_100_100_10_8(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 100, 10, 8)
+}
+
+func BenchmarkDashboardPermissionFilter_100_1000_0_0(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 1000, 0, 0)
+}
+
+func BenchmarkDashboardPermissionFilter_100_1000_10_2(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 1000, 10, 2)
+}
+
+func BenchmarkDashboardPermissionFilter_100_1000_10_4(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 1000, 10, 4)
+}
+
+func BenchmarkDashboardPermissionFilter_100_1000_10_8(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 100, 1000, 10, 8)
+}
+
+func BenchmarkDashboardPermissionFilter_300_10000_0_0(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 300, 10000, 0, 0)
+}
+
+func BenchmarkDashboardPermissionFilter_300_10000_10_2(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 300, 10000, 10, 2)
+}
+
+func BenchmarkDashboardPermissionFilter_300_10000_10_4(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 300, 10000, 10, 4)
+}
+
+func BenchmarkDashboardPermissionFilter_300_10000_10_8(b *testing.B) {
+ benchmarkDashboardPermissionFilter(b, 300, 10000, 10, 8)
}
func batch(count, batchSize int, eachFn func(start, end int) error) error {
diff --git a/pkg/services/sqlstore/searchstore/builder.go b/pkg/services/sqlstore/searchstore/builder.go
index 1ae89d05de9..3fb805262e4 100644
--- a/pkg/services/sqlstore/searchstore/builder.go
+++ b/pkg/services/sqlstore/searchstore/builder.go
@@ -44,6 +44,9 @@ func (b *Builder) ToSQL(limit, page int64) (string, []interface{}) {
}
func (b *Builder) buildSelect() {
+ var recQuery string
+ var recQueryParams []interface{}
+
b.sql.WriteString(
`SELECT
dashboard.id,
@@ -61,9 +64,25 @@ func (b *Builder) buildSelect() {
if f, ok := f.(FilterSelect); ok {
b.sql.WriteString(fmt.Sprintf(", %s", f.Select()))
}
+
+ if f, ok := f.(FilterWith); ok {
+ recQuery, recQueryParams = f.With()
+ }
}
b.sql.WriteString(` FROM `)
+
+ if recQuery == "" {
+ return
+ }
+
+ // prepend recursive queries
+ var bf bytes.Buffer
+ bf.WriteString(recQuery)
+ bf.WriteString(b.sql.String())
+
+ b.sql = bf
+ b.params = append(recQueryParams, b.params...)
}
func (b *Builder) applyFilters() (ordering string) {
diff --git a/pkg/services/sqlstore/searchstore/filters.go b/pkg/services/sqlstore/searchstore/filters.go
index f5cc63e421a..170d6a2cf4d 100644
--- a/pkg/services/sqlstore/searchstore/filters.go
+++ b/pkg/services/sqlstore/searchstore/filters.go
@@ -14,6 +14,12 @@ type FilterWhere interface {
Where() (string, []interface{})
}
+// FilterWith returns any recursive CTE queries (if supported)
+// and their parameters
+type FilterWith interface {
+ With() (string, []interface{})
+}
+
// FilterGroupBy should be used after performing an outer join on the
// search result to ensure there is only one of each ID in the results.
// The id column must be present in the result.
diff --git a/pkg/services/sqlstore/searchstore/search_test.go b/pkg/services/sqlstore/searchstore/search_test.go
index 9d0945aac3d..b092579ab17 100644
--- a/pkg/services/sqlstore/searchstore/search_test.go
+++ b/pkg/services/sqlstore/searchstore/search_test.go
@@ -10,7 +10,9 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
+ "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboards"
+ "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/sqlstore/permissions"
"github.com/grafana/grafana/pkg/services/sqlstore/searchstore"
@@ -148,6 +150,145 @@ func TestBuilder_Permissions(t *testing.T) {
assert.Len(t, res, 0)
}
+func TestBuilder_RBAC(t *testing.T) {
+ testsCases := []struct {
+ desc string
+ userPermissions []accesscontrol.Permission
+ features featuremgmt.FeatureToggles
+ expectedParams []interface{}
+ }{
+ {
+ desc: "no user permissions",
+ features: featuremgmt.WithFeatures(),
+ expectedParams: []interface{}{
+ int64(1),
+ },
+ },
+ {
+ desc: "user with view permission",
+ userPermissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
+ },
+ features: featuremgmt.WithFeatures(),
+ expectedParams: []interface{}{
+ int64(1),
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "dashboards:read",
+ "dashboards:write",
+ 2,
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "dashboards:read",
+ "dashboards:write",
+ 2,
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "folders:read",
+ "dashboards:create",
+ 2,
+ },
+ },
+ {
+ desc: "user with view permission with nesting",
+ userPermissions: []accesscontrol.Permission{
+ {Action: dashboards.ActionDashboardsRead, Scope: "dashboards:uid:1"},
+ },
+ features: featuremgmt.WithFeatures(featuremgmt.FlagNestedFolders),
+ expectedParams: []interface{}{
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "dashboards:read",
+ "dashboards:write",
+ 2,
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "folders:read",
+ "dashboards:create",
+ 2,
+ int64(1),
+ int64(1),
+ int64(1),
+ 0,
+ "Viewer",
+ int64(1),
+ 0,
+ "dashboards:read",
+ "dashboards:write",
+ 2,
+ },
+ },
+ }
+
+ user := &user.SignedInUser{
+ UserID: 1,
+ OrgID: 1,
+ OrgRole: org.RoleViewer,
+ }
+
+ store := setupTestEnvironment(t)
+ createDashboards(t, store, 0, 1, user.OrgID)
+
+ recursiveQueriesAreSupported, err := store.RecursiveQueriesAreSupported()
+ require.NoError(t, err)
+
+ for _, tc := range testsCases {
+ t.Run(tc.desc, func(t *testing.T) {
+ if len(tc.userPermissions) > 0 {
+ user.Permissions = map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tc.userPermissions)}
+ }
+
+ level := dashboards.PERMISSION_EDIT
+
+ builder := &searchstore.Builder{
+ Filters: []interface{}{
+ searchstore.OrgFilter{OrgId: user.OrgID},
+ searchstore.TitleSorter{},
+ permissions.NewAccessControlDashboardPermissionFilter(
+ user,
+ level,
+ "",
+ tc.features,
+ recursiveQueriesAreSupported,
+ ),
+ },
+ Dialect: store.GetDialect(),
+ }
+
+ res := []dashboards.DashboardSearchProjection{}
+ err := store.WithDbSession(context.Background(), func(sess *db.Session) error {
+ sql, params := builder.ToSQL(limit, page)
+ // TODO: replace with a proper test
+ assert.Equal(t, tc.expectedParams, params)
+ return sess.SQL(sql, params...).Find(&res)
+ })
+ require.NoError(t, err)
+
+ assert.Len(t, res, 0)
+ })
+ }
+}
+
func setupTestEnvironment(t *testing.T) db.DB {
t.Helper()
store := db.InitTestDB(t)
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index d197040a1d9..19bcc640cd5 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -146,6 +146,9 @@ func verifyExistingOrg(sess *DBSession, orgId int64) error {
func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, error) {
var org org.Org
+ org.Created = time.Now()
+ org.Updated = org.Created
+
if ss.Cfg.AutoAssignOrg {
has, err := sess.Where("id=?", ss.Cfg.AutoAssignOrgId).Get(&org)
if err != nil {
@@ -164,18 +167,11 @@ func (ss *SQLStore) getOrCreateOrg(sess *DBSession, orgName string) (int64, erro
org.Name = mainOrgName
org.ID = int64(ss.Cfg.AutoAssignOrgId)
- } else {
- org.Name = orgName
- }
-
- org.Created = time.Now()
- org.Updated = time.Now()
-
- if org.ID != 0 {
if err := sess.InsertId(&org, ss.Dialect); err != nil {
return 0, err
}
} else {
+ org.Name = orgName
if _, err := sess.InsertOne(&org); err != nil {
return 0, err
}
diff --git a/pkg/tsdb/cloudwatch/constants/metrics.go b/pkg/tsdb/cloudwatch/constants/metrics.go
index 0b6f4fbd9ae..e0d29a1f602 100644
--- a/pkg/tsdb/cloudwatch/constants/metrics.go
+++ b/pkg/tsdb/cloudwatch/constants/metrics.go
@@ -340,7 +340,7 @@ var NamespaceMetricsMap = map[string][]string{
"AWS/Glue": {"glue.driver.BlockManager.disk.diskSpaceUsed_MB", "glue.driver.ExecutorAllocationManager.executors.numberAllExecutors", "glue.driver.ExecutorAllocationManager.executors.numberMaxNeededExecutors", "glue.driver.aggregate.bytesRead", "glue.driver.aggregate.elapsedTime", "glue.driver.aggregate.numCompletedStages", "glue.driver.aggregate.numCompletedTasks", "glue.driver.aggregate.numFailedTasks", "glue.driver.aggregate.numKilledTasks", "glue.driver.aggregate.recordsRead", "glue.driver.aggregate.shuffleBytesWritten", "glue.driver.aggregate.shuffleLocalBytesRead", "glue.driver.jvm.heap.usage glue.executorId.jvm.heap.usage glue.ALL.jvm.heap.usage", "glue.driver.jvm.heap.used glue.executorId.jvm.heap.used glue.ALL.jvm.heap.used", "glue.driver.s3.filesystem.read_bytes glue.executorId.s3.filesystem.read_bytes glue.ALL.s3.filesystem.read_bytes", "glue.driver.s3.filesystem.write_bytes glue.executorId.s3.filesystem.write_bytes glue.ALL.s3.filesystem.write_bytes", "glue.driver.system.cpuSystemLoad glue.executorId.system.cpuSystemLoad glue.ALL.system.cpuSystemLoad"},
"AWS/GroundStation": {"BitErrorRate", "BlockErrorRate", "ReceivedPower", "Es/N0"},
"AWS/Inspector": {"TotalAssessmentRunFindings", "TotalAssessmentRuns", "TotalHealthyAgents", "TotalMatchingAgents"},
- "AWS/IVS": {"ConcurrentViews", "ConcurrentStreams", "LiveDeliveredTime", "LiveInputTime", "RecordedTime"},
+ "AWS/IVS": {"ConcurrentViews", "ConcurrentStreams", "IngestAudioBitrate", "IngestFramerate", "IngestVideoBitrate", "KeyframeInterval", "LiveDeliveredTime", "LiveInputTime", "RecordedTime"},
"AWS/IoT": {"CanceledJobExecutionCount", "CanceledJobExecutionTotalCount", "ClientError", "Connect.AuthError", "Connect.ClientError", "Connect.ServerError", "Connect.Success", "Connect.Throttle", "DeleteThingShadow.Accepted", "FailedJobExecutionCount", "FailedJobExecutionTotalCount", "Failure", "GetThingShadow.Accepted", "InProgressJobExecutionCount", "InProgressJobExecutionTotalCount", "NonCompliantResources", "NumLogBatchesFailedToPublishThrottled", "NumLogEventsFailedToPublishThrottled", "ParseError", "Ping.Success", "PublishIn.AuthError", "PublishIn.ClientError", "PublishIn.ServerError", "PublishIn.Success", "PublishIn.Throttle", "PublishOut.AuthError", "PublishOut.ClientError", "PublishOut.Success", "QueuedJobExecutionCount", "QueuedJobExecutionTotalCount", "RejectedJobExecutionCount", "RejectedJobExecutionTotalCount", "RemovedJobExecutionCount", "RemovedJobExecutionTotalCount", "ResourcesEvaluated", "RuleMessageThrottled", "RuleNotFound", "RulesExecuted", "ServerError", "Subscribe.AuthError", "Subscribe.ClientError", "Subscribe.ServerError", "Subscribe.Success", "Subscribe.Throttle", "SuccededJobExecutionCount", "SuccededJobExecutionTotalCount", "Success", "TopicMatch", "Unsubscribe.ClientError", "Unsubscribe.ServerError", "Unsubscribe.Success", "Unsubscribe.Throttle", "UpdateThingShadow.Accepted", "Violations", "ViolationsCleared", "ViolationsInvalidated"},
"AWS/IoTAnalytics": {"ActionExecution", "ActivityExecutionError", "IncomingMessages"},
"AWS/IoTSiteWise": {"Gateway.Heartbeat", "Gateway.PublishSuccessCount", "Gateway.PublishFailureCount", "Gateway.ProcessFailureCount", "OPCUACollector.Heartbeat", "OPCUACollector.ActiveDataStreamCount", "OPCUACollector.IncomingValuesCount"},
diff --git a/pkg/tsdb/elasticsearch/client/search_request.go b/pkg/tsdb/elasticsearch/client/search_request.go
index dd7f8642d37..d267210f103 100644
--- a/pkg/tsdb/elasticsearch/client/search_request.go
+++ b/pkg/tsdb/elasticsearch/client/search_request.go
@@ -73,10 +73,21 @@ func (b *SearchRequestBuilder) Size(size int) *SearchRequestBuilder {
return b
}
-// SortDesc adds a sort to the search request
-func (b *SearchRequestBuilder) SortDesc(field, unmappedType string) *SearchRequestBuilder {
+type SortOrder string
+
+const (
+ SortOrderAsc SortOrder = "asc"
+ SortOrderDesc SortOrder = "desc"
+)
+
+// Sort adds a "asc" | "desc" sort to the search request
+func (b *SearchRequestBuilder) Sort(order SortOrder, field string, unmappedType string) *SearchRequestBuilder {
+ if order != SortOrderAsc && order != SortOrderDesc {
+ return b
+ }
+
props := map[string]string{
- "order": "desc",
+ "order": string(order),
}
if unmappedType != "" {
@@ -110,6 +121,16 @@ func (b *SearchRequestBuilder) AddHighlight() *SearchRequestBuilder {
return b
}
+func (b *SearchRequestBuilder) AddSearchAfter(value interface{}) *SearchRequestBuilder {
+ if b.customProps["search_after"] == nil {
+ b.customProps["search_after"] = []interface{}{value}
+ } else {
+ b.customProps["search_after"] = append(b.customProps["search_after"].([]interface{}), value)
+ }
+
+ return b
+}
+
// Query creates and return a query builder
func (b *SearchRequestBuilder) Query() *QueryBuilder {
if b.queryBuilder == nil {
diff --git a/pkg/tsdb/elasticsearch/client/search_request_test.go b/pkg/tsdb/elasticsearch/client/search_request_test.go
index f3f1601c9a1..f89b4ccd0ed 100644
--- a/pkg/tsdb/elasticsearch/client/search_request_test.go
+++ b/pkg/tsdb/elasticsearch/client/search_request_test.go
@@ -45,7 +45,7 @@ func TestSearchRequest(t *testing.T) {
t.Run("When adding size, sort, filters", func(t *testing.T) {
b := setup()
b.Size(200)
- b.SortDesc(timeField, "boolean")
+ b.Sort(SortOrderDesc, timeField, "boolean")
filters := b.Query().Bool().Filter()
filters.AddDateRangeFilter(timeField, 10, 5, DateFormatEpochMS)
filters.AddQueryStringFilter("test", true)
diff --git a/pkg/tsdb/elasticsearch/data_query.go b/pkg/tsdb/elasticsearch/data_query.go
index 0d4653ab80a..f725ce441b6 100644
--- a/pkg/tsdb/elasticsearch/data_query.go
+++ b/pkg/tsdb/elasticsearch/data_query.go
@@ -317,12 +317,24 @@ func isRawDocumentQuery(query *Query) bool {
func processLogsQuery(q *Query, b *es.SearchRequestBuilder, from, to int64, defaultTimeField string) {
metric := q.Metrics[0]
- b.SortDesc(defaultTimeField, "boolean")
- b.SortDesc("_doc", "")
+ sort := es.SortOrderDesc
+ if metric.Settings.Get("sortDirection").MustString() == "asc" {
+ // This is currently used only for log context query
+ sort = es.SortOrderAsc
+ }
+ b.Sort(sort, defaultTimeField, "boolean")
+ b.Sort(sort, "_doc", "")
b.AddDocValueField(defaultTimeField)
b.Size(stringToIntWithDefaultValue(metric.Settings.Get("limit").MustString(), defaultSize))
b.AddHighlight()
+ // This is currently used only for log context query to get
+ // log lines before and after the selected log line
+ searchAfter := metric.Settings.Get("searchAfter").MustArray()
+ for _, value := range searchAfter {
+ b.AddSearchAfter(value)
+ }
+
// For log query, we add a date histogram aggregation
aggBuilder := b.Agg()
q.BucketAggs = append(q.BucketAggs, &BucketAgg{
@@ -342,8 +354,8 @@ func processLogsQuery(q *Query, b *es.SearchRequestBuilder, from, to int64, defa
func processDocumentQuery(q *Query, b *es.SearchRequestBuilder, from, to int64, defaultTimeField string) {
metric := q.Metrics[0]
- b.SortDesc(defaultTimeField, "boolean")
- b.SortDesc("_doc", "")
+ b.Sort(es.SortOrderDesc, defaultTimeField, "boolean")
+ b.Sort(es.SortOrderDesc, "_doc", "")
b.AddDocValueField(defaultTimeField)
b.Size(stringToIntWithDefaultValue(metric.Settings.Get("size").MustString(), defaultSize))
}
diff --git a/pkg/tsdb/elasticsearch/data_query_test.go b/pkg/tsdb/elasticsearch/data_query_test.go
index 478ae5feab2..f43f05d8430 100644
--- a/pkg/tsdb/elasticsearch/data_query_test.go
+++ b/pkg/tsdb/elasticsearch/data_query_test.go
@@ -1354,6 +1354,25 @@ func TestExecuteElasticsearchDataQuery(t *testing.T) {
})
})
+ t.Run("With log context query with sortDirection and searchAfter should return correct query", func(t *testing.T) {
+ c := newFakeClient()
+ _, err := executeElasticsearchDataQuery(c, `{
+ "metrics": [{ "type": "logs", "id": "1", "settings": { "limit": "1000", "sortDirection": "asc", "searchAfter": [1, "2"] }}]
+ }`, from, to)
+ require.NoError(t, err)
+ sr := c.multisearchRequests[0].Requests[0]
+ require.Equal(t, sr.Sort["@timestamp"], map[string]string{"order": "asc", "unmapped_type": "boolean"})
+ require.Equal(t, sr.Sort["_doc"], map[string]string{"order": "asc"})
+
+ searchAfter := sr.CustomProps["search_after"].([]interface{})
+ firstSearchAfter, err := searchAfter[0].(json.Number).Int64()
+ require.NoError(t, err)
+ require.Equal(t, firstSearchAfter, int64(1))
+ secondSearchAfter := searchAfter[1].(string)
+ require.NoError(t, err)
+ require.Equal(t, secondSearchAfter, "2")
+ })
+
t.Run("With invalid query should return error", (func(t *testing.T) {
c := newFakeClient()
_, err := executeElasticsearchDataQuery(c, `{
diff --git a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.jsonc b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.jsonc
index 1a6da1a668a..e69529d5b16 100644
--- a/pkg/tsdb/influxdb/flux/testdata/grouping.golden.jsonc
+++ b/pkg/tsdb/influxdb/flux/testdata/grouping.golden.jsonc
@@ -104,6 +104,14 @@
3.56,
null
]
+ ],
+ "nanos": [
+ [
+ 0,
+ 0,
+ 881833
+ ],
+ null
]
}
},
@@ -146,6 +154,15 @@
1.74,
null
]
+ ],
+ "nanos": [
+ [
+ 0,
+ 0,
+ 0,
+ 881833
+ ],
+ null
]
}
},
@@ -200,6 +217,21 @@
1.71,
null
]
+ ],
+ "nanos": [
+ [
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 881833
+ ],
+ null
]
}
}
diff --git a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.jsonc b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.jsonc
index ac09d56e348..444c50c4c9d 100644
--- a/pkg/tsdb/influxdb/flux/testdata/multiple.golden.jsonc
+++ b/pkg/tsdb/influxdb/flux/testdata/multiple.golden.jsonc
@@ -92,6 +92,13 @@
1.4,
6.6
]
+ ],
+ "nanos": [
+ [
+ 814545,
+ 214724
+ ],
+ null
]
}
},
@@ -131,6 +138,13 @@
4,
-1
]
+ ],
+ "nanos": [
+ [
+ 814545,
+ 214724
+ ],
+ null
]
}
},
@@ -170,6 +184,13 @@
0,
2
]
+ ],
+ "nanos": [
+ [
+ 978640,
+ 100374
+ ],
+ null
]
}
}
diff --git a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.jsonc b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.jsonc
index 0680c4f629e..b62a1c33f9f 100644
--- a/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.jsonc
+++ b/pkg/tsdb/influxdb/flux/testdata/non_standard_time_column.golden.jsonc
@@ -76,6 +76,15 @@
[
156.304
]
+ ],
+ "nanos": [
+ [
+ 584046
+ ],
+ [
+ 584046
+ ],
+ null
]
}
}
diff --git a/pkg/tsdb/influxdb/flux/testdata/simple.golden.jsonc b/pkg/tsdb/influxdb/flux/testdata/simple.golden.jsonc
index a5dd5329b50..8bf18138289 100644
--- a/pkg/tsdb/influxdb/flux/testdata/simple.golden.jsonc
+++ b/pkg/tsdb/influxdb/flux/testdata/simple.golden.jsonc
@@ -64,6 +64,13 @@
1.4,
6.6
]
+ ],
+ "nanos": [
+ [
+ 814545,
+ 214724
+ ],
+ null
]
}
}
diff --git a/pkg/tsdb/influxdb/flux/testdata/table.golden.jsonc b/pkg/tsdb/influxdb/flux/testdata/table.golden.jsonc
index 144491e159f..786dbb1decb 100644
--- a/pkg/tsdb/influxdb/flux/testdata/table.golden.jsonc
+++ b/pkg/tsdb/influxdb/flux/testdata/table.golden.jsonc
@@ -59,6 +59,12 @@
[
42
]
+ ],
+ "nanos": [
+ [
+ 905100
+ ],
+ null
]
}
}
diff --git a/pkg/tsdb/loki/testdata/streams_simple.golden.jsonc b/pkg/tsdb/loki/testdata/streams_simple.golden.jsonc
index 2bd8cc42b5c..1d83e77e033 100644
--- a/pkg/tsdb/loki/testdata/streams_simple.golden.jsonc
+++ b/pkg/tsdb/loki/testdata/streams_simple.golden.jsonc
@@ -356,6 +356,20 @@
"1645030245539423744_fd17f65c_sq",
"1645030244091700992_62ae07f3_sq"
]
+ ],
+ "nanos": [
+ null,
+ [
+ 757120,
+ 735040,
+ 587968,
+ 587968,
+ 423744,
+ 700992
+ ],
+ null,
+ null,
+ null
]
}
}
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 9b41b602b40..202c3a7fa11 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
{
"name": "@grafana-plugins/input-datasource",
- "version": "9.5.0-pre",
+ "version": "10.0.0-pre",
"description": "Input Datasource",
"private": true,
"repository": {
@@ -15,15 +15,15 @@
},
"author": "Grafana Labs",
"devDependencies": {
- "@grafana/toolkit": "9.5.0-pre",
+ "@grafana/toolkit": "10.0.0-pre",
"@types/jest": "26.0.15",
"@types/lodash": "4.14.149",
"@types/react": "17.0.30",
"lodash": "4.17.21"
},
"dependencies": {
- "@grafana/data": "9.5.0-pre",
- "@grafana/ui": "9.5.0-pre",
+ "@grafana/data": "10.0.0-pre",
+ "@grafana/ui": "10.0.0-pre",
"jquery": "3.5.1",
"react": "17.0.1",
"react-dom": "17.0.1",
diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
index ef63d3f0fc6..548436f4101 100644
--- a/public/app/core/components/AppChrome/AppChrome.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -104,6 +104,7 @@ const getStyles = (theme: GrafanaTheme2) => {
boxShadow: shadow,
background: theme.colors.background.primary,
flexDirection: 'column',
+ borderBottom: `1px solid ${theme.colors.border.weak}`,
}),
};
};
diff --git a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
index 9a13cfb57da..c322b4c3875 100644
--- a/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
+++ b/public/app/core/components/AppChrome/QuickAdd/QuickAdd.tsx
@@ -19,6 +19,7 @@ export const QuickAdd = ({}: Props) => {
const navBarTree = useSelector((state) => state.navBarTree);
const breakpoint = theme.breakpoints.values.sm;
+ const [isOpen, setIsOpen] = useState(false);
const [isSmallScreen, setIsSmallScreen] = useState(!window.matchMedia(`(min-width: ${breakpoint}px)`).matches);
const createActions = useMemo(() => findCreateActions(navBarTree), [navBarTree]);
@@ -46,14 +47,13 @@ export const QuickAdd = ({}: Props) => {
return createActions.length > 0 ? (
<>
-
- {(isOpen) =>
- isSmallScreen ? (
-
- ) : (
-
- )
- }
+
+
diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx
index 6d9fe53dce3..73a09f82603 100644
--- a/public/app/core/components/PageNew/Page.tsx
+++ b/public/app/core/components/PageNew/Page.tsx
@@ -131,17 +131,15 @@ const getStyles = (theme: GrafanaTheme2) => {
padding: theme.spacing(2),
borderRadius: theme.shape.borderRadius(1),
border: `1px solid ${theme.colors.border.weak}`,
+ borderBottom: 'none',
background: theme.colors.background.primary,
display: 'flex',
flexDirection: 'column',
flexGrow: 1,
margin: theme.spacing(0, 0, 0, 0),
- [theme.breakpoints.up('sm')]: {
- margin: theme.spacing(0, 1, 1, 1),
- },
[theme.breakpoints.up('md')]: {
- margin: theme.spacing(2, 2, 2, 1),
+ margin: theme.spacing(2, 2, 0, 1),
padding: theme.spacing(3),
},
}),
diff --git a/public/app/core/components/PageNew/SectionNav.tsx b/public/app/core/components/PageNew/SectionNav.tsx
index 746ac980cc1..1b46e1a86c4 100644
--- a/public/app/core/components/PageNew/SectionNav.tsx
+++ b/public/app/core/components/PageNew/SectionNav.tsx
@@ -100,6 +100,7 @@ const getStyles = (theme: GrafanaTheme2) => {
flexDirection: 'column',
padding: theme.spacing(2, 1, 2, 2),
minWidth: '250px',
+
[theme.breakpoints.up('md')]: {
padding: theme.spacing(4.5, 1, 2, 2),
},
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index d2e9b6c42f0..16acfd7c110 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -50,6 +50,8 @@ export interface FolderRequestOptions {
withAccessControl?: boolean;
}
+const GRAFANA_TRACEID_HEADER = 'grafana-trace-id';
+
export class BackendSrv implements BackendService {
private inFlightRequests: Subject = new Subject();
private HTTP_REQUEST_CANCELED = -1;
@@ -223,6 +225,7 @@ export class BackendSrv implements BackendService {
type,
redirected,
config: options,
+ traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
};
return fetchResponse;
}),
@@ -238,7 +241,13 @@ export class BackendSrv implements BackendService {
filter((response) => response.ok === false),
mergeMap((response) => {
const { status, statusText, data } = response;
- const fetchErrorResponse: FetchError = { status, statusText, data, config: options };
+ const fetchErrorResponse: FetchError = {
+ status,
+ statusText,
+ data,
+ config: options,
+ traceId: response.headers.get(GRAFANA_TRACEID_HEADER) ?? undefined,
+ };
return throwError(fetchErrorResponse);
}),
retryWhen((attempts: Observable) =>
diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts
index a0fe3067587..ffa46ae60db 100644
--- a/public/app/core/specs/backend_srv.test.ts
+++ b/public/app/core/specs/backend_srv.test.ts
@@ -1,5 +1,5 @@
import 'whatwg-fetch'; // fetch polyfill needed for PhantomJs rendering
-import { Observable, of } from 'rxjs';
+import { Observable, of, lastValueFrom } from 'rxjs';
import { delay } from 'rxjs/operators';
import { AppEvents, DataQueryErrorType, EventBusExtended } from '@grafana/data';
@@ -21,6 +21,7 @@ const getTestContext = (overides?: object) => {
redirected: false,
type: 'basic',
url: 'http://localhost:3000/api/some-mock',
+ headers: new Map(),
};
const props = { ...defaults, ...overides };
const textMock = jest.fn().mockResolvedValue(JSON.stringify(props.data));
@@ -29,6 +30,7 @@ const getTestContext = (overides?: object) => {
ok: props.ok,
status: props.status,
statusText: props.statusText,
+ headers: props.headers,
text: textMock,
redirected: false,
type: 'basic',
@@ -355,6 +357,63 @@ describe('backendSrv', () => {
});
});
});
+
+ describe('traceId handling', () => {
+ const opts = { url: '/something', method: 'GET' };
+ it('should handle a success-response without traceId', async () => {
+ const ctx = getTestContext({ status: 200, statusText: 'OK', headers: new Headers() });
+ const res = await lastValueFrom(ctx.backendSrv.fetch(opts));
+ expect(res.traceId).toBeUndefined();
+ });
+
+ it('should handle a success-response with traceId', async () => {
+ const ctx = getTestContext({
+ status: 200,
+ statusText: 'OK',
+ headers: new Headers({
+ 'grafana-trace-id': 'traceId1',
+ }),
+ });
+ const res = await lastValueFrom(ctx.backendSrv.fetch(opts));
+ expect(res.traceId).toBe('traceId1');
+ });
+
+ it('should handle an error-response without traceId', () => {
+ const ctx = getTestContext({
+ ok: false,
+ status: 500,
+ statusText: 'INTERNAL SERVER ERROR',
+ headers: new Headers(),
+ });
+ return lastValueFrom(ctx.backendSrv.fetch(opts)).then(
+ (data) => {
+ throw new Error('must not get here');
+ },
+ (error) => {
+ expect(error.traceId).toBeUndefined();
+ }
+ );
+ });
+
+ it('should handle an error-response with traceId', () => {
+ const ctx = getTestContext({
+ ok: false,
+ status: 500,
+ statusText: 'INTERNAL SERVER ERROR',
+ headers: new Headers({
+ 'grafana-trace-id': 'traceId1',
+ }),
+ });
+ return lastValueFrom(ctx.backendSrv.fetch(opts)).then(
+ (data) => {
+ throw new Error('must not get here');
+ },
+ (error) => {
+ expect(error.traceId).toBe('traceId1');
+ }
+ );
+ });
+ });
});
describe('datasourceRequest', () => {
@@ -369,6 +428,7 @@ describe('backendSrv', () => {
ok: true,
status: 200,
statusText: 'Ok',
+ headers: new Map(),
text: () => Promise.resolve(JSON.stringify(slowData)),
redirected: false,
type: 'basic',
@@ -382,6 +442,7 @@ describe('backendSrv', () => {
ok: true,
status: 200,
statusText: 'Ok',
+ headers: new Map(),
text: () => Promise.resolve(JSON.stringify(fastData)),
redirected: false,
type: 'basic',
diff --git a/public/app/features/alerting/unified/api/alertmanager.ts b/public/app/features/alerting/unified/api/alertmanager.ts
index 2f75264468f..ba565453d42 100644
--- a/public/app/features/alerting/unified/api/alertmanager.ts
+++ b/public/app/features/alerting/unified/api/alertmanager.ts
@@ -34,6 +34,8 @@ export async function fetchAlertManagerConfig(alertManagerSourceName: string): P
template_files: result.data.template_files ?? {},
template_file_provenances: result.data.template_file_provenances ?? {},
alertmanager_config: result.data.alertmanager_config ?? {},
+ last_applied: result.data.last_applied,
+ id: result.data.id,
};
} catch (e) {
// if no config has been uploaded to grafana, it returns error instead of latest config
diff --git a/public/app/features/alerting/unified/api/alertmanagerApi.ts b/public/app/features/alerting/unified/api/alertmanagerApi.ts
index be7f2634b44..66f6d760422 100644
--- a/public/app/features/alerting/unified/api/alertmanagerApi.ts
+++ b/public/app/features/alerting/unified/api/alertmanagerApi.ts
@@ -1,12 +1,16 @@
import {
AlertmanagerChoice,
+ AlertManagerCortexConfig,
ExternalAlertmanagerConfig,
ExternalAlertmanagers,
ExternalAlertmanagersResponse,
} from '../../../../plugins/datasource/alertmanager/types';
+import { getDatasourceAPIUid, GRAFANA_RULES_SOURCE_NAME } from '../utils/datasource';
import { alertingApi } from './alertingApi';
+const LIMIT_TO_SUCCESSFULLY_APPLIED_AMS = 10;
+
export interface AlertmanagersChoiceResponse {
alertmanagersChoice: AlertmanagerChoice;
numExternalAlertmanagers: number;
@@ -33,5 +37,24 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
query: (config) => ({ url: '/api/v1/ngalert/admin_config', method: 'POST', data: config }),
invalidatesTags: ['AlertmanagerChoice'],
}),
+
+ getValidAlertManagersConfig: build.query({
+ //this is only available for the "grafana" alert manager
+ query: () => ({
+ url: `/api/alertmanager/${getDatasourceAPIUid(
+ GRAFANA_RULES_SOURCE_NAME
+ )}/config/history?limit=${LIMIT_TO_SUCCESSFULLY_APPLIED_AMS}`,
+ }),
+ }),
+
+ resetAlertManagerConfigToOldVersion: build.mutation<{ message: string }, { id: number }>({
+ //this is only available for the "grafana" alert manager
+ query: (config) => ({
+ url: `/api/alertmanager/${getDatasourceAPIUid(GRAFANA_RULES_SOURCE_NAME)}/config/history/${
+ config.id
+ }/_activate`,
+ method: 'POST',
+ }),
+ }),
}),
});
diff --git a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
index a9bebf53196..5b6df00d2f9 100644
--- a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
+++ b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.test.tsx
@@ -100,9 +100,7 @@ describe('Admin config', () => {
alertmanager_config: {},
});
mocks.api.deleteAlertManagerConfig.mockResolvedValue();
-
- await renderAdminPage(dataSources.alertManager.name);
-
+ renderAdminPage(dataSources.alertManager.name);
await userEvent.click(await ui.resetButton.find());
await userEvent.click(ui.confirmButton.get());
await waitFor(() => expect(mocks.api.deleteAlertManagerConfig).toHaveBeenCalled());
@@ -128,7 +126,7 @@ describe('Admin config', () => {
mocks.api.fetchConfig.mockImplementation(() => Promise.resolve(savedConfig ?? defaultConfig));
mocks.api.updateAlertManagerConfig.mockResolvedValue();
- await renderAdminPage(dataSources.alertManager.name);
+ renderAdminPage(dataSources.alertManager.name);
const input = await ui.configInput.find();
expect(input.value).toEqual(JSON.stringify(defaultConfig, null, 2));
await userEvent.clear(input);
@@ -147,7 +145,7 @@ describe('Admin config', () => {
...someCloudAlertManagerStatus,
config: someCloudAlertManagerConfig.alertmanager_config,
});
- await renderAdminPage(dataSources.promAlertManager.name);
+ renderAdminPage(dataSources.promAlertManager.name);
await ui.readOnlyConfig.find();
expect(ui.configInput.query()).not.toBeInTheDocument();
diff --git a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.tsx b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.tsx
index 959e55d4d3a..b5d4261ba13 100644
--- a/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.tsx
+++ b/public/app/features/alerting/unified/components/admin/AlertmanagerConfig.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
import React, { useEffect, useState, useMemo } from 'react';
import { GrafanaTheme2 } from '@grafana/data';
-import { Alert, Button, ConfirmModal, TextArea, HorizontalGroup, Field, Form, useStyles2 } from '@grafana/ui';
+import { Alert, useStyles2 } from '@grafana/ui';
import { useDispatch } from 'app/types';
import { useAlertManagerSourceName } from '../../hooks/useAlertManagerSourceName';
@@ -17,7 +17,10 @@ import { GRAFANA_RULES_SOURCE_NAME, isVanillaPrometheusAlertManagerDataSource }
import { initialAsyncRequestState } from '../../utils/redux';
import { AlertManagerPicker } from '../AlertManagerPicker';
-interface FormValues {
+import AlertmanagerConfigSelector, { ValidAmConfigOption } from './AlertmanagerConfigSelector';
+import { ConfigEditor } from './ConfigEditor';
+
+export interface FormValues {
configJSON: string;
}
@@ -29,11 +32,14 @@ export default function AlertmanagerConfig(): JSX.Element {
const [showConfirmDeleteAMConfig, setShowConfirmDeleteAMConfig] = useState(false);
const { loading: isDeleting } = useUnifiedAlertingSelector((state) => state.deleteAMConfig);
const { loading: isSaving } = useUnifiedAlertingSelector((state) => state.saveAMConfig);
+
const readOnly = alertManagerSourceName ? isVanillaPrometheusAlertManagerDataSource(alertManagerSourceName) : false;
const styles = useStyles2(getStyles);
const configRequests = useUnifiedAlertingSelector((state) => state.amConfigs);
+ const [selectedAmConfig, setSelectedAmConfig] = useState();
+
const {
result: config,
loading: isLoadingConfig,
@@ -60,6 +66,13 @@ export default function AlertmanagerConfig(): JSX.Element {
[config]
);
+ const defaultValidValues = useMemo(
+ (): FormValues => ({
+ configJSON: selectedAmConfig ? JSON.stringify(selectedAmConfig.value, null, 2) : '',
+ }),
+ [selectedAmConfig]
+ );
+
const loading = isDeleting || isLoadingConfig || isSaving;
const onSubmit = (values: FormValues) => {
@@ -84,9 +97,25 @@ export default function AlertmanagerConfig(): JSX.Element {
dataSources={alertManagers}
/>
{loadingError && !loading && (
-
- {loadingError.message || 'Unknown error.'}
-
+ <>
+
+ {loadingError.message || 'Unknown error.'}
+
+
+ {alertManagerSourceName === GRAFANA_RULES_SOURCE_NAME && (
+
+ )}
+
)}
{isDeleting && alertManagerSourceName !== GRAFANA_RULES_SOURCE_NAME && (
@@ -94,70 +123,17 @@ export default function AlertmanagerConfig(): JSX.Element {
)}
{alertManagerSourceName && config && (
- 
+
The dashboard version history feature lets you compare and restore to previously saved dashboard versions.
@@ -25,20 +25,18 @@ The dashboard version history feature lets you compare and restore to previously
To compare two dashboard versions, select the two versions from the list that you wish to compare. Once selected, the "Compare versions" button will become clickable. Click the button to view the diff between the two versions.
-
+
Upon clicking the button, you'll be brought to the diff view. By default, you'll see a textual summary of the changes, like in the image below.
-
+
-If you want to view the diff of the raw JSON that represents your dashboard, you can do that as well by clicking the "View JSON Diff" button at the bottom.
-
-If you want to restore to the version you are diffing against, you can do so by clicking the "Restore to version \
+
After restoring to a previous version, a new version will be created containing the same exact data as the previous version, only with a different version number. This is indicated in the "Notes column" for the row in the new dashboard version. This is done simply to ensure your previous dashboard versions are not affected by the change.
diff --git a/docs/sources/dashboards/create-manage-playlists/index.md b/docs/sources/dashboards/create-manage-playlists/index.md
index e3c12996a26..9be403a304d 100644
--- a/docs/sources/dashboards/create-manage-playlists/index.md
+++ b/docs/sources/dashboards/create-manage-playlists/index.md
@@ -26,21 +26,22 @@ Use the information in this section to access existing playlists. Start and cont
### Access a playlist
-1. Hover your cursor over Grafana’s side menu.
-1. Click **Playlists**. You will see a list of existing playlists.
+1. Click **Dashboards** in the left-side menu.
+1. Click **Playlists** to see a list of existing playlists.
### Start a playlist
-You can start a playlist in five different view modes. View mode determine how the menus and navigation bar appear on the dashboards.
+You can start a playlist in five different view modes. View modes determine how the menus and navigation bar appear on the dashboards.
By default, each dashboard is displayed for the amount of time entered in the Interval field, which you set when you create or edit a playlist. After you start a playlist, you can control it with the navbar at the top of the page.
-1. [Access](#access-playlist) the playlist page to see a list of existing playlists.
-1. Find the playlist you want to start, then click **Start playlist**. The start playlist dialog opens.
-1. Select one of the five playlist modes available based on the information in the following table.
-1. Click **Start 
+
#### Relative time range
diff --git a/docs/sources/dashboards/variables/add-template-variables/index.md b/docs/sources/dashboards/variables/add-template-variables/index.md
index d26e4b0e434..deda7868f77 100644
--- a/docs/sources/dashboards/variables/add-template-variables/index.md
+++ b/docs/sources/dashboards/variables/add-template-variables/index.md
@@ -44,17 +44,17 @@ weight: 100
The following table lists the types of variables shipped with Grafana.
-| Variable type | Description |
-| :---------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Query | Query-generated list of values such as metric names, server names, sensor IDs, data centers, and so on. [Add a query variable]({{< relref "#add-a-query-variable" >}}). |
-| Custom | Define the variable options manually using a comma-separated list. [Add a custom variable]({{< relref "#add-a-custom-variable" >}}). |
-| Text box | Display a free text input field with an optional default value. [Add a text box variable]({{< relref "#add-a-text-box-variable" >}}). |
-| Constant | Define a hidden constant. [Add a constant variable]({{< relref "#add-a-constant-variable" >}}). |
-| Data source | Quickly change the data source for an entire dashboard. [Add a data source variable]({{< relref "#add-a-data-source-variable" >}}). |
-| Interval | Interval variables represent time spans. [Add an interval variable]({{< relref "#add-an-interval-variable" >}}). |
-| Ad hoc filters | Key/value filters that are automatically added to all metric queries for a data source (InfluxDB, Prometheus, and Elasticsearch only). [Add ad hoc filters]({{< relref "#add-ad-hoc-filters" >}}). |
-| Global variables | Built-in variables that can be used in expressions in the query editor. Refer to [Global variables]({{< relref "#global-variables" >}}). |
-| Chained variables | Variable queries can contain other variables. Refer to [Chained variables]({{< relref "#chained-variables" >}}). |
+| Variable type | Description |
+| :---------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Query | Query-generated list of values such as metric names, server names, sensor IDs, data centers, and so on. [Add a query variable]({{< relref "#add-a-query-variable" >}}). |
+| Custom | Define the variable options manually using a comma-separated list. [Add a custom variable]({{< relref "#add-a-custom-variable" >}}). |
+| Text box | Display a free text input field with an optional default value. [Add a text box variable]({{< relref "#add-a-text-box-variable" >}}). |
+| Constant | Define a hidden constant. [Add a constant variable]({{< relref "#add-a-constant-variable" >}}). |
+| Data source | Quickly change the data source for an entire dashboard. [Add a data source variable]({{< relref "#add-a-data-source-variable" >}}). |
+| Interval | Interval variables represent time spans. [Add an interval variable]({{< relref "#add-an-interval-variable" >}}). |
+| Ad hoc filters | Key/value filters that are automatically added to all metric queries for a data source (Prometheus, Loki, InfluxDB, and Elasticsearch only). [Add ad hoc filters]({{< relref "#add-ad-hoc-filters" >}}). |
+| Global variables | Built-in variables that can be used in expressions in the query editor. Refer to [Global variables]({{< relref "#global-variables" >}}). |
+| Chained variables | Variable queries can contain other variables. Refer to [Chained variables]({{< relref "#chained-variables" >}}). |
## Enter General options
@@ -194,7 +194,7 @@ Ad hoc filters are one of the most complex and flexible variable options availab
Interpolating a variable with multiple values selected is tricky as it is not straight forward how to format the multiple values into a string that is valid in the given context where the variable is used. Grafana tries to solve this by allowing each data source plugin to inform the templating interpolation engine what format to use for multiple values.
-> **Note:** The **Custom all value** option on the variable must be blank for Grafana to format all values into a single string. If leave it blank, then the Grafana concatenates (adds together) all the values in the query. Something like `value1,value2,value3`. If a custom `all` value is used, then instead the value will be something like `*` or `all`.
+> **Note:** The **Custom all value** option on the variable must be blank for Grafana to format all values into a single string. If it is left blank, then Grafana concatenates (adds together) all the values in the query. Something like `value1,value2,value3`. If a custom `all` value is used, then instead the value will be something like `*` or `all`.
#### Multi-value variables with a Graphite data source
@@ -281,6 +281,8 @@ This variable is the `$__interval` variable in milliseconds, not a time interval
This variable is only available in the Singlestat panel and can be used in the prefix or suffix fields on the Options tab. The variable will be replaced with the series name or alias.
+> **Note:** The Singlestat panel is no longer available from Grafana 8.0.
+
### $\_\_org
This variable is the ID of the current organization.
@@ -398,7 +400,7 @@ apps.fakesite.web_server_01.cpu.*
#### InfluxDB example
-In this example, you have several data centers. Each data center has a different subset of hosts. It is based on the [InfluxDB Templated](https://play.grafana.org/d/000000002/influxdb-templated?orgId=1).
+In this example, you have several data centers. Each data center has a different subset of hosts. It is based on the [InfluxDB Templated](https://play.grafana.org/d/000000002/influxdb-templated?orgId=1) dashboard.
In this example, when the user changes the value of the `datacenter` variable, it changes the dropdown options returned by the `host` variable. The `host` variable uses the **Multi-value** option and **Include all option**, allowing users to select some or all options presented at any time. The `datacenter` does not use either option, so you can only select one data center at a time.
@@ -407,7 +409,7 @@ In this example, when the user changes the value of the `datacenter` variable, i
The query for this variable basically says, "Give me all the data centers that exist."
```
-SHOW TAG VALUES WITH KEY = "datacenter"
+SHOW TAG VALUES WITH KEY = "datacenter"
```
The values returned are `America`, `Africa`, `Asia`, and `Europe`.
diff --git a/docs/sources/datasources/alertmanager/_index.md b/docs/sources/datasources/alertmanager/_index.md
index 0e69a550f71..3c4ac6b793d 100644
--- a/docs/sources/datasources/alertmanager/_index.md
+++ b/docs/sources/datasources/alertmanager/_index.md
@@ -28,24 +28,25 @@ When using Prometheus, contact points and notification policies are read-only in
## Configure the data source
-**To access the data source configuration page:**
+To configure basic settings for the data source, complete the following steps:
-1. Select the **Data sources** section from the **Administration** menu
-2. Select the **Alertmanager** data source
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Enter `Alertmanager` in the search bar.
+1. Click **Alertmanager**.
-Set the data source's basic configuration options carefully:
+ The **Settings** tab of the data source is displayed.
-| Name | Description |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Name** | Sets the name you use to refer to the data source |
-| **Default** | Sets whether the data source is pre-selected for new panels and queries |
-| **Alertmanager** | |
-| **Implementation** | Alertmanager implementation. **Mimir**, **Cortex,** and **Prometheus** are supported |
-| **Receive Grafana Alerts** | When enabled the Alertmanager receives alert instances from Grafana-managed alert rules. **Important:** It works only if Grafana alerting is configured to send its alert instances to external Alertmanagers |
-| **HTTP** | |
-| **URL** | Sets the HTTP protocol, IP, and port of your Alertmanager instance, such as `https://alertmanager.example.org:9093` |
-| **Access** | Only **Server** access mode is functional |
-| | |
+1. Set the data source's basic configuration options:
+
+ | Name | Description |
+ | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+ | **Name** | Sets the name you use to refer to the data source |
+ | **Default** | Sets whether the data source is pre-selected for new panels and queries |
+ | **Alertmanager Implementation** | Alertmanager implementation. **Mimir**, **Cortex,** and **Prometheus** are supported |
+ | **Receive Grafana Alerts** | When enabled the Alertmanager receives alert instances from Grafana-managed alert rules. **Important:** It works only if Grafana alerting is configured to send its alert instances to external Alertmanagers |
+ | **HTTP URL** | Sets the HTTP protocol, IP, and port of your Alertmanager instance, such as `https://alertmanager.example.org:9093` |
+ | **Access** | Only **Server** access mode is functional |
## Provision the Alertmanager data source
diff --git a/docs/sources/datasources/aws-cloudwatch/_index.md b/docs/sources/datasources/aws-cloudwatch/_index.md
index 3bb9a4160ef..ab5b0372780 100644
--- a/docs/sources/datasources/aws-cloudwatch/_index.md
+++ b/docs/sources/datasources/aws-cloudwatch/_index.md
@@ -31,11 +31,12 @@ Once you've added the data source, you can [configure it]({{< relref "#configure
## Configure the data source
-**To access the data source configuration page:**
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Enter `CloudWatch` in the search bar.
+1. Click **CloudWatch**.
-1. Hover the cursor over the **Configuration** (gear) icon.
-1. Select **Data Sources**.
-1. Select the CloudWatch data source.
+ The **Settings** tab of the data source is displayed.
### Configure AWS authentication
@@ -49,7 +50,7 @@ For authentication options and configuration details, refer to [AWS authenticati
To read CloudWatch metrics and EC2 tags, instances, regions, and alarms, you must grant Grafana permissions via IAM.
You can attach these permissions to the IAM role or IAM user you configured in [AWS authentication]({{< relref "./aws-authentication/" >}}).
-**Metrics-only:**
+##### Metrics-only permissions
```json
{
@@ -84,7 +85,7 @@ You can attach these permissions to the IAM role or IAM user you configured in [
}
```
-**Logs-only:**
+##### Logs-only permissions
```json
{
@@ -119,7 +120,7 @@ You can attach these permissions to the IAM role or IAM user you configured in [
}
```
-**Metrics and Logs:**
+##### Metrics and logs permissions
```json
{
@@ -167,7 +168,7 @@ You can attach these permissions to the IAM role or IAM user you configured in [
}
```
-**Cross-account observability: (see below) **
+##### Cross-account observability permissions
```json
{
@@ -234,7 +235,7 @@ For more information about provisioning, and for available configuration options
#### Provisioning examples
-**Using AWS SDK (default):**
+##### Using AWS SDK (default)
```yaml
apiVersion: 1
@@ -246,7 +247,7 @@ datasources:
defaultRegion: eu-west-2
```
-**Using credentials' profile name (non-default):**
+##### Using credentials' profile name (non-default)
```yaml
apiVersion: 1
@@ -261,7 +262,7 @@ datasources:
profile: secondary
```
-**Using accessKey and secretKey:**
+##### Using accessKey and secretKey
```yaml
apiVersion: 1
@@ -277,7 +278,7 @@ datasources:
secretKey: '