public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
286,102 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

696 Commits

Author SHA1 Message Date
Martin Milata 5d3d3eac8b nixos/statsd: fix username 
Broken in 1d61efb7f1.
 2020-02-10 17:56:35 +01:00
Martin Milata 17c72ef75f nixos/heapster: fix username 
Broken in 1d61efb7f1.
 2020-02-10 17:55:46 +01:00
Franz Pletz add880c5e8
prometheus-xmpp-alerts: init at 0.4.2 2020-02-01 15:04:01 +01:00
Aaron Andersen 01ccb67598 nixos/httpd: code cleanup 2020-01-31 20:39:12 -05:00
Milan Pässler 9414f03d97 nixos/alertmanager: Fix startup 
Fixed a problem with quotation marks introduced in commit
23d5d9bbe9 merged with #78358.
 2020-01-28 00:34:37 +01:00
Jean-Philippe Braun a63f916b87 nixos/prometheus-postfix-exporter: fix typo 2020-01-26 17:00:35 +01:00
Yorick van Pelt ed6e4a936c
nixos/alertmanager: provide example of envsubst usage 2020-01-24 18:07:24 +01:00
Yorick van Pelt 23d5d9bbe9
nixos/alertmanager: add environmentFile, envsubst for secrets 2020-01-23 13:51:00 +01:00
rnhmjoj 1d61efb7f1 treewide: use attrs instead of list for types.loaOf options 2020-01-06 10:39:18 -05:00
Aaron Andersen 66bf75415f
Merge pull request #76551 from symphorien/nagios2 
nagios: various improvements
 2019-12-30 14:21:03 -05:00
Aaron Andersen 7c8d98f8df nixos/sysstat: provide a type for each module option 2019-12-30 17:10:53 +01:00
symphorien+git@xlumurb.eu be25e45fc8 nagios: various improvements 
* structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
 2019-12-30 16:40:52 +01:00
Aaron Andersen 79215f0df1 nixos/httpd: limit serving web content to virtual hosts, convert virtualHosts option type from listOf to attrsOf, add ACME integration 2019-12-24 20:27:48 -05:00
Silvan Mosberger 4ee3e8b21d
nixos/treewide: Move rename.nix imports to their respective modules 
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
 2019-12-10 02:51:19 +01:00
WilliButz adc5ae70bf
nixos/prometheus-exporters: fix nginx exporter startup 
When nginx is enabled on the same host the nginx exporter is,
the exporter needs to start after nginx.
 2019-11-26 10:11:12 +01:00
Florian Klink 02f869ff30 osquery: remove 
osquery was marked as broken since April.

If somebody steps up to fix it, we can always revive it from the
histroy, but there's not much value in shipping completely broken things
in current master.

cc @ma27
 2019-11-24 22:38:07 +01:00
PsyanticY 1f6fbc922f nixos/grafana: fix smtp enable typo 2019-11-14 14:46:37 +01:00
Renaud 266d3dd7f6
Merge pull request #72187 from Izorkin/netdata-fix 
nixos/netdata: add which to path
 2019-11-03 14:06:51 +01:00
Silvan Mosberger dd0a47e7ae
treewide: Switch to system users (#71055) 
treewide: Switch to system users
 2019-11-01 13:26:43 +01:00
Izorkin 001b3d5764 nixos/netdata: add which to path 2019-10-28 21:20:57 +03:00
Astro 06abd24886 nixos/collectd: add option buildMinimalPackage 2019-10-20 00:53:49 +02:00
Astro e2283d9533 nixos/collectd: add plugin config 2019-10-20 00:53:49 +02:00
tilpner 1ae39fff83
nixos/cadvisor: don't enable docker 
cadvisor has usecases that don't involve docker, and it's entirely
unexpected for a monitoring service to enable docker.
 2019-10-18 12:46:29 +02:00
Dima b788467ec4 prometheus-blackbox-exporter: fixing path issue 
This fixes an issue with a recent addition of a config file
check in c28ded36ef.

Previously it was possible to supply a path as a string
to `configFile`. Now it will fail checking the config file
during evaluation of the module due to sandboxing.

A toggle to disable the check, more informative log messages
and handling for various configFile values are added.
 2019-10-18 02:03:02 +02:00
Maximilian Bosch 87178a2e6e
Merge pull request #71058 from WilliButz/add-nextcloud-exporter 
prometheus-nextcloud-exporter: init at 2019-10-12, with module and test
 2019-10-13 13:47:41 +02:00
Maximilian Bosch eeb4726446
nixos/prometheus-wireguard-exporter: remove `addr` option 
This option was added by mistake since `listenAddress` exists by default
for each prometheus-exporter. Using
`services.prometheus.exporters.wireguard.addr` will now cause a warning,
but doesn't break eval.
 2019-10-13 12:16:46 +02:00
WilliButz d953d328ca
nixos/prometheus-nextcloud-exporter: add module 2019-10-12 23:17:48 +02:00
Janne Heß d6c08776ba treewide: Switch to system users 2019-10-12 22:25:28 +02:00
Bas van Dijk 82259b5d54 thanos: 0.6.1 -> 0.7.0 2019-10-05 10:35:52 +02:00
Silvan Mosberger 643a329a4c
do-agent: init at 3.5.6 (#69186) 
do-agent: init at 3.5.6
 2019-10-02 22:34:26 +02:00
yvt 00a54207e0 nixos/do-agent: Depend on network-online.target 2019-10-03 02:44:33 +09:00
yvt e3c1ecf111 nixos/do-agent: Use DynamicUser 2019-10-03 01:30:41 +09:00
Silvan Mosberger c75a18fea6
mkRemovedOptionModule: assert on removed options (#69419) 
mkRemovedOptionModule: assert on removed options
 2019-09-30 16:39:40 +02:00
Robin Gloster b08b0bcbbe mkRemovedOptionModule: assert on removed options 
We don't want to ignore config that can mess up machines. In general
this should always fail evaluation, as you think you are changing
behaviour and don't, which can easily create run-time errors we can
catch early.
 2019-09-30 12:07:13 +02:00
Maximilian Bosch beb59b76cf
prometheus-wireguard-exporter: 3.1.0 -> 3.1.1 
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.1

This release adds a flag `-l` which takes an address where the exporter
is available. The default is `0.0.0.0` (previously, `0.0.0.0` was used
by default).

Please note that there are no dependency changes in Cargo and therefore
the cargo hash didn't change.
 2019-09-28 20:55:57 +02:00
Marek Mahut a28f136bdb
Merge pull request #69297 from aanderse/zabbix 
nixos/zabbixServer: move pid file from default (/tmp) to /run/zabbix …
 2019-09-25 20:35:50 +02:00
Aaron Andersen 32a38d50bb nixos/zabbixServer: move pid file from default (/tmp) to /run/zabbix to avoid issues with PrivateTmp=true 2019-09-23 09:35:51 -04:00
yvt 832ede6514 nixos/do-agent: init 2019-09-21 13:16:25 +09:00
Eelco Dolstra b0ccd6dd16
Revert "nixos/doc: re-format" 
This reverts commit ea6e8775bd. The new
format is not an improvement.
 2019-09-19 19:17:30 +02:00
Jan Tojnar ea6e8775bd
nixos/doc: re-format 2019-09-18 22:13:35 +02:00
volth fbd2b55715
nixos/graphite: fix escape 2019-09-17 00:19:28 +00:00
WilliButz bcce960d7d
nixos/prometheus-exporters: add rspamd-exporter 
This adds a module that configures the json exporter,
which then acts as an exporter for rspamd.
 2019-09-11 14:21:36 +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
Vladimír Čunát f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
WilliButz 7786d0718c
nixos/prometheus-exporters: fix user generation 2019-09-01 12:51:39 +02:00
Silvan Mosberger 478e7184f8
nixos/modules: Remove all usages of types.string 
And replace them with a more appropriate type

Also fix up some minor module problems along the way
 2019-08-31 18:19:00 +02:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Florian Klink 132a8382b0
Merge pull request #66922 from davidak/netdata_enableCgroupAccounting 
netdata: enable cgroup accounting
 2019-08-29 11:56:57 +02:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Aaron Andersen 249b4ad942
Merge pull request #66492 from aanderse/extra-subservice-cleanup 
nixos/httpd: extraSubservices cleanup
 2019-08-20 18:55:08 -04:00
davidak 6d4c69e640 netdata: enable cgroup accounting 2019-08-19 14:57:41 +02:00
tilpner 944a3a0dfc
nixos/cadvisor: allow passing custom arguments 2019-08-19 01:32:01 +02:00
Marek Mahut e6fb350cf6
Merge pull request #66606 from DerTim1/riemann-config 
nixos/riemann-tools: Add ExtraArgs Config Option
 2019-08-18 18:47:19 +02:00
danbst d80cd26ff9 Merge branch 'master' into flip-map-foreach 2019-08-18 18:00:25 +03:00
Marek Mahut caf9b8cc35
Merge pull request #66591 from aanderse/zabbix-proxy 
nixos/zabbixProxy: fix database initialization logic
 2019-08-17 20:55:13 +02:00
WilliButz ecd4d03dfe
grafana-loki: fix typo in service config 2019-08-17 12:08:51 +02:00
Aaron Andersen 265163da07 nixos/systemhealth: drop unmaintained module 2019-08-15 21:01:23 -04:00
Tim Digel 5bbde1e1ca nixos/riemann-tools: Add ExtraArgs Config Option 
Added option "extraArgs" to forward any switches to riemann-tools.
 2019-08-14 08:26:13 +02:00
Aaron Andersen 9af06755f3 nixos/zabbixProxy: fix database initialization logic 2019-08-13 18:50:28 -04:00
Franz Pletz f3160a2db6
Merge pull request #66476 from WilliButz/fix-prometheus-alertmanager-option 
nixos/prometheus2: replace alertmanagerURL with new alertmanagers option
 2019-08-12 17:59:27 +00:00
Maximilian Bosch f0d6955052
Merge pull request #66470 from WilliButz/update-blackbox-exporter 
prometheus-blackbox-exporter: 0.12.0 -> 0.14.0, run tests and check config
 2019-08-12 19:38:43 +02:00
Graham Christensen 5d807f80c7
Merge pull request #63864 from cransom/datadog-agent-integrations-fix 
datadog-agent: fix extraIntegrations
 2019-08-12 12:15:48 -04:00
WilliButz c28ded36ef
nixos/prometheus-blackbox-exporter: add config check 2019-08-12 10:53:00 +02:00
WilliButz 543f219b30
nixos/prometheus: replace 'alertmanagerURL' options for prometheus2 
Prometheus2 does no longer support the command-line flag to specify
an alertmanager. Instead it now supports both service discovery and
configuration of alertmanagers in the alerting config section.

Simply mapping the previous option to an entry in the new alertmanagers
section is not enough to allow for complete configurations of an
alertmanager.

Therefore the option alertmanagerURL is no longer used and instead
a full alertmanager configuration is expected.
 2019-08-12 10:42:28 +02:00
Jean Potier 9847967594
Fix typo in assert in grafana module 
Current assert prevents using secretKeyFile entirely
 2019-08-11 13:21:26 +03:00
Maximilian Bosch 41b9c5f1da
nixos/prometheus-wireguard-exporter: add support for `-r` switch 
With this switch activated, the exporter also exposes the remote IP of
each active WireGuard peer.
 2019-08-08 21:54:49 +02:00
Danylo Hlynskyi 7585496eff
Merge branch 'master' into flip-map-foreach 2019-08-05 14:09:28 +03:00
danbst 0f8596ab3f mass replace "flip map -> forEach" 
See `forEach`-introduction commit.
```
rg 'flip map ' --files-with-matches | xargs sed -i 's/flip map /forEach /g'
```
 2019-08-05 14:03:38 +03:00
danbst 91bb646e98 Revert "mass replace "flip map -> foreach"" 
This reverts commit 3b0534310c.
 2019-08-05 14:01:45 +03:00
WilliButz 1ce989cce6
nixos/prometheus-exporters: update documentation 2019-08-02 18:50:01 +02:00
WilliButz 29d765e250
nixos/prometheus-wireguard-exporter: use ExecStart instead of script 2019-08-02 18:50:01 +02:00
WilliButz afd0dc17d6
nixos/prometheus-exporters: use DynamicUser by default 
Only define seperate users and groups when necessary.
 2019-08-02 18:50:01 +02:00
WilliButz 495222a840
nixos/prometheus-exporter: use separate user for each exporter 
Stop using nobody/nogroup by default and use seperate users for each
exporter instead.
 2019-08-02 18:49:56 +02:00
WilliButz c221f9fdf2
Merge pull request #65751 from mayflower/pkgs/prometheus-postgres-exporter 
prometheus-postgres-exporter: init at 0.5.1
 2019-08-02 18:45:32 +02:00
Franz Pletz e4c60a1e42
prometheus-postgres-exporter: init at 0.5.1 2019-08-02 15:59:29 +02:00
WilliButz 5818c73d95
nixos/prometheus-exporters: add mail exporter module 2019-07-30 19:24:26 +02: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
Marek Mahut 6e762653de module zabbixProxy: server is a mandatory parameter 2019-07-26 16:22:47 +02:00
WilliButz 5dc50eab68
Merge pull request #65102 from d-goldin/patch-1 
docs prometheus.exporters: typo fix.
 2019-07-23 10:06:20 +02:00
WilliButz c64f621bfd
nixos/prometheus-nginx-exporter: update module 
Update exporter submodule to match the new exporter version.
 2019-07-22 16:41:10 +02:00
WilliButz fb6f0a48bb
nixos/prometheus-exporters: add option renaming for submodules 
Adds the functionality to create option renamings and removals
for exporter submodules as in nixos/modules/rename.nix.
 2019-07-22 16:41:10 +02:00
WilliButz 774221191d
nixos/prometheus-exporters: refactor imports, replace 'with lib;' 
Pass through 'options' to exporter definitions and replace 'with lib;'
by explicit function imports.
 2019-07-22 16:41:09 +02:00
WilliButz 01ee2ee2ba
nixos/test: fix prometheus-{bind,varnish}-exporter tests 2019-07-22 16:41:09 +02:00
Maximilian Bosch 7095bdf988
nixos/prometheus-exporters/wireguard: add support for `-s` switch 
Since version 3.0 all allowed IPs and subnets are exposed by the
exporter. With `-s` set on the CLI, instead of a comma-separated list,
each allowed IP and subnet will be in a single field with the schema
`allowed_ip_<index>`.
 2019-07-21 21:39:49 +02:00
Dima 186222ce7b
Fixing minor typo in prometheus exporters doc 2019-07-19 21:13:57 +02:00
WilliButz a9ce5f6c59
nixos/grafana: add grafana user to group 'grafana' 2019-07-15 18:33:19 +02:00
danbst 3b0534310c mass replace "flip map -> foreach" 
See `foreach`-introduction commit.
```
rg 'flip map ' --files-with-matches | xargs sed -i 's/flip map /foreach /g'
```
 2019-07-14 13:46:10 +03:00
Aaron Andersen 4191c80c31 nixos/zabbixProxy: init module 2019-07-11 18:55:58 -04:00
Aaron Andersen 70092c9acb nixos/zabbixAgent & nixos/zabbixServer: various module updates 2019-07-11 18:54:15 -04:00
Matthew Bauer 99c04c74cf
Merge pull request #63581 from PsyanticY/zabbix-4.0 
zabbix:1.8 -> 4.0 | remove old packages
 2019-07-11 15:05:05 -04:00
PsyanticY 16f8a17416 zabbix:1.8 -> 4.0 | remove old packages 2019-07-11 17:22:26 +01:00
WilliButz 3f598c0faa
nixos/loki: add module 2019-07-08 16:09:56 +02:00
Izorkin fb4d71a39f nixos/netdata: increase performance 2019-07-06 10:15:21 +03:00
Izorkin 6e592faa92 nixos/netdata: enable reload service and add PID file 2019-07-06 10:12:20 +03:00
Izorkin 064a19afe2 nixos/netdata: add capabilites to freeipmi.plugin 2019-07-04 13:08:38 +03:00
Aaron Andersen ec80ffc621
Merge pull request #62061 from aanderse/nagios 
nixos/nagios: module updates
 2019-07-03 06:19:35 -04:00
Casey Ransom 35d58c3421 datadog-agent: fix extraIntegrations 
The override that builds the custom python for integrations-core was
overriding python, but pythonPackages was still being inherited from a
call to `datadog-integrations-core {}`, causing
service.datadog-agent.extraIntegrations to be ignored.
 2019-07-01 11:45:19 -04:00
Graham Christensen 38c28ef10c
Merge pull request #56265 from aanderse/permissions-start-only 
replace deprecated usage of PermissionsStartOnly (part 2)
 2019-06-25 18:04:22 -04:00
Ivan Kozik 41c6d7adfc nixos/prometheus-node-exporter: fix systemd unit for systemd 242 (#63540) 
Avoid having a backslash at the end of ExecStart=.

See https://github.com/NixOS/nixpkgs/issues/63533 for details
about the change to systemd's unit parser.

Fixes #63383.
 2019-06-20 17:04:36 -04:00
Jan Tojnar 11cb382a4c
nixos/doc: Fix spurious indentation 2019-06-17 12:28:26 +02:00
volth f3282c8d1e treewide: remove unused variables (#63177) 
* treewide: remove unused variables

* making ofborg happy
 2019-06-16 19:59:05 +00:00
Maximilian Bosch bf09e6a14e
prometheus-wireguard-exporter: init at 2.0.1 
This is a simple exporter which exports the information
provided by `wg show all dump` to prometheus.

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
 2019-06-07 17:40:44 +02:00
WilliButz ba17b32b43
nixos/prometheus-fritzbox-exporter: update binary name 2019-05-31 18:50:27 +02:00
Aaron Andersen fff8b9bcaa nixos/netdata: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-26 07:20:57 -04:00
Aaron Andersen 2c350782ba nixos/alerta: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-26 07:20:56 -04:00
Aaron Andersen ff2fdc294e nixos/kapacitor: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-26 07:20:55 -04:00
Aaron Andersen 780ff9a4eb nixos/riemann-tools: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-26 07:20:55 -04:00
Aaron Andersen cdcc504848 nixos/scollector: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-26 07:20:55 -04:00
Aaron Andersen 73342be85b nixos/riemann-dash: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-05-25 13:48:41 -04:00
Aaron Andersen 2726c45b01 nixos/nagios: update apacheHttpd configuration from 2.2 to 2.4 syntax 2019-05-25 10:38:07 -04:00
Aaron Andersen c2f8d6334c nixos/nagios: replace deprecated usage of PermissionsStartOnly 
see #53852
 2019-05-25 10:33:58 -04:00
Aaron Andersen 609c1580d8 nixos/nagios: change group from nogroup to nagios 
see #55370
 2019-05-25 10:25:49 -04:00
Robin Gloster 6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull 
treewide: Remove usage of isNull
 2019-05-18 09:36:24 +00:00
Will Dietz 329df95958 vnstat: 2.1 -> 2.2 
https://humdi.net/vnstat/CHANGES

* enable tests
* add hardening options from upstream's
  example service
* fix "documentation" setting in service:
  either needs to be `unitConfig.Documentation`
  (uppercase) or lowercase but not within unitConfig.
 2019-05-03 01:47:57 -05:00
Silvan Mosberger bc5b262c9c
Merge pull request #60333 from azazel75/fix-grafana_reporter 
grafana_reporter: Fix library function name
 2019-05-03 06:29:09 +02:00
Daniel Schaefer 786f02f7a4 treewide: Remove usage of isNull 
isNull "is deprecated; just write e == null instead" says the Nix manual
 2019-04-29 14:05:50 +02:00
Benjamin Hipple d084937fe7 nixos.grafana: fix docstring typo 2019-04-27 13:09:48 -04:00
Alberto Berti 47f62b4821 grafana_reporter: Fix library function name 2019-04-27 19:09:06 +02:00
Daniel Schaefer 92cccb6f83 treewide: Use HTTPS for readthedocs URLs 2019-04-22 20:46:18 +02:00
Aaron Andersen 3464b50c61
Merge pull request #59389 from aanderse/issue/53853-1 
replace deprecated usage of PermissionsStartOnly (part 1)
 2019-04-18 20:46:28 -04:00
Bas van Dijk cdd82681b3 nixos/prometheus: add more missing options 2019-04-18 12:53:13 +02:00
Bas van Dijk 285fd3c05a nixos/prometheus: abstract over optional option creation 2019-04-18 11:55:43 +02:00
Bas van Dijk 55ef5d4246 nixos/prometheus: set optional attributes to type types.nullOr 
This makes sure that when a user hasn't set a Prometheus option it
won't show up in the prometheus.yml configuration file. This results
in smaller and easier to understand configuration files.
 2019-04-17 14:49:09 +02:00
Bas van Dijk 57e5b75f9c nixos/prometheus: filter out the _module attr in a central place 
We previously filtered out the `_module` attribute in a NixOS
configuration by filtering it using the option's `apply` function.

This meant that every option that had a submodule type needed to have
this apply function. Adding this function is easy to forget thus this
mechanism is error prone.

We now recursively filter out the `_module` attributes at the place we
construct the Prometheus configuration file. Since we now do the filtering
centrally we don't have to do it per option making it less prone to errors.
 2019-04-17 14:08:16 +02:00
Bas van Dijk a913d0891c nixos/prometheus: filter out empty srcape_configs attributes 
This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
 2019-04-16 16:06:11 +02:00
Bas van Dijk a23db5db08 nixos/prometheus: add new ec2_sd_config options for prometheus2 2019-04-16 16:04:33 +02:00
Andrew Childs ad7e232f88 nixos/prometheus: add `ec2_sd_configs` section to `scrape_configs` 2019-04-16 13:43:52 +02:00
Bas van Dijk d1940beb3a nixos/prometheus/pushgateway: add module and test 2019-04-16 08:09:38 +02:00
Aaron Andersen 09af9fcd34 nixos/collectd: replace deprecated usage of PermissionsStartOnly 
see https://github.com/NixOS/nixpkgs/issues/53852
 2019-04-13 07:00:55 -04:00
Enno Lohmeier da7aeb1b7d prometheus: add tls_config 2019-04-11 20:34:31 +02:00
Bas van Dijk cd4486ecc3 nixos/prometheus/alertmanager: use DynamicUser instead of nobody 
See issue #55370
 2019-04-10 20:38:40 +02:00
Bas van Dijk 739bdff4a4 nixos/prometheus/alertmanager: use ExecStart instead of script 
This results in a simpler service unit which doesn't first have to
start a shell:

  > cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
  ...
  ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
    --config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
    --web.listen-address [::1]:9093 \
    --log.level warn
  ...
 2019-04-10 15:03:09 +02:00
Bas van Dijk 2f2e2971d6
Merge pull request #58255 from jbgi/prometheus2 
Add Prometheus 2 service in parallel with 1.x version (continuation)
 2019-04-09 14:14:18 +02:00
Bas van Dijk c95179b52f nixos/prometheus: add back the option services.prometheus.dataDir 
This is to ensure more backwards compatibility. Note this is not 100%
backwards compatible because we now require dataDir to begin with /var/lib/.
 2019-04-09 13:13:34 +02:00
Bas van Dijk eed84d1f8d nixos/prometheus: fix indentation and unnecessary parenthesis 2019-04-08 19:14:42 +02:00
Bas van Dijk 7cf27feb2f
nixos/prometheus: get rid of empty arguments 
Previously the prometheus.service file looked like:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s \
     \

  Restart=always

Now it's:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus \
    -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s
  Restart=always
 2019-04-08 14:59:12 +02:00
Bas van Dijk a59c92903e
nixos/prometheus: use ExecStart instead of a shell script 
This uses fewer lines of code and one less process.
 2019-04-08 14:59:12 +02:00
Jean-Baptiste Giraudeau 0333d877c2
Use same user for both prometheus 1 and 2. Use StateDirectory. 2019-03-25 14:49:22 +01:00
Jean-Baptiste Giraudeau 5ae25922b5
Prometheus2: --web.external-url need two dash. 2019-03-25 14:36:48 +01:00
Jean-Baptiste Giraudeau bfbae97cfa
Rollback versionning of services.prometheus.{exporters, alertmanager}. 2019-03-25 14:36:46 +01:00
Alberto Berti e17b464a43
Fix alertmanager service definition. Thanks to @eonpatapon 2019-03-25 14:36:45 +01:00
Alberto Berti 1b6ce80c2b
Make it pass a minimal test 2019-03-25 14:36:44 +01:00
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
Bob van der Linden 40679eb3c8 nixos/zabbix: /var/run -> /run 2019-03-20 00:02:46 +01:00
Bob van der Linden 3068252913 nixos/nagios: /var/run -> /run 2019-03-20 00:02:45 +01:00
Yurii Izorkin f56d507e06 nixos/datadog-agent: change start command (#57871) 2019-03-18 13:31:04 -07:00
Andrew Childs c53703a6b2 nixos/prometheus: use append instead of insert for opening firewalls (#55224) 
Inserting with `-I` causes the rules to placed before `ctstate`
tracking, while `-A` places them alongside all other allow rules.
 2019-03-13 12:44:36 +02:00
Ryan Mulligan 18f6dbe6be nixos/hdaps: automatically enable the hdapsd kernel module (#56309) 
patch by hpoussin via
https://discourse.nixos.org/t/hdapsd-automatically-enable-the-hdapsd-kernel-module/2183
 2019-03-08 09:50:02 +02:00
Izorkin 35b6943507 datadog-trace-agent: trace-agent moved to datadog-agent 2019-03-01 10:47:02 +03:00
Yurii Izorkin fa20f98571 datadog-agent: 6.9.0 -> 6.10.0 (#56523) 2019-02-28 11:48:49 -08:00
Tom F 9f07fa719c Document the addresses Alertmanager will listen on (#56409) 
https://github.com/golang/go/issues/9334 describes how net.Listen (as used by Alertmanager):
* listens on 127.0.0.1 if the listenAddress is "localhost"
* listens on all interfaces if the listenAddress is ""
 2019-02-26 14:59:11 +01:00
Symphorien Gibol a915b33315 nixos: add preferLocalBuild=true; on derivations for config files 2019-02-22 20:11:27 +01:00
Aleksandar Topuzović 092eab7228
nixos/grafana: implement dashboard & datasource provisioning 
Adds the ability to automatically provision datasources and dashboards.
 2019-02-06 12:50:24 +01:00
Ben Kelly ace4855cf6 nixos/munin: enable munin_update and disable munin_stats 
munin_update relies on a stats file that exists, but isn't found in the
default location on NixOS; the appropriate plugin configuration is
added.

munin_stats relies on munin-cron writing a logfile, which the NixOS
build of munin does not. (This is probably fixable in the munin package,
but I don't have time to dig into that right now.)
 2019-02-04 20:17:26 -05:00
Ben Kelly e7c1449ae9 nixos/munin: add types to Munin options 
Some options were missing their types.
 2019-02-04 20:17:26 -05:00
Ben Kelly c4437fee7e nixos/munin: add extraCSS option 
This permits custom styling of the generated HTML without needing to
build your own Munin package from source. Also comes with an example
that works as a passable dark theme for Munin.
 2019-02-04 20:17:26 -05:00
Ben Kelly 6c907851f4 nixos/munin: add extraPlugins and extraAutoPlugins options [#17895] 
extraAutoPlugins lets you list plugins and plugin directories to be
autoconfigured, and extraPlugins lets you enable plugins on a one-by-one
basis. This can be used to enable plugins from contrib (although you'll
need to download and check out contrib yourself, then point these
options at it), or plugins you've written yourself.
 2019-02-04 20:17:26 -05:00
Ben Kelly b5b82b2cae nixos/munin: require DejaVu fonts if enabled 
munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it
can't find it, there's no guarantee it finds a monospaced font at all,
and if it can't find a monospaced font the legends come out badly
misformatted.
 2019-02-04 20:17:26 -05:00
Ben Kelly 0c3208a8e4 nixos/munin: add disabledPlugins option 
This is just a set of globs to remove from the active plugins directory
after autoconfiguration is complete.

I also removed the hard-coded disabling of "diskstats", since it seems
to work just fine now.
 2019-02-04 20:17:26 -05:00
Ben Kelly c74abf763a nixos/munin: add extraPluginConfig option 
This lets you specify additional plugin-specific configuration to go in
plugin-conf.d, and complements the extraConfig and extraGlobalConfig
options.
 2019-02-04 20:17:26 -05:00
Ben Kelly c02564e37c nixos/munin: fix documentation links 
Since this module was written, Munin has moved their documentation from
munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the
links were broken, and the ones that weren't went to "please use the new
site" pages.
 2019-02-04 20:17:26 -05:00
Silvan Mosberger 2146511740
Merge pull request #54562 from pjones/pjones/netdata-plugins/master 
nixos/netdata: Add option to include extra plugins
 2019-01-28 19:56:24 +01:00
Peter Jones 0da9489c6a
nixos/netdata: Add option to include extra plugins 
New option `extraPluginPaths' that allows users to supply additional
paths for netdata plugins.  Very useful for when you want to use
custom collection scripts.
 2019-01-28 09:02:47 -07:00
volth b3c5e9ac1e
nixos/collectd: restart on failure 
`collectd' might fail because of a failure in any of numerous plugins.
For example `virt' plugin sometimes fails if `collectd' is started before `libvirtd'
 2019-01-26 00:31:32 +00:00
Silvan Mosberger 7222fd9e21
Merge pull request #53986 from Ma27/document-dovecot-prometheus-exporter-issues 
nixos/prometheus-dovecot-exporter: enhance `socketPath` documentation
 2019-01-24 00:17:20 +01:00
Maximilian Bosch ca72dbd125
nixos/prometheus-dovecot-exporter: enhance `socketPath` documentation 
In Dovecot 2.3[1] the stats module changed and now the UNIX socket
provided by Dovecot by default isn't compatible anymore with the
exporter[2]. By enabling the `old-stats` plugin in Dovecot this issue
can be solved which should be documented in this module.

[1] https://wiki2.dovecot.org/Upgrading/2.3
[2] https://github.com/kumina/dovecot_exporter/issues/8
 2019-01-23 23:51:48 +01:00
Maximilian Bosch 003132c2dd
nixos/prometheus: make `source_labels` optional 
It's possible to skip `source_labels` entirely, an example for this is
the blackbox exporter configuration:

https://github.com/prometheus/blackbox_exporter#prometheus-configuration
 2019-01-16 14:01:43 +01:00
Silvan Mosberger 6a942aec5b
Merge pull request #52765 from Izorkin/datadog-agent 
datadog-agent: 6.4.2 -> 6.8.3
 2019-01-08 16:01:26 +01:00
Izorkin 47a8b13efa datadog-agent: 6.4.2 -> 6.8.3 2019-01-08 11:16:44 +03:00
Jean-Philippe Braun 4f99f8d2cb nixos/prometheus-bind-exporter: add module 2019-01-03 21:14:21 +01:00
WilliButz 60eff0eecb
nixos/grafana: use new default for connMaxLifetime 2018-12-05 20:49:45 +01:00
Pierre Bourdon 3873f43fc3 prometheus/exporters: fix regression in DynamicUser behavior 
Instead of setting User/Group only when DynamicUser is disabled, the
previous version of the code set it only when it was enabled. This
caused services with DynamicUser enabled to actually run as nobody, and
services without DynamicUser enabled to run as root.

Regression from fbb7e0c82f.
 2018-12-05 11:26:38 +01:00
Pierre Bourdon 199b4c4743 prometheus/exporters/tor: make CPython happy by defining $HOME 2018-12-05 11:26:38 +01:00
Renaud 6a5fff3741
Merge pull request #51001 from c0bw3b/cleanup/more-https 
Treewide: use more HTTPS-enabled sources
 2018-11-25 16:22:34 +01:00
Craig Younkins eff461c8ef treewide: systemd timeout arguments to use infinity instead of 0 (#50934) 
Fixes https://github.com/NixOS/nixpkgs/issues/49700
 2018-11-25 13:33:22 +01:00
c0bw3b 434eab9955 nixos/systemhealth: fix url and use https 2018-11-24 23:07:30 +01:00
Andreas Rammhold 51c3082119 nixos/prometheus: require one alertmanager configuration parameter 
This commit adds an assertion that checks that either `configFile` or
`configuration` is configured for alertmanager. The alertmanager config
can not be an empty attributeset. The check executed with `amtool` fails
before the service even has the chance to start. We should probably not
allow a broken alertmanager configuration anyway.

This also introduces a test for alertmanager configuration that piggy
backs on the existing prometheus tests.
 2018-11-23 19:45:17 +01:00
Andreas Rammhold b1032db5a9 nixos/prometheus: check alertmanager configuration 2018-11-23 19:45:17 +01:00
Andreas Rammhold d1ef00ebee nixos/prometheus: add `package` option to alertmanager 2018-11-23 19:45:17 +01:00
Jörg Thalheim 769735d8a1
netdata: create missing /etc/netdata 
Since netdata 1.11.0 updated in https://github.com/NixOS/nixpkgs/pull/50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
 2018-11-21 23:00:04 +00:00
Jörg Thalheim 31d2593ced
netdata: fix python plugins 
fixes #33366
 2018-11-17 15:38:15 +00:00
Jörg Thalheim 348b7b8be9 nixos/netdata: own plugins must the looked up first 
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
 2018-11-16 11:24:27 -05:00
Jörg Thalheim 1d261945c7
Merge pull request #50113 from ryantm/monit 
nixos/monit: change type of 'config' option to lines
 2018-11-10 14:47:38 +00:00
Silvan Mosberger 9c984b06c4
Merge pull request #38514 from disassembler/grafana-reporter 
grafana-reporter: init at 2.0.1
 2018-11-10 15:15:21 +01:00
Ryan Mulligan 8d0b95dc09 nixos/monit: change type of 'config' option to lines 
By using types.lines for 'config', we can specify monit configurations
in lots of modules and they can all be automatically combined together
with newlines. This is desireable because different modules might want
to each specify the small monitoring task specific to their service.

This commit also updates the module to use current idioms.
 2018-11-09 16:07:42 -08:00
Sander van der Burg 530b4bcadd nixos/alerta: create new module + add kapacitor integration 2018-11-08 22:34:23 +01:00
Andreas Rammhold 6795bdd58c nixos/prometheus: check configuration before starting service 
With `promtool` we can check the validity of a configuration before
deploying it. This avoids situations where you would end up with a
broken monitoring system without noticing it - since the monitoring
broke down. :-)
 2018-11-04 15:08:44 +01:00
Andreas Rammhold 0de150e0f2 nixos/prometheus: add `package` option 
With a package option we can let the user decide what package to use for
prometheus without requiring an overlay.
 2018-11-04 15:08:44 +01:00
Sander van der Burg 60298d1e08 nixos/kapacitor: new service 2018-11-01 21:53:45 +01:00
Samuel Leathers 5b30cd77db
nixos/grafana_reporter: initial service 2018-10-27 05:15:03 -04:00
Rob Vermaas debbed29d1 datadog-agent: add option to enable trace agent 2018-10-23 12:30:06 +02:00
Jörg Thalheim c4a7ebb46b
Merge pull request #47070 from Mic92/grafana-improvements 
Grafana: secrets outside of the nix store + smtp
 2018-10-21 14:21:09 +01:00
Renaud cb9237d16f
Merge pull request #47775 from florianjacob/munin-var-run-to-run 
nixos/munin: move from /var/run to /run
 2018-10-21 10:07:25 +02:00