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