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

944 Commits

Author SHA1 Message Date
Aaron Andersen
aca5d04f3e
Merge pull request #81179 from aanderse/zabbix 
zabbix: 3.0.29 -> 3.0.30, 4.0.17 -> 4.0.18, 4.4.5 -> 4.4.6
 2020-03-03 05:36:58 -05:00
WilliButz
eaef96093a
prometheus-nginx-exporter: 0.5.0 -> 0.6.0 (#81285) 
* prometheus-nginx-exporter: 0.5.0 -> 0.6.0

* nixos/prometheus-nginx-exporter: update for 0.6.0

Added new option constLabels and updated virtualHost name in the
exporter's test.
 2020-03-02 14:48:40 -05:00
WilliButz
e97dfe73bb
Merge pull request #80649 from Frostman/snmp_exporter-0.17.0 
snmp_exporter: 0.15.0 -> 0.17.0
 2020-02-28 11:54:44 +01:00
Aaron Andersen
9059f31e6f zabbix: 4.4.5 -> 4.4.6 2020-02-27 08:00:27 -05:00
Aaron Andersen
5d073b2fc7 zabbix: 4.0.17 -> 4.0.18 2020-02-27 07:58:18 -05:00
Aaron Andersen
cc81ca7ee2 zabbix: 3.0.29 -> 3.0.30 2020-02-27 07:57:13 -05:00
foxit64
19e98d1917 update telegraf 1.13.3 => 1.13.4 2020-02-26 11:46:35 +01:00
Netix (Espinet François)
9f0014b6f2
grafana: made phantomjs2 optional 
On servers especially, phantomjs2 pulls graphical dependencies which is unecessary.
This pathes enable the package to be linked/installed without
phantomjs2. Phantomjs2 is disabled by default since it has been deprecated in grafana https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/
 2020-02-25 20:36:47 +01:00
Sergey Lukjanov
5b80220d53 grafana: 6.6.1 -> 6.6.2 2020-02-20 08:33:16 -08:00
Sergey Lukjanov
bd3319d28c snmp_exporter: 0.15.0 -> 0.17.0 2020-02-20 08:12:32 -08:00
Sergey Lukjanov
c2dc35e6fe
prometheus: 2.15.2 -> 2.16.0 (#80105) 2020-02-14 14:45:21 -05:00
Benjamin Hipple
eb11feaa0b treewide: change fetchCargoTarball default to opt-out 
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
 2020-02-13 22:41:37 -08:00
Sergey Lukjanov
4965950365
prometheus: 2.14.0 -> 2.15.2 (#79400) 2020-02-06 21:36:39 -05:00
Maximilian Bosch
5e0b85b912
grafana: add myself as maintainer 2020-02-06 22:17:37 +01:00
WilliButz
13305343f5
grafana: 6.6.0 -> 6.6.1 2020-02-06 21:44:17 +01:00
Jörg Thalheim
2dbe2a60d7
Merge pull request #79259 from foxit64/master 
telegraf 1.13.2 -> 1.13.3
 2020-02-06 10:36:19 +00:00
Bruno Bigras
78ab6d338f prometheus-alertmanager: 0.19.0 -> 0.20.0 2020-02-05 23:38:05 -05:00
foxit64
d5fd6bb066 telegraf 1.13.2 -> 1.13.3 2020-02-05 11:34:30 +01:00
Franz Pletz
add880c5e8
prometheus-xmpp-alerts: init at 0.4.2 2020-02-01 15:04:01 +01:00
Aaron Andersen
609699bc95 zabbix: 4.4.4 -> 4.4.5 2020-01-30 21:56:29 -08:00
Aaron Andersen
768154aaed zabbix: 4.0.16 -> 4.0.17 2020-01-30 21:56:29 -08:00
Mario Rodas
9f53b1bd6a
Merge pull request #77903 from r-ryantm/auto-update/seyren 
seyren: 1.1.0 -> 1.5.0
 2020-01-29 21:53:51 -05:00
Robin Gloster
5f9e215214
Merge pull request #78612 from WilliButz/update-grafana 
grafana: 6.5.3 -> 6.6.0
 2020-01-29 14:07:12 +01:00
Jörg Thalheim
0218f30af5
telegraf: reference nixosTests 2020-01-28 14:08:38 +00:00
WilliButz
c24688e787
grafana: 6.5.3 -> 6.6.0 2020-01-27 15:37:53 +01:00
foxit64
bec01d8270 telegraf 1.12.1 -> 1.13.2 2020-01-27 12:51:45 +01:00
WilliButz
96de24cfdb
grafana-loki: 1.2.0 -> 1.3.0, patch distributor test 
Only include the loopback interface "lo" in the lifecycler configuration
of the distributor test.
 2020-01-22 23:44:32 +01:00
R. RyanTM
3c7da59aeb seyren: 1.1.0 -> 1.5.0 2020-01-17 10:47:56 +00:00
WilliButz
e0f9743c89
grafana: 6.5.2 -> 6.5.3 2020-01-15 15:13:30 +01:00
worldofpeace
a14e1e343b
Merge pull request #77078 from fgaz/facette/remove 
facette: remove
 2020-01-07 18:53:09 -05:00
Francesco Gazzetta
d56e84b9c4 facette: remove 
It never actually built within the sandbox, and it's now more difficult
to package than ever
 2020-01-07 16:12:49 +01:00
Symphorien Gibol
b40fc3a56b pynagsystemd: init at 1.2.0 
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
 2020-01-03 15:48:42 -08:00
Jonathan Ringer
d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Aaron Andersen
66bf75415f
Merge pull request #76551 from symphorien/nagios2 
nagios: various improvements
 2019-12-30 14:21:03 -05:00
Symphorien Gibol
cb38bf33e7 nagios: add nixos test 2019-12-30 16:41:18 +01:00
symphorien+git@xlumurb.eu
be25e45fc8 nagios: various improvements 
* structured config for main config file allows to launch nagios in
debug mode without having to write the whole config file by hand
* build time syntax check
* all options have types, one more example
* I find it misleading that the main nagios config file is linked in
/etc but that if you change the link in /etc/ and restart nagios, it
has no effect. Have nagios use /etc/nagios.cfg
* fix paths in example nagios config files, which allows to reuse it:
  services.nagios.objectDefs =
   (map (x: "${pkgs.nagios}/etc/objects/${x}.cfg")
   [ "templates" "timeperiods" "commands" ]) ++ [ ./main.cfg ]
* for the above reason, add mailutils to default plugins

Co-Authored-By: Aaron Andersen <aaron@fosslib.net>
 2019-12-30 16:40:52 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
8fb0e16133
munin: *Flags are lists 2019-12-30 12:15:29 +01:00
symphorien+git@xlumurb.eu
18090331d6 monitoring plugins: fix path to sudo and mailq 
this fixes check_mailq with postfix at least
 2019-12-29 15:45:13 -06:00
Jörg Thalheim
89c55c0a6d
net-snmp: split outputs (#76155) 
net-snmp: split outputs
 2019-12-25 06:27:55 +00:00
Aaron Andersen
8051289f19 zabbix: 4.4.3 -> 4.4.4 2019-12-23 13:19:07 -05:00
Aaron Andersen
051cda4854 zabbix: 4.0.15 -> 4.0.16 2019-12-23 13:18:32 -05:00
Aaron Andersen
7e66f5b923 zabbix: 3.0.28 -> 3.0.29 2019-12-23 13:17:23 -05:00
Mario Rodas
bce8090922
cadvisor: 0.34.0 -> 0.35.0 
Changelog: https://github.com/google/cadvisor/releases/tag/v0.35.0
 2019-12-22 00:00:00 -05:00
Jörg Thalheim
725f85e271
net-snmp: rename from net_snmp 2019-12-21 22:56:08 +00:00
Jörg Thalheim
a446ac2bb0
net-snmp: add multiple outputs to reduce closure size 2019-12-21 22:55:43 +00:00
Marek Mahut
2f3cd7dda7 alertmanager-bot: init at 0.4.0 2019-12-19 03:23:52 +00:00
Mario Rodas
9f2092b6a9
grafana-loki: fix build on darwin 2019-12-14 22:22:22 -05:00
WilliButz
95553b2cfd
grafana: 6.5.1 -> 6.5.2 2019-12-11 17:00:59 +01:00
Marek Mahut
cd979f45c8
Merge pull request #75386 from WilliButz/update-loki 
grafana-loki: 1.1.0 -> 1.2.0
 2019-12-10 22:42:13 +01:00
Mario Rodas
5e60ae8515
Merge pull request #75382 from r-ryantm/auto-update/riemann 
riemann: 0.3.4 -> 0.3.5
 2019-12-09 20:15:53 -05:00
WilliButz
3526e7deb0
grafana-loki: 1.1.0 -> 1.2.0 2019-12-09 19:12:53 +01:00
R. RyanTM
1dfd5f1f4b riemann: 0.3.4 -> 0.3.5 2019-12-09 09:53:25 -08:00
WilliButz
fa16b6a689
prometheus-nginx-exporter: 0.4.2 -> 0.5.0 2019-12-06 21:30:50 +01:00
Graham Christensen
d7ca8feaba
Merge pull request #74987 from delroth/prom-webui 
prometheus: bundle the webui assets and build the new React UI
 2019-12-06 08:03:33 -05:00
WilliButz
f659187525
grafana-loki: 1.0.0 -> 1.1.0 2019-12-05 16:37:08 +01:00
Maximilian Bosch
58aa380671
prometheus-wireguard-exporter: 3.2.1 -> 3.2.2 2019-12-04 23:12:13 +01:00
Pierre Bourdon
a5fc982ea5
prometheus: bundle the webui assets and build the new React UI 
v2.14 introduced a new experimental React UI and changed how web assets
are bundled with Prometheus. A separate pre-build command is required to
generate an asset bundle that gets statically linked into the Prometheus
binary.
 2019-12-04 15:44:22 +01:00
Aaron Andersen
503b5c9705 zabbix: drop 4.2.x series 2019-12-01 11:31:16 -05:00
Aaron Andersen
fb0c13d1dd zabbix: 4.4.1 -> 4.4.3 2019-12-01 11:30:41 -05:00
Aaron Andersen
640b67be76 zabbix: 4.0.14 -> 4.0.15 2019-12-01 11:29:26 -05:00
WilliButz
b8227da4c9
grafana: 6.5.0 -> 6.5.1 2019-11-28 12:46:24 +01:00
WilliButz
ce74c85ce7
grafana: 6.4.5 -> 6.5.0, build with go 1.13 2019-11-26 10:23:13 +01:00
Robin Gloster
39781e89a4
Merge pull request #74200 from WilliButz/update-varnish-exporter 
prometheus-varnish-exporter: 1.5.1 -> 1.5.2
 2019-11-27 17:30:10 +01:00
WilliButz
7176ca165b
prometheus-varnish-exporter: 1.5.1 -> 1.5.2 2019-11-25 22:23:54 +01:00
WilliButz
9edd7ad38f
prometheus-postgres-exporter: 0.7.0 -> 0.8.0 2019-11-25 21:59:42 +01:00
WilliButz
12c1f4b785 grafana: 6.4.4 -> 6.4.5 2019-11-25 09:02:06 -08:00
WilliButz
a3465d9d10
Merge pull request #73453 from mmahut/prometheus-nginxlog-exporter 
prometheus-nginxlog-exporter: init at 1.3.0
 2019-11-24 22:32:05 +01:00
Marek Mahut
693c27b111 grafana-loki: 0.4.0 -> 1.0.0 
Adding mmahut as maintaner
 2019-11-21 13:20:23 +01:00
Marek Mahut
6c692a29c8 prometheus-nginxlog-exporter: init at 1.3.0 2019-11-15 12:21:39 +01:00
Niklas Hambüchen
5245766158 consul-alerts: 0.5.0 -> 0.6.0 
Changelog: https://github.com/AcalephStorage/consul-alerts/releases/tag/v0.6.0
 2019-11-14 18:12:46 +01:00
Mario Rodas
c42f58233c
prometheus: 2.13.1 -> 2.14.0 
Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.14.0
 2019-11-13 04:20:00 -05:00
Renaud
4f3cfc3784
Merge pull request #72273 from Ma27/dnsmasq-exporter-bump 
prometheus-dnsmasq-exporter: 0.1.0 -> 0.2.0
 2019-11-13 13:34:59 +01:00
WilliButz
ef1d31e53c
prometheus-blackbox-exporter: 0.15.1 -> 0.16.0, disable tests 2019-11-11 19:49:38 +01:00
Maximilian Bosch
1683c4087e
prometheus-wireguard-exporter: 3.2.0 -> 3.2.1 
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.2.1
 2019-11-08 18:13:43 +01:00
Aaron Andersen
94d4533e94
Merge pull request #72871 from aanderse/zabbix 
zabbix: minor version bump
 2019-11-06 17:57:25 -05:00
WilliButz
d4763639e0
grafana: 6.4.3 -> 6.4.4 2019-11-06 18:51:54 +01:00
Aaron Andersen
d433b25d49 zabbix44: 4.4.0 -> 4.4.1 2019-11-05 21:28:30 -05:00
Aaron Andersen
e9a37289e0 zabbix40: 4.0.13 -> 4.0.14 2019-11-05 21:27:37 -05:00
WilliButz
09f823dc83
prometheus-postgres-exporter: 0.6.0 -> 0.7.0, run tests 2019-10-31 23:52:16 +01:00
Peter Hoeg
e64f741583 check-nwc-health: fix source URL 2019-10-31 12:03:59 +08:00
WilliButz
e3ce6c5902
prometheus-postgres-exporter: 0.5.1 -> 0.6.0 2019-10-30 16:19:43 +01:00
Maximilian Bosch
03ca141a40
prometheus-dnsmasq-exporter: 0.1.0 -> 0.2.0 
https://github.com/google/dnsmasq_exporter/releases/tag/v0.2.0
 2019-10-29 23:00:57 +01:00
Andrew Childs
ef8d146274 sensu-go: 5.11.0 -> 5.14.1 2019-10-30 02:14:46 +09:00
WilliButz
3236de7b4d
grafana-loki: 0.3.0 -> 0.4.0 2019-10-25 23:37:40 +02:00
R. RyanTM
df0aa12e9f riemann: 0.3.3 -> 0.3.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/riemann/versions
 2019-10-23 15:55:06 -07:00
Aaron Andersen
fdee83d0fb zabbix: init at 4.4.0 2019-10-20 09:16:41 -04:00
Marek Mahut
b16f6953a2
Merge pull request #71354 from aanderse/zabbix-update 
zabbix: 4.2.6 -> 4.2.7, 4.0.12 -> 4.0.13
 2019-10-20 09:30:13 +02:00
Aaron Andersen
76d1658f3f zabbix: 4.2.6 -> 4.2.7, 4.0.12 -> 4.0.13 2019-10-18 14:37:52 -04:00
Mario Rodas
096558a0f6
prometheus: 2.13.0 -> 2.13.1 
Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.13.1
 2019-10-17 18:00:00 -05:00
WilliButz
747172ba60
grafana: 6.4.2 -> 6.4.3 2019-10-16 17:06:01 +02:00
Robin Gloster
2137b0c8f0
prometheus: fix hash 2019-10-16 00:46:40 +02:00
Robin Gloster
80a671d366
Merge pull request #70461 from marsam/update-prometheus 
prometheus: 2.12.0 -> 2.13.0
 2019-10-16 00:33:12 +02:00
Maximilian Bosch
d08a743156
prometheus-wireguard-exporter: 3.1.1 -> 3.2.0 
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.2.0

Previously, the exporter used `wg show all dump` by default to retrieve
information about wireguard peers. If a wireguard config is set, the interface is
now extracted automatically and the exporter runs `wg show <interface> dump`[1].

The cargo hash didn't change as no dependency updates were done in this
release.

[1] 4e332cb73f
 2019-10-13 20:16:03 +02:00
WilliButz
05ed82e6f4
prometheus-nextcloud-exporter: use tagged version 
The tag was not pushed when this exporter was added to nixpkgs.
The source hash remains the same, because the tag refers to the
same revision.
 2019-10-13 18:50:55 +02:00
WilliButz
a7206ec3d7
prometheus-nextcloud-exporter: init at 2019-10-12 2019-10-12 23:06:24 +02:00
WilliButz
0b549a7a1e
grafana: 6.4.1 -> 6.4.2 2019-10-08 12:58:26 +02:00
Mario Rodas
aa69f548b7
prometheus: 2.12.0 -> 2.13.0 
Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.13.0
 2019-10-05 04:20:00 -05:00
Bas van Dijk
82259b5d54 thanos: 0.6.1 -> 0.7.0 2019-10-05 10:35:52 +02:00
Robin Gloster
513a68a723
prometheus-alertmanager: 0.18.0 -> 0.19.0 2019-10-03 21:00:39 +02:00
Maximilian Bosch
5f22c1487b
Merge pull request #70231 from WilliButz/grafana-update 
grafana: 6.4.0 -> 6.4.1
 2019-10-03 14:37:32 +02:00
Silvan Mosberger
643a329a4c
do-agent: init at 3.5.6 (#69186) 
do-agent: init at 3.5.6
 2019-10-02 22:34:26 +02:00
WilliButz
dbdb787cce
grafana: 6.4.0 -> 6.4.1 2019-10-02 10:08:44 +02:00
WilliButz
79b99099cf
grafana: 6.3.6 -> 6.4.0 2019-10-01 15:46:52 +02:00
Maximilian Bosch
beb59b76cf
prometheus-wireguard-exporter: 3.1.0 -> 3.1.1 
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.1

This release adds a flag `-l` which takes an address where the exporter
is available. The default is `0.0.0.0` (previously, `0.0.0.0` was used
by default).

Please note that there are no dependency changes in Cargo and therefore
the cargo hash didn't change.
 2019-09-28 20:55:57 +02:00
Aaron Andersen
034bf58d34
Merge pull request #69703 from r-ryantm/auto-update/nagios 
nagios: 4.4.4 -> 4.4.5
 2019-09-28 07:20:31 -04:00
R. RyanTM
b93dd3d2c5 nagios: 4.4.4 -> 4.4.5 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nagios/versions
 2019-09-27 14:32:40 -07:00
Dmitry Kalinkin
c455adcc42
Merge branch 'master' into staging-next 
Fixes eval on darwin after #69072

Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10564 which
adapts #69210 to master that doesn't yet have
329a88efa7

Tested using maintainers/scripts/eval-release.sh before and after to see
that the fix works
 2019-09-25 19:21:46 -04:00
Maximilian Bosch
99b12cfc08
prometheus-wireguard-exporter: 3.0.1 -> 3.1.0 
Although this is a minor release, this only contains a single, but
improtant bugfix: https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.1.0
 2019-09-25 22:07:41 +02:00
Peter Hoeg
e121bf8503
Merge pull request #34250 from peterhoeg/p/wmi 
check-wmiplus: init at 1.64
 2019-09-25 05:09:19 +08:00
yvt
4fd8034b7d do-agent: Fix modSha256 2019-09-24 17:52:52 +09:00
Peter Hoeg
5426932f7c
check-openvpn: init at 0.0.1 (#69301) 
* check-openvpn: init at 0.0.1
 2019-09-24 14:53:21 +08:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Peter Hoeg
7f0c4d326b check-wmiplus: init at 1.64 2019-09-24 10:48:04 +08:00
WilliButz
c846b0a52f
grafana: 6.3.5 -> 6.3.6 2019-09-23 13:42:03 +02:00
yvt
1745ab38a0 nixos/do-agent: Update description 2019-09-23 17:23:58 +09:00
yvt
74e1d473ed do-agent: Use pname instead of name 2019-09-23 17:23:54 +09:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
Vladimír Čunát
41af38f372
Merge branch 'staging-next' 2019-09-21 13:14:09 +02:00
yvt
5ef5852b30 do-agent: init at 3.5.6 2019-09-21 13:16:17 +09:00
Jan Hrnko
a203ba2bf1 prometheus-apcupsd-exporter: init at unstable-2019-03-14 2019-09-20 10:34:00 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next 2019-09-18 21:15:35 +02:00
Mario Rodas
d990f0df4d
telegraf: 1.10.2 -> 1.12.1 2019-09-17 21:16:09 -05:00
WilliButz
ec885ad2a8
prometheus-blackbox-exporter: 0.15.0 -> 0.15.1 2019-09-17 17:35:39 +02:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
Aaron Andersen
908a842c89 zabbix: 4.2.5 -> 4.2.6, 4.0.11 -> 4.0.12 2019-09-16 08:22:05 -04:00
Marwan Aljubeh
d88f4efd0b munin: Use outPath for packages in makeFlags 
With this change, evaluating the `makeFlags` attribute does not result in building the referenced packages.

This makes it possible for users to override `buildInputs` and remove inputs they don't want without having to also make a modified copy of the `makeFlags` attribute.

An example use case is to remove the `jre` dependency.
 2019-09-16 07:03:49 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Peter Hoeg
e6bb0a70b7
Merge pull request #68340 from peterhoeg/p/wmic_bin 
wmic-bin: add at 0.5.0
 2019-09-13 17:52:25 +08:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02:00
WilliButz
9fd90aa825
prometheus-blackbox-exporter: 0.14.0 -> 0.15.0 2019-09-11 15:48:42 +02:00
Peter Hoeg
d8807fa108 check-ups-health: 2.8.2.2 -> 2.8.3.3 2019-09-11 13:08:47 +08:00
Peter Hoeg
b2fb72dae3 check-nwc-health: 7.0.1.3 -> 7.10.0.6 2019-09-11 13:08:47 +08:00
Peter Hoeg
3ce644e683 check-mssql-health: 2.6.4.14 -> 2.6.4.15 2019-09-11 13:08:47 +08:00
Peter Hoeg
28abdeb448 glplugin: requirement for check_xx_health 2019-09-11 13:08:47 +08:00
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Peter Hoeg
7881e0bcbe wmic-bin: add at 0.5.0 2019-09-09 14:24:14 +08:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk
66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00
WilliButz
283d9a0942
prometheus: remove prometheus_1, rename prometheus_2 
As prometheus is no longer developed, nixpkgs now only includes
prometheus 2. Having only one version of prometheus, there is no need
for having the version in the attribute name.
 2019-09-06 21:55:19 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
adisbladis
a560ea3736
prometheus-snmp-exporter: 0.13.0 -> 0.15.0 2019-09-05 22:33:39 +01:00
Jan Hrnko
bf9fd00b2e prometheus-process-exporter: init at 0.5.0 2019-09-05 20:21:10 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Marek Mahut
bdbc922b98 prometheus-aws-s3-exporter: init at 0.3.0 2019-09-03 10:48:27 +02:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging 2019-09-02 23:25:24 +02:00
WilliButz
c65ec9ed06
grafana: 6.3.4 -> 6.3.5 2019-09-02 13:11:25 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00