mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
96424 commits 218 branches 122 tags 7.1 GiB
Commit graph

187 commits

Author SHA1 Message Date
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
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
Joachim Fasting b38c0c94ab graphite service: network-interfaces.target -> network.target 2016-09-13 11:19:22 +02:00
Eric Sagnes 981df6387c ups module: optionSet -> submodule 2016-09-13 12:53:10 +09:00
Eric Sagnes 06c11a62b3 smartd module: optionSet -> submodule 2016-09-13 12:53:10 +09:00
Franz Pletz 80f38e9032
prometheus service: move to separate folder 2016-09-11 23:20:26 +02:00
Franz Pletz 5a7e5537aa Merge pull request #18298 from teh/prometheus-service 
Prometheus service
 2016-09-11 23:18:36 +02:00
Alexander Ried 27bc34f1e4 treewide: deprecate ip-up.target (#18319) 
Systemd upstream provides targets for networking. This also includes a target network-online.target.

In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
 2016-09-10 18:03:59 +02:00
Tom Hunger d459916501 prometheus service: rename values to match prometheus 1.0 naming. 2016-09-04 20:03:45 +01:00
Benjamin Staffin 58869cf310 prometheus service: add 
This is based on @benleys work: https://github.com/NixOS/nixpkgs/pull/8216
I updated changed the user and group ids.
 2016-09-04 20:03:32 +01:00
Tuomas Tynkkynen c73aa79a8f graphite service: Use correct output of cairo 2016-08-23 03:20:21 +03:00
Corbin 09e75a4c29 services/graphite: Fix paths to some Python packages. 
Unbreaks some private Graphite deployments.
 2016-08-17 21:14:31 -07:00
Rob Vermaas 9494b764d2 dd-agent: support jmx, needs a separate daemon nowadays. 
(cherry picked from commit 1425a1f964)
 2016-07-29 12:42:07 +00:00
Franz Pletz febcd39afa nixos/grafana: set plugins path, fix image generation 
Also add options to configure which organization should have anonymous access.
 2016-07-19 00:18:12 +02:00
Graham Christensen d3d7f43f76
sysstat: Create systemd service for historical sar data 
Every period, sa1 collects and stores data.
Every 24 hours, sa2 aggregates the previous day's data in to a
report.

Timers and unit configurations were lifted from Fedora's default
units.
 2016-07-12 16:19:40 -05:00
Kamil Chmielewski 437ea9fd37 Fixes #16181 - using bin output for Go services 2016-06-13 23:32:16 +02:00
Franz Pletz df8958435e grafana: 2.6.0 -> 3.0.1 (#15395) 
* grafana: 2.6.0 -> 3.0.1

* grafana module: Fix anonymous auth & add analytics config
 2016-05-13 02:28:24 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
makefu 626bfce3b8 graphite: fix carbonCache graphiteWeb graphiteApi 
This commit implements the changes necessary to start up a graphite carbon Cache
with twisted and start the corresponding graphiteWeb service.
Dependencies need to be included via python buildEnv to include all recursive
implicit dependencies.

Additionally cairo is a requirement of graphiteWeb and pycairo is not a standard
python package (buildPythonPackage) and therefore cannot be included via
buildEnv. It also needs cairo in the Library PATH.
 2016-03-12 02:02:04 +01:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Bjørn Forsman d99033beb9 grafana service: unbreak 
Accidentally broken by 4fede53c09
("nixos manuals: bring back package references").

Without this fix, grafana won't start:

$ systemctl status grafana
...
systemd[1]: Starting Grafana Service Daemon...
systemd[1]: Started Grafana Service Daemon.
grafana[666]: 2016/03/06 19:57:32 [log.go:75 Fatal()] [E] Failed to detect generated css or javascript files in static root (%!s(MISSING)), have you executed default grunt task?
systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE
systemd[1]: grafana.service: Unit entered failed state.
systemd[1]: grafana.service: Failed with result 'exit-code'.
 2016-03-06 21:16:47 +01:00
Franz Pletz fde23a01b4 nixos/collectd: Fix package option 
Commit ed979124ca was missing some code.
 2016-02-28 14:55:58 +01:00
Vladimír Čunát 3cf9cd8bc3 Merge #12796: nixos docs: show references to packages 
(version 2) A better implementation of #10039, after #12357.
This time I did more thorough checking.

See commit messages for details.
 2016-02-27 10:48:12 +01:00
Emery b16dc8dcc5 New hdapsd module 2016-02-24 21:51:13 +01:00
Bjørn Forsman b2b1511353 nixos/collectd: add defaultText to package option 
CC @fpletz
 2016-02-18 20:30:05 +01:00
Franz Pletz ed979124ca collectd service: Add option package 2016-02-18 03:44:55 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Vladimír Čunát 4fede53c09 nixos manuals: bring back package references 
This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
 2016-02-03 14:47:14 +01:00
Guillaume Maudoux 9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Vladimír Čunát 889351af8b Revert "Merge #12357: nixos docs: show references to packages" 
The PR wasn't good enough yet.
This reverts commit b2a37ceeea, reversing
changes made to 7fa9a1abce.
 2016-02-03 12:16:33 +01:00
Vladimír Čunát b2a37ceeea Merge #12357: nixos docs: show references to packages 2016-02-03 10:07:27 +01:00
Eelco Dolstra bfebc7342e Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt 2016-01-29 02:32:05 +01:00
Tuomas Tynkkynen 96372f2edb treewide: Mass replace 'cairo}/lib' to refer the 'out' output 2016-01-24 10:03:33 +02:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00