Commit graph

706 commits

Author SHA1 Message Date
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
WilliButz
c323b0ea59
grafana: 6.3.3 -> 6.3.4, update url for static source 2019-08-29 17:16:47 +02:00
WilliButz
b602b5c067
Merge pull request #67634 from mmahut/prometheus-cups-exporter
prometheus-cups-exporter: init at unstable-2019-03-17
2019-08-28 21:07:16 +02:00
Marek Mahut
0c4cb4c102 prometheus-cups-exporter: init at unstable-2019-03-17 2019-08-28 19:56:12 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
WilliButz
a377286c8f
Merge pull request #67590 from basvandijk/thanos-0.6.1
thanos: 0.6.0 -> 0.6.1
2019-08-28 11:29:58 +02:00
Mario Rodas
1aee94dc42
cadvisor: 0.33.1 -> 0.34.0 2019-08-27 22:40:43 -05:00
Bas van Dijk
09b1501d7c thanos: 0.6.0 -> 0.6.1 2019-08-28 00:00:14 +02:00
Marek Mahut
eee23c116f prometheus-gitlab-ci-pipelines-exporter: init at 0.2.5 2019-08-27 16:39:25 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Maximilian Bosch
826b492dc3
Merge pull request #67348 from mayflower/prometheus-exporter-mysqld-0.11.0
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0
2019-08-23 16:44:42 +02:00
Robin Gloster
f1512dfea3
prometheus-mysqld-exporter: 0.10.0 -> 0.11.0 2019-08-23 16:06:54 +02:00
Robin Gloster
7d1bd575e8
Merge pull request #67344 from mayflower/alertmanager-0.18.0
alertmanager: 0.16.2 -> 0.18.0
2019-08-23 16:06:44 +02:00
Robin Gloster
3ac9fd3046
Merge pull request #67315 from marsam/update-prometheus
prometheus_2: 2.11.1 -> 2.12.0
2019-08-23 16:01:24 +02:00
Robin Gloster
c6a082b8a7
Merge pull request #63763 from thefloweringash/node-exporter-update
prometheus-node-exporter: 0.17.0 -> 0.18.1; set version information
2019-08-23 15:57:59 +02:00
Robin Gloster
88b55379fd
alertmanager: 0.16.2 -> 0.18.0 2019-08-23 15:38:07 +02:00
Mario Rodas
b0ea62045b
prometheus_2: 2.11.1 -> 2.12.0
Changelog: https://github.com/prometheus/prometheus/releases/tag/v2.12.0
2019-08-22 19:26:55 -05:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Rickard Nilsson
225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
WilliButz
dfb66de179 grafana-loki: 0.2.0 -> 0.3.0 (#66835) 2019-08-18 21:47:31 +02:00
Marek Mahut
3a17a52a2a
Merge pull request #66676 from WilliButz/grafana-update
grafana: 6.3.2 -> 6.3.3
2019-08-18 14:18:07 +02:00
Frederik Rietdijk
f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Marek Mahut
caf9b8cc35
Merge pull request #66591 from aanderse/zabbix-proxy
nixos/zabbixProxy: fix database initialization logic
2019-08-17 20:55:13 +02:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk
fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Aaron Andersen
71a556d916 zabbix: 4.0.9 -> 4.0.11 & 4.2.3 -> 4.2.5 2019-08-15 21:19:35 -04:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
WilliButz
74a1a6b60c
grafana: 6.3.2 -> 6.3.3 2019-08-15 14:30:23 +02:00
Aaron Andersen
9af06755f3 nixos/zabbixProxy: fix database initialization logic 2019-08-13 18:50:28 -04:00
Maximilian Bosch
f0d6955052
Merge pull request #66470 from WilliButz/update-blackbox-exporter
prometheus-blackbox-exporter: 0.12.0 -> 0.14.0, run tests and check config
2019-08-12 19:38:43 +02:00
WilliButz
4d7465126f prometheus-varnish-exporter: 1.5 -> 1.5.1, use buildGoModule (#66472) 2019-08-12 09:23:27 -07:00
WilliButz
dcc12cea9f
prometheus-blackbox-exporter: 0.12.0 -> 0.14.0, run tests
Also added myself as maintainer.
2019-08-12 10:53:00 +02:00
WilliButz
d373b3fbb3
prometheus-nginx-exporter: 0.4.1 -> 0.4.2, run tests 2019-08-11 12:30:41 +02:00
Maximilian Bosch
e80b0b2b22
prometheus-wireguard-exporter: 3.0.0 -> 3.0.1
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.0.1
2019-08-08 21:47:19 +02:00
WilliButz
8f2abf573b
grafana: 6.3.0 -> 6.3.2 2019-08-07 13:02:09 +02:00
Marek Mahut
e62a45e45e
Merge pull request #66001 from r-ryantm/auto-update/nagios
nagios: 4.4.3 -> 4.4.4
2019-08-07 11:35:16 +02:00
WilliButz
f477658959
grafana: 6.2.5 -> 6.3.0 2019-08-06 17:12:10 +02:00
R. RyanTM
40934322f8 nagios: 4.4.3 -> 4.4.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/nagios/versions
2019-08-04 18:05:41 -07:00
WilliButz
2d09016ed3
grafana-loki: 0.1.0 -> 0.2.0 2019-08-03 00:19:14 +02:00