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

978 commits

Author SHA1 Message Date
Andrew Marshall 3bbfc7849e nixos/prometheus: Remove upstream-deprecated alertManagerTimeout 
When started, Prometheus prints:

> The flag --alertmanager.timeout has no effect and will be removed in
> the future.

See also
2316062d4e
 2022-04-11 23:37:33 -04:00
Guillaume Girol 44a3d91e5f nixos/collectd: put extraconfig before plugins 
this is necessary to override the global option Interval.
If set after the plugins, it has no effect.
 2022-04-03 17:25:26 +02:00
Florian Klink c57c5c42a4 prometheus-bird-exporter: update birdSocket default path 
a5276e1fbd updated bird to use
/run/bird/bird.ctl, but didn't update the default used for
prometheus-bird-exporter.

Reported-In: https://github.com/NixOS/nixpkgs/pull/161193#issuecomment-1086228985
 2022-04-01 22:59:48 +02:00
Martin Weinelt 35b3c26351
Merge pull request #164533 from mweinelt/kea-exporter-after-kea 
nixos/prometheus-exporters/kea: wait for kea
 2022-03-30 00:03:03 +02:00
Moritz 9f715a3d31
nixos/grafana: Add foldersFromFilesStructure option for dashboard provisioning (#132348) 2022-03-29 10:53:39 +02:00
Janne Heß a34c788e30
Merge pull request #163230 from helsinki-systems/feat/misc-prometheus-varnis 
nixos/prometheus/exporters/varnish: improve some defaults
 2022-03-26 18:32:30 +01:00
Martin Weinelt 8b7ca8bdcb
nixos/prometheus-exporters/kea: wait for kea 
Fixes race conditions like this:

> systemd[1]: Started prometheus-kea-exporter.service.
> kea-exporter[927]: Listening on http://0.0.0.0:9547
> kea-exporter[927]: Socket at /run/kea/dhcp4.sock does not exist. Is Kea running?
> systemd[1]: prometheus-kea-exporter.service: Main process exited, code=exited, status=1/FAILURE
 2022-03-17 03:27:21 +01:00
Maximilian Bosch 0c5586c2f2
Merge pull request #162254 from Ma27/init-dmarc-exporter 
prometheus-dmarc-exporter: init at 0.5.1
 2022-03-14 09:02:08 +01:00
Martin Weinelt 76721f5e5e
Merge pull request #159986 from NukaDuka/pve_exporter 2022-03-10 22:41:45 +01:00
pennae 06c57317c2
Merge pull request #146653 from DarkDNA/nixos/fix-systemd-exporter/extraFlags 
nixos/prometheus/systemd: Implement the extraFlags config option.
 2022-03-09 16:12:32 +00:00
ajs124 a28591680b nixos/prometheus/exporters/varnish: improve some defaults 2022-03-08 01:42:27 +01:00
Kartik Gokte 6a0b420d94 nixos/prometheus-pve-exporter: init at 2.2.2 2022-03-02 23:59:33 +05:30
Maximilian Bosch 5cee9c9ef2
prometheus-dmarc-exporter: init at 0.5.1 2022-02-28 16:50:01 +01:00
Joseph Heyburn 263c233e51
prometheus-exporter/unifi-poller: Add loki config 
Allows unifi logs to be sent to Loki via unifi-poller
 2022-02-27 08:36:02 +00:00
Martin Weinelt 9d8a23f66e
nixos/smartctl-exporter: fix typo in rawio capab 2022-01-30 04:32:15 +01:00
Martin Weinelt 12c26aca1f
prometheus.exporters.smartctl: Fix autodiscovery 
When no devices are given the exporter tries to autodiscover available
disks. The previous DevicePolicy was however preventing the exporter
from accessing any device at all, since only explicitly mentioned ones
were allowed.

This commit adds an allow rule for several device classes that I could
find on my machines, that gets set when no devices are explicitly
configured.

There is an existing problem with nvme devices, that expose a character
device at `/dev/nvme0`, and a (namespaced) block device at
`/dev/nvme0n1`. The character device does not come with permissions that
we could give to the exporter without further impacting the hardening.

  crw------- 1 root root 247, 0 27. Jan 03:10 /dev/nvme0
  brw-rw---- 1 root disk 259, 0 27. Jan 03:10 /dev/nvme0n1

The autodiscovery only finds the character device, which the exporter
unfortunately does not have access to.

However a simple udev rule can be used to resolve this:

  services.udev.extraRules = ''
    SUBSYSTEM=="nvme", KERNEL=="nvme[0-9]*", GROUP="disk"
  '';

Unfortunately I'm not fully aware of the security implications this
change carries and we should question upstream (systemd) why they did
not include such a rule.
The disk group has no members on any of my machines.

  ❯ getent group disk
  disk❌6:
 2022-01-27 17:33:27 +01:00
Martin Weinelt f860b289d4
prometheus.exporters.smartctl: Allow RAWIO 
This allows the exporter to perform SCSI commands and interact with hpsa
and cciss devices.
 2022-01-27 13:49:25 +01:00
misuzu 768d0d6098 nixos/netdata: expose /etc/netdata 2022-01-10 23:56:57 +02:00
misuzu 9e6145c73b nixos/netdata: add configDir option 
This option makes the complete netdata configuration directory available for
modification. The default configuration is merged with changes
defined in the configDir option.

Co-authored-by: Michael Raitza <spacefrogg-github@meterriblecrew.net>
 2022-01-10 23:56:53 +02:00
Sandro Jäckel 39ce4ddd85
nixos/prometheus: fix usage of bearer_token 2022-01-08 22:56:51 +01:00
Alexandre Iooss e5b24e6da2
nixos/prometheus-node-exporter: do not protect home 
Set ProtectHome to false for the node exporter. This allows free space
monitoring under /home.
 2022-01-04 08:14:36 +01:00
Jörg Thalheim fd0a6311a7 prometheus: add authorization section 2022-01-03 12:04:08 +01:00
Bobby Rong 7378b39d1d
Merge pull request #149704 from squalus/nginx-prometheus-exporter-fix 
nixos/prometheus-nginx-exporter: fix argument syntax
 2021-12-23 10:27:16 +08:00
Guillaume Girol d96a3994cc nixos/collectd: validate config file syntax at build time 2021-12-23 00:08:43 +01:00
Graham Christensen 3907d19260 services.prometheus.exporters.fastly: add a smoke test 2021-12-20 10:57:31 -05:00
Graham Christensen 1753f97e13 services.prometheus.exporters.fastly: fixup broken module config 2021-12-20 10:29:13 -05:00
Graham Christensen 06edb74413
Merge pull request #148785 from pennae/more-option-doc-staticizing 
treewide: more defaultText for options
 2021-12-17 11:14:08 -05:00
pennae e67a646a92 treewide: add defaultText to remaining options 
these are mostly options that use alias bindings, bindings to constants,
or bindings to calculated values.
 2021-12-09 01:42:24 +01:00
pennae 9407761763 treewide: add defaultText for options using other shortcut bindings 2021-12-09 01:42:24 +01:00
pennae 2d564521c0 treewide: add literalDocBook text to options with complex defaults 
some options have default that are best described in prose, such as
defaults that depend on the system stateVersion, defaults that are
derivations specific to the surrounding context, or those where the
expression is much longer and harder to understand than a simple text
snippet.
 2021-12-09 01:38:24 +01:00
pennae ed673a69db treewide: add defaultText for options with simple cfg.* expression defaults 
adds defaultText for options with defaults that use only literals, full config.*
paths, and the cfg shortcut binding.
 2021-12-09 01:14:16 +01:00
pennae fb0e5be843 treewide: add defaultText for options with simple interpolation defaults 
adds defaultText for all options that use `cfg.*` values in their
defaults, but only for interpolations with no extra processing (other
than toString where necessary)
 2021-12-09 01:13:48 +01:00
pennae e24a8775a8 treewide: set defaultText for options using simple path defaults 
adds defaultText for all options that set their default to a path expression
using the ubiquitous `cfg` shortcut bindings.
 2021-12-09 01:12:13 +01:00
squalus c3ab9e6d40 nixos/prometheus-nginx-exporter: fix argument syntax 
Arguments were being ignored because the program expects an equals sign
to separate the argument name from the value.

Documented in https://github.com/nginxinc/nginx-prometheus-exporter/issues/153

Fixes #107541
 2021-12-08 11:32:13 -08:00
Robert Hensing 862d167f17
Merge pull request #147441 from pennae/option-doc-staticizing 
nixos/*: add trivial defaultText to options where applicable
 2021-12-06 01:35:38 +01:00
Jörg Thalheim 8ae2771224
Merge pull request #148729 from bjornfor/add-missing-collectd-group-v2 
nixos/collectd: add missing group
 2021-12-05 17:18:55 +00:00
Bjørn Forsman 05bc708a7f nixos/collectd: add missing group 
While upgrading my NixOS system I was greeted by this error:

  error:
  Failed assertions:
  - users.users.collectd.group is unset. This used to default to
  nogroup, but this is unsafe. For example you can create a group
  for this user with:
  users.users.collectd.group = "collectd";
  users.groups.collectd = {};

Let's fix it.
 2021-12-05 17:17:12 +01:00
Martin Weinelt 0c008f9c0d
Merge pull request #147056 from mweinelt/smartctl-exporter 2021-12-05 03:00:48 +01:00
Maximilian Bosch 8e6d403e65
nixos/prometheus-postfix-exporter: whitelist addr-family AF_UNIX 
Otherwise, `postfix_up{path="/var/lib/postfix/queue/public/showq"}` will
always be `0` indicating an postfix outage because this is a unix domain
socket that cannot be connected to:

    2021/12/03 14:50:46 Failed to scrape showq socket: dial unix /var/lib/postfix/queue/public/showq: socket: address family not supported by protocol
 2021-12-03 19:01:19 +01:00
pennae 2512455639 nixos/*: add trivial defaultText for options with simple defaults 2021-12-02 22:35:04 +01:00
Martin Weinelt 386a1e79eb
nixos/smartctl-exporter: init 2021-11-23 11:30:28 +01:00
Amanda Cameron 4bfe837a58 nixos/prometheus/systemd: Implement the extraFlags config option. 2021-11-19 13:09:56 -05:00
Marek Mahut 2e75b280a7
prometheus-nginx-exporter: boolean conversion to string 2021-11-19 16:22:04 +01:00
Artturi aa64f17479
Merge pull request #146420 from Artturin/cadvisorfix 2021-11-18 23:40:03 +02:00
Michele Guerini Rocco 90bb5d0e19
Merge pull request #146409 from aanderse/zabbix 
nixos/zabbixServer: explicitely set security.wrappers ownership
 2021-11-17 22:05:16 +01:00
Artturin 0894568aee nixos/cadvisor: add zfs to path when zfs enabled 
fixes https://github.com/NixOS/nixpkgs/issues/105139
 2021-11-17 20:47:44 +02:00
Aaron Andersen ebbf93136f nixos/zabbixServer: explicitely set security.wrappers ownership 2021-11-17 11:26:14 -05:00
Sandro 93a0ff08d8
Merge pull request #141551 from astro/collectd-plugin-config 2021-11-10 20:11:24 +01:00
Astro 19fc2904f3 nixos/collectd: give plugins option a mergeable type 2021-11-08 17:09:56 +01:00
Bas van Dijk 7f7780daa5 nixos/prometheus: throw a helpful error when services.prometheus.environmentFile is defined 2021-11-07 19:04:24 +00:00
Bas van Dijk 0e4abb0df7 nixos/prometheus: remove services.prometheus.environmentFile 
The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
 2021-11-07 14:45:40 +00:00
Yannik Rödel 7d34d32b3d nixos/prometheus: add remaining service discovery options 2021-11-05 12:18:13 +01:00
Yannik Rödel b3d4f6d841 nixos/prometheus: add service discovery options 2021-11-04 15:07:18 +00:00
Yannik Rödel 904d29e1c4 nixos/prometheus: add new configuration options 2021-11-04 15:02:00 +00:00
Bas van Dijk 0140e239f3
Merge pull request #143147 from basvandijk/prometheus-reload 
nixos/prometheus: optionally support reloading on config changes
 2021-11-04 13:54:18 +01:00
Bas van Dijk f12e976ade module/prometheus: optionally support reloading on config changes 
The new option `services.prometheus.enableReload` has been introduced
which, when enabled, causes the prometheus systemd service to reload
when its config file changes.

More specifically the following property holds: switching to a
configuration (`switch-to-configuration`) that changes the prometheus
configuration only finishes successully when prometheus has finished
loading the new configuration.

`enableReload` is `false` by default in which case the old semantics
of restarting the prometheus systemd service are in effect.
 2021-11-04 11:15:21 +00:00
Pascal Bach b01c019afd
Merge pull request #136191 from LeSuisse/nixos-unifi-poller-loki 
nixos/unifi-poller: add support of Loki
 2021-11-03 08:25:13 +01:00
Alexandre Iooss 8d559672be
nixos/grafana: fix systemd unit 
Remove MemoryDenyWriteExecute hardening as it breaks image rendering
plugin. Add CAP_NET_BIND_SERVICE to bind to low ports when needed.
Remove PrivateUsers and ProcSubset as upstream choose to remove it.

Upstream changes: <https://github.com/grafana/grafana/pull/40219>,
<https://github.com/grafana/grafana/pull/40178>,
<https://github.com/grafana/grafana/pull/40339> and
<https://github.com/grafana/grafana/pull/40815>.
 2021-10-23 14:33:31 +02:00
Martin Weinelt 9b46e3084b
nixos/prometheus: add hardening exceptions to node-exporter 
Conditionally grants access for the logind, wifi and network_route
collectors.
 2021-10-18 19:21:30 +02:00
Alexandre Macabies 7fb3edb077 nixos/prometheus-rtl_433-exporter: fix systemd hardening 
9fea6d4c85 broke rtl_433-exporter by
introducing several hardening options which do not play well with
rtl_433 requiring writing to USB. More precisely, rtl_433 requires
(a) AF_NETLINK to configure the radio; (b) access to the USB device,
but PrivateDevices=true hides them; (c) rw access to the USB device,
but DeviceAllow= block-lists everything.

This commit was tested on real hardware with a standard NixOS setup.
 2021-10-16 01:57:50 +02:00
Matthias Treydte 72fbd63c5c nixos/prometheus: fix node exporter timex collector 
The timex collector (enabled by default) needs the
adjtimex syscall, which was disabled by
9fea6d4c85.

So allow it unless the timex collector is disabled.
 2021-10-14 11:26:29 +02:00
Matthias Treydte ae7ce180dd nixos/prometheus: fix node exporter systemd collector 
The systemd collector needs AF_UNIX to talk to
/var/run/dbus/system_bus_socket, which was broken
with 9fea6d4c85.

This commit allows AF_UNIX when needed.
 2021-10-14 11:26:29 +02:00
Arseniy Seroka cd53bf7acc
Merge pull request #140076 from jraygauthier/jrg/96633_fix-teamviewer-client-server-issue 
teamviewer: fix #96633, #44307 and #97148 + 15.15.5 -> 15.18.5 -> 15.22.3
 2021-10-12 20:58:56 +03:00
Alexandre Iooss 9fea6d4c85 nixos/prometheus: systemd unit hardening of exporters 2021-10-07 10:19:55 +02:00
Naïm Favier c53c69ab17
nixos: fixes after #136909 2021-10-05 12:48:43 +02:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Raymond Gauthier 953bbc0d73
nixos/teamviewer: fix issue #44307 
Move to a forefront launch of the daemon. Doing so allowed us
to move the service from forking to simple to avoid the
missing pid  error log.

Also:

 -  Make the dbus dependency explicit.
 2021-09-30 19:36:45 -04:00
Raymond Gauthier 200e959995
nixos/teamviewer: fix issue #96633 
Add teamviewer package as a dbus package now that the
client / server communication depends on dbus.
 2021-09-30 16:08:57 -04:00
Graham Christensen 6c88e85807
Merge pull request #133726 from deshaw/fastly-exporter 
prometheus-fastly-exporter: init at v6.1.0
 2021-09-27 11:09:33 -04:00
Souvik Sen 2f669293bf prometheus-fastly-exporter: init at v6.1.0 2021-09-21 04:05:18 -04:00
Izorkin 1e54f84012
nixos/netdata: fix working with disabled ipmi plugin 2021-09-19 19:15:49 +03:00
Guillaume Girol ceb2e6667b
Merge pull request #126289 from rnhmjoj/wrappers 
nixos/security/wrappers: make well-typed
 2021-09-18 15:28:49 +00:00
Guillaume Girol cd2b24c306 nixos/heapster: define group, fix after #133166 2021-09-18 14:42:08 +02:00
Guillaume Girol 3592034595
Merge pull request #133166 from symphorien/nonogroup 
Don't default to nogroup for the primary group of users.
 2021-09-13 18:29:21 +00:00
talyz 6496902fb2
nixos/parsedmarc: Add manual entry and release note 2021-09-13 13:57:17 +02:00
talyz 98d9617705
nixos/parsedmarc: Add NixOS module 2021-09-13 13:57:06 +02:00
rnhmjoj fedd7cd690
nixos: explicitely set security.wrappers ownership 
This is slightly more verbose and inconvenient, but it forces you
to think about what the wrapper ownership and permissions will be.
 2021-09-13 13:48:13 +02:00
Sandro a79648dd7f
Merge pull request #136109 from john-consumable/master 2021-09-13 00:42:54 +02:00
Guillaume Girol bc3bca822a nixos: define the primary group of users where needed 2021-09-12 14:59:30 +02:00
John Soo a51ee771be nixos/datadog-agent: Update process collection binary. 2021-09-11 15:32:14 -07:00
Alyssa Ross c9ce275aa4
treewide: "does not exists" -> "does not exist" 
I noticed this minor grammar mistake when running update.nix, and then
while grepping to find the source I noticed we had it a few times in
Nixpkgs.  Just as easy to fix treewide as it was to fix the one
occurrence I noticed.
 2021-09-09 18:45:33 +00:00
Alexandre Iooss bbc51efb46 nixos/grafana: systemd unit hardening 2021-09-08 10:43:46 +02:00
Thomas Gerbet 36c179b208 nixos/unifi-poller: add support of Loki 
Since the v2.0.2 unifi-poller supports Loki [0][1], this contribution
adds the options so it can be used.

[0] https://github.com/unpoller/unpoller/releases/tag/v2.0.2-beta1
[1] https://unpoller.com/docs/dependencies/loki/
 2021-08-30 16:54:32 +02:00
Leo Maroni 2163af5167 nixos/grafana: start systemd service after database 2021-08-26 07:06:59 +09:00
Robert Hensing 1f20a1097d treewide: runCommandNoCCLocal -> runCommandLocal 
It has always been a synonym.
 2021-08-15 17:36:41 +02:00
Robert Hensing fbafeb7ad5 treewide: runCommandNoCC -> runCommand 
This has been synonymous for ~5y.
 2021-08-15 17:36:41 +02:00
Guillaume Girol 582a9c13b5 nixos/tests/nagios.nix: fix eval 2021-08-08 12:00:00 +00:00
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