9 Commits (b24602f713d5268473e9d5abe744d6b6160f3651)

Author	SHA1	Message	Date
Julius Volz	c187308366	storage: Contextify storage interfaces. ... This is based on https://github.com/prometheus/prometheus/pull/1997. This adds contexts to the relevant Storage methods and already passes PromQL's new per-query context into the storage's query methods. The immediate motivation supporting multi-tenancy in Frankenstein, but this could also be used by Prometheus's normal local storage to support cancellations and timeouts at some point.	8 years ago
Julius Volz	ed5a0f0abe	promql: Allow per-query contexts. ... For Weaveworks' Frankenstein, we need to support multitenancy. In Frankenstein, we initially solved this without modifying the promql package at all: we constructed a new promql.Engine for every query and injected a storage implementation into that engine which would be primed to only collect data for a given user. This is problematic to upstream, however. Prometheus assumes that there is only one engine: the query concurrency gate is part of the engine, and the engine contains one central cancellable context to shut down all queries. Also, creating a new engine for every query seems like overkill. Thus, we want to be able to pass per-query contexts into a single engine. This change gets rid of the promql.Engine's built-in base context and allows passing in a per-query context instead. Central cancellation of all queries is still possible by deriving all passed-in contexts from one central one, but this is now the responsibility of the caller. The central query context is now created in main() and passed into the relevant components (web handler / API, rule manager). In a next step, the per-query context would have to be passed to the storage implementation, so that the storage can implement multi-tenancy or other features based on the contextual information.	8 years ago
beorn7	75bae065fd	Revert "Modify tests to adjust to reverting the /graph changes" ... This reverts commit f1ea5bf232. Part two necessary for reverting the /graph revert.	8 years ago
beorn7	f1ea5bf232	Modify tests to adjust to reverting the /graph changes ... These tests have been added after the /graph changes and therefore already test the new syntax. This commit has to be reverted together with the previous one to get back to the old new state. *sigh*	8 years ago
Julius Volz	da7206ec29	Fix rule HTML escaping issues ... This was mentioned as part of https://github.com/prometheus/alertmanager/issues/452	8 years ago
Brian Brazil	0509b0f2db	Expand alert templates at eval time. ... Fixes #1678 #1677	9 years ago
beorn7	4b574e8a61	Switch chunk encoding to type 2 where it was hardcoded type 1 before ... The chunk encoding was hardcoded there because it mostly doesn't matter what encoding is chosen in that test. Since type 1 is battle-hardened enough, I'm switching to type 2 here so that we can catch unexpected problems as a byproduct. My expectation is that the chunk encoding doesn't matter anyway, as said, but then "unexpected problems" contains the word "unexpected".	9 years ago
Fabian Reinartz	171f50706a	Fix unkeyed field errors.	9 years ago
Brian Brazil	3bcdb2bbba	rules: Allow for setting labels on LHS on scalars	9 years ago