Commit graph

687 commits

Author SHA1 Message Date
volth
6d2edfb0b8 treewide: remove aliases evaluated to null 2018-12-14 16:27:53 +00:00
WilliButz
3a28198918
grafana: 5.4.1 -> 5.4.2 2018-12-13 18:07:23 +01:00
WilliButz
174800f2c6 grafana: 5.4.0 -> 5.4.1 2018-12-11 16:25:19 +01:00
WilliButz
d014e767be
grafana: 5.3.4 -> 5.4.0 2018-12-05 20:49:45 +01:00
Renaud
ff0d51d790
Merge pull request #50814 from r-ryantm/auto-update/check_ssl_cert
checkSSLCert: 1.76.0 -> 1.78.0
2018-11-20 20:25:47 +01:00
Franz Pletz
3cd66c1263
prometheus-alertmanager: 0.15.2 -> 0.15.3 2018-11-20 13:43:19 +01:00
R. RyanTM
97c1e3069b checkSSLCert: 1.76.0 -> 1.78.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
2018-11-19 17:52:18 -08:00
WilliButz
d837beb57c grafana: 5.3.2 -> 5.3.4 (#50311) 2018-11-13 16:49:53 +01:00
Silvan Mosberger
9c984b06c4
Merge pull request #38514 from disassembler/grafana-reporter
grafana-reporter: init at 2.0.1
2018-11-10 15:15:21 +01:00
Jörg Thalheim
eb6337b3e3
Merge pull request #50146 from r-ryantm/auto-update/check_ssl_cert
checkSSLCert: 1.73.0 -> 1.76.0
2018-11-10 12:30:09 +00:00
R. RyanTM
e9081d9329 checkSSLCert: 1.73.0 -> 1.76.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
2018-11-09 23:59:12 -08:00
Alyssa Ross
26bf4b3df3
riemann-dash: rack: 1.6.4 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
2018-11-06 09:23:22 +00:00
Sander van der Burg
5262cf6d0a kapacitor: 1.4.0 -> 1.5.1 2018-11-01 21:40:50 +01:00
Samuel Leathers
5573795901
grafana-reporter: init at 2.0.1 2018-10-27 05:09:28 -04:00
WilliButz
e3927861d6
grafana: 5.3.1 -> 5.3.2 2018-10-25 17:07:23 +02:00
Frederik Rietdijk
8d8dc1fa34 Merge master into staging 2018-10-18 11:43:54 +02:00
Frederik Rietdijk
821a3beb10
Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
2018-10-18 11:23:04 +02:00
WilliButz
6ed5b4624d
grafana: 5.2.4 -> 5.3.1 2018-10-17 16:41:58 +02:00
Frederik Rietdijk
89349fdae9 Merge staging-next into staging 2018-10-17 08:36:28 +02:00
Frederik Rietdijk
18fcc337af Merge master into staging-next 2018-10-17 08:04:22 +02:00
volth
f65dfb3caf buildPerlPackage -> perlPackages.buildPerlPackage 2018-10-14 09:10:41 +02:00
Pierre Bourdon
86d644f8cc prometheus-tor-exporter: init at 0.3
Upstream: https://github.com/atx/prometheus-tor_exporter
2018-10-13 10:10:29 +02:00
Frederik Rietdijk
6f5142e48e Merge master into staging 2018-10-13 09:48:20 +02:00
Thilo Uttendorfer
adc6e9c2c4 prometheus_2: 2.3.2 -> 2.4.3 (#48118) 2018-10-10 22:22:04 +02:00
Andreas Rammhold
020a3ff09b
Merge pull request #48123 from andir/net_snmp
net_snmp: fix CVE-2018-18065
2018-10-10 21:05:00 +02:00
Peter Hoeg
804c227b83 uchiwa: 1.2.0 -> 1.3.1 2018-10-10 16:35:46 +08:00
Thilo Uttendorfer
dd58c35332 prometheus-alertmanager: 0.15.1 -> 0.15.2 (#48121) 2018-10-09 23:39:52 +02:00
Andreas Rammhold
2f7c242953 net_snmp: fix CVE-2018-18065 2018-10-09 23:07:36 +02:00
Frederik Rietdijk
bc9bd012c4 Merge staging-next into staging 2018-10-09 15:37:52 +02:00
R. RyanTM
af910b2ffa checkSSLCert: 1.72.0 -> 1.73.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
2018-10-03 21:30:58 -07:00
volth
5f91657ad1 remove support for pre-5.26 Perl 2018-10-03 19:29:58 +00:00
R. RyanTM
67c5133f60 cadvisor: 0.30.2 -> 0.31.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cadvisor/versions
2018-09-25 06:48:02 -07:00
WilliButz
b59cd2bc17 prometheus-json-exporter: add patch to support bool parsing 2018-09-18 18:21:00 +02:00
WilliButz
b712736283 prometheus-json-exporter: 2016-09-13 -> 2017-10-06 2018-09-18 18:21:00 +02:00
R. RyanTM
6557bcde9f checkSSLCert: 1.64.0 -> 1.72.0 (#46290)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
2018-09-18 18:05:19 +02:00
Maximilian Bode
7c98b3d0d1 prometheus_2: 2.2.1 -> 2.3.2 (#46333) 2018-09-17 11:23:12 +02:00
WilliButz
81156549a2 prometheus-snmp-exporter: 0.11.0 -> 0.13.0 (#46677) 2018-09-15 02:02:34 +02:00
WilliButz
21324ef0e4
prometheus-dovecot-exporter: 0.1.1 -> 0.1.3 2018-09-13 21:07:21 +02:00
WilliButz
68b25008e2
grafana: 5.2.3 -> 5.2.4 2018-09-13 18:22:37 +02:00
Shea Levy
18337f3ece
Merge branch 'no-toPath' 2018-09-06 08:09:53 -04:00
R. RyanTM
96ae011720 nagios: 4.4.1 -> 4.4.2 (#45558)
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.
2018-08-28 13:53:51 +02:00
Tuomas Tynkkynen
9236e9a28d zabbix34: Compile with OpenSSL
Fixes:

"TLSConnect" configuration parameter cannot be used: Zabbix agent was compiled without TLS support
2018-08-27 18:41:09 +03:00
Uli Baum
da0ce8ca52 munin: fix build
fallout from perl 5.24 -> 5.28 update
2018-08-25 01:00:05 +02:00
WilliButz
c847fbb54e grafana: 5.2.2 -> 5.2.3 2018-08-23 00:13:06 +02:00
Francesco Gazzetta
0e0e963847 facette: mark as broken since it requires internet
It _is_ buildable, just not without an internet connection (like in hydra)
2018-08-20 16:17:15 +02:00
Francesco Gazzetta
fbab1a3cae facette: 0.4.0 -> 0.4.1 2018-08-20 11:43:36 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
xeji
fc283bd41c
Merge pull request #44824 from yegortimoshenko/20180809.194746/prometheus
prometheus-node-exporter: work around prometheus/node_exporter#870
2018-08-10 00:07:16 +02:00
Yegor Timoshenko
c2839a8e1f
prometheus-node-exporter: add comment pointing to upstream bug 2018-08-10 00:52:21 +03:00
Silvan Mosberger
81634e8498
uchiwa: fix build 2018-08-09 20:41:41 +02:00
Yegor Timoshenko
bdf2850262 prometheus-node-exporter: work around prometheus/node_exporter#870
See: https://github.com/prometheus/node_exporter/issues/870
2018-08-09 19:47:56 +03:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
R. RyanTM
a2fcc1f7a8 cadvisor: 0.29.1 -> 0.30.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cadvisor/versions.
2018-08-08 19:28:02 -07:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
WilliButz
a0383ffec8 grafana: 5.2.1 -> 5.2.2 2018-07-25 17:47:50 +02:00
volth
cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Franz Pletz
27b8072a98
prometheus-alertmanager: 0.14.0 -> 0.15.1 2018-07-15 21:41:45 +02:00
Jaka Hudoklin
6cc50b144a prometheus-jmx-httpserver: init at 0.10 (#43336)
prometheus-jmx-httpserver: init at 0.10
2018-07-11 21:17:09 +02:00
R. RyanTM
1d5d31a927 nagios: 4.4.0 -> 4.4.1
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.

These checks were done:

- built on NixOS
- /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/nagios passed the binary check.
- /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/nagiostats passed the binary check.
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/archivejson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/avail.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/cmd.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/config.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/extinfo.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/histogram.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/history.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/notifications.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/objectjson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/outages.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/showlog.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/status.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/statusjson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/statusmap.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/statuswml.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/statuswrl.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/summary.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/tac.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1/bin/trends.cgi had a zero exit code or showed the expected version
- 2 of 21 passed binary check by having a zero exit code.
- 0 of 21 passed binary check by having the new version present in output.
- found 4.4.1 with grep in /nix/store/pgbqarrqn64rgx44qk9ijmw4z7lpira4-nagios-4.4.1
- directory tree listing: https://gist.github.com/f137b97a1d6cd8319299734685e0bae9
- du listing: https://gist.github.com/d14b3339adc574bb4d4ca3657a548883
2018-07-03 21:34:47 -07:00
WilliButz
180855a1fe grafana: 5.2.0 -> 5.2.1 2018-06-29 13:58:07 +02:00
Matthew Bauer
4490b136b7
Merge pull request #42478 from r-ryantm/auto-update/nagios
nagios: 4.3.4 -> 4.4.0
2018-06-28 22:02:16 -04:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
WilliButz
14ca98e51e grafana: 5.1.4 -> 5.2.0, replace hard coded version (#42653)
Replaced the hard coded version with the packaged version
and updated the source URL which changed with the latest release.
2018-06-27 17:18:49 +02:00
Niklas Hambüchen
44c22ef8a8 consul-alerts: Add meta and myself as maintainer 2018-06-25 16:51:09 +02:00
Niklas Hambüchen
574b5365c7 consul-alerts: 0.3.3 -> 0.5.0 2018-06-25 01:28:49 +02:00
R. RyanTM
66ae89bf95 nagios: 4.3.4 -> 4.4.0
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.

These checks were done:

- built on NixOS
- /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/nagios passed the binary check.
- /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/nagiostats passed the binary check.
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/archivejson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/avail.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/cmd.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/config.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/extinfo.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/histogram.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/history.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/notifications.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/objectjson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/outages.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/showlog.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/status.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statusjson.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statusmap.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statuswml.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/statuswrl.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/summary.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/tac.cgi had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0/bin/trends.cgi had a zero exit code or showed the expected version
- 2 of 21 passed binary check by having a zero exit code.
- 0 of 21 passed binary check by having the new version present in output.
- found 4.4.0 with grep in /nix/store/z91fmra6ni1yq0dk5v109m06lw0yxf87-nagios-4.4.0
- directory tree listing: https://gist.github.com/8dd6e454a51a3faf0756a68239207b0c
- du listing: https://gist.github.com/3a2aa37f2b390790b9578447b099cc88
2018-06-23 19:58:16 -07:00
Jörg Thalheim
2193fcdee3 telegraf: also remove old deps file 2018-06-21 11:48:46 +01:00
Jörg Thalheim
7e67294e06 telegraf: 1.6.1 -> 1.7.0 2018-06-21 11:47:46 +01:00
WilliButz
f6af93f44e
grafana: 5.1.3 -> 5.1.4 2018-06-19 15:24:51 +02:00
Mrmaxmeier
e99a869c19 prometheus-node-exporter: 0.15.2 -> 0.16.0 2018-06-18 19:39:07 +02:00
Peter Hoeg
b48af23d16
Merge pull request #41617 from peterhoeg/p/mssql
check-mssql-health: init at 2.6.4.14
2018-06-07 14:55:59 +08:00
Peter Hoeg
d5f37d1f2e check-mssql-health: init at 2.6.4.14 2018-06-07 14:21:18 +08:00
Matthew Justin Bauer
bc7ea93a47
Merge pull request #40028 from WilliButz/add-dnsmasq-exporter
prometheus-dnsmasq-exporter: init at 2018-05-05, add module
2018-06-01 23:18:49 -04:00
WilliButz
6c76c4c6d8 prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363) 2018-06-01 18:25:08 +02:00
Matthew Justin Bauer
6cc070df8a
Merge pull request #41162 from ryantm/name-format
treewide: fix derivation names
2018-05-28 13:58:17 -04:00
Ryan Mulligan
af9d10a91b treewide: fix derivation names 2018-05-28 05:59:57 -07:00
R. RyanTM
4e965c6270 riemann: 0.3.0 -> 0.3.1 (#41044)
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.

These checks were done:

- built on NixOS
- /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/.riemann-wrapped passed the binary check.
- /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/riemann passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.3.1 with grep in /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1
- directory tree listing: https://gist.github.com/ed9907cdc302813f2c87257f6a26628e
- du listing: https://gist.github.com/b50c1c815b3cd6102e0ec8d21b9f1365
2018-05-28 14:48:02 +02:00
Shea Levy
6da6accd30
treewide: Remove uses of builtins.toPath.
toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
2018-05-22 16:42:02 -04:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Uli Baum
d44e68c856 prometheus_1: 1.8.1 -> 1.8.2 2018-05-18 23:01:05 +02:00
Tuomas Tynkkynen
003473613a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
WilliButz
ec9bb1bb34 grafana: 5.1.2 -> 5.1.3 (#40621) 2018-05-17 13:18:06 +02:00
Pascal Bach
13ceaf66aa prometheus: correctly set version information (#40617)
The way prometheus expects the version to be set is not what was currently set.
2018-05-17 00:05:53 +02:00
Tuomas Tynkkynen
6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Peter Hoeg
44361ea409 check-{ups,nwc}-health: update to release versions (#40541) 2018-05-15 18:23:43 +02:00
Frederik Rietdijk
64c8c6dcb3 Merge master into staging 2018-05-10 09:30:56 +02:00
WilliButz
1f2647aad5
grafana: 5.1.1 -> 5.1.2 2018-05-09 11:40:10 +02:00
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
WilliButz
f5249fa042 grafana: 5.1.0 -> 5.1.1 2018-05-07 16:35:46 +02:00
WilliButz
4b69aab023
prometheus-dnsmasq-exporter: init at unstable-2018-05-05 2018-05-06 13:58:39 +02:00
Matthew Justin Bauer
ea1d75e442
Merge pull request #39925 from Assassinkin/master
Zabbix-agent 3.4
2018-05-05 15:48:14 -05:00
WilliButz
23d98f9e8f
prometheus-postfix-exporter: 0.1.1 -> 0.1.2
With this release systemd support became optional.
It can now be disabled by passing `withSystemdSupport = false` to `callPackage`.
2018-05-04 13:21:50 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Assassinkin
554e296c9f Adding Zabbix agent 3.4 packages 2018-05-03 14:00:17 +01:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Pascal Wittmann
42d3b536c6
Merge pull request #39756 from fgaz/facette
facette: init at 0.4.0
2018-05-02 17:01:36 +02:00
Francesco Gazzetta
4217017340 facette: init at 0.4.0 2018-05-02 14:10:43 +00:00
Samuel Leathers
503f85251c prometheus-surfboard-exporter: init at 2.0.0 2018-05-02 13:04:34 +02:00
WilliButz
4bca8f8d25 prometheus-varnish-exporter: 1.2 -> 1.4 2018-05-01 18:00:53 +02:00
WilliButz
913ec8736c prometheus-nginx-exporter: 20161107 -> 0.1.0
- added myself as maintainer
- fixed license
2018-05-01 15:45:48 +02:00
WilliButz
5d0adad0ca prometheus-snmp-exporter: 0.3.0 -> 0.9.0 2018-05-01 15:36:19 +02:00
Peter Hoeg
a3b69a52c5 uchiwa: 1.1.2 -> 1.2.0 2018-04-29 20:34:52 +08:00
WilliButz
f925480215 grafana: 5.0.4 -> 5.1.0 2018-04-26 20:22:46 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jörg Thalheim
9105db24ec telegraf: 1.5.3 -> 1.6.1 2018-04-24 10:48:42 +01:00
Matthew Justin Bauer
405daa25f1
Merge pull request #27257 from hectorj/init-zipkin-server-1.28.1
zipkin-server: init at 1.28.1
2018-04-21 15:22:43 -05:00
WilliButz
fdee448486
prometheus-postfix-exporter: makeWrapper -> nativeBuildInputs 2018-04-20 20:31:31 +02:00
WilliButz
f45acb6b47
prometheus-postfix-exporter: 2017-06-01 -> 0.1.1 2018-04-19 19:46:07 +02:00
WilliButz
059a2a8c7b prometheus-dovecot-exporter: 2018-01-18 -> 0.1.1 2018-04-19 00:35:27 +02:00
R. RyanTM
10f02ad446 munin: 2.0.34 -> 2.0.37
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/munin/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped -h’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped --help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-check-wrapped help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check -h’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check --help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-check help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/.munin-cron-wrapped --help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-cron --help’ got 0 exit code
- ran ‘/nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37/bin/munin-node-configure help’ got 0 exit code
- found 2.0.37 with grep in /nix/store/af5ja0gxnyhdhg8qgfnfbvxdf7zl110c-munin-2.0.37
- directory tree listing: https://gist.github.com/44aa9c5969938bba7e7a4e9710568ae9
2018-04-17 18:49:38 +02:00
Maximilian Bode
b34d6f90b1 prometheus: actually run tests
as remarked in #36782
2018-04-02 21:04:49 +02:00
Maximilian Bode
cd9b6a5615 prometheus: 2.1.0 -> 2.2.1 2018-04-02 21:04:44 +02:00
Johannes Lötzsch
2e566aaf95 monitoring-plugins: fix typo in meta (#38259) 2018-04-01 08:06:23 +02:00
Ryan Mulligan
0a931ed0c4 checkSSLCert: 1.51.0 -> 1.64.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/check_ssl_cert/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.64.0 with grep in /nix/store/yiphzx29lcf6zx02g4bh1p80pappzw6f-check_ssl_cert-1.64.0
- directory tree listing: https://gist.github.com/37591ae2c040336904beb8059082afdc
2018-03-30 10:18:53 +01:00
WilliButz
93561ed0bf grafana: 5.0.3 -> 5.0.4 2018-03-28 23:45:49 +01:00
Franz Pletz
9152ef910b
prometheus-node-exporter: 0.15.0 -> 0.15.2 2018-03-22 01:05:30 +01:00
Franz Pletz
1497815543
prometheus-blackbox-exporter: 0.11.0 -> 0.12.0 2018-03-22 01:05:26 +01:00
WilliButz
ca7b29050f grafana: 5.0.2 -> 5.0.3, fix headless phantomjs 2018-03-19 19:59:10 +01:00
Matthew Justin Bauer
ac037da8e6
Merge pull request #36782 from mbode/prometheus_2_1_0
prometheus: add 2.1.0
2018-03-19 12:25:52 -05:00
Jörg Thalheim
de4d861d6d
Merge pull request #37270 from xeji/p/heapster
heapster: fix build
2018-03-18 09:43:11 +00:00
Jörg Thalheim
d5c077b109 telegraf: 1.5.1 -> 1.5.3 2018-03-18 08:31:54 +00:00
xeji
690939730a heapster: fix build
fetchFromGitHub returned a different sha256 for the same revision
2018-03-17 20:00:48 +01:00
WilliButz
cfd37eb349 grafana: 5.0.1 -> 5.0.2 2018-03-15 14:36:58 +01:00
Joachim F
db1d422ac0
Merge pull request #36481 from ryantm/auto-update/cadvisor
cadvisor: 0.28.3 -> 0.29.1
2018-03-14 19:37:06 +00:00
WilliButz
ef90ff2d8e grafana: 5.0.0 -> 5.0.1 2018-03-12 23:37:29 +01:00
Maximilian Bode
78f50651f9 prometheus: add 2.1.0 2018-03-11 01:08:34 +01:00
Ryan Mulligan
bc7ca17345 cadvisor: 0.28.3 -> 0.29.1
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.29.1 with grep in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
- found 0.29.1 in filename of file in /nix/store/8zpvaz7imhsknld6d0qyykqw9b718lxi-cadvisor-0.29.1
2018-03-07 19:50:56 -08:00
Franz Pletz
440c24e247
prometheus-alertmanager: 0.13.0 -> 0.14.0 2018-03-04 16:35:56 +01:00
adisbladis
6c060b0444
Merge pull request #35998 from ryantm/auto-update/riemann-0.2.12-to-0.3.0
riemann: 0.2.12 -> 0.3.0
2018-03-02 18:41:50 +08:00
WilliButz
5ea2c87464
grafana: 4.6.3 -> 5.0.0 2018-03-01 17:50:09 +01:00
Ryan Mulligan
47d1d9bf91 riemann: 0.2.12 -> 0.3.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/.riemann-wrapped -h` got 0 exit code
- ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/.riemann-wrapped -h` and found version 0.3.0
- ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -h` got 0 exit code
- ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -v` and found version 0.3.0
- ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -h` and found version 0.3.0
- found 0.3.0 with grep in /nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0
- found 0.3.0 in filename of file in /nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0

cc "@rickynils"
2018-02-27 13:30:48 -08:00
Ryan Mulligan
429e8c3835 nagios: 4.2.4 -> 4.3.4
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4/bin/nagios -V` and found version 4.3.4
- ran `/nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4/bin/nagios --version` and found version 4.3.4
- ran `/nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4/bin/nagiostats -V` and found version 4.3.4
- ran `/nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4/bin/nagiostats --version` and found version 4.3.4
- found 4.3.4 with grep in /nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4
- found 4.3.4 in filename of file in /nix/store/h6fdhwd698dwp4v91x1hqsjymrhr230b-nagios-4.3.4

cc "@thoughtpolice @relrod"
2018-02-27 07:55:58 -08:00
Robin Gloster
c2cc8240cd
grafana: fix name 2018-02-27 14:07:49 +01:00
Ryan Mulligan
e4c9cc2344 kapacitor: 1.0.0 -> 1.4.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/zc5x872jh6g02y47rfa2giw7wjypnq12-kapacitor-1.4.0-bin/bin/kapacitord -h` got 0 exit code
- ran `/nix/store/zc5x872jh6g02y47rfa2giw7wjypnq12-kapacitor-1.4.0-bin/bin/kapacitord help` got 0 exit code
- ran `/nix/store/zc5x872jh6g02y47rfa2giw7wjypnq12-kapacitor-1.4.0-bin/bin/tickfmt help` got 0 exit code
- found 1.4.0 with grep in /nix/store/zc5x872jh6g02y47rfa2giw7wjypnq12-kapacitor-1.4.0-bin
- found 1.4.0 in filename of file in /nix/store/zc5x872jh6g02y47rfa2giw7wjypnq12-kapacitor-1.4.0-bin

cc "@offline @ehmry @lethalman"
2018-02-26 19:41:57 -08:00
Will Dietz
317ac44121 net-snmp: alpine patches 2018-02-13 09:44:45 -06:00
adisbladis
1ca9fb1085
cadvisor: 0.26.1 -> 0.28.3 2018-01-28 06:51:28 +08:00
Peter Hoeg
afdc186a03 uchiwa: 1.1.1 -> 1.1.2 2018-01-27 14:40:38 +08:00
WilliButz
2f237868ab
prometheus-postfix-exporter: init at 2017-06-01 2018-01-26 20:07:01 +01:00
WilliButz
a7a9653b06
prometheus-dovecot-exporter: init at 2018-01-18 2018-01-26 20:06:35 +01:00
Benjamin Staffin
0a0f8d637d
prometheus-alertmanager: 0.9.1 -> 0.13.0 2018-01-25 17:41:25 -05:00
Pascal Bach
f694b98b8e prometheus-minio-exporter: 0.1.0 -> 0.2.0 2018-01-21 17:45:30 +01:00
Jörg Thalheim
2769a38c1d telegraf: 1.5.0 -> 1.5.1 2018-01-12 19:40:56 +00:00
Peter Hoeg
96e777adfd uchiwa: add update script 2018-01-12 23:02:39 +08:00
Peter Hoeg
754b5961a2 uchiwa: 1.1.0 -> 1.1.1 2018-01-12 23:02:39 +08:00
Samuel Dionne-Riel
7b97c8c0c8 treewide: homepage+src updates (found by repology, #33263) 2018-01-05 20:42:46 +01:00
Ollie Charles
f16431b0e2 prometheus-rabbitmq-exporter: init at 0.25.2 2018-01-05 14:50:39 +00:00
Robin Gloster
a0d3ee9fce
prometheus-blackbox-exporter: 0.10.0 -> 0.11.0 2017-12-29 01:13:35 +01:00
Ben Wolsieffer
a8433be79b telegraf: 1.4.4 -> 1.5.0 2017-12-23 18:20:46 -05:00
Orivej Desh
87fa72f0ef grafana: use canonical amazon s3 domain 2017-12-20 01:34:23 +00:00
Peter Hoeg
2e2c2cad6c uchiwa: 0.26.3 -> 1.1.0 2017-12-18 14:00:50 +08:00
WilliButz
37911930db
grafana: 4.6.2 -> 4.6.3 2017-12-15 14:53:52 +01:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Vladimír Čunát
9adbe64761
longview: restrict meta.platforms
https://github.com/NixOS/nixpkgs/issues/32326#issuecomment-349745708
2017-12-06 21:26:18 +01:00
Philipp Hausmann
59a737a922 FusionInventory: Patch in NixOS support
Adds support for the /etc/os-release file and to read installed
software from the Nix store.
2017-11-29 14:58:36 +00:00
Philipp Hausmann
5f59913c74 FusionInventory: 3.18 -> 3.21 2017-11-29 14:58:36 +00:00
Frederik Rietdijk
0cd857bffd Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 11:38:13 +01:00
Kjetil Orbekk
a2dc37c7d1 munin-node: patch to configure plugin-conf.d
Add a new patch (adding_sconfdir_munin-node.patch) to be able to
configure the location of plugin-conf.d (otherwise it has to be
configured at build time).  This patch is very similar to the
existing 'adding_servicedir_munin-node.patch'.
2017-11-25 11:23:56 +01:00
Kjetil Orbekk
c164d83536 munin-node: add patch to preserve environment variables 2017-11-25 11:23:56 +01:00
Kjetil Orbekk
e36962a002 munin: 2.0.33 -> 2.0.34 2017-11-25 11:23:56 +01:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
John Ericson
da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Franz Pletz
6a9f12b915
zabbix22: 2.2.16 -> 2.2.20 2017-11-19 19:09:18 +01:00
Franz Pletz
1d66d64ae0
zabbix20: 2.0.11 -> 2.0.21 for multiple CVEs
Fixes CVE-2014-9450, CVE-2016-4338.

cc #30959
2017-11-19 19:08:44 +01:00
WilliButz
518fa4a38b
grafana: 4.6.1 -> 4.6.2 2017-11-19 01:10:57 +01:00
Peter Hoeg
76dac3c788 uchiwa: 0.26.0 -> 0.26.3 2017-11-10 18:54:31 +08:00
Peter Hoeg
a6f62cfa07 uchiwa: get rid of broken upgrade script 2017-11-10 18:54:31 +08:00
Joerg Thalheim
bee61a065a telegraf: also remove old deps file 2017-11-09 09:26:47 +00:00
Joerg Thalheim
3f9e87259c telegraf: 1.4.2 -> 1.4.4 2017-11-09 09:24:36 +00:00
Tuomas Tynkkynen
5d5eb6aba4 lcdproc: Disable parallel build
https://hydra.nixos.org/build/63628044
2017-11-07 00:17:31 +02:00
Michal 'BlessJah' Marzuchowski
c3e7e2249b mtail: init at 3.0.0-rc4 2017-11-04 01:36:52 +01:00
WilliButz
febacc5de6
grafana: 4.6.0 -> 4.6.1 2017-11-03 02:00:29 +01:00
Christine Koppelt
821a7a38ea prometheus-alertmanager: 0.8.0 -> 0.9.1 2017-10-30 17:04:56 +01:00
WilliButz
49e88fbd37
grafana: 4.5.2 -> 4.6.0 2017-10-26 12:59:09 +02:00
Franz Pletz
422fd6a2aa
prometheus: 1.7.2 -> 1.8.1 2017-10-24 14:21:05 +02:00
Franz Pletz
8e5a5904c1
prometheus-blackbox-exporter: 0.9.1 -> 0.10.0 2017-10-24 14:21:04 +02:00
Pascal Bach
38a66bb033 prometheus-node-exporter: 0.14.0 -> 0.15.0 2017-10-22 14:45:48 +02:00
Joerg Thalheim
914fcc8b4b telegraf: 1.4.1 -> 1.4.2 2017-10-18 16:42:07 +01:00
Vladimír Čunát
994036d857
Merge branch 'master' into staging
Hydra: ?compare=1400181
2017-10-09 11:24:35 +02:00
Dan Peebles
b426c85ce2 Get rid of most @rpath nonsense on Darwin
This requires some small changes in the stdenv, then working around the
weird choice LLVM made to hardcode @rpath in its install name, and then
lets us remove a ton of annoying workaround hacks in many of our Go
packages. With any luck this will mean less hackery going forward.
2017-10-08 16:13:46 -04:00
Pascal Bach
9e4be636ba prometheus-minio-exporter: init at 0.1.0 2017-10-08 12:08:29 +02:00
Orivej Desh
f137004179 Merge branch 'master' into staging
* master: (81 commits)
  Add NixOS 17.09 AMIs
  gradle: 4.2 -> 4.2.1
  maintainers.nix: use my GitHub handle as maintainer name
  fcitx-engines.rime: init at 0.3.2
  brise: init at 2017-09-16
  librime: init at 1.2.9
  marisa: init at 0.2.4
  opencc: build shared library and programs
  josm: 12712 -> 12914
  exa: 0.7.0 -> 0.8.0
  krb5: add deprecation date for old configuration
  rustRegistry: 2017-09-10 -> 2017-10-03
  go-ethereum: Fix libusb segmentation faults on Darwin
  tor-browser-bundle-bin: 7.0.5 -> 7.0.6
  libsodium: 1.0.13 -> 1.0.15
  tor-browser-bundle: geoip support
  tor-browser-bundle: support transports obfs2,obfs3
  tor-browser-bundle: bump https-everywhere to 2017.9.12
  tint2: limit platforms to Linux since macOS is not supported and fails the tests
  eclipse-plugin-vrapper: init at 0.72.0
  ...
2017-10-03 17:46:39 +00:00
Franz Pletz
6dc9d21cc8
prometheus-blackbox-exporter: 0.8.1 -> 0.9.1 2017-10-02 20:36:06 +02:00
Franz Pletz
15cca009c1
prometheus: 1.7.1 -> 1.7.2 2017-10-02 20:25:02 +02:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
WilliButz
7ee1eb4eac
grafana: 4.5.1 -> 4.5.2 2017-10-01 23:05:54 +02:00
Joerg Thalheim
7742797e67 telegraf: 1.3.0 -> 1.4.1 2017-10-01 10:21:16 +01:00
Rodney Lorrimar
3ef954bdd7 uchiwa: fix bower hashes
Previous bower2nix had a bug resulting in incorrect hashes.

This uses bower2nix 3.2.0 to regenerate the bower packages file.
2017-09-28 20:58:17 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Peter Hoeg
dd6591c506 uchiwa: 0.25.3 -> 0.26.0 2017-09-26 17:53:42 +08:00
Philipp Hausmann
00bc46b722 FusionInventory: Remove unused parameters 2017-09-25 10:39:11 +02:00
Philipp Hausmann
2490dea9d0 FusionInventory: Disable tests requiring network access. 2017-09-25 10:39:11 +02:00
Philipp Hausmann
de3d26165f FusionInventory: Init at 2.3.18 2017-09-25 10:39:11 +02:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
WilliButz
8eb3e45f37
grafana: 4.5.0 -> 4.5.1 2017-09-18 16:28:26 +02:00
WilliButz
e13e3dd2fb
grafana: 4.4.3 -> 4.5.0 2017-09-15 02:12:32 +02:00
Daiderd Jordan
56ea313c29
prometheus-node-exported: fix output cycle on darwin 2017-09-13 22:08:25 +02:00
WilliButz
226a20117d
grafana: 4.3.2 -> 4.4.3 2017-09-05 21:12:17 +02:00
Franz Pletz
6f7f5b5c85
cadvisor: 0.23.8 -> 0.26.1 2017-09-05 14:24:58 +02:00