Andrew Childs
01f03f30db
nixos/prometheus: add checkConfig
...
Workaround for https://github.com/prometheus/prometheus/issues/5222
2020-03-14 04:40:55 +00:00
Mario Rodas
ee599f376c
Merge pull request #71329 from tilpner/cadvisor-no-docker
...
nixos/cadvisor: don't enable docker
2020-03-13 20:35:46 -05:00
Jesper Geertsen Jonsson
b42babd160
nixos/netdata: add module package option
2020-03-10 23:06:01 +01:00
Martin Milata
421a18f42b
nixos/prometheus-mikrotik-exporter: init
2020-03-06 10:39:05 +01:00
Martin Milata
e7ed7901a8
nixos/prometheus-mail-exporter: misc fixes
...
- Fix misspelled option. mkRenamedOptionModule is not used because the
option hasn't really worked before.
- Add missing cfg.telemetryPath arg to ExecStart.
- Fix mkdir invocation in test.
2020-03-06 01:44:05 +01:00
Martin Milata
3b5cf35e8b
nixos/prometheus-mail-exporter: fix assertion
...
The assertion was printed when user explicitly defined only the
configFile option.
2020-03-06 01:44:05 +01:00
Martin Milata
2a080ac434
nixos/prometheus-snmp-exporter: fix assertion
...
The assertion was printed when user explicitly defined only the
configurationPath option.
2020-03-06 01:43:20 +01:00
Martin Milata
87f87fb3e9
nixos/prometheus-snmp-exporter: update log options
...
The allowed values have changed in bd3319d28c
2020-03-06 01:43:20 +01:00
Martin Milata
0ac24ccf2a
nixos/prometheus-*-exporter: escape shell args
2020-03-06 01:43:20 +01:00
WilliButz
eaef96093a
prometheus-nginx-exporter: 0.5.0 -> 0.6.0 ( #81285 )
...
* prometheus-nginx-exporter: 0.5.0 -> 0.6.0
* nixos/prometheus-nginx-exporter: update for 0.6.0
Added new option constLabels and updated virtualHost name in the
exporter's test.
2020-03-02 14:48:40 -05:00
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#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
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
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
