10 commits

Author	SHA1	Message	Date
Bas van Dijk	82259b5d54	thanos: 0.6.1 -> 0.7.0	2019-10-05 10:35:52 +02:00
Frederik Rietdijk	66bc7fc1b3	Merge master into staging-next	2019-09-06 22:46:05 +02:00
WilliButz	bb62066225	nixos/prometheus: remove prometheus1 module, rename prometheus2 ... Prometheus 1 is no longer supported, instead 'services.prometheus' now configures the Prometheus 2 service.	2019-09-06 21:55:23 +02:00
volth	35d68ef143	treewide: remove redundant quotes	2019-08-26 21:40:19 +00:00
Bas van Dijk	0a59be7136	thanos: 0.5.0 -> 0.6.0	2019-07-28 13:28:27 +02:00
Bas van Dijk	dc69b3e6ad	nixos/thanos: code style: don't use a space before a colon	2019-07-28 13:28:27 +02:00
Bas van Dijk	e32e0e6e02	nixos/thanos: assert that prometheus2 is running and has labels set	2019-07-28 13:28:27 +02:00
Bas van Dijk	13da811853	nixos/thanos: allow overriding arguments to the thanos subcommands	2019-07-28 13:28:27 +02:00
Bas van Dijk	2d0243c187	thanos: 0.4.0 -> 0.5.0-rc.0	2019-07-28 13:28:27 +02:00
Bas van Dijk	ebc65a5f21	nixos/thanos: add module for the thanos service	2019-07-28 13:28:27 +02:00