Skip to content

Fix: prevent incorrect label injection into PromQL 'offset' keyword #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
credativ-marco wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: prevent incorrect label injection into PromQL 'offset' keyword #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bef2660
Fix: prevent incorrect label injection into PromQL 'offset' keyword
credativ-marco Mar 19, 2026
5ab94a9
Fix white spaces
credativ-marco Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions public/app/plugins/datasource/prometheus/add_label_to_query.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ describe('addLabelToQuery()', () => {
'count(my_metric{bar="baz",job!="foo"} < (5*1024*1024*1024) or vector(0)) - 1'
);
});
it('should not add ad-hoc filter to the offset keyword', () => {
expect(addLabelToQuery('metric offset 5m', 'foo', 'bar')).toBe('metric{foo="bar"} offset 5m');
expect(
addLabelToQuery('unless ratelimit_service_rate_limit_over_limit offset 5m', 'container', 'istio-ratelimit')
).toBe('unless ratelimit_service_rate_limit_over_limit{container="istio-ratelimit"} offset 5m');
});
});

describe('addLabelToSelector()', () => {
Expand Down
2 changes: 1 addition & 1 deletion public/app/plugins/datasource/prometheus/add_label_to_query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';

const keywords = 'by|without|on|ignoring|group_left|group_right|bool';
const keywords = 'by|without|on|ignoring|group_left|group_right|bool|offset';
const logicalOperators = 'or|and|unless';

// Duplicate from mode-prometheus.js, which can't be used in tests due to global ace not being loaded.
Expand Down
Loading