tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-19 07:05:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
494951 commits 211 branches 129 tags 11 GiB
Commit graph

1041 commits

Author SHA1 Message Date
Martin Weinelt 46ea00da23 nixos/prometheus-influxdb-exporter: init 2021-07-26 16:00:01 +02:00
Cole Helbling 88fb6d25d8 nixos/prometheus-buildkite-agent-exporter: init 2021-07-19 08:35:58 -07:00
Jörg Thalheim c24fa221ab nixos/telegraf: improve documentation 2021-07-18 09:40:42 +02:00
Jörg Thalheim cc56dc078d nixos/telegraf: don't run as nogroup 2021-07-18 08:54:45 +02:00
Martin Weinelt cf139f7203
nixos/tests/prometheus-exporters/kea: migrate to kea nixos module 2021-07-14 01:36:04 +02:00
Martin Weinelt 508408559a
nixos/prometheus: allow overriding default export user 2021-07-14 01:36:04 +02:00
n0emis 336494e19f
nixos/prometheus: add password_file option to scrapeConfig's basic_auth (#123252) 2021-07-10 21:18:38 +02:00
github-actions[bot] b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
github-actions[bot] 1df79d27a7
Merge staging-next into staging 2021-06-22 00:07:12 +00:00
Konrad Borowski 447b1cf03d nixos/prometheus: allow state access for service only 
There is no reason for Prometheus state files to be
world-readable.
 2021-06-21 10:16:47 +02:00
Sandro 84a79c2f0f
Merge pull request #126284 from aanderse/zabbix-user-params 
zabbixAgent: add bash to $PATH
 2021-06-20 17:58:43 +02:00
Daniel Nagy 044d996906
nixos/grafana: use port type 2021-06-18 17:27:31 +02:00
Erik Skytthe d1b4158155
nixos/grafana: Change services.grafana.provision.datasources.*.type to be open (#126831) 2021-06-16 11:12:51 +02:00
Aaron Andersen a0a11fd22c zabbixAgent: add bash to $PATH 2021-06-08 19:42:39 -04:00
Robert Hensing 843248d39f
Merge pull request #117379 from hercules-ci/nixos-metricbeat 
nixos/metricbeat: init
 2021-06-08 13:53:20 +02:00
talyz 41387135dd nixos/grafana: Add error handling to service script 
Without this, the services starts even if files are missing or
prerequisite commands fail, which can lead to incorrect initial
state.
 2021-06-07 18:00:13 +09:00
talyz 98f07d6cc5 nixos/grafana: Filter out duplicate plugins 
If the same plugin appears multiple times in `declarativePlugins`, for
example due to being added both by a module and in user config, the
build fails with an error message similar to

ln: failed to create symbolic link 'grafana-worldmap-panel/glmqcj88zk2bz3mvdr3r7920wxg02qnq-grafana-worldmap-panel-0.3.2': Permission denied

This is solved by removing all duplicates.
 2021-06-07 18:00:13 +09:00
Luke Granger-Brown 91fb672b21
Merge pull request #125573 from Flakebi/prometheus-script-exporter 
prometheus-script-exporter: init at 1.2.0
 2021-06-07 01:59:41 +01:00
Flakebi 3bcf4e31ef
nixos/prometheus: add script exporter 2021-06-06 22:42:46 +02:00
Flakebi 5e5a3c39ed nixos/prometheus: add process exporter 2021-06-06 08:17:25 +09:00
Maximilian Bosch ba9768f314
nixos/mail-exporter: add note about rspamd marking probe mails as spam 2021-06-03 13:10:23 +02:00
Maximilian Bosch 6fb847c556
nixos/dovecot-exporter: fix documentation for old stats 2021-06-03 13:01:11 +02:00
Maximilian Bosch 976d668e5c
nixos/rspamd-exporter: fix metrics 
In 0.3.0 of the json-exporter[1] it was switched to a different jsonpath
library which made some changes - especially for spaces in keys -
necessary. Also I decided to remove the pretty-printed JSON as this
would interfere with the bash quoting too much. If one needs
pretty-printed output, they can still pipe the output to `jq`.

[1] https://github.com/prometheus-community/json_exporter/releases/tag/v0.3.0
 2021-06-03 12:37:48 +02:00
Robert Hensing 5699d027ec nixos/metricbeat: init 2021-05-31 10:42:08 +02:00
Sandro Jäckel 0724518919
nixos/prometheus: init pihole-exporter 2021-05-24 04:05:59 +02:00
Maximilian Bosch a2379c69a4
Merge pull request #122833 from helsinki-systems/feat/prometheus-metric-relabel 
nixos/prometheus: Add support for metric relabeling
 2021-05-21 23:13:41 +02:00
Aaron Andersen 58ddbfa71d
Merge pull request #118395 from jwygoda/grafana-google-oauth2 
grafana: add google oauth2 config
 2021-05-18 23:11:24 -04:00
Martin Weinelt 4c798857e2
Merge pull request #100274 from hax404/prometheus-xmpp-alerts 2021-05-19 01:36:28 +02:00
Georg Haas 03c092579a
prometheus-xmpp-alerts: apply RFC 42 2021-05-19 01:08:38 +02:00
WilliButz 94b2848559
Merge pull request #91663 from mweinelt/kea-exporter 
prometheus-kea-exporter: init at 0.4.1
 2021-05-14 14:38:08 +02:00
Maximilian Bosch bfd4c121ff
Merge pull request #122637 from mayflower/prometheus-2.26.0 
Prometheus 2.26.0 + exporter updates
 2021-05-13 23:05:29 +02:00
Janne Heß 672e64701c
nixos/prometheus: Add support for metric relabeling 2021-05-13 15:59:46 +02:00
Martin Weinelt bc4a80979b
nixos/prometheus-kea-exporter: init 2021-05-12 21:51:44 +02:00
Robin Gloster 9438b12f99
prometheus-collectd-exporter: fix options for new version 2021-05-11 17:57:46 -05:00
Robin Gloster b2956ce654
prometheus-bind-exporter: fix options for new version 2021-05-11 17:57:46 -05:00
Robin Gloster da85657a6c
prometheus-rspamd-exporter: fix for new json exporter syntax 2021-05-11 17:57:46 -05:00
Izorkin 85914bc01d
nixos/netdata: change wrappers permissions 2021-05-10 10:35:51 +03:00
Izorkin 859633ee43
nixos/netdata: use cgroup v2 2021-05-10 10:24:31 +03:00
Izorkin 58497175be
nixos/netdata: cgroup-network: don't use AmbientCapabilities 2021-05-10 10:19:57 +03:00
Jörg Thalheim 4e783a4cb7
Merge pull request #121724 from Izorkin/update-netdata 
netdata: 1.29.3 -> 1.30.1
 2021-05-06 14:58:33 +01:00
Izorkin 53651179b9
nixos/netdata: update capabilities 2021-05-05 20:46:07 +03:00
Silvan Mosberger 0a377f11a5 nixos/treewide: Remove usages of deprecated types.string 2021-05-05 03:31:41 +02:00
Izorkin 9aad915539
nixos/netadata: add required packages 2021-05-04 21:02:23 +03:00
WilliButz 674cea17a7
Merge pull request #120492 from SuperSandro2000/prometheus-unbound-exporter 
Prometheus unbound exporter
 2021-04-29 10:54:22 +02:00
Sandro Jäckel ba13dc0652
nixos/prometheus: add unbound exporter 2021-04-29 06:19:29 +02:00
Symphorien Gibol ddf567cd5a nixos/nagios: use the correct option to restart on config change 
X-ReloadIfChanged is incorrect, apparently https://github.com/NixOS/nixpkgs/pull/120324#discussion_r619472321
We restart instead of reloading because nagios unit file has no
ExecReload.
 2021-04-24 17:12:51 +02:00
Evils 7ff0ccc324 nixos/vnstat: homedir -> statedir 
before, a nixos update that didn't trigger the chmod would break vnstat

and use a vnstatd group
 2021-04-24 00:31:58 +02:00
Symphorien Gibol 7a87973b4c nixos/users: require one of users.users.name.{isSystemUser,isNormalUser} 
As the only consequence of isSystemUser is that if the uid is null then
it's allocated below 500, if a user has uid = something below 500 then
we don't require isSystemUser to be set.

Motivation: https://github.com/NixOS/nixpkgs/issues/112647
 2021-04-14 20:40:00 +02:00
Jarosław Wygoda df3be1718a grafana: add google oauth2 config 
Grafana supports Google OAuth2.
https://grafana.com/docs/grafana/latest/auth/google/
 2021-04-13 12:33:04 +00:00
Pavol Rusnak 073fbba9bf
Merge pull request #89267 from mmilata/bitcoin-exporter 
nixos/prometheus-bitcoin-exporter: init
 2021-04-06 00:08:33 +02:00
Martin Milata 6b028bcf35 nixos/prometheus-bitcoin-exporter: init 2021-04-05 23:50:42 +02:00
Sandro 7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
Martin Milata 6840746f2d nixos/prometheus-domain-exporter: init 2021-04-04 22:25:12 +02:00
Sandro Jäckel 9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Maximilian Bosch 4364fd3038
Merge pull request #118305 from Ma27/openldap-exporter 
prometheus-openldap-exporter: init at 2.1
 2021-04-03 15:02:59 +02:00
Pascal Bach e58bd1763e
Merge pull request #117941 from em0lar/grafana-module-socket 
nixos/grafana: add socket configuration option
 2021-04-02 22:35:20 +02:00
Maximilian Bosch 4794829734
prometheus-openldap-exporter: init at 2.1 2021-04-02 19:16:50 +02:00
D Anzorge 5d81fcdf37 nixos/netdata: add config option for disabling analytics 
Option disables analytics through the DO_NOT_TRACK environment variable,
as detailed in
https://learn.netdata.cloud/docs/agent/anonymous-statistics

Default is analytics off
 2021-04-01 13:06:04 +02:00
Leo Maroni c162597465
nixos/grafana: add socket configuration option 2021-03-29 15:59:24 +02:00
Aaron Andersen d6fd7c6613 nixos/zabbixAgent: add a few minor tweaks to make configuration file compatible with both zabbix agent 1 and 2 2021-03-28 13:35:21 -04:00
Raphael Megzari f295110b26
prometheus-postgres-exporter: add environment file (#116373) 
* prometheus-postgres-exporter: add environment file

* Update nixos/modules/services/monitoring/prometheus/exporters/postgres.nix

Co-authored-by: WilliButz <WilliButz@users.noreply.github.com>
 2021-03-17 01:36:31 +01:00
Maximilian Bosch 22b61e5263
nixos/prometheus/exporters: fix eval if only openFirewall = true; is set 
If `openFirewall = true`, but no `firewallFilter` is set, the evaluation
fails with the following error:

    The option `services.prometheus.exporters.node.firewallFilter` is defined both null and
    not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'
    and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'.

Originally introduced by me in #115185. The problem is that
`mkOptionDefault` has - as its name suggests - the same priority as the
default-value of the option `firewallFilter` and thus it conflicts if
this declaration and the actual default value are set which is the case
if `firewallFilter` isn't specified somewhere else.
 2021-03-13 15:21:55 +01:00
WilliButz 3971cda05f
Merge pull request #116037 from petabyteboy/feature/jitsi-exporter 
prometheus-jitsi-exporter: init at 0.2.18
 2021-03-13 13:37:10 +01:00
Milan Pässler b2bebd7cd5
nixos/prometheus-jitsi-exporter: init 2021-03-12 11:11:16 +01:00
WilliButz f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags 
prometheus-systemd-exporter: Init at 0.4.0
 2021-03-11 19:18:29 +01:00
WilliButz 3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter 
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
 2021-03-11 18:58:59 +01:00
WilliButz 902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter 
nixos/prometheus-exporters/artifactory: init at 1.9.0
 2021-03-11 18:44:03 +01:00
Robert Schütz 6692b32105
Merge pull request #112125 from dotlambda/alerta 
alerta: move to all-packages.nix and use buildPythonApplication
 2021-03-08 10:09:30 +01:00
Maximilian Bosch 2838365903
nixos/prometheus/exporters: assert that openFirewall is true if firewallFilter is declared 2021-03-05 13:35:16 +01:00
Maximilian Bosch b4bd584b64
nixos/prometheus/exporters/knot: init 2021-03-05 13:13:46 +01:00
Maximilian Bosch d65d9dea2c
nixos/prometheus/exporters: use types.port for port option 2021-03-05 13:06:03 +01:00
Milan Pässler 507b66a5e5
nixos/grafana: create directory for notifiers provisioning 2021-03-03 20:11:25 +01:00
Isaac van Bakel 3e4499519d Add trailing periods to all Grafana option descriptions 2021-03-03 03:59:39 -05:00
Isaac van Bakel f689b8a65f Add notifier configs to grafana provisioning 
Similar to dashboards and datasources, notifiers in Grafana can also be
provisioned. This adds them to the Grafana service definition.
 2021-03-03 03:59:39 -05:00
Robert Schütz 336c114214 alerta: move to all-packages.nix and use buildPythonApplication 2021-02-28 12:25:52 +01:00
Robert Schütz 3fcd9361b5 alerta-server: move to all-packages.nix and use buildPythonApplication 2021-02-28 12:25:47 +01:00
Matthew Bauer c168e05c7e
Merge pull request #86239 from tathougies/patch-2 
[nixos/prometheus] promTypes.filter.value -> promTypes.filter.values
 2021-02-26 19:28:18 -06:00
Chuck 83de9e2d12 prometheus-systemd-exporter: Init at 0.4.0 2021-02-18 09:56:45 -08:00
Louis Blin 458fafa8fc nixos/prometheus-exporters/artifactory: init at 1.9.0 
Adds a Prometheus exporter to scrape metrics from the API of JFrog
Artifactory instances.
 2021-02-11 15:56:58 +00:00
Finn Behrens 92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
Logan Glasson c6ec272c78 nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled 
On a system with nginx enabled but the prometheus exporter not enabled,
the prometheus-nginx-exporter service should not be created.
 2021-02-08 13:17:56 +13:00
Lorenzo Manacorda 57e5fe7608 docs: modules/prometheus: finish exporter setup 
The last step, in which the exporter is hooked up to the server, was missing.
 2021-01-26 20:14:12 +02:00
Bas van Dijk 8ac4b251c8
nixos: use functionTo to prevent evaluation errors while merging 
Without this patch merging options like
services.xserver.windowManager.xmonad.extraPackages
results in the evaluation error:

  error: value is a list while a set was expected, at nixpkgs/lib/options.nix:77:23

With this patch we get the desired merging behaviour that just concatenates the
resulting package lists.

(cherry picked from commit 6e99f9fdec)

Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
 2021-01-24 17:18:37 +01:00
volth bc0d605cf1 treewide: fix double quoted strings in meta.description 
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
 2021-01-24 19:56:59 +07:00
Maximilian Bosch 2abfc93a68
nixos/grafana-image-renderer: typo fix 
Since the service doesn't do a strict config check, this worked fine
before, however the settings in the block never applied properly.
 2021-01-18 18:44:58 +01:00
WilliButz 254b510ce7
nixos/promtheus-nextcloud-exporter: update module and test 
Use new command-line flags of release 0.3.0 and always answer with the
expected XML in the VM test instead of using a test-specific fixed path.

Co-authored-by: ajs124 <git@ajs124.de>
 2021-01-17 15:25:18 +01:00
Phillip Cloud cbe4de90af nixos/prometheus: remove unnecessary whitespace 2021-01-10 13:09:47 -05:00
Phillip Cloud 53796fd70f nixos/prometheus: improve the tag_separator description 2021-01-10 13:08:48 -05:00
Phillip Cloud de96ffeb1c nixos/prometheus: use types.port for metrics port type 2021-01-10 13:08:48 -05:00
Phillip Cloud cad83fc596 nixos/prometheus: add cloud to refresh_interval description 2021-01-10 13:08:48 -05:00
Phillip Cloud 7958dbb8a7 nixos/prometheus: add gce_sd_configs scrapeConfig option 2021-01-10 13:08:47 -05:00
Maximilian Bosch 3b57908018
Merge pull request #108179 from WilliButz/update/prometheus-json-exporter/0.2.0 
prometheus-json-exporter: unstable-2017-10-06 -> 0.2.0
 2021-01-03 19:28:12 +01:00
Maximilian Bosch 6e43cc7fb0
nixos/prometheus-exporters: minor doc improvements 
* Content of `programlisting` shouldn't be indented, otherwise it's
  weirdly indented in the output.
* Use `<xref linkend=.../>` in the release notes: then users can
  directly go to the option documentation when reading release notes.
* Don't use docbook tags in `mkRemovedOptionModule`: it's only used
  during evaluation where docbook isn't rendered.
 2021-01-03 19:04:33 +01:00
Phillip Cloud 287939e2ed nixos/prometheus: update relabel_action list 2021-01-03 11:01:30 -05:00
WilliButz 3f94c66ee1
nixos/prometheus-json-exporter: update modules & tests, add release notes 2021-01-02 13:10:27 +01:00
WilliButz 5e9d92c839
Merge pull request #108142 from Ma27/grafana-img-renderer 
grafana-image-renderer: init at 2020-12-01
 2021-01-01 19:19:51 +01:00
Maximilian Bosch ca2a67549d
nixos/grafana-image-renderer: init 2021-01-01 19:19:11 +01:00
WilliButz 0587d518db
Merge pull request #107891 from lukegb/smokeping-prober 
prometheus-smokeping-prober: init at 0.3.1 from git
 2021-01-01 16:08:20 +01:00
WilliButz 15c7a0eb18
Merge pull request #108067 from 0x4A6F/master-prometheus-service 
nixos/prometheus: fix remote_{read,write} options
 2021-01-01 16:04:06 +01:00
WilliButz 2b04b8817e
Merge pull request #108096 from lukegb/bird-exporter 
prometheus-bird-exporter: init at 1.3.5-git
 2021-01-01 16:03:37 +01:00
0x4A6F 06414886f1
nixos/prometheus: fix remote_{read,write} options 
Fix and reorder options and use mkOpt for optional parameters,
according to official documentation.
 2021-01-01 14:43:51 +00:00
Luke Granger-Brown 699e402705 prometheus-bird-exporter: init at 1.3.5-git 2021-01-01 04:43:59 +00:00
Luke Granger-Brown d0a9e1ec83 nixos/grafana: add support for declarative plugin installation 2020-12-30 17:59:52 +00:00
Luke Granger-Brown 3297ac72f1 nixos/prometheus: add smokeping and corresponding NixOS test 2020-12-29 18:59:51 +00:00
0x4A6F c53a0c16e4
nixos/prometheus: remote_{read,write} 
- add [remote_write](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) and [remote_read](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_read) support

Co-authored-by: Yorick van Pelt <yorickvanpelt@gmail.com>
 2020-12-29 14:48:57 +00:00
Maximilian Güntner 65fd031277
nixos: add prometheus_nginxlog_exporter module + test 2020-12-21 21:23:39 +01:00
Matej Urbas 4970fbedbc nixos/prometheus-exporters/py-air-control: invoke exporter command 
Package `py-air-control exporter` v0.1.5 comes with a new CLI. This change uses the new CLI (which simplifies the exporter's systemd service setup).
 2020-12-12 20:19:54 +00:00
Matej Urbas 4948743705 nixos/prometheus-exporters/py-air-control: init 2020-12-10 19:02:30 +00:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Jörg Thalheim 0f84e08fcd
nixos/telegraf: make example a bit more compact 2020-11-18 21:41:58 +01:00
Jörg Thalheim 69caedcc42
nixos/telegraf: null value for environmentFiles is invalid 
it's also not needed given that empty list covers all use cases.
 2020-11-18 21:41:55 +01:00
Jörg Thalheim 7534d92648
nixos/telegraf: allow multiple env files 2020-11-14 16:33:50 +01:00
Jörg Thalheim 8edc4619ab
nixos/telegraf: switch to setting types 
This allows to split up configuration into multiple modules
 2020-11-14 16:33:46 +01:00
Jörg Thalheim 157d7354d6
nixos/telegraf: add environmentFile option 2020-11-14 16:33:42 +01:00
Jörg Thalheim 9750813b89
nixos/telegraf: add support for native ping 2020-11-14 16:33:39 +01:00
Kevin Cox 5dee9b5699
Merge pull request #96679 from midchildan/add-mackerel 
mackerel-agent: init at 0.69.3
 2020-11-11 06:59:22 -05:00
Jörg Thalheim 4c64fa224e
nixos/loki: mergeable configuration 
type.attrs is not mergable
 2020-11-10 10:49:25 +01:00
Jörg Thalheim 689eb49d42
nixos/loki: add logcli to system path 
Admins quite likely want to query loki for debugging purpose.
 2020-11-10 10:49:21 +01:00
midchildan 921a66edc4
nixos/mackerel-agent: init 2020-11-07 13:37:33 +09:00
Maximilian Bosch 68726901e1
Merge pull request #94673 from justinas/prom-sql-exporter 
prometheus-sql-exporter: init at 0.3.0
 2020-11-06 17:00:47 +01:00
Justinas Stankevicius d447c2413c
nixos/prometheus-sql-exporter: new module 2020-11-06 16:35:38 +01:00
Philipp Kern ec6b0950ef
nixos/prometheus: Support environmentFile (#97933) 
For the same reason Alertmanager supports environmentFile to pass
secrets along, it is useful to support the same for Prometheus'
configuration to store bearer tokens outside the Nix store.
 2020-10-31 20:52:13 +01:00
lf- b37bbca521 nixos/modules: fix systemd start rate-limits 
These were broken since 2016:
f0367da7d1
since StartLimitIntervalSec got moved into [Unit] from [Service].
StartLimitBurst has also been moved accordingly, so let's fix that one
too.

NixOS systems have been producing logs such as:
/nix/store/wf98r55aszi1bkmln1lvdbp7znsfr70i-unit-caddy.service/caddy.service:31:
Unknown key name 'StartLimitIntervalSec' in section 'Service', ignoring.

I have also removed some unnecessary duplication in units disabling
rate limiting since setting either interval or burst to zero disables it
(ad16158c10/src/basic/ratelimit.c (L16))
 2020-10-31 01:35:56 -07:00
WilliButz 993437d0d6
Merge pull request #96511 from Zopieux/rtl_433_prom 
Add rtl_433 Prometheus exporter
 2020-10-23 23:24:38 +02:00
Alexandre Macabies 121bc17ab9 nixos/prometheus-rtl_433-exporter: new module 2020-10-23 20:33:42 +02:00
Florian Klink 8d52cf501f nixos/datadog: Don't recommend dd_url for sites, add proper option 
Turns out, `dd_url` should only be used in proxy scenarios, not to point
datadog to their EU endpoint - `site` should be used for that.

The `dd_url` setting doesn't affect APM, Logs or Live Process intake
which have their own "*_dd_url" settings.
 2020-09-25 22:30:55 +02:00
Andreas Rammhold bb33cdd44b
Merge pull request #98738 from mayflower/prometheus-retention 
nixos/prometheus: add retentionTime
 2020-09-25 17:11:27 +02:00
Robin Gloster 5c0a2e8c60 nixos/prometheus: add retentionTime 2020-09-25 13:44:13 +02:00
Kirill Elagin a4afd525cb prometheus: Unbreak IPv6 listenAddress 
The format of the listenAddress option was recently changed to separate
the address and the port parts. There is now a legacy check that
tells users to update to the new format. This legacy check produces
a false positive on IPv6 addresses, since they contain colons.

Fix the regex to make it not match colons within IPv6 addresses.
 2020-09-21 07:53:47 +02:00
Ryan Mulligan 16b94bf231 nixos/monit: add ryantm as maintainer 2020-09-18 22:09:22 -07:00
Ryan Mulligan 61863c5155
Revert "nixos/monit: Allow splitting the config in multiple files" 2020-09-18 21:57:54 -07:00
Florian Klink 2865a8867f
nixos/datadog: allow specifying dd_url (#97775) 
Useful when you want to point datadog to another endpoint, either
because you need a proxy to send out data, or because you use their EU
endpoint.
 2020-09-12 21:02:20 +02:00
Linus Heckemann ef4e81d756
Merge pull request #96830 from mayflower/unifi-poller 
unifi-poller: add service and prometheus-exporter
 2020-09-08 09:53:07 +02:00
WilliButz 5d51096839
nixos/prometheus-exporters: fix default firewall filter 
Instead of always using the default port of one exporter for its default
firewall filter, the port from the current service configuration is used.
 2020-09-07 10:28:36 +02:00
elseym aaf0002f68
prometheus-unifi-poller-exporter: init module 2020-09-06 17:48:19 +02:00
elseym b381aacbba
nixos/unifi-poller: init unifi-poller service 2020-09-06 17:47:52 +02:00
Lassulus bfd706923e
Merge pull request #87700 from serokell/mkaito/upstream/prometheus-port 
prometheus: Split options listenAddress and port
 2020-08-23 09:29:01 +02:00
Lassulus 2fb9ee9caa
Merge pull request #87553 from JoeDupuis/enhancing-monit-module 
nixos/monit: Allow splitting the config in multiple files
 2020-08-22 19:21:55 +02:00
Silvan Mosberger f8e6745ad3
Merge pull request #82817 from pacien/smartd-fix-hostname-notifications 
smartmontools: fix missing hostname in notifications
 2020-08-22 16:09:14 +02:00
Aaron Andersen f6a3403055 nixos/zabbix: use proper character set and collation for mysql database 2020-08-18 10:30:27 -04:00
pacien ea37c9caa1 smartmontools: use standard subject in notification emails 
This makes the notification script use the subject generated by smartmontools
itself both for consistency with other distros and to include the hostname.
 2020-08-16 20:48:42 +02:00
pacien f1922cdbdc smartmontools: fix missing hostname in notifications 
This properly registers some missing dependencies of smartd_warning.sh.
 2020-08-16 20:48:03 +02:00
Izorkin 2f6a18af5a nixos/netadata: enable simple sandboxing 2020-08-09 10:19:30 +03:00
Jörg Thalheim ba930d8679
nixos/modules: remove trailing whitespace 
This leads to ci failure otherwise if the file gets changed.
git-blame can ignore whitespace changes.
 2020-08-07 14:45:39 +01:00
Jonathan Ringer 8d57f75f7a nixos/smartd: fix description for docbook 2020-08-06 10:06:59 +10:00
tmplt f9f48250fe nixos/smartd: add option for notifiction email sender 2020-08-05 14:26:48 -07:00
Aaron Andersen 620e154921
Merge pull request #94043 from aanderse/zabbix-settings 
nixos/zabbix*: replace extraConfig option with settings option
 2020-08-04 12:49:43 -04:00
Aaron Andersen 7415ba0be8 nixos/zabbixProxy: replace extraConfig option with settings option 2020-07-28 08:11:33 -04:00
Aaron Andersen b58e0905d0 nixos/zabbixAgent: replace extraConfig option with settings option 2020-07-27 22:09:25 -04:00
Aaron Andersen 3aa68faa78 nixos/zabbixServer: replace extraConfig option with settings option 2020-07-27 22:09:20 -04:00
Kirill Elagin e1d80de838 prometheus: Add assert for legacy listenAddress 2020-07-23 18:16:13 -04:00
Kirill Elagin 5d2a465add prometheus: Use types.port for port 2020-07-23 18:15:57 -04:00
Peter Hoeg e0589ec65b nixos/do-agent: use .service from upstream 2020-07-23 19:30:01 +08:00
Matt Layher a58346a5ee
nixos/prometheus-modemmanager-exporter: new module 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2020-07-17 13:54:58 -04:00
Evils 73a90b0154 nixos/tuptime: change group/user to match upstream 2020-06-20 05:34:37 +02:00
Florian Klink f5f8b08f16
Merge pull request #91065 from Infinisil/move-fontultimate 
nixos/fontconfig: Move deprecated ultimate removals to relevant module
 2020-06-19 00:07:46 +02:00
Silvan Mosberger 78453e6ba6
nixos/fontconfig: Move deprecated ultimate removals to relevant module 
This was a mistake in https://github.com/NixOS/nixpkgs/pull/61570, this
does not belong to prometheus
 2020-06-18 23:12:18 +02:00
Sarah Brofeldt 344e64a4d9 nixos/prometheus-redis-exporter: init 2020-06-18 11:13:25 +02:00
Maximilian Bosch 6148b0e59f
Merge pull request #99079 from mayflower/openvpn-exporter-upstream 
nixos/prometheus-exporters/openvpn: init
 2020-09-30 15:37:03 +02:00
Linus Heckemann a560936cab nixos/prometheus-exporters/openvpn: init 
Co-Authored-By: Franz Pletz <fpletz@fnordicwalking.de>
Co-Authored-By: Robin Gloster <mail@glob.in>
 2020-09-29 10:53:04 +02:00
Linus Heckemann 2c1e72ee6a prometheus exporters: always set user and group 
systemd.exec(5) on DynamicUser:
> If a statically allocated user or group of the configured name
> already exists, it is used and no dynamic user/group is allocated.

Using DynamicUser while still setting a group name can be
useful for granting access to resources that can otherwise only be
accessed with entirely static IDs.
 2020-09-29 10:53:04 +02:00
WilliButz e736a990c1
Merge pull request #98746 from mayflower/postfix-exporter-group 
prometheus postfix exporter: misc
 2020-09-27 22:37:38 +02:00
Linus Heckemann edcb73f6b5 nixos/prometheus/postfix: enable systemd by default 2020-09-25 14:29:16 +02:00
Linus Heckemann e80fa27968 nixos/prometheus/postfix: correct default showqPath 2020-09-25 14:28:32 +02:00
WilliButz f412df1f6b nixos/prometheus-postfix-exporter: set default group 
The postfix exporter needs to access postfix's `queue/public/` directory
to read the `showq` socket inside. Instead of making the public
directory world accessible, this sets the postfix exporter's group to
`postdrop` by default, when the postfix service is enabled.
 2020-09-25 13:59:46 +02:00
Martin Milata 876bf3abc9 nixos/prometheus-lnd-exporter: init 2020-06-11 18:23:54 +02:00
WilliButz 3190ba12f7
Merge pull request #90077 from mdlayher/mdl-nixos-apcupsd 
nixos/prometheus-apcupsd-exporter: new module
 2020-06-11 15:23:33 +02:00
Matt Layher e45146d94b
nixos/prometheus-apcupsd-exporter: new module 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2020-06-10 17:33:41 -04:00
Matt Layher e77426822f
nixos/prometheus-keylight-exporter: new module 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
 2020-06-10 13:12:43 -04:00
Christian Höppner ba3c3de8a6
prometheus: Split options listenAddress and port 
Accessing the configured port of a service is quite useful, for example
when configuring virtual hosts for a service. The prometheus module did
not expose the configured por separately, making it unnecessarily
cumbersome to consume.

This is a breaking change only if you were setting `listenAddress` to
a non-standard value. If you were, you should now set `listenAddress`
and `port` separately.
 2020-05-19 11:48:44 +01:00
Joe Dupuis 8f4070c4c6 nixos/monit: Allow splitting the config in multiple files 2020-05-10 17:53:50 -04:00
Travis Athougies 8389fb8f16
[nixos/prometheus] promTypes.filter.value -> promTypes.filter.values 
The new configuration name for this is plural. Currently, attempting to enable ec2 SD results in a `promtool check config` error
 2020-04-28 10:22:03 -07:00
zowoq c59c4e3589 nixos/*: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +10:00
Arian van Putten f332109ebf nixos/datadog-agent: Fix restartTriggers 
Fixes #85800

1d61efb7f1 accidentially changed the
restartTriggers of `datadog-agent.service` to point to the attribute
name (in this case, a location relative to `/etc`), instead of the
location of the config files in the nix store.

This caused datadog to not get restarted on activation of new
config, if the file name hasn't changed.

Fix this, by pointing this back to the location in the nix store.
 2020-04-23 09:58:18 +02:00
Florian Klink a88d17bc69
Merge pull request #83301 from evils/tuptime 
Tuptime: Init Package, Module and Test
 2020-04-19 23:38:53 +02:00
Robin Gloster e484ca3d9b
alertmanager: implement HA clustering support 2020-04-13 18:39:51 +02:00
Robin Gloster 0e040d16e8
prometheus: use runCommandNoCCLocal for config gen 2020-04-12 20:13:23 +02:00
Nejc Zupan 479c521af9
Automatically restart netdata on failures 
I've had Netdata crash on me sometimes. Rarely but more than once. And I lost days of data before I noticed.

Let's be nice and restart it on failures by default.
 2020-04-08 20:58:06 +01:00
Evils b29d48acfb nixos/tuptime: init module 2020-04-03 17:29:56 +02:00
lewo afb035a32b
Merge pull request #82808 from nlewo/fix-alertmanager 
nixos/alertmanager: start after the network-online target
 2020-03-28 09:29:01 +01:00
Izorkin d508a2f366 nixos/netdata: fix permissions for perf.plugin 2020-03-23 12:24:49 +03:00
Izorkin a3c769fef6 nixos/netdata: fix permissions for slabinfo.plugin 2020-03-23 12:24:49 +03:00
Lancelot SIX 37ffa6ea51 nixos/griphite: Migrate to python3, drop graphite-pager 2020-03-22 22:47:53 -07:00
Jörg Thalheim bfb747aacf
Merge pull request #82286 from yesbox/netdata_module_package_option 
nixos/netdata: add module package option
 2020-03-21 11:21:39 +00:00
Antoine Eiche 39621bb8de nixos/alertmanager: start after the network-online target 
If the host network stack is slow to start, the alertmanager fails to
start with this error message:

    caller=main.go:256 msg="unable to initialize gossip mesh" err="create memberlist: Failed to get final advertise address: No private IP address found, and explicit IP not provided"

This bug can be reproduced by shutting down the network stack and
restarting the alertmanager.

Note I don't know why I didn't hit this issue with previous
alertmanager releases.
 2020-03-17 22:18:20 +01:00
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.

0.15:
      --log.level="info"        Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
      --log.format="logger:stderr"
                                Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"

0.17:
      --log.level=info          Only log messages with the given severity or above. One of: [debug, info, warn, error]
      --log.format=logfmt       Output format of log messages. One of: [logfmt, json]
 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 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