public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
182,981 Commits 1 Branch 0 Tags
65ee1ace94aa9ed94de16e86a407874bbdc13cde
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bas van Dijk b71fa33328 Merge pull request #62655 from basvandijk/terraform-provider-elasticsearch-0.7.0 
terraform-provider-elasticsearch: 0.6.0 -> 0.7.0
 2019-06-04 14:12:25 +02:00
Bas van Dijk 6b4279e792 terraform-provider-elasticsearch: 0.6.0 -> 0.7.0 2019-06-04 12:34:24 +02:00
Bas van Dijk f6ba5b91e8 Merge pull request #62616 from basvandijk/strongswan-5.8.0 
strongswan: 5.7.2 -> 5.8.0
 2019-06-03 23:43:20 +02:00
Bas van Dijk 1959799d51 strongswan: 5.7.2 -> 5.8.0 2019-06-03 18:01:55 +02:00
Bas van Dijk ea061fd71d Merge pull request #62122 from basvandijk/terraform-provider-elasticsearch-0.6.0 
terraform-provider-elasticsearch: init at 0.6.0
 2019-05-27 19:34:15 +02:00
Bas van Dijk d19b0b2ddf terraform-provider-elasticsearch: init at 0.6.0 2019-05-27 17:48:36 +02:00
Bas van Dijk a4354df1f1 Merge pull request #61633 from basvandijk/elasticsearch-curator-5.7.6 
elasticsearch-curator: 5.6.0 -> 5.7.6 & upgrades of dependencies (based on staging)
 2019-05-24 16:02:39 +02:00
Bas van Dijk 72fc6f7e5c libbytesize: 1.4 -> 2.0 2019-05-24 15:59:09 +02:00
Bas van Dijk 3df8bed953 pythonPackages.elasticsearch-dsl: 6.3.1 -> 7.0.0 2019-05-24 12:54:13 +02:00
Bas van Dijk e5f4e17ad4 elasticsearch-curator: 5.6.0 -> 5.7.6 2019-05-24 12:54:13 +02:00
Bas van Dijk 4812547618 pythonPackages.elasticsearch: 6.3.1 -> 7.0.1 2019-05-24 12:54:13 +02:00
Bas van Dijk f12f9afa2a awscli: 1.16.106 -> 1.16.160 2019-05-24 12:54:13 +02:00
Bas van Dijk adef5b9c97 pythonPackages.boto3: 1.9.96 -> 1.9.150 2019-05-24 12:54:13 +02:00
Bas van Dijk 6efa24ee07 pythonPackages.botocore: 1.12.96 -> 1.12.150 2019-05-24 12:54:13 +02:00
Bas van Dijk c404cfd801 pythonPackages.certifi: 2018.11.29 -> 2019.3.9 2019-05-24 12:54:13 +02:00
Bas van Dijk edb1668130 Merge pull request #61939 from basvandijk/terraform-0.12 
terraform: 0.11.13 -> 0.11.14 & 0.12.0-rc1 -> 0.12.0
 2019-05-23 14:54:17 +02:00
Bas van Dijk 8669561bde terraform_0_12: 0.12.0-rc1 -> 0.12.0 2019-05-23 11:07:23 +02:00
Bas van Dijk 2bcc8de182 terraform_0_11: 0.11.13 -> 0.11.14 2019-05-23 11:06:57 +02:00
Bas van Dijk 240ae5eb87 Merge pull request #61604 from basvandijk/tinydns-nixos-test 
nixos: add test for tinydns
 2019-05-17 01:48:40 +02:00
Bas van Dijk 71fdb69314 nixos: add test for tinydns 2019-05-16 23:46:17 +02:00
Bas van Dijk cc3d0f4acf Merge pull request #61255 from basvandijk/elk-old-upgrades 
elk5: 5.6.9 -> 5.6.16 & elk6: 6.7.1 -> 6.7.2
 2019-05-10 23:48:21 +02:00
Bas van Dijk 1a0818e941 elk6: 6.7.1 -> 6.7.2 2019-05-10 23:32:44 +02:00
Bas van Dijk 8673d82bc1 elk5: 5.6.9 -> 5.6.16 2019-05-10 22:46:12 +02:00
Bas van Dijk 4b7aea9e8c Merge pull request #61237 from basvandijk/journalbeat-fixes 
NixOS: support journalbeat >= 6
 2019-05-10 18:44:44 +02:00
Bas van Dijk 477c552c7d nixos/journalbeat: support journalbeat >= 6 & add test 2019-05-10 15:41:41 +02:00
Bas van Dijk a662f99139 journalbeat: make journalbeat6 the default 
Version 6.x is also the default for the other beats.
 2019-05-10 15:39:11 +02:00
Bas van Dijk 42c9c6df73 journalbeat7: fix binary by setting RPATH to systemd using patchelf 2019-05-10 15:36:53 +02:00
Bas van Dijk 42f357d1ac journalbeat6: fix binary by setting RPATH to systemd using patchelf 2019-05-10 15:29:35 +02:00
Bas van Dijk 6f0a6bfc60 journalbeat: patchelf the binary instead of using a wrapper 2019-05-10 15:27:45 +02:00
Bas van Dijk 46a869b286 Merge pull request #61185 from basvandijk/elk-7.0.1 
elk: 7.0.0 -> 7.0.1
 2019-05-09 15:50:03 +02:00
Bas van Dijk 78cb9b7898 elk: 7.0.0 -> 7.0.1 2019-05-09 11:37:48 +02:00
Bas van Dijk d6b866e52b Merge pull request #60464 from basvandijk/strongswan-refactor 
strongswan: cleanup
 2019-04-30 15:49:01 +02:00
Bas van Dijk 80df0495bb strongswan: remove the now unnecessary dependency on libpcap 
Since #51787 has been merged we can remove this ad-hoc fix.
 2019-04-30 10:28:31 +02:00
Bas van Dijk d771036ab2 strongswan: use placeholder instead of configureFlagsArray 2019-04-30 10:27:49 +02:00
Bas van Dijk 710b9675fc Merge pull request #59983 from ivan/prometheus-statsd-exporter-0.9.0 
prometheus-statsd-exporter: 0.4.0 -> 0.9.0
 2019-04-22 23:21:46 +02:00
Bas van Dijk cccc7a93d2 Merge pull request #59828 from basvandijk/prometheus-refactoring 
nixos/prometheus: refactored & added more missing options
 2019-04-18 13:43:53 +02:00
Bas van Dijk cdd82681b3 nixos/prometheus: add more missing options 2019-04-18 12:53:13 +02:00
Bas van Dijk 285fd3c05a nixos/prometheus: abstract over optional option creation 2019-04-18 11:55:43 +02:00
Bas van Dijk 55ef5d4246 nixos/prometheus: set optional attributes to type types.nullOr 
This makes sure that when a user hasn't set a Prometheus option it
won't show up in the prometheus.yml configuration file. This results
in smaller and easier to understand configuration files.
 2019-04-17 14:49:09 +02:00
Bas van Dijk 57e5b75f9c nixos/prometheus: filter out the _module attr in a central place 
We previously filtered out the `_module` attribute in a NixOS
configuration by filtering it using the option's `apply` function.

This meant that every option that had a submodule type needed to have
this apply function. Adding this function is easy to forget thus this
mechanism is error prone.

We now recursively filter out the `_module` attributes at the place we
construct the Prometheus configuration file. Since we now do the filtering
centrally we don't have to do it per option making it less prone to errors.
 2019-04-17 14:08:16 +02:00
Bas van Dijk 4e867661d5 Merge pull request #54691 from thefloweringash/prometheus-ec2 
nixos/prometheus: add `ec2_sd_configs` section to `scrape_configs`
 2019-04-16 17:33:42 +02:00
Bas van Dijk a913d0891c nixos/prometheus: filter out empty srcape_configs attributes 
This results in a smaller prometheus.yml config file.

It also allows us to use the same options for both prometheus-1 and
prometheus-2 since the new options for prometheus-2 default to null
and will be filtered out if they are not set.
 2019-04-16 16:06:11 +02:00
Bas van Dijk a23db5db08 nixos/prometheus: add new ec2_sd_config options for prometheus2 2019-04-16 16:04:33 +02:00
Bas van Dijk 0cfeb78bc5 Merge pull request #59685 from basvandijk/remove-notes-prometheus2-rl-1909 
nixos/doc: remove prometheus2 notes from the 19.09 release notes
 2019-04-16 11:46:01 +02:00
Bas van Dijk ced565b3d3 Merge pull request #59606 from vbgl/dune-1.9.1 
dune: 1.9.0 -> 1.9.1
 2019-04-16 11:37:32 +02:00
Bas van Dijk e7fadde7a7 nixos/doc: remove prometheus2 notes from the 19.09 release notes 
prometheus2 has been backported to 19.03 so it won't be new for 19.09.
 2019-04-16 09:47:45 +02:00
Bas van Dijk e138020e8d Merge pull request #59676 from basvandijk/prometheus-pushgateway-module 
nixos/prometheus/pushgateway: add module and test
 2019-04-16 09:18:34 +02:00
Bas van Dijk d1940beb3a nixos/prometheus/pushgateway: add module and test 2019-04-16 08:09:38 +02:00
Bas van Dijk fd05e3407e Merge pull request #59608 from basvandijk/prometheus-pushgateway-0.8.0 
prometheus-pushgateway: 0.7.0 -> 0.8.0
 2019-04-15 21:52:58 +02:00
Bas van Dijk b0fbe1df3f prometheus-pushgateway: 0.7.0 -> 0.8.0 2019-04-15 16:12:14 +02:00
Bas van Dijk e5724e8e66 Merge pull request #59514 from basvandijk/elk-7.0.0 
elk7: init at 7.0.0
 2019-04-15 07:05:13 +02:00
Bas van Dijk 13352f28d2 elk7: init at 7.0.0 
This adds the following new packages:

+ elasticsearch7
+ elasticsearch7-oss
+ logstash7
+ logstash7-oss
+ kibana7
+ kibana7-oss
+ filebeat7
+ heartbeat7
+ metricbeat7
+ packetbeat7
+ journalbeat7

The default major version of the ELK stack stays at 6. We should
probably set it to 7 in a next commit.
 2019-04-14 21:39:46 +02:00
Bas van Dijk 08b277e0da Merge pull request #56017 from elohmeier/prom-tls 
prometheus: add tls_config
 2019-04-12 12:57:54 +02:00
Bas van Dijk 1a926b82a8 Merge pull request #59263 from Zimmi48/dune-1.9.0 
dune: 1.8.2 -> 1.9.0
 2019-04-11 09:07:14 +02:00
Bas van Dijk 38ae3fe584 Merge pull request #59270 from basvandijk/alertmanager-DynamicUser 
nixos/prometheus/alertmanager: use DynamicUser instead of nobody
 2019-04-10 22:56:17 +02:00
Bas van Dijk cd4486ecc3 nixos/prometheus/alertmanager: use DynamicUser instead of nobody 
See issue #55370
 2019-04-10 20:38:40 +02:00
Bas van Dijk 08d9cf7ad4 Merge pull request #59264 from basvandijk/alertmanager-0.16.2 
alertmanager: 0.15.3 -> 0.16.2
 2019-04-10 16:45:18 +02:00
Bas van Dijk 739bdff4a4 nixos/prometheus/alertmanager: use ExecStart instead of script 
This results in a simpler service unit which doesn't first have to
start a shell:

  > cat /nix/store/s95nsr8zbkblklanqpkiap49mkwbaq45-unit-alertmanager.service/alertmanager.service
  ...
  ExecStart=/nix/store/4g784lwcy7kp69hg0z2hfwkhjp2914lr-alertmanager-0.16.2-bin/bin/alertmanager \
    --config.file /nix/store/p2c7fyi2jkkwq04z2flk84q4wyj2ggry-checked-config \
    --web.listen-address [::1]:9093 \
    --log.level warn
  ...
 2019-04-10 15:03:09 +02:00
Bas van Dijk 18925d0ceb prometheus-alertmanager: 0.15.3 -> 0.16.2 2019-04-10 14:52:31 +02:00
Bas van Dijk ed426e4df8 Merge pull request #59234 from basvandijk/fluentd-1.4.2 
fluentd: 1.2.3 -> 1.4.2
 2019-04-10 12:47:49 +02:00
Bas van Dijk ad41c1f1c0 fluentd: 1.2.3 -> 1.4.2 2019-04-10 12:46:06 +02:00
Bas van Dijk 2f2e2971d6 Merge pull request #58255 from jbgi/prometheus2 
Add Prometheus 2 service in parallel with 1.x version (continuation)
 2019-04-09 14:14:18 +02:00
Bas van Dijk b423b73adc nixos/doc: add Prometheus stateDir handling to rl-1909.xml 2019-04-09 13:13:44 +02:00
Bas van Dijk c95179b52f nixos/prometheus: add back the option services.prometheus.dataDir 
This is to ensure more backwards compatibility. Note this is not 100%
backwards compatible because we now require dataDir to begin with /var/lib/.
 2019-04-09 13:13:34 +02:00
Bas van Dijk a3fb03df3e Merge pull request #59206 from basvandijk/elk-6.7.1 
elk: 6.5.1 -> 6.7.1
 2019-04-09 13:04:14 +02:00
Bas van Dijk 7062a073e8 elk: 6.5.1 -> 6.7.1 2019-04-09 12:34:01 +02:00
Bas van Dijk 29d7d8f44d nixos/doc: added the Prometheus changes to the 19.09 release notes 2019-04-08 19:39:22 +02:00
Bas van Dijk eed84d1f8d nixos/prometheus: fix indentation and unnecessary parenthesis 2019-04-08 19:14:42 +02:00
Bas van Dijk 13d5f47a84 Merge pull request #59182 from basvandijk/prometheus-2.8.1 
prometheus_2: 2.6.0 -> 2.8.1
 2019-04-08 19:01:10 +02:00
Bas van Dijk 2a722175cd prometheus_2: 2.6.0 -> 2.8.1 
See: https://github.com/prometheus/prometheus/releases/tag/v2.8.1
 2019-04-08 18:06:00 +02:00
Bas van Dijk 65fa918adb Merge pull request #59175 from jbgi/generic-prometheus 
Expose prometheus generic builder.
 2019-04-08 18:03:25 +02:00
Bas van Dijk b6fdd1a0fc prometheus: rename the generic function to buildPrometheus 
Since the `generic` function is now exported it should have a less
generic name, pun intended.
 2019-04-08 16:40:42 +02:00
Bas van Dijk 394970047e nixos/tests: register the prometheus2 test 2019-04-08 15:24:23 +02:00
Bas van Dijk 7cf27feb2f nixos/prometheus: get rid of empty arguments 
Previously the prometheus.service file looked like:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s \
     \

  Restart=always

Now it's:

  ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus \
    -storage.local.path=/var/lib/prometheus/metrics \
    -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
    -web.listen-address=0.0.0.0:9090 \
    -alertmanager.notification-queue-capacity=10000 \
    -alertmanager.timeout=10s
  Restart=always
 2019-04-08 14:59:12 +02:00
Bas van Dijk a59c92903e nixos/prometheus: use ExecStart instead of a shell script 
This uses fewer lines of code and one less process.
 2019-04-08 14:59:12 +02:00
Bas van Dijk 0b2ae584c9 Merge pull request #57880 from basvandijk/megacli-8.07.14 
megacli: 8.07.07 -> 8.07.14
 2019-03-18 23:31:54 +01:00
Bas van Dijk ef006122f0 megacli: 8.07.07 -> 8.07.14 2019-03-18 22:13:34 +01:00
Bas van Dijk 6b9d8a21fe Merge pull request #57072 from knl/upgrade-strongswan-5.7.2 
strongswan: 5.7.1 -> 5.7.2
 2019-03-08 16:29:49 +01:00
Bas van Dijk e44e2455d3 strongswan-swanctl: fix module by setting the new SWANCTL_DIR envvar 2019-03-08 16:11:38 +01:00
Bas van Dijk 6ac10cd764 Merge pull request #53399 from LumiGuide/feat-wordpress-copy-plugins 
apache-httpd/wordpress: copy plugins and themes instead of symlinking
 2019-01-07 13:41:29 +01:00
Bas van Dijk 8ad610b040 Merge pull request #53523 from jacereda/futhark-darwin 
Fix futhark build on Darwin
 2019-01-07 12:13:13 +01:00
Bas van Dijk f2eda0105b Merge pull request #53289 from LumiGuide/feat-wordpress-upgrade 
Wordpress: 4.9.1 -> 5.0.2
 2019-01-03 11:14:46 +01:00
Bas van Dijk 559916f648 haskellPackages.inline-c-cpp: disable test-suite on darwin to fix the build 2019-01-01 16:51:24 +01:00
Bas van Dijk 4b033e3e49 Merge pull request #52794 from LumiGuide/opencv_contrib-4.0.1 
opencv4: opencv_contrib: 4.0.0 -> 4.0.1
 2018-12-24 23:56:38 +01:00
Bas van Dijk e36ab216ec opencv4: opencv_contrib: 4.0.0 -> 4.0.1 2018-12-24 23:37:12 +01:00
Bas van Dijk 5747c7114e Merge pull request #52689 from LumiGuide/pgmanage-11.0.1 
pgmanage: 10.3.1 -> 11.0.1
 2018-12-22 18:37:12 +01:00
Bas van Dijk ee42dab330 Merge pull request #52687 from LumiGuide/opencv-4.0.1 
OpenCV: 3.4.5 & 4.0.1
 2018-12-22 18:36:44 +01:00
Bas van Dijk f1f1de32f3 pgmanage: 10.3.1 -> 11.0.1 2018-12-22 17:39:15 +01:00
Bas van Dijk 8347028c21 opencv4: 4.0.0 -> 4.0.1 2018-12-22 17:26:12 +01:00
Bas van Dijk b2ea557879 opencv3: 3.4.4 -> 3.4.5 2018-12-22 17:24:21 +01:00
Bas van Dijk 72eae72223 openblas: fix build on x86_64-darwin 
See: https://github.com/xianyi/OpenBLAS/issues/1926
 2018-12-20 13:25:44 +01:00
Bas van Dijk 6267a02d9c opencv4: fix OpenCV issue 13207 
This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
 2018-12-20 10:49:40 +01:00
Bas van Dijk 49965e61d7 opencv3: fix OpenCV issue 13207 
See: https://github.com/opencv/opencv/pull/13232

This also fixes the test of haskell-opencv HEAD where we got the
following error:

    Feature Detection
      houghLinesP:
libgomp: Out of memory allocating 927712937064 bytes
Test suite test-opencv: FAIL
 2018-12-20 10:49:40 +01:00
Bas van Dijk 9c53047262 Merge pull request #51256 from LumiGuide/elasticsearch-curator-5.6.0 
elasticsearch-curator: 5.5.4 -> 5.6.0
 2018-12-13 21:14:45 +01:00
Bas van Dijk 5d970e740e pythonPackages.elasticsearch-curator: 5.5.4 -> 5.6.0 2018-12-13 20:58:58 +01:00
Bas van Dijk 1ce2cc47fc pythonPackages.certifi: 2018.10.15 -> 2018.11.29 2018-12-13 20:58:25 +01:00
Bas van Dijk b560dd9047 elasticsearch: make sure to patchelf the x-pack-ml binaries 2018-12-02 15:54:20 +01:00
Bas van Dijk 7035598251 Merge pull request #51225 from LumiGuide/elk-6.5.1 
elk: 6.3.2 -> 6.5.1
 2018-12-02 14:44:47 +01:00
Bas van Dijk fbf0efc6a7 elk: 6.3.2 -> 6.5.1 2018-12-01 12:47:12 +01:00
Bas van Dijk 274e72aa29 Merge pull request #51027 from LumiGuide/opencv-4.0.0 
opencv4: init at 4.0.0
 2018-11-30 23:56:36 +01:00