JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,611 Commits 2 Branches 0 Tags 13 GiB
d7cb79a1ef
Commit Graph

234 Commits

Author SHA1 Message Date
Michael Raskin
7e19fcddcc Merge pull request #24366 from rvl/longview-password-file 
longview service: don't write passwords to nix store
 2017-05-01 09:39:35 +02:00
Michael Raskin
01ba1a40d3 Merge pull request #24341 from LumiGuide/cadviser-storageDriverPasswordFile 
cadviser: add storageDriverPasswordFile option
 2017-05-01 02:01:49 +02:00
Bjørn Forsman
c282de7103 nixos/munin: remove duplicated /run/current-system/sw/bin path 
A side effect of commit ff21171921
("Fix references to current-system/sw/sbin"). It changed "sbin" to "bin"
but didn't check for duplicates.
 2017-04-30 21:04:51 +02:00
Andrew Martin
e289b94fbe graphite service: no recursive chown when starting (#24442) 
Fixes #24444
 2017-04-27 17:33:42 +02:00
John Ericson
37e5e71fdf Merge pull request #24974 from Ericson2314/mapNullable 
Introduce `mapNullable` into lib and use it in a few places
 2017-04-17 17:12:14 -04:00
John Ericson
85aa5005af Introduce mapNullable into lib and use it in a few places 
Also simply some configure flag logic my grep also alerted me too.
 2017-04-17 17:04:04 -04:00
Franz Pletz
3ab45f4b36
treewide: use boolToString function 2017-04-11 18:18:53 +02:00
Franz Pletz
4f0dd2f746
prometheus service: add scrapeConfigs.params option 2017-04-10 14:31:27 +02:00
Bas van Dijk
2030a91f58 cadviser: add storageDriverPasswordFile option 
This gives users the option of storing the storageDriverPassword outside the
world-readable Nix store.
 2017-04-08 14:15:18 +02:00
Rodney Lorrimar
db14ea3926 longview service: don't write passwords to nix store 
Adds services.longview.{apiKeyFile,mysqlPasswordFile} options as
alternatives to apiKey and mysqlPassword, which still work, but are
deprecated with a warning message.

Related to #24288.
 2017-03-26 23:06:42 +01:00
Jörg Thalheim
b4169bb8dd
munin: fix tests by replacing cron with systemd timer 2017-03-22 00:16:36 +01:00
Franz Pletz
9536169074
nixos/treewide: remove boolean examples for options 
They contain no useful information and increase the length of the
autogenerated options documentation.

See discussion in #18816.
 2017-03-17 23:36:19 +01:00
Pascal Bach
3728143cbc prometheus-unifi-exporter: init at 0.4.0 2017-03-17 15:41:22 +01:00
Pascal Bach
a8cca7037e prometheus-fritzbox-exporter: init at 1.0 2017-03-15 17:22:36 +01:00
Gregor Kleen
899fd868ea das_watchdog: fix service type 2017-03-09 16:14:17 +01:00
Benjamin Staffin
1c555e772e Merge pull request #23155 from doshitan/fix-prometheus-basic-auth 
prometheus service: fix basic auth option
 2017-02-24 15:08:35 -05:00
Tanner Doshier
b846ce5243 prometheus service: fix basic auth option 
If some configuration is provided, we need to filter out the `_module` key or
else it breaks prometheus.
 2017-02-24 13:32:01 -06:00
Jörg Thalheim
0338817f62 vnstat: provide full path of "kill" in ExecReload 2017-02-21 09:26:25 +00:00
florianjacob
c23c2c50de munin service: listen on IPv6 loopback as well (#23012) 
munin service: listen on IPv6 loopback as well
 2017-02-20 06:13:48 +01:00
Franz Pletz
188526da3d
prometheus.blackboxExporter service: add CAP_NET_RAW 
The blackbox-exporter for prometheus needs CAP_NET_RAW for sending icmp
probes.
 2017-02-15 09:35:27 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Rickard Nilsson
cda4a4dcfc nixos/grafana: Don't print password warning if no password has been set 2017-02-13 23:11:40 +01:00
Parnell Springmeyer
6777e6f812
Merging with upstream 2017-01-29 05:54:01 -06:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Michael Peyton Jones
46c0da1818 arbtt: multi-user.target does not exist in user systemd 2017-01-28 14:29:19 +00:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Kai
25d86bdd10 vnstat service: init (#19809) 2017-01-24 14:45:01 +01:00
Daiderd Jordan
2b2b0b566d Merge pull request #20183 from womfoo/init/netdata-service 
netdata service: init
 2017-01-20 21:05:10 +01:00
Bjørn Forsman
d2413943fa nixos/prometheus: add configText option for alertmanager 
The reason being less mental overhead when reading upstream
documentation. Examples can be pasted right into the configuration
instead of translating to Nix attrset first.
 2017-01-14 15:41:05 +01:00
Jörg Thalheim
62708c29f8 Merge pull request #21570 from michaelpj/services/arbtt 
arbtt service: init
 2017-01-11 22:27:52 +01:00
oida
d423567a95
prometheus-snmp-exporter: added nixos module 2017-01-09 18:05:28 +01:00
Robin Gloster
575afe3fa7
prometheus exporter modules: unify firewall handling 2017-01-09 15:31:37 +01:00
Corbin
618b249fc5 prometheus module: add blackboxExporter 2017-01-09 15:20:26 +01:00
Corbin
bd45d5fe8d prometheus module: add jsonExporter 2017-01-09 15:20:26 +01:00
Corbin
1b839a586b prometheus module: add varnishExporter 2017-01-09 15:20:26 +01:00
Corbin
363fa27448 promeutheus.nginxExporter: add improvements 
- use ExecStart and ExecReload
 - add extraFlags
 2017-01-09 15:20:26 +01:00
Robin Gloster
39e8eaf8b6 prometheus module: add nginxExporter 2017-01-09 15:20:26 +01:00
Michael Peyton Jones
10e2d88f6c arbtt service: init 2017-01-01 18:59:01 +00:00
Bjørn Forsman
9ec867f59f nixos/prometheus: unbreak alertmanager default config 
The current default value of listenAddress = null blows up:

  $ nixos-rebuild build
  error: cannot coerce null to a string, at
  .../nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix:97:16

With listenAddress = "" we use the same default as upstream and there is
no blow up :-)
 2016-12-28 13:52:15 +01:00
lassulus
cfbe501d4e nixos/graphite: fix beacon config parameter 2016-12-27 19:38:18 +01:00
Bjørn Forsman
b20fdff521 nixos/prometheus: make scrapeConfigs.*.static_configs.*.labels optional 
...by providing a default value of "no labels" (an empty attrset).

Without this change we get

  $ nixos-rebuild test -I nixpkgs=.
  building Nix...
  building the system configuration...
  error: The option `services.prometheus.scrapeConfigs.[definition 1-entry 1].static_configs.[definition 1-entry 1].labels' is used but not defined.

which is unneeded, because labels _are_ optional.
 2016-12-25 15:38:55 +01:00
Bjørn Forsman
caa476b357 nixos/prometheus: add services.prometheus.configText option 
The structured options are incomplete compared to upstream and I think
it will be a maintenance burden to try to keep up. Instead, provide an
option for the raw config file contents (prometheus.yml).
 2016-12-21 00:32:24 +01:00
Bjørn Forsman
ebe67d69d0 collectd service: change /var/lib/collectd perms: 700 -> 755 
The collectd service runs as an unprivileged user by default, so it does
not leak more information to its data directory than any user can obtain
elsewhere by other means.

If people are running it as root and are worried about information leak,
we can add collectd group and set perms to 750.

CC @offlinehacker.

Fixes #21198.
 2016-12-16 23:04:42 +01:00
Corbin Simpson
27f1def068 nixos/collectd: Fix syntax error on some hostnames. (#20694) 
Without this, hostnames that e.g. end in digits will cause syntax errors for
collectd.
 2016-11-24 21:47:17 +01:00
Kranium Gikos Mendoza
2715222f0c netdata service: init 2016-11-10 16:12:52 +08:00
Emery Hemingway
b675619391 nixos: use types.lines for extraConfig 2016-10-23 19:41:43 +02:00
Jörg Thalheim
5f886fb8cb Merge pull request #19262 from chris-martin/riemann-health-ps 
Fix riemann-health service (add missing procps dependency)
 2016-10-20 22:11:43 +02:00
oida
725e04cc01
prometheus module: added default option values for relabel_config 2016-10-09 11:37:33 +02:00