Commit Graph

179 Commits

Author SHA1 Message Date
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
Domen Kožar
b4e2172ad4 fix munin (and the test), refs #12801 #13999
(cherry picked from commit 7877e33af8c0ec7f3a91c650ae4da6288b7dfe49)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-03-28 10:26:35 +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
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Franz Pletz
70e47ab981 grafana: 2.5.0 -> 2.6.0 2016-01-08 17:19:02 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Vladimír Čunát
adb2b803b9 net-snmp: avoid nested list, /cc #11739 2015-12-17 12:35:15 +01:00
michael bishop
88bccd83fe
net-snmp: fix mnttab path when built under chroot 2015-12-15 08:45:58 -04:00
Luca Bruno
cf4b503692 net-snmp: fix references to openssl in multiple-outputs 2015-12-07 16:32:58 +01:00
Rodney Lorrimar
96f81e3be5 longview: Linode metrics collector
Longview is a perl script used for sending server metrics to Linode
virtual private server hosting.
2015-11-22 12:37:00 +00:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
Jaka Hudoklin
7955be7a82 Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
2015-11-17 17:17:44 +01:00
Jaka Hudoklin
0667fe29c9 Merge pull request #11061 from offlinehacker/nixos/heapster/add
heapster module: init
2015-11-17 17:17:01 +01:00
Jaka Hudoklin
15c76d17fe heapster: init at 3057a2c07061c8d9ffaf77e5442ffd7512ac0133 2015-11-16 16:58:09 +01:00
Jaka Hudoklin
abda14309f grafana: 2.0.0-beta1 -> 2.5.0 2015-11-16 14:59:16 +01:00
Jaka Hudoklin
c8d1e900d6 bosun: 0.3.0 -> 0.5.0-alpha 2015-11-16 14:23:54 +01:00
William A. Kennington III
8fe216dd3e bosun: Move to go-packages 2015-09-04 21:11:42 -07:00
Benjamin Staffin
395c268ab7 prometheus-statsd-bridge: fold into go-packages.nix 2015-08-30 00:26:10 -07:00
Benjamin Staffin
d17a29a150 prometheus-pushgateway: fold into go-packages.nix 2015-08-30 00:22:09 -07:00
Benjamin Staffin
4c95e49593 prometheus-node-exporter: fold into go-packages.nix 2015-08-30 00:16:00 -07:00
Benjamin Staffin
6122488297 prometheus-nginx-exporter: fold into go-packages.nix 2015-08-30 00:12:09 -07:00
Benjamin Staffin
4f53847ca2 prometheus-mysqld-exporter: fold into go-packages.nix 2015-08-29 23:51:19 -07:00
Benjamin Staffin
52dd6ea9d9 prometheus-mesos-exporter: fold into go-packages.nix 2015-08-29 23:47:13 -07:00
Benjamin Staffin
9001ad4106 prometheus-haproxy-exporter: fold into go-packages.nix 2015-08-29 23:37:48 -07:00
Benjamin Staffin
c5b6f17e1c prometheus-collectd-exporter: fold into go-packages.nix 2015-08-29 23:30:27 -07:00
Benjamin Staffin
fe5a2b0a39 prom2json: fold into go-packages.nix 2015-08-29 23:19:48 -07:00
Benjamin Staffin
853602fae5 prometheus-cli: fold into go-packages.nix 2015-08-29 23:17:13 -07:00
Benjamin Staffin
87655d9fe8 prometheus-alertmanager: fold into go-packages.nix 2015-08-29 22:55:22 -07:00
Benjamin Staffin
d74e65bd6f prometheus: fold definition into go-packages.nix 2015-08-29 22:46:57 -07:00
Benjamin Staffin
ff03cf23c6 prometheus-*: trivial cleanup 2015-08-29 22:30:26 -07:00
Benjamin Staffin
e734ce05b8 prometheus-pushgateway: move go-bindata into nativeBuildInputs
Thereotically make life easier for a future cross-compilation path.
2015-08-29 22:13:51 -07:00
Benjamin Staffin
94407ad644 prometheus-alertmanager: streamline build, prune buildInputs
It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
2015-08-29 22:13:51 -07:00
Benjamin Staffin
a480bd89dc prometheus-*: fixes to deal with goPackages multiple-outputs changes 2015-08-29 22:13:51 -07:00
Benjamin Staffin
96882b14d5 prometheus: Include console templates and libraries
Also tweaked to work with the recent goPackages multiple-outputs stuff.
2015-08-29 22:13:51 -07:00
Benjamin Staffin
86eca38b0c prometheus: 0.14.0 -> 0.15.1 2015-08-29 00:19:22 -07:00
Rickard Nilsson
3afc387b4a scollector: Update from 20150506172827 to 0.3.0 2015-08-11 13:46:17 +02:00
Rickard Nilsson
9f7cfea070 bosun: Update from 0.2.0 to 0.3.0 2015-08-11 13:46:17 +02:00
Benjamin Staffin
bcf990c7fd prometheus-alertmanager: 0.0.1 -> 0.0.4 2015-07-04 14:05:32 -07:00
Benjamin Staffin
a9c403d38b prometheus-node-exporter: 0.8.1 -> 0.10.0 2015-07-04 14:05:32 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Pascal Wittmann
512225ef81 Fixed some descriptions 2015-06-29 16:20:58 +02:00
Rickard Nilsson
03e4e3e92a bosun: Update to 0.2.0 2015-06-11 19:55:33 +02:00
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
lethalman
6e0ca8cd11 Merge pull request #8122 from benley/prometheus-0.14
Prometheus: update to 0.14.0
2015-06-03 11:09:44 +02:00
Benjamin Staffin
3309a15be9 New package: prometheus-nginx-exporter
Adding to the growing collection of prometheus tools...
2015-06-01 15:32:51 -07:00
Benjamin Staffin
23bc70208c Prometheus: update to 0.14.0 2015-06-01 15:28:47 -07:00
Benjamin Staffin
c40c1be798 prometheus-mesos-exporter: Fix misplaced dependencies
goPackages.mesos-stats doesn't actually have any dependencies of its
own; the mesos_exporter app does.
2015-05-30 11:50:59 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Benjamin Staffin
d3fe5487ad New package: prometheus-collectd-exporter 2015-05-24 14:33:39 -07:00