@@ -0,0 +1,6 @@
+---
+'@hyperdx/common-utils': patch
+'@hyperdx/app': patch
+---
+
+feat: Broadcast adhoc dashboard filter conditions
@@ -35,6 +35,10 @@ import {
   isTimeSeriesDisplayType,
 } from '@hyperdx/common-utils/dist/core/utils';
 import { getBlockingRequiredFilterNames } from '@hyperdx/common-utils/dist/dashboardFilterValues';
+import {
+  getPromqlFilters,
+  getSqlFilters,
+} from '@hyperdx/common-utils/dist/filters';
 import {
   displayTypeRequiresSource,
   isBuilderChartConfig,
@@ -51,12 +55,12 @@ import {
 import { isMissingFiltersMacro } from '@hyperdx/common-utils/dist/macros';
 import {
   AlertState,
+  BroadcastFilter,
   ChartConfigWithDateRange,
   ChartVariable,
   DashboardContainer as DashboardContainerSchema,
   DashboardFilter,
   DisplayType,
-  Filter,
   getSampleWeightExpression,
   isLogSource,
   isTraceSource,
@@ -471,7 +475,7 @@ const Tile = ({
   onSettled?: () => void;
   granularity: SQLInterval | undefined;
   onTimeRangeSelect: (start: Date, end: Date) => void;
-  filters?: Filter[];
+  filters?: BroadcastFilter[];
   variables?: ChartVariable[];
   /** The dashboard's required filters that have nothing selected. */
   unsatisfiedRequiredFilters?: DashboardFilter[];
@@ -654,6 +658,15 @@ const Tile = ({
     missingRequiredFilterNames.length > 0 &&
     displayTypeRequiresSource(chart.config.displayType);
 
+  const sqlFilters = useMemo(
+    () => (filters ? getSqlFilters(filters) : undefined),
+    [filters],
+  );
+  const promqlFilters = useMemo(
+    () => (filters ? getPromqlFilters(filters) : undefined),
+    [filters],
+  );
+
   useEffect(() => {
     if (isPromqlSavedChartConfig(chart.config)) {
       if (source != null) {
@@ -664,6 +677,7 @@ const Tile = ({
           dateRange,
           granularity,
           variables: tileVariables,
+          filters: promqlFilters,
         });
       }
       return;
@@ -676,7 +690,7 @@ const Tile = ({
           ...chart.config,
           dateRange,
           granularity,
-          filters,
+          filters: sqlFilters,
           variables: tileVariables,
         });
       } else if (source != null) {
@@ -695,7 +709,7 @@ const Tile = ({
           sampleWeightExpression: getSampleWeightExpression(source),
           dateRange,
           granularity,
-          filters,
+          filters: sqlFilters,
           variables: tileVariables,
         });
       }
@@ -736,13 +750,21 @@ const Tile = ({
             ? source.bodyExpression
             : undefined,
           sampleWeightExpression: getSampleWeightExpression(source),
-          filters,
+          filters: sqlFilters,
           variables: tileVariables,
           metricTables: isMetricSource ? source.metricTables : undefined,
         });
       }
     }
-  }, [source, chart, dateRange, granularity, filters, tileVariables]);
+  }, [
+    source,
+    chart,
+    dateRange,
+    granularity,
+    sqlFilters,
+    promqlFilters,
+    tileVariables,
+  ]);
 
   const [hovered, setHovered] = useState(false);
 
@@ -813,7 +835,7 @@ const Tile = ({
       where: builderConfig?.where,
       whereLanguage: builderConfig?.whereLanguage,
       select: builderConfig?.select,
-      filters,
+      filters: sqlFilters,
     },
   );
 
@@ -823,10 +845,10 @@ const Tile = ({
   );
 
   const filterWarning = useMemo(() => {
-    const doFiltersExist = !!filters?.filter(
+    const doFiltersExist = !!sqlFilters?.filter(
       f => (f.type === 'lucene' || f.type === 'sql') && f.condition.trim(),
     )?.length;
-    const doLuceneFiltersExist = !!filters?.filter(
+    const doLuceneFiltersExist = !!sqlFilters?.filter(
       f => f.type === 'lucene' && f.condition.trim(),
     )?.length;
 
@@ -862,7 +884,7 @@ const Tile = ({
         <IconZoomExclamation size={16} color="var(--color-text-danger)" />
       </Tooltip>
     );
-  }, [filters, queriedConfig, source]);
+  }, [sqlFilters, queriedConfig, source]);
 
   const replaySearchUrl = useMemo(() => {
     return buildDashboardReplaySearchUrl({
@@ -1656,7 +1678,7 @@ const EditTileModal = ({
   isSaving?: boolean;
   onSave: (chart: Tile) => void;
   variables?: ChartVariable[];
-  getDashboardFilters: (sourceId: string | undefined) => Filter[];
+  getDashboardFilters: (sourceId: string | undefined) => BroadcastFilter[];
   unsatisfiedRequiredFilters?: DashboardFilter[];
 }) => {
   const contextZIndex = useZIndex();
@@ -2435,7 +2457,7 @@ function DBDashboardPage({
   // `sourceId`. Shared with the tile editor so its preview queries what the
   // tile does.
   const getTileFilters = useCallback(
-    (sourceId: string | undefined): Filter[] => [
+    (sourceId: string | undefined): BroadcastFilter[] => [
       {
         type: whereLanguage === 'sql' ? 'sql' : 'lucene',
         condition: where,
 
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+import { isAdhocConditionSupported } from '@hyperdx/common-utils/dist/filters';
 import {
   ADHOC_FILTER_MAX_CONDITIONS,
   AdhocDashboardFilter as AdhocDashboardFilterType,
@@ -103,6 +104,10 @@ export function AdhocDashboardFilter({
               operator={operator.label}
               value={condition.value}
               isExcluded={operator.isExcluded}
+              isInvalid={
+                !isAdhocConditionSupported(filter.sourceType, condition)
+              }
+              invalidReason={`Filter not applied: PromQL has no ${condition.operator} operator. Remove this condition and add it again with a supported operator.`}
               onRemove={() => remove(index)}
               renderPopover={close => (
                 <AdhocConditionEditor
 
@@ -40,11 +40,14 @@ const editorId = 'adhoc-condition-editor-Conditions';
 
 const addButton = () => screen.getByTestId('adhoc-filter-add-Conditions');
 
-const renderFilter = (conditions: AdhocFilterCondition[]) => {
+const renderFilter = (
+  conditions: AdhocFilterCondition[],
+  definition: AdhocDashboardFilterType = filter,
+) => {
   const onChange = jest.fn();
   renderWithMantine(
     <AdhocDashboardFilter
-      filter={filter}
+      filter={definition}
       conditions={conditions}
       onChange={onChange}
       dateRange={dateRange}
@@ -74,6 +77,20 @@ describe('AdhocDashboardFilter', () => {
     expect(pills[1]).toHaveTextContent('Level regex ^err');
   });
 
+  it('marks conditions a PromQL filter cannot apply as invalid', () => {
+    renderFilter(
+      [
+        { key: 'job', operator: 'LIKE', value: '%api%' },
+        { key: 'env', operator: '=', value: 'prod' },
+      ],
+      { ...filter, sourceType: 'promql' },
+    );
+
+    const pills = screen.getAllByTestId('adhoc-condition-pill');
+    expect(pills[0]).toHaveAttribute('data-invalid', 'true');
+    expect(pills[1]).not.toHaveAttribute('data-invalid');
+  });
+
   it('removes a condition', async () => {
     const onChange = renderFilter([
       existing,
 
@@ -86,6 +86,12 @@ describe('getSqlSourceColumnKeys', () => {
       ]),
     ).toEqual(['ServiceName']);
   });
+
+  it('quotes column names that are not bare identifiers', () => {
+    expect(getSqlSourceColumnKeys([column('service-name', 'String')])).toEqual([
+      '`service-name`',
+    ]);
+  });
 });
 
 describe('getValueSuggestions', () => {
 
@@ -45,26 +45,37 @@ const unionSorted = (lists: (string[] | undefined)[]) =>
   Array.from(new Set(lists.flatMap(list => list ?? []))).sort();
 
 /**
- * A SQL source's filterable keys, in the search sidebar's key format: scalar
- * columns, and the keys inside its map and JSON columns.
+ * Quote a column name that isn't a bare identifier (e.g. `log-attributes`), so
+ * the stored key is SQL that broadcasting can use verbatim.
+ */
+const toQuotedKeys = (keys: string[], columns: ColumnMeta[]) => {
+  const columnNames = new Set(columns.map(column => column.name));
+  return keys.map(key => toQuotedClickHouseKeyExpression(key, columnNames));
+};
+
+/**
+ * A SQL source's filterable keys, as SQL expressions in the search sidebar's
+ * key format: scalar columns, and the keys inside its map and JSON columns.
  */
 export function getSqlSourceKeys(fields: Field[], columns: ColumnMeta[]) {
   const columnNames = (types: JSDataType[]) =>
     filterColumnMetaByType(columns, types)?.map(column => column.name) ?? [];
   const jsonColumns = columnNames([JSDataType.JSON]);
   const mapColumns = columnNames([JSDataType.Map]);
-  return fields
+  const keys = fields
     .filter(field => field.path.length > 1 || isJSDataTypeScalar(field.jsType))
     .map(field => mergePath(field.path, jsonColumns, mapColumns));
+  return toQuotedKeys(keys, columns);
 }
 
 /** A SQL source's scalar columns, the only keys known without field metadata. */
 export function getSqlSourceColumnKeys(columns: ColumnMeta[]) {
-  return columns
+  const keys = columns
     .filter(column =>
       isJSDataTypeScalar(convertCHDataTypeToJSType(column.type)),
     )
     .map(column => column.name);
+  return toQuotedKeys(keys, columns);
 }
 
 /**
 
@@ -22,11 +22,11 @@ import {
   isRawSqlSavedChartConfig,
 } from '@hyperdx/common-utils/dist/guards';
 import {
+  BroadcastFilter,
   ChartConfigWithDateRange,
   ChartVariable,
   DashboardFilter,
   DisplayType,
-  Filter,
   HeatmapMode,
   SavedChartConfig,
   SourceKind,
@@ -106,6 +106,7 @@ import {
   displayTypeToActiveTab,
   resolveTilePreviewFilters,
   TABS_WITH_GENERATED_SQL,
+  withBroadcastFilters,
   zSavedChartConfig,
 } from './utils';
 
@@ -115,7 +116,7 @@ type EditTimeChartFormProps = {
   /** Variables and their selected values, from the parent dashboard (if one exists). */
   variables?: ChartVariable[];
   /** Function returning the dashboard's broadcast filters for the given source, if any. */
-  getDashboardFilters?: (sourceId: string | undefined) => Filter[];
+  getDashboardFilters?: (sourceId: string | undefined) => BroadcastFilter[];
   /** The dashboard's required filters that have nothing selected, if any */
   unsatisfiedRequiredFilters?: DashboardFilter[];
   displayedTimeInputValue?: string;
@@ -524,8 +525,7 @@ export default function EditTimeChartForm({
       return queriedConfig;
     }
     return {
-      ...queriedConfig,
-      filters: previewDashboardFilters?.filters,
+      ...withBroadcastFilters(queriedConfig, previewDashboardFilters?.filters),
       variables: previewDashboardFilters?.variables,
     };
   }, [queriedConfig, previewDashboardFilters]);
 
@@ -3,6 +3,8 @@ import {
   ChartVariable,
   DashboardFilter,
   DisplayType,
+  Filter,
+  PromqlConditionFilter,
   PromqlExpressionList,
   SavedChartConfig,
   SourceKind,
@@ -23,6 +25,7 @@ import {
   seriesToFilters,
   tabQueriesData,
   TABS_WITH_GENERATED_SQL,
+  withBroadcastFilters,
 } from '@/components/DBEditTimeChartForm/utils';
 
 // ---------------------------------------------------------------------------
@@ -639,6 +642,10 @@ describe('resolveTilePreviewFilters', () => {
     { type: 'sql' as const, condition: "ServiceName IN ('api')" },
   ];
   const variables = [{ name: 'service', values: ['api'] }];
+  const promqlFilter: PromqlConditionFilter = {
+    type: 'promql',
+    condition: 'job="api"',
+  };
 
   const promqlConfig: ChartConfigWithDateRange = {
     configType: 'promql',
@@ -696,8 +703,30 @@ describe('resolveTilePreviewFilters', () => {
     });
   });
 
-  it('never hands filters to a PromQL tile', () => {
-    expect(resolve({ config: promqlConfig }).filters).toBeUndefined();
+  it('never hands SQL filters to a PromQL tile', () => {
+    expect(resolve({ config: promqlConfig }).filters).toEqual([]);
+  });
+
+  it('hands each tile the filters in its own query language', () => {
+    const filters = [...dashboardFilters, promqlFilter];
+
+    expect(resolve({ config: promqlConfig, filters }).filters).toEqual([
+      promqlFilter,
+    ]);
+    expect(resolve({ filters }).filters).toEqual(dashboardFilters);
+    expect(
+      resolve({ config: rawSqlWithFiltersMacro, filters }).filters,
+    ).toEqual(dashboardFilters);
+  });
+
+  it('drops PromQL filters when turned off', () => {
+    expect(
+      resolve({
+        config: promqlConfig,
+        filters: [promqlFilter],
+        applySelections: false,
+      }).filters,
+    ).toBeUndefined();
   });
 
   it('drops the filters a raw-SQL template would not apply', () => {
@@ -761,6 +790,32 @@ describe('resolveTilePreviewFilters', () => {
   });
 });
 
+describe('withBroadcastFilters', () => {
+  const sqlFilter: Filter = { type: 'sql', condition: "ServiceName = 'api'" };
+  const promqlFilter: PromqlConditionFilter = {
+    type: 'promql',
+    condition: 'job="api"',
+  };
+  const promqlConfig: ChartConfigWithDateRange = {
+    configType: 'promql',
+    promqlExpression: 'up',
+    connection: 'local',
+    dateRange,
+  };
+
+  it('attaches only PromQL filters to a PromQL config', () => {
+    expect(
+      withBroadcastFilters(promqlConfig, [sqlFilter, promqlFilter]),
+    ).toMatchObject({ filters: [promqlFilter] });
+  });
+
+  it('attaches only SQL and Lucene filters to other configs', () => {
+    expect(
+      withBroadcastFilters(builderConfig, [sqlFilter, promqlFilter]),
+    ).toMatchObject({ filters: [sqlFilter] });
+  });
+});
+
 // ---------------------------------------------------------------------------
 // buildSampleEventsConfig
 // ---------------------------------------------------------------------------