{showHeaderForFirstTimeUsers &&
}
@@ -240,7 +610,12 @@ export function getTopSceneFor(metric?: string) {
}
}
-function getVariableSet(initialDS?: string, metric?: string, initialFilters?: AdHocVariableFilter[]) {
+function getVariableSet(
+ initialDS?: string,
+ metric?: string,
+ initialFilters?: AdHocVariableFilter[],
+ otelJoinQuery?: string
+) {
return new SceneVariableSet({
variables: [
new DataSourceVariable({
@@ -250,6 +625,24 @@ function getVariableSet(initialDS?: string, metric?: string, initialFilters?: Ad
value: initialDS,
pluginId: 'prometheus',
}),
+ new CustomVariable({
+ name: VAR_OTEL_DEPLOYMENT_ENV,
+ label: 'Deployment environment',
+ hide: VariableHide.hideVariable,
+ value: undefined,
+ placeholder: 'Select',
+ isMulti: true,
+ }),
+ new AdHocFiltersVariable({
+ name: VAR_OTEL_RESOURCES,
+ label: 'Select resource attributes',
+ addFilterButtonText: 'Select resource attributes',
+ datasource: trailDS,
+ hide: VariableHide.hideVariable,
+ layout: 'vertical',
+ defaultKeys: [],
+ applyMode: 'manual',
+ }),
new AdHocFiltersVariable({
name: VAR_FILTERS,
addFilterButtonText: 'Add label',
@@ -258,9 +651,11 @@ function getVariableSet(initialDS?: string, metric?: string, initialFilters?: Ad
layout: config.featureToggles.newFiltersUI ? 'combobox' : 'vertical',
filters: initialFilters ?? [],
baseFilters: getBaseFiltersForMetric(metric),
+ applyMode: 'manual',
// since we only support prometheus datasources, this is always true
supportsMultiValueOperators: true,
}),
+ ...getVariablesWithOtelJoinQueryConstant(otelJoinQuery ?? ''),
],
});
}
diff --git a/public/app/features/trails/DataTrailSettings.tsx b/public/app/features/trails/DataTrailSettings.tsx
index 4b9a4e7ee0a..2584b7bb930 100644
--- a/public/app/features/trails/DataTrailSettings.tsx
+++ b/public/app/features/trails/DataTrailSettings.tsx
@@ -3,8 +3,12 @@ import { css } from '@emotion/css';
import { GrafanaTheme2 } from '@grafana/data';
import { SceneComponentProps, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
import { Dropdown, Switch, ToolbarButton, useStyles2 } from '@grafana/ui';
+import { Trans } from '@grafana/ui/src/utils/i18n';
+import { MetricScene } from './MetricScene';
+import { MetricSelectScene } from './MetricSelect/MetricSelectScene';
import { reportExploreMetrics } from './interactions';
+import { getTrailFor } from './utils';
export interface DataTrailSettingsState extends SceneObjectState {
stickyMainGraph?: boolean;
@@ -29,19 +33,42 @@ export class DataTrailSettings extends SceneObjectBase
{
this.setState({ isOpen });
};
+ public onTogglePreviews = () => {
+ const trail = getTrailFor(this);
+ trail.setState({ showPreviews: !trail.state.showPreviews });
+ };
+
static Component = ({ model }: SceneComponentProps) => {
const { stickyMainGraph, isOpen } = model.useState();
const styles = useStyles2(getStyles);
+ const trail = getTrailFor(model);
+
+ const { showPreviews, topScene } = trail.useState();
+
const renderPopover = () => {
return (
/* eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */
evt.stopPropagation()}>
Settings
-
-
Always keep selected metric graph in-view
-
-
+ {topScene instanceof MetricScene && (
+
+
+
+ Always keep selected metric graph in-view
+
+
+
+
+ )}
+ {topScene instanceof MetricSelectScene && (
+
+
+ Show previews of metric graphs
+
+
+
+ )}