3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

994 commits

Author SHA1 Message Date
Ryan Lahfa f8dd03989e
Merge pull request #208038 from SuperSandro2000/uptime-kuma-apprise
nixos/uptime-kuma: add option to enable apprise support
2023-01-15 17:59:00 +01:00
Sandro fa8ae2120d
Merge pull request #208715 from elohmeier/prom-rspamd-fix
Fixes https://github.com/NixOS/nixpkgs/issues/210390
2023-01-15 02:49:52 +01:00
pennae 53fc887582 nixos/manual: move "edit the MD file" comments to generated XML 2023-01-10 12:34:37 +01:00
pennae bf92eaebe4 nixos/manual: generate module chapters with md-to-db.sh 2023-01-10 10:32:00 +01:00
pennae dc7788efb8 nixos/manual: regenerate chapter xml files
apparently pandoc has changed behavior over the past releases, so the
files are no longer in sync. occasionally this requires edits
to the markdown source to not remove an anchor that was there
before (albeit wth a very questionable id), or where things were simply
being misrendered due to syntax errors.
2023-01-10 10:31:59 +01:00
pennae 23ea73b416 nixos/manual: enable smart quotes for all MD chapters 2023-01-10 10:31:59 +01:00
pennae ce319f60ad nixos/prometheus/exporters: convert manual chapter to MD 2023-01-10 10:31:57 +01:00
Ross Gardiner b199b821c2 nixos/grafana: fix spelling 2023-01-09 13:02:36 +01:00
Sandro Jäckel 5703c16118
nixos/uptime-kuma: add option to enable apprise support 2023-01-06 16:51:18 +01:00
Bjørn Forsman 295c552dc9 nixos/apcupsd: wrap CLI with "-f ${configFile}"
This ensures that the CLI is in sync with the service configuration.

(I tried building apcupsd with --sysconfdir=/etc instead, but it wants
to install stuff there at build time, so I backed out.)

Fixes https://github.com/NixOS/nixpkgs/issues/208204.
2023-01-04 21:45:58 +01:00
Enno Richter ed060ff92b prometheus-exporters: update rspamd exporter for prometheus-json-exporter >=0.5.0 2023-01-02 06:36:22 +01:00
Moritz 'e1mo' Fromm 59c28cab1c
nixos/parsedmarc: follow upstream configuration
> Starting in version 8.0.0, most options from the `imap` section have
been moved to the `mailbox` section.

6b2131f0e8
2022-12-31 16:42:41 +01:00
figsoda 403c65ab00
Merge pull request #207875 from SuperSandro2000/nixos-kuma-fix-link
nixos/uptime-kuma: fix link
2022-12-29 10:18:21 -05:00
Sandro de1b8b9c0f
Update nixos/modules/services/monitoring/uptime-kuma.nix
Co-authored-by: figsoda <figsoda@pm.me>
2022-12-29 15:41:04 +01:00
Sandro Jäckel 7e0588b2fb
nixos/grafana: listen on localhost by default (again) 2022-12-29 03:00:14 +01:00
Sandro 9bc0aeb745
nixos/uptime-kuma: fix link 2022-12-26 21:52:30 +01:00
Maximilian Bosch f37f1de422
Merge pull request #204537 from squalus/grafana-role
nixos/grafana: add Admin to valid auto_assign_org_role values
2022-12-20 21:14:47 +01:00
Sandro bf46d7b626
Merge pull request #172084 from priegger/prometheus-statsd-exporter 2022-12-19 23:16:02 +01:00
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
squalus ef90ce7093 nixos/grafana: add Admin to valid auto_assign_org_role values 2022-12-04 13:10:19 -08: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