Alberto Berti 11b89720b7 Add prometheus2 configuration to the prometheus modules ... As the configuration for the exporters and alertmanager is unchanged between the two major versions this patch tries to minimize duplication while at the same time as there's no upgrade path from 1.x to 2.x, it allows running the two services in parallel. See also #56037		2019-03-25 14:36:44 +01:00
..
config	zram: revert "change default algorithm to zstd" (#56856)	2019-03-07 02:11:20 +02:00
hardware	nixos/docker: add enableNvidia option	2019-02-27 09:56:03 +01:00
i18n/input-method	docs: format	2018-09-29 20:51:11 -04:00
installer	ova: remove stateVersion	2019-03-09 14:25:05 -05:00
misc	Add prometheus2 configuration to the prometheus modules	2019-03-25 14:36:44 +01:00
profiles	profiles/graphical.nix: Enable pulseaudio for virtualbox appliances	2019-02-22 07:23:59 +01:00
programs	nixos/sway: Improve the module and adapt it to NixOS	2019-03-13 11:37:11 +01:00
security	Merge pull request #55792 from sdier/fix/pam-update	2019-02-25 01:38:51 +01:00
services	Add prometheus2 configuration to the prometheus modules	2019-03-25 14:36:44 +01:00
system	lib: add showWarnings	2019-03-08 11:19:18 +02:00
tasks	network-scripting: do not run resolvconf if /etc/resolv.conf is managed manually (#56682)	2019-03-09 13:42:14 +02:00
testing	types.optionSet: deprecate and remove last usages	2019-01-31 00:41:10 +02:00
virtualisation	amazon-image.nix: Resolve failure to include resize2fs	2019-03-15 17:33:45 +01:00
module-list.nix	Merge #56922: nixos/knot: init basic service + tests	2019-03-16 09:17:15 +01:00
rename.nix	tautulli/plexpy: 1.4.25 -> 2.1.26 (renamed)	2019-02-28 19:07:00 +01:00