{
+ | {labelType && } |
{/* Key - value columns */}
{singleKey ? parsedKeys[0] : this.generateMultiVal(parsedKeys)} |
@@ -360,7 +384,7 @@ class UnThemedLogDetailsRow extends PureComponent {
{showFieldsStats && singleKey && singleVal && (
- |
+ |
{
}
}
+function LabelTypeBadge({ type, styles }: { type: string; styles: ReturnType }) {
+ return (
+
+
+ {type.substring(0, 1)}
+
+
+ );
+}
+
interface AsyncIconButtonProps extends Pick, 'onClick'> {
name: IconName;
isActive(): Promise;
diff --git a/public/app/features/logs/components/LogLabels.test.tsx b/public/app/features/logs/components/LogLabels.test.tsx
index af5217d110f..f736b0a595c 100644
--- a/public/app/features/logs/components/LogLabels.test.tsx
+++ b/public/app/features/logs/components/LogLabels.test.tsx
@@ -1,6 +1,7 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody';
import { LogLabels, LogLabelsList } from './LogLabels';
describe('', () => {
@@ -38,8 +39,9 @@ describe('', () => {
describe('', () => {
it('renders labels', () => {
- render();
+ render();
expect(screen.queryByText('bar')).toBeInTheDocument();
expect(screen.queryByText('42')).toBeInTheDocument();
+ expect(screen.queryByText('log line')).toBeInTheDocument();
});
});
diff --git a/public/app/features/logs/components/LogLabels.tsx b/public/app/features/logs/components/LogLabels.tsx
index 951597c887f..fa675287a72 100644
--- a/public/app/features/logs/components/LogLabels.tsx
+++ b/public/app/features/logs/components/LogLabels.tsx
@@ -4,6 +4,8 @@ import { memo, forwardRef, useMemo } from 'react';
import { GrafanaTheme2, Labels } from '@grafana/data';
import { Tooltip, useStyles2 } from '@grafana/ui';
+import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody';
+
// Levels are already encoded in color, filename is a Loki-ism
const HIDDEN_LABELS = ['detected_level', 'level', 'lvl', 'filename'];
@@ -59,7 +61,7 @@ export const LogLabelsList = memo(({ labels }: LogLabelsArrayProps) => {
{labels.map((label) => (
- {label}
+ {label === LOG_LINE_BODY_FIELD_NAME ? 'log line' : label}
))}
diff --git a/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx b/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx
index 05b48eabff1..4e0bdfccf4a 100644
--- a/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx
+++ b/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx
@@ -4,6 +4,7 @@ import userEvent from '@testing-library/user-event';
import { createTheme, LogLevel } from '@grafana/data';
import { IconButton } from '@grafana/ui';
+import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody';
import { LogRowMessageDisplayedFields, Props } from './LogRowMessageDisplayedFields';
import { createLogRow } from './__mocks__/logRow';
import { getLogRowStyles } from './getLogRowStyles';
@@ -42,7 +43,14 @@ const setup = (propOverrides: Partial = {}, detectedFields = ['place', 'p
describe('LogRowMessageDisplayedFields', () => {
it('renders diplayed fields from a log row', () => {
setup();
- expect(screen.queryByText('Logs are wonderful')).not.toBeInTheDocument();
+ expect(screen.queryByText(/Logs are wonderful/)).not.toBeInTheDocument();
+ expect(screen.getByText(/place=Earth/)).toBeInTheDocument();
+ expect(screen.getByText(/planet=Mars/)).toBeInTheDocument();
+ });
+
+ it('renders diplayed fields and body from a log row', () => {
+ setup({}, ['place', 'planet', LOG_LINE_BODY_FIELD_NAME]);
+ expect(screen.queryByText(/Logs are wonderful/)).toBeInTheDocument();
expect(screen.getByText(/place=Earth/)).toBeInTheDocument();
expect(screen.getByText(/planet=Mars/)).toBeInTheDocument();
});
diff --git a/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx b/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
index 363fb97bb17..2cc495148a1 100644
--- a/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
+++ b/public/app/features/logs/components/LogRowMessageDisplayedFields.tsx
@@ -3,6 +3,7 @@ import { memo, ReactNode, useMemo } from 'react';
import { LogRowModel, Field, LinkModel, DataFrame } from '@grafana/data';
+import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody';
import { LogRowMenuCell } from './LogRowMenuCell';
import { LogRowStyles } from './getLogRowStyles';
import { getAllFields } from './logParser';
@@ -45,21 +46,26 @@ export const LogRowMessageDisplayedFields = memo((props: Props) => {
let line = '';
for (let i = 0; i < detectedFields.length; i++) {
const parsedKey = detectedFields[i];
+
+ if (parsedKey === LOG_LINE_BODY_FIELD_NAME) {
+ line += ` ${row.entry}`;
+ }
+
const field = fields.find((field) => {
const { keys } = field;
return keys[0] === parsedKey;
});
- if (field) {
+ if (field != null) {
line += ` ${parsedKey}=${field.values}`;
}
- if (row.labels[parsedKey] !== undefined && row.labels[parsedKey] !== null) {
+ if (row.labels[parsedKey] != null && row.labels[parsedKey] != null) {
line += ` ${parsedKey}=${row.labels[parsedKey]}`;
}
}
return line.trimStart();
- }, [detectedFields, fields, row.labels]);
+ }, [detectedFields, fields, row.entry, row.labels]);
const shouldShowMenu = useMemo(() => mouseIsOver || pinned, [mouseIsOver, pinned]);
diff --git a/public/app/features/logs/utils.ts b/public/app/features/logs/utils.ts
index 4d8f88c5641..e6db5c67038 100644
--- a/public/app/features/logs/utils.ts
+++ b/public/app/features/logs/utils.ts
@@ -343,3 +343,48 @@ export function createLogRowsMap() {
return false;
};
}
+
+function getLabelTypeFromFrame(labelKey: string, frame: DataFrame, index: number): null | string {
+ const typeField = frame.fields.find((field) => field.name === 'labelTypes')?.values[index];
+ if (!typeField) {
+ return null;
+ }
+ return typeField[labelKey] ?? null;
+}
+
+export function getLabelTypeFromRow(label: string, row: LogRowModel) {
+ if (!row.datasourceType) {
+ return null;
+ }
+ const idField = row.dataFrame.fields.find((field) => field.name === 'id');
+ if (!idField) {
+ return null;
+ }
+ const rowIndex = idField.values.findIndex((id) => id === row.rowId);
+ if (rowIndex < 0) {
+ return null;
+ }
+ const labelType = getLabelTypeFromFrame(label, row.dataFrame, rowIndex);
+ if (!labelType) {
+ return null;
+ }
+ return getDataSourceLabelType(labelType, row.datasourceType);
+}
+
+function getDataSourceLabelType(labelType: string, datasourceType: string) {
+ switch (datasourceType) {
+ case 'loki':
+ switch (labelType) {
+ case 'I':
+ return 'Indexed label';
+ case 'S':
+ return 'Structured metadata';
+ case 'P':
+ return 'Parsed label';
+ default:
+ return null;
+ }
+ default:
+ return null;
+ }
+}
diff --git a/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx
index 5ce78e36621..c82226fc763 100644
--- a/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx
+++ b/public/app/features/trails/ActionTabs/MetricOverviewScene.tsx
@@ -13,9 +13,9 @@ import {
import { Stack, Text, TextLink } from '@grafana/ui';
import { Trans } from 'app/core/internationalization';
-import { getUnitFromMetric } from '../AutomaticMetricQueries/units';
import { MetricScene } from '../MetricScene';
import { StatusWrapper } from '../StatusWrapper';
+import { getUnitFromMetric } from '../autoQuery/units';
import { reportExploreMetrics } from '../interactions';
import { updateOtelJoinWithGroupLeft } from '../otel/util';
import { VAR_DATASOURCE_EXPR, VAR_GROUP_BY, VAR_OTEL_GROUP_LEFT } from '../shared';
diff --git a/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts b/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts
deleted file mode 100644
index 94d2287e126..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/AutoQueryEngine.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { getQueryGeneratorFor } from './query-generators/getQueryGeneratorFor';
-import { AutoQueryInfo } from './types';
-
-export function getAutoQueriesForMetric(metric: string): AutoQueryInfo {
- const metricParts = metric.split('_');
-
- const suffix = metricParts.at(-1);
-
- const generator = getQueryGeneratorFor(suffix);
-
- if (!generator) {
- throw new Error(`Unable to generate queries for metric "${metric}" due to issues with derived suffix "${suffix}"`);
- }
-
- return generator(metricParts);
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts
deleted file mode 100644
index 252dba74701..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/graph-builders/heatmap.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { PanelBuilders } from '@grafana/scenes';
-import { HeatmapColorMode } from 'app/plugins/panel/heatmap/types';
-
-import { CommonVizParams } from './types';
-
-export function heatmapGraphBuilder({ title, unit }: CommonVizParams) {
- return PanelBuilders.heatmap() //
- .setTitle(title)
- .setUnit(unit)
- .setOption('calculate', false)
- .setOption('color', {
- mode: HeatmapColorMode.Scheme,
- exponent: 0.5,
- scheme: 'Spectral',
- steps: 32,
- reverse: false,
- });
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts
deleted file mode 100644
index 36578e56ffb..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/graph-builders/percentiles.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PanelBuilders } from '@grafana/scenes';
-import { SortOrder } from '@grafana/schema';
-import { TooltipDisplayMode } from '@grafana/ui';
-
-import { CommonVizParams } from './types';
-
-export function percentilesGraphBuilder({ title, unit }: CommonVizParams) {
- return PanelBuilders.timeseries()
- .setTitle(title)
- .setUnit(unit)
- .setCustomFieldConfig('fillOpacity', 9)
- .setOption('tooltip', { mode: TooltipDisplayMode.Multi, sort: SortOrder.Descending })
- .setOption('legend', { showLegend: false });
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts
deleted file mode 100644
index d04766f23e4..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/graph-builders/simple.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PanelBuilders } from '@grafana/scenes';
-import { SortOrder } from '@grafana/schema';
-import { TooltipDisplayMode } from '@grafana/ui';
-
-import { CommonVizParams } from './types';
-
-export function simpleGraphBuilder({ title, unit }: CommonVizParams) {
- return PanelBuilders.timeseries() //
- .setTitle(title)
- .setUnit(unit)
- .setOption('legend', { showLegend: false })
- .setOption('tooltip', { mode: TooltipDisplayMode.Multi, sort: SortOrder.Descending })
- .setCustomFieldConfig('fillOpacity', 9);
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts b/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts
deleted file mode 100644
index 5167b71f003..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/graph-builders/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type CommonVizParams = {
- title: string;
- unit: string;
-};
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/baseQuery.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/common/baseQuery.ts
deleted file mode 100644
index 5d0759e669d..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/common/baseQuery.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { VAR_METRIC_EXPR, VAR_FILTERS_EXPR, VAR_OTEL_JOIN_QUERY_EXPR } from 'app/features/trails/shared';
-
-const GENERAL_BASE_QUERY = `${VAR_METRIC_EXPR}${VAR_FILTERS_EXPR}`;
-const GENERAL_RATE_BASE_QUERY = `rate(${GENERAL_BASE_QUERY}[$__rate_interval])`;
-
-export function getGeneralBaseQuery(rate: boolean) {
- return rate
- ? `${GENERAL_RATE_BASE_QUERY} ${VAR_OTEL_JOIN_QUERY_EXPR}`
- : `${GENERAL_BASE_QUERY} ${VAR_OTEL_JOIN_QUERY_EXPR}`;
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/default.test.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/default.test.ts
deleted file mode 100644
index cddc48925ec..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/default.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { VAR_GROUP_BY_EXP } from '../../shared';
-import { AutoQueryDef, AutoQueryInfo } from '../types';
-
-import { getGeneralBaseQuery } from './common/baseQuery';
-import { generateQueries } from './default';
-
-describe('generateQueries', () => {
- const agg = 'sum';
- const unit = 'mockunit';
-
- type QueryInfoKey = keyof AutoQueryInfo;
-
- function testRateIndependentAssertions(queryDef: AutoQueryDef, key: QueryInfoKey) {
- describe('regardless of rate', () => {
- test(`specified unit must be propagated`, () => expect(queryDef.unit).toBe(unit));
- test(`only one query is expected`, () => expect(queryDef.queries.length).toBe(1));
- const query = queryDef.queries[0];
- test(`specified agg function must be propagated in the query expr`, () => {
- const queryAggFunction = query.expr.split('(', 2)[0];
- expect(queryAggFunction).toBe(agg);
- });
- if (key === 'breakdown') {
- const expectedSuffix = `by(${VAR_GROUP_BY_EXP})`;
- test(`breakdown query must end with "${expectedSuffix}"`, () => {
- const suffix = query.expr.substring(query.expr.length - expectedSuffix.length);
- expect(suffix).toBe(expectedSuffix);
- });
- }
- });
- }
-
- function testRateSpecificAssertions(queryDef: AutoQueryDef, rate: boolean, key: QueryInfoKey) {
- const query = queryDef.queries[0];
- const firstParen = query.expr.indexOf('(');
- const expectedBaseQuery = getGeneralBaseQuery(rate);
- const detectedBaseQuery = query.expr.substring(firstParen + 1, firstParen + 1 + expectedBaseQuery.length);
-
- const inParentheses = rate ? 'overall per-second rate' : 'overall';
- const description = `\${metric} (${inParentheses})`;
-
- describe(`since rate is ${rate}`, () => {
- test(`base query must be "${expectedBaseQuery}"`, () => expect(detectedBaseQuery).toBe(expectedBaseQuery));
- if (key === 'main') {
- test(`main panel title contains expected description "${description}"`, () =>
- expect(queryDef.title).toContain(description));
- } else {
- test(`${key} panel title is just "\${metric}"`, () => expect(queryDef.title).toBe('${metric}'));
- test(`${key} panel title does not contain description "${description}"`, () =>
- expect(queryDef.title).not.toContain(description));
- }
-
- if (key === 'breakdown') {
- test(`breakdown query uses "{{\${groupby}}}" as legend`, () =>
- expect(query.legendFormat).toBe('{{${groupby}}}'));
- } else {
- test(`preview query uses "${description}" as legend`, () => expect(query.legendFormat).toBe(description));
- }
- });
- }
-
- for (const rate of [true, false]) {
- describe(`when rate is ${rate}`, () => {
- const queryInfo = generateQueries({ agg, unit, rate });
-
- let key: QueryInfoKey;
- for (key in queryInfo) {
- if (key !== 'variants') {
- const queryDef = queryInfo[key];
- describe(`queryInfo.${key}`, () => testRateIndependentAssertions(queryDef, key));
- describe(`queryInfo.${key}`, () => testRateSpecificAssertions(queryDef, rate, key));
- continue;
- }
-
- queryInfo[key].forEach((queryDef, index) => {
- describe(`queryInfo.${key}[${index}]`, () => testRateIndependentAssertions(queryDef, key));
- describe(`queryInfo.${key}[${index}]`, () => testRateSpecificAssertions(queryDef, rate, key));
- });
- }
- });
- }
-});
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/default.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/default.ts
deleted file mode 100644
index b81feb30d62..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/default.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from 'app/features/trails/shared';
-
-import { AutoQueryInfo } from '../types';
-import { getPerSecondRateUnit, getUnit } from '../units';
-
-import { getGeneralBaseQuery } from './common/baseQuery';
-import { generateCommonAutoQueryInfo } from './common/generator';
-
-/** These suffixes will set rate to true */
-const RATE_SUFFIXES = new Set(['count', 'total']);
-
-const UNSUPPORTED_SUFFIXES = new Set(['sum', 'bucket']);
-
-/** Non-default aggregation keyed by suffix */
-const SPECIFIC_AGGREGATIONS_FOR_SUFFIX: Record = {
- count: 'sum',
- total: 'sum',
-};
-
-function shouldCheckPreviousSuffixForUnit(suffix: string) {
- return suffix === 'total';
-}
-
-const aggLabels: Record = {
- avg: 'average',
- sum: 'overall',
-};
-
-function getAggLabel(agg: string) {
- return aggLabels[agg] || agg;
-}
-
-export type AutoQueryParameters = {
- agg: string;
- unit: string;
- rate: boolean;
-};
-
-export function generateQueries({ agg, rate, unit }: AutoQueryParameters): AutoQueryInfo {
- const baseQuery = getGeneralBaseQuery(rate);
-
- const aggregationDescription = rate ? `${getAggLabel(agg)} per-second rate` : `${getAggLabel(agg)}`;
-
- const description = `${VAR_METRIC_EXPR} (${aggregationDescription})`;
-
- const mainQueryExpr = `${agg}(${baseQuery})`;
- const breakdownQueryExpr = `${agg}(${baseQuery})by(${VAR_GROUP_BY_EXP})`;
-
- return generateCommonAutoQueryInfo({
- description,
- mainQueryExpr,
- breakdownQueryExpr,
- unit,
- });
-}
-
-export function createDefaultMetricQueryDefs(metricParts: string[]) {
- // Get the last part of the metric name
- const suffix = metricParts.at(-1);
-
- // If the suffix is null or is in the set of unsupported suffixes, throw an error because the metric should be delegated to a different generator (summary or histogram)
- if (suffix == null || UNSUPPORTED_SUFFIXES.has(suffix)) {
- throw new Error(`This function does not support a metric suffix of "${suffix}"`);
- }
-
- // Check if generating rate query and/or aggregation query
- const rate = RATE_SUFFIXES.has(suffix);
- const agg = SPECIFIC_AGGREGATIONS_FOR_SUFFIX[suffix] || 'avg';
-
- // Try to find the unit in the Prometheus metric name
- const unitSuffix = shouldCheckPreviousSuffixForUnit(suffix) ? metricParts.at(-2) : suffix;
-
- // Get the Grafana unit or Grafana rate unit
- const unit = rate ? getPerSecondRateUnit(unitSuffix) : getUnit(unitSuffix);
-
- const params = {
- agg,
- unit,
- rate,
- };
- return generateQueries(params);
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/getQueryGeneratorFor.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/getQueryGeneratorFor.ts
deleted file mode 100644
index e44bfc31e60..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/getQueryGeneratorFor.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { AutoQueryInfo } from '../types';
-
-import { createDefaultMetricQueryDefs } from './default';
-import { createHistogramMetricQueryDefs } from './histogram';
-import { createSummaryMetricQueryDefs } from './summary';
-
-// TODO: when we have a known unit parameter, use that rather than having the generator functions infer from suffix
-export type MetricQueriesGenerator = (metricParts: string[]) => AutoQueryInfo;
-
-export function getQueryGeneratorFor(suffix?: string): MetricQueriesGenerator {
- if (suffix === 'sum') {
- return createSummaryMetricQueryDefs;
- }
-
- if (suffix === 'bucket') {
- return createHistogramMetricQueryDefs;
- }
-
- return createDefaultMetricQueryDefs;
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts
deleted file mode 100644
index 4fd492d5322..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/histogram.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { PromQuery } from '@grafana/prometheus';
-
-import { VAR_FILTERS_EXPR, VAR_GROUP_BY_EXP, VAR_METRIC_EXPR, VAR_OTEL_JOIN_QUERY_EXPR } from '../../shared';
-import { heatmapGraphBuilder } from '../graph-builders/heatmap';
-import { percentilesGraphBuilder } from '../graph-builders/percentiles';
-import { simpleGraphBuilder } from '../graph-builders/simple';
-import { AutoQueryDef } from '../types';
-import { getUnit } from '../units';
-
-export function createHistogramMetricQueryDefs(metricParts: string[]) {
- const title = `${VAR_METRIC_EXPR}`;
-
- const unitSuffix = metricParts.at(-2);
-
- const unit = getUnit(unitSuffix);
-
- const common = {
- title,
- unit,
- };
-
- const p50: AutoQueryDef = {
- ...common,
- variant: 'p50',
- queries: [percentileQuery(50)],
- vizBuilder: () => simpleGraphBuilder(p50),
- };
-
- const breakdown: AutoQueryDef = {
- ...common,
- variant: 'p50',
- queries: [percentileQuery(50, [VAR_GROUP_BY_EXP])],
- vizBuilder: () => simpleGraphBuilder(breakdown),
- };
-
- const percentiles: AutoQueryDef = {
- ...common,
- variant: 'percentiles',
- queries: [99, 90, 50].map((p) => percentileQuery(p)),
- vizBuilder: () => percentilesGraphBuilder(percentiles),
- };
-
- const heatmap: AutoQueryDef = {
- ...common,
- variant: 'heatmap',
- queries: [heatMapQuery()],
- vizBuilder: () => heatmapGraphBuilder(heatmap),
- };
-
- return { preview: heatmap, main: heatmap, variants: [percentiles, heatmap], breakdown: breakdown };
-}
-
-const BASE_QUERY = `rate(${VAR_METRIC_EXPR}${VAR_FILTERS_EXPR}[$__rate_interval])${VAR_OTEL_JOIN_QUERY_EXPR}`;
-
-function baseQuery(groupings: string[] = []) {
- const sumByList = ['le', ...groupings];
- return `sum by(${sumByList.join(', ')}) (${BASE_QUERY})`;
-}
-
-function heatMapQuery(groupings: string[] = []): PromQuery {
- return {
- refId: 'Heatmap',
- expr: baseQuery(groupings),
- format: 'heatmap',
- };
-}
-
-function percentileQuery(percentile: number, groupings: string[] = []) {
- const percent = percentile / 100;
-
- let legendFormat = `${percentile}th Percentile`;
-
- // For the breakdown view, show the label value variable we are grouping by
- if (groupings[0]) {
- legendFormat = `{{${groupings[0]}}}`;
- }
-
- return {
- refId: `Percentile${percentile}`,
- expr: `histogram_quantile(${percent}, ${baseQuery(groupings)})`,
- legendFormat,
- };
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts b/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts
deleted file mode 100644
index cd73d93db25..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/query-generators/summary.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { VAR_GROUP_BY_EXP, VAR_METRIC_EXPR } from '../../shared';
-import { AutoQueryInfo } from '../types';
-import { getUnit } from '../units';
-
-import { getGeneralBaseQuery } from './common/baseQuery';
-import { generateCommonAutoQueryInfo } from './common/generator';
-
-export function createSummaryMetricQueryDefs(metricParts: string[]): AutoQueryInfo {
- const suffix = metricParts.at(-1);
- if (suffix !== 'sum') {
- throw new Error('createSummaryMetricQueryDefs is only to be used for metrics that end in "_sum"');
- }
-
- const unitSuffix = metricParts.at(-2);
- const unit = getUnit(unitSuffix);
-
- const rate = true;
- const baseQuery = getGeneralBaseQuery(rate);
-
- const subMetric = metricParts.slice(0, -1).join('_');
- const mainQueryExpr = createMeanExpr(`sum(${baseQuery})`);
- const breakdownQueryExpr = createMeanExpr(`sum(${baseQuery})by(${VAR_GROUP_BY_EXP})`);
-
- const operationDescription = `average`;
- const description = `${subMetric} (${operationDescription})`;
-
- function createMeanExpr(expr: string) {
- const numerator = expr.replace(VAR_METRIC_EXPR, `${subMetric}_sum`);
- const denominator = expr.replace(VAR_METRIC_EXPR, `${subMetric}_count`);
- return `${numerator}/${denominator}`;
- }
-
- return generateCommonAutoQueryInfo({
- description,
- mainQueryExpr,
- breakdownQueryExpr,
- unit,
- });
-}
diff --git a/public/app/features/trails/AutomaticMetricQueries/units.test.ts b/public/app/features/trails/AutomaticMetricQueries/units.test.ts
deleted file mode 100644
index 15f61988690..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/units.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getUnitFromMetric } from './units';
-
-// Tests for units
-describe('getUnitFromMetric', () => {
- it('should return the last part of the metric if it is a valid unit', () => {
- expect(getUnitFromMetric('go_gc_gomemlimit_bytes')).toBe('bytes');
- expect(getUnitFromMetric('go_gc_duration_seconds')).toBe('seconds');
- });
-
- it('should return the second to last part of the metric if it is a valid unit', () => {
- expect(getUnitFromMetric('go_gc_heap_allocs_by_size_bytes_count')).toBe('bytes');
- expect(getUnitFromMetric('go_cpu_classes_gc_mark_assist_cpu_seconds_total')).toBe('seconds');
- });
-
- it('should return null if no valid unit is found', () => {
- expect(getUnitFromMetric('ALERTS')).toBe(null);
- });
-});
diff --git a/public/app/features/trails/AutomaticMetricQueries/units.ts b/public/app/features/trails/AutomaticMetricQueries/units.ts
deleted file mode 100644
index e025d41af2d..00000000000
--- a/public/app/features/trails/AutomaticMetricQueries/units.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-const DEFAULT_UNIT = 'short';
-
-// Get unit from metric name (e.g. "go_gc_duration_seconds" -> "seconds")
-export function getUnitFromMetric(metric: string) {
- const metricParts = metric.split('_');
- const suffix = metricParts.at(-1) ?? '';
- const secondToLastSuffix = metricParts.at(-2) ?? '';
- if (UNIT_LIST.includes(suffix)) {
- return suffix;
- } else if (UNIT_LIST.includes(secondToLastSuffix)) {
- return secondToLastSuffix;
- } else {
- return null;
- }
-}
-
-// Get Grafana unit for a panel (e.g. "go_gc_duration_seconds" -> "s")
-export function getUnit(metricPart: string | undefined) {
- return (metricPart && UNIT_MAP[metricPart]) || DEFAULT_UNIT;
-}
-
-const UNIT_MAP: Record = {
- bytes: 'bytes',
- seconds: 's',
-};
-
-const UNIT_LIST = ['bytes', 'seconds'];
-
-const RATE_UNIT_MAP: Record = {
- bytes: 'Bps', // bytes per second
- seconds: 'short', // seconds per second is unitless -- this may indicate a count of some resource that is active
-};
-
-const DEFAULT_RATE_UNIT = 'cps'; // Count per second
-
-export function getPerSecondRateUnit(metricPart: string | undefined) {
- return (metricPart && RATE_UNIT_MAP[metricPart]) || DEFAULT_RATE_UNIT;
-}
diff --git a/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx b/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx
index 0072bbafb85..1ab14b84aac 100644
--- a/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx
+++ b/public/app/features/trails/Breakdown/LabelBreakdownScene.tsx
@@ -1,7 +1,7 @@
import init from '@bsull/augurs/outlier';
import { css } from '@emotion/css';
import { isNumber, max, min, throttle } from 'lodash';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
import { DataFrame, FieldType, GrafanaTheme2, PanelData, SelectableValue } from '@grafana/data';
import { config } from '@grafana/runtime';
@@ -26,16 +26,16 @@ import {
VizPanel,
} from '@grafana/scenes';
import { DataQuery, SortOrder, TooltipDisplayMode } from '@grafana/schema';
-import { Button, Field, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, LoadingPlaceholder, useStyles2 } from '@grafana/ui';
import { Trans } from 'app/core/internationalization';
-import { getAutoQueriesForMetric } from '../AutomaticMetricQueries/AutoQueryEngine';
-import { AutoQueryDef } from '../AutomaticMetricQueries/types';
import { BreakdownLabelSelector } from '../BreakdownLabelSelector';
import { DataTrail } from '../DataTrail';
import { MetricScene } from '../MetricScene';
import { AddToExplorationButton } from '../MetricSelect/AddToExplorationsButton';
import { StatusWrapper } from '../StatusWrapper';
+import { getAutoQueriesForMetric } from '../autoQuery/getAutoQueriesForMetric';
+import { AutoQueryDef } from '../autoQuery/types';
import { reportExploreMetrics } from '../interactions';
import { updateOtelJoinWithGroupLeft } from '../otel/util';
import { getSortByPreference } from '../services/store';
@@ -47,6 +47,7 @@ import {
VAR_FILTERS,
VAR_GROUP_BY,
VAR_GROUP_BY_EXP,
+ VAR_MISSING_OTEL_TARGETS,
VAR_OTEL_GROUP_LEFT,
} from '../shared';
import { getColorByIndex, getTrailFor } from '../utils';
@@ -338,6 +339,14 @@ export class LabelBreakdownScene extends SceneObjectBase option.value !== ALL_VARIABLE_VALUE).unshift(all);
}
+ const [dismissOtelWarning, updateDismissOtelWarning] = useState(false);
+ const missingOtelTargets = sceneGraph.lookupVariable(VAR_MISSING_OTEL_TARGETS, trail)?.getValue();
+ if (missingOtelTargets && !dismissOtelWarning) {
+ reportExploreMetrics('missing_otel_labels_by_truncating_job_and_instance', {
+ metric: trail.state.metric,
+ });
+ }
+
useEffect(() => {
if (useOtelExperience) {
// this will update the group left variable
@@ -369,6 +378,22 @@ export class LabelBreakdownScene extends SceneObjectBase
)}
+ {missingOtelTargets && !dismissOtelWarning && (
+ updateDismissOtelWarning(true)}
+ className={styles.truncatedOTelResources}
+ >
+
+ This metric has too many job and instance label values to call the Prometheus label_values endpoint with
+ the match[] parameter. These label values are used to join the metric with target_info, which contains
+ the resource attributes. Please include more resource attributes filters.
+
+
+ )}
+
{body && }
@@ -400,6 +425,10 @@ function getStyles(theme: GrafanaTheme2) {
gap: theme.spacing(2),
justifyContent: 'space-between',
}),
+ truncatedOTelResources: css({
+ minWidth: '30vw',
+ flexGrow: 0,
+ }),
};
}
diff --git a/public/app/features/trails/DataTrail.tsx b/public/app/features/trails/DataTrail.tsx
index 0101498a33c..547de8ee9c0 100644
--- a/public/app/features/trails/DataTrail.tsx
+++ b/public/app/features/trails/DataTrail.tsx
@@ -65,6 +65,7 @@ import {
VAR_DATASOURCE,
VAR_DATASOURCE_EXPR,
VAR_FILTERS,
+ VAR_MISSING_OTEL_TARGETS,
VAR_OTEL_DEPLOYMENT_ENV,
VAR_OTEL_GROUP_LEFT,
VAR_OTEL_JOIN_QUERY,
@@ -732,6 +733,11 @@ function getVariableSet(
value: undefined,
hide: VariableHide.hideVariable,
}),
+ new ConstantVariable({
+ name: VAR_MISSING_OTEL_TARGETS,
+ hide: VariableHide.hideVariable,
+ value: false,
+ }),
],
});
}
diff --git a/public/app/features/trails/DataTrailBookmarks.tsx b/public/app/features/trails/DataTrailBookmarks.tsx
index 4793110cf03..edf449c9b1b 100644
--- a/public/app/features/trails/DataTrailBookmarks.tsx
+++ b/public/app/features/trails/DataTrailBookmarks.tsx
@@ -84,12 +84,8 @@ function getStyles(theme: GrafanaTheme2) {
header: css({
color: theme.colors.text.primary,
textAlign: 'center',
- /* H4 */
- fontFamily: 'Inter',
fontSize: '18px',
- fontStyle: 'normal',
- fontWeight: '400',
- lineHeight: '22px' /* 122.222% */,
+ lineHeight: '22px',
letterSpacing: '0.045px',
}),
horizontalLine: css({
diff --git a/public/app/features/trails/DataTrailCard.tsx b/public/app/features/trails/DataTrailCard.tsx
index b64afe1ed71..75967191964 100644
--- a/public/app/features/trails/DataTrailCard.tsx
+++ b/public/app/features/trails/DataTrailCard.tsx
@@ -59,7 +59,7 @@ export function DataTrailCard(props: Props) {
const { filters, metric, createdAt } = values;
return (
-
+
{truncateValue('', getMetricName(metric), 39)}
@@ -93,34 +93,18 @@ export function DataTrailCard(props: Props) {
{createdAt && dateTimeFormat(createdAt, { format: 'YYYY-MM-DD' })}
-
+
);
}
export function getStyles(theme: GrafanaTheme2) {
return {
- metricLabel: css({
- display: 'inline',
- color: theme.colors.text.primary,
- fontFamily: 'Inter',
- fontSize: '14px',
- fontStyle: 'normal',
- fontWeight: 400,
- }),
metricValue: css({
display: 'inline',
color: theme.colors.text.primary,
- fontFamily: 'Inter',
- fontSize: '14px',
- fontStyle: 'normal',
fontWeight: 500,
wordBreak: 'break-all',
}),
- tag: css({
- maxWidth: '260px',
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- }),
card: css({
position: 'relative',
width: '318px',
@@ -159,19 +143,14 @@ export function getStyles(theme: GrafanaTheme2) {
primaryFont: css({
display: 'inline',
color: theme.colors.text.primary,
- fontFamily: 'Inter',
fontSize: '12px',
- fontStyle: 'normal',
fontWeight: '500',
- lineHeight: '18px' /* 150% */,
letterSpacing: '0.018px',
}),
secondaryFont: css({
display: 'inline',
color: theme.colors.text.secondary,
- fontFamily: 'Inter',
fontSize: '12px',
- fontStyle: 'normal',
fontWeight: '400',
lineHeight: '18px' /* 150% */,
letterSpacing: '0.018px',
@@ -181,9 +160,5 @@ export function getStyles(theme: GrafanaTheme2) {
bottom: theme.spacing(1),
right: theme.spacing(1),
}),
- wordwrap: css({
- overflow: 'hidden',
- overflowWrap: 'anywhere',
- }),
};
}
diff --git a/public/app/features/trails/DataTrailsApp.tsx b/public/app/features/trails/DataTrailsApp.tsx
index f7f0112e456..c47be4d1b0b 100644
--- a/public/app/features/trails/DataTrailsApp.tsx
+++ b/public/app/features/trails/DataTrailsApp.tsx
@@ -155,6 +155,7 @@ export function getDataTrailsApp() {
const getStyles = () => ({
topNavContainer: css({
width: '100%',
+ height: '100%',
display: 'flex',
flexDirection: 'row',
justifyItems: 'flex-start',
diff --git a/public/app/features/trails/DataTrailsHome.tsx b/public/app/features/trails/DataTrailsHome.tsx
index 5c7ee62b185..c0c4d6d5995 100644
--- a/public/app/features/trails/DataTrailsHome.tsx
+++ b/public/app/features/trails/DataTrailsHome.tsx
@@ -57,8 +57,8 @@ export class DataTrailsHome extends SceneObjectBase {
};
return (
-
-
+
+
{theme.isDark ? : }
@@ -87,10 +87,10 @@ export class DataTrailsHome extends SceneObjectBase {
- | |