3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

974 commits

Author SHA1 Message Date
Franz Pletz 6f8f1b0454
Merge pull request #205865 from DeeUnderscore/fix/grafana-socket 2022-12-19 12:04:22 +01:00
figsoda 6bb0dbf91f nixos: fix typos 2022-12-17 19:31:14 -05:00
Shawn8901 6e530b9eda prometheus: Adds an option for web.config.file which can specity settings including authorization. 2022-12-15 10:14:42 +01:00
Shawn8901 470247d433 prometheus: Use yaml format generator instaed json for prometheus.yml
Additionally remove an unused variable
2022-12-15 10:11:25 +01:00
D Anzorge 9be81d0acf nixos/grafana: allow @chown syscalls when using unix sockets
Grafana will unconditionally call chown on the socket after creating it,
even if the configuration does not ask for a different socket gid.
2022-12-13 02:47:50 +01:00
Bobby Rong 9015c9f389
Merge pull request #205525 from SuperSandro2000/prometheus2
nixos/alertmanager: fix renamed option
2022-12-12 18:08:36 +08:00
Sandro Jäckel a49606696e
nixos/alertmanager: fix renamed option 2022-12-10 20:11:18 +01:00
Martin Weinelt fdcc9e8202
nixos/prometheus.exporters.smartctl: Simplify DeviceAllow logic
Setting up the DeviceAllow list with explicitly configured devices was a
nice idea, but sometimes a configured device (`/dev/nvme0n1` an NVMe
namespace) has a parent device (`/dev/nvme0`) that smartctl needs to
access to query metrics.

Falling back to the block and character definitions is probably a valid
fallback.
2022-12-09 01:40:01 +01:00
Sergey Lukjanov a49feed255 nixos/prometheus.exporters.smartctl: use cli args instead of config
Config support was dropped and replaced with CLI args
2022-12-08 15:31:33 -08:00
Naïm Favier 0ff3b35356 nixos/doc: fix some options 2022-12-08 17:52:52 +01:00
Daniel Nagy ad866e565d
treewide: switch to port type for nixos modules 2022-12-08 00:00:00 +01:00
Luke Granger-Brown c7918fed9e nixos/prometheus/unifi-poller: rename to unpoller. 2022-12-03 20:12:54 +00:00
Luke Granger-Brown ffcd97b521 nixos/unifi-poller: rename to unpoller. 2022-12-03 20:12:54 +00:00
Sandro 068e7cb340
Merge pull request #201817 from jhh/nut-exporter 2022-12-03 02:22:48 +01:00
Daniel Nagy dbe8182e74
treewide: switch to port type for nixos modules 2022-12-01 22:30:00 +01:00
Sandro 03b9249971
Merge pull request #202087 from Shawn8901/pve-load-credential 2022-11-28 23:17:26 +01:00
Jeff Hutchison a587e528c5
Add prometheus-nut-exporter module 2022-11-24 07:50:09 -05:00
Mathieu Fenniak eed28ead0c Workaround for upstream crash when !datadog 2022-11-23 12:58:07 -07:00
Mathieu Fenniak e7f761fe60 Fix executable name 2022-11-23 10:31:46 -07:00
Shawn8901 5ed08d83f7 nixos/prometheus-pve-exporter: Use LoadCredentials to make configFiles readable to DynamicUser 2022-11-21 20:20:50 +01:00
Maximilian Bosch 98cadbcf70
nixos/grafana: review fixes 2022-11-20 19:54:44 +01:00
Maximilian Bosch 6ee5ae3e48
nixos/grafana: make warning more clear 2022-11-20 18:21:41 +01:00
Maximilian Bosch 9d7e9c5965
nixos/grafana: allow using both directories or single YAML files for non-Nix provisioning 2022-11-20 18:21:41 +01:00
Maximilian Bosch 2f1dfb0db3
nixos/grafana: fix w/o datasources or dashboard provisioning 2022-11-20 18:21:41 +01:00
Maximilian Bosch 4ec456b725
nixos/grafana: fix secret-related warnings
Closes #198646

* The options `password`/`basicAuthPassword` were removed for
  datasources in Grafana 9. The only option to declare them now is to use
  `secureJsonData`.
* Fix description for contactPoints provisioning: when using file/env
  providers, nothing will be leaked into the store.
* Fix regex in file-provider usage check: it's also possible to either
  use `$__env{FOO}` or `$FOO` to fetch secrets from the environment.
* Fix warning for datasources: `password`/`basicAuthPassword` was
  removed, also check for each setting in `secureJsonData` if
  env/file-provider was used (then no warning is needed!).
2022-11-20 18:21:40 +01:00
Maximilian Bosch 45e1ce7e3a
nixos/grafana: get rid of unnecessary flatten for warnings 2022-11-20 18:21:39 +01:00
Maximilian Bosch 25b5824696
nixos/grafana: mark services.grafana.extraOptions as removed 2022-11-20 18:21:38 +01:00
Maximilian Bosch 957e368f3d
nixos/grafana: provision.{datasources,dashboards} can't be a list anymore
The hack with `either` had the side-effect that the sub-options of the
submodule didn't appear in the manual. I decided to remove this because
the "migration" isn't that hard, you just need to fix some module
declarations.

However, `mkRenamedOptionModule` wouldn't work here because it'd create
a "virtual" option for the deprecated path (i.e.
`services.grafana.provision.{datasources,dashboards}`), but that's the
already a new option, i.e. the submodule for the new stuff.

To make sure that you still get errors, I implemented a small hack using
`coercedTo` which throws an error if a list is specified (as it would be
done on 22.05) which explains what to do instead to make the migration
easier.

Also, I linkified the options in the manual now to make it easier to
navigate between those.
2022-11-20 18:21:35 +01:00
happysalada 4a3aa6ff98 tremor-rs: module init 2022-11-19 11:41:21 -05:00
Franz Pletz 8cc2dcce7d
Merge pull request #199524 from ymarkus/zfs-exporter
nixos/prometheus-zfs-exporter: init
2022-11-11 02:01:13 +01:00
Franz Pletz 286f868a5c
Merge pull request #162057 from jdheyburn/jdheyburn-unifi-prometheus-exporter-loki 2022-11-11 01:31:41 +01:00
Franz Pletz 8e9f00682d
nixos/prometheus-zfs-exporter: mdDoc descriptions 2022-11-11 01:29:10 +01:00
Daniel Nagy b4674b39c1
treewide: use mkEnableOption in nixos modules 2022-11-10 09:30:00 +01:00
Daniel Nagy 095269c862
treewide: use types.port in nixos modules 2022-11-10 09:30:00 +01:00
Robert Hensing 93a905ec4f
Merge pull request #194759 from hercules-ci/fqdn-or-hostname
nixos: Add `networking.fqdnOrHostName`
2022-11-09 13:53:57 +01:00
Maximilian Bosch dcb32beda0
nixos/prometheus: fix startup w/hardened service
See the discussion below the original PR[1] and #197443 for more
context.

I guess I missed that upon review because the branch was too old and I
cherry-picked the commit onto my deployment branch which is based on
22.05. Sorry for that!

[1] https://github.com/NixOS/nixpkgs/pull/162784#issuecomment-1306848036
2022-11-08 17:46:35 +01:00
David Arnold 2aa5c8d3ab nixos/teamviewer: fix for non-NetworkManager environments 2022-11-07 19:54:25 +01:00
Maximilian Bosch 58227c4de0
Merge pull request #162784 from amarshall/prom-svc-harden
nixos/prometheus: Harden systemd service
2022-11-07 15:03:43 +01:00
Franz Pletz 7519cb2c7c
Merge pull request #198638 from KFearsoff/fix-node-exporter-netdev-collector
nixos/prometheus-node-exporter: fix netdev collect
2022-11-06 12:05:09 +01:00
Yannick Markus 50f308b059 nixos/prometheus-zfs-exporter: init 2022-11-04 14:43:01 +01:00
Sandro b99b28431c
Merge pull request #197987 from SuperSandro2000/grafana-socket 2022-10-31 01:45:42 +01:00
KFears b3782f29ff nixos/prometheus-node-exporter: fix netdev collect
Netdev collector needs AF_NETLINK permissions to work. It will fail with
the message "couldn't get netstats: socket: address family is not
supported by protocol" otherwise.
2022-10-30 14:59:05 +04:00
Yorick van Pelt af4a43e36a
treewide: convert fake octal ints to strings
These were being cast to strings later and then reinterpreted as
octal.
2022-10-28 17:23:44 +02:00
Martin Weinelt 96d7f29087
Merge pull request #176553 from MalteT/fix/smartctl-exporter-override 2022-10-27 15:50:54 +02:00
Sandro Jäckel 95a7b35b1c
nixos/grafana: add default value back to settings.server.socket 2022-10-27 00:53:46 +02:00
KFears f2e74bdf57 nixos/grafana: fix secrets-related warnings 2022-10-26 21:03:57 +04:00
MidAutumnMoon afb8d0e5a6
nixos/prometheus-smartctl: set proper SystemCallFilter 2022-10-25 16:47:09 +08:00
KFears f3cb29a5b8 nixos/grafana: fix issues with rfc42 refactoring 2022-10-24 19:31:50 +04:00
Maximilian Bosch f9afc634e3
Merge pull request #191768 from KFearsoff/grafana-rfc42
nixos/grafana: refactor for RFC42
2022-10-23 13:28:25 +02:00
Julien Malka b54ae5a868 nixos/uptime-kuma: init module 2022-10-23 12:44:16 +02:00