65 Commits (268b4c29e101706cbff0f90f0882bf05608fc56c)

Author	SHA1	Message	Date
Fabian Reinartz	06c2b76cd4	Merge branch 'master' into uptsdb	8 years ago
Julius Volz	ac203ef0ee	Add externalURL template function (#2716) ... This allows users to e.g. add links back to the generating Prometheus right in their alert templates.	8 years ago
Fabian Reinartz	e94b0899ee	rules: fix tests, remove model types	8 years ago
Jonathan Lange	2a2da40223	Make rule evaluation publicly available ... Means that a third-party can parse rules and run them with their own execution model.	8 years ago
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
Brian Brazil	6fc88d4b4d	Remove __name__ from alerts sent to AM. ... Fixes #1861	8 years ago
Brian Brazil	0509b0f2db	Expand alert templates at eval time. ... Fixes #1678 #1677	9 years ago
Tobias Schmidt	f1f8317fa5	Fix detection of flapping alerts ... Alerts in the resolve retention period must be transitioned to the active state again when their condition is met.	9 years ago
Fabian Reinartz	62075aa037	Reduce noisy no-alertmanager warning	9 years ago
Fabian Reinartz	52e5224f5a	Refactor rules/ package	9 years ago
Fabian Reinartz	7c90db22ed	Use annotation based alerts in rules/ ... This commit breaks the previously used alert format.	9 years ago
Fabian Reinartz	306e8468a0	Switch from client_golang/model to common/model	9 years ago
Fabian Reinartz	f06cf664e1	rules: cleanup alerting test	10 years ago
Fabian Reinartz	4625485b84	rules: move rules*.go contents to manager*.go	10 years ago