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
Chris Martin
57023aba3d
riemann-health service: add procps to path ( #19237 )
2016-10-05 10:52:15 -04:00
Joachim F
0906a0f197
Merge pull request #18491 from groxxda/network-interfaces
...
Replace Network-interfaces.target
2016-10-02 16:34:37 +02:00
Joachim F
7e80c42b0e
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
...
modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
0ida
619ab48988
prometheus: add options for alertmanager
2016-09-20 19:35:03 +02:00
0ida
fdded2c554
prometheus alertmanager module: init
2016-09-20 19:35:03 +02:00
Eric Sagnes
2d2c311304
cadvisor test: fix ( #18671 )
...
* influxdb module: add postStart
* cadvisor module: increase TimeoutStartSec
Under high load, the cadvisor module can take longer than the default 90
seconds to start. This change should hopefully fix the test on Hydra.
2016-09-16 22:06:16 +02:00
Robin Gloster
0201869418
prometheus.nodeExporter module: improve after feedback
...
cc @teh @groxxda @fpletz
2016-09-16 15:10:18 +02:00
zimbatm
7a6b860e1c
Merge pull request #18437 from Mic92/telegraf
...
Telegraf
2016-09-15 23:21:08 +01:00
Robin Gloster
55b8430f6f
Merge branch 'prometheus-node-exporter' of https://github.com/teh/nixpkgs into prometheus-nixos-exporter
2016-09-15 20:59:17 +02:00
Robin Gloster
e43a15720d
prometheus module: add nodeExporter submodule
2016-09-15 20:31:03 +02:00
Jörg Thalheim
8fddcad3f9
telegraf: init at 1.0.0
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2016-09-14 07:19:55 +02:00
Tom Hunger
0ded9a63a3
prometheus-node-exporter: Add module.
2016-09-13 11:28:45 +01:00
Alexander Ried
23ca90b013
monitoring.monit: get closer to upstream service definition
...
taken from
e02247e048/system/startup/monit.service.in
?at=master
2016-09-13 11:19:22 +02:00
Joachim Fasting
1a60210561
nagios service: network-interfaces.target -> network.target
2016-09-13 11:19:22 +02:00