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#69210 to master that doesn't yet have
329a88efa7
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
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
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 41af38f372f0fec244ca
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
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
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
