Jan Tojnar
f9237f3152
Merge branch 'master' into staging-next
2019-09-06 16:55:11 +02:00
adisbladis
4e30b30a65
logstash5: Remove EOL package
2019-09-06 14:22:15 +01:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging
2019-09-02 23:25:24 +02:00
Silvan Mosberger
478e7184f8
nixos/modules: Remove all usages of types.string
...
And replace them with a more appropriate type
Also fix up some minor module problems along the way
2019-08-31 18:19:00 +02:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Aaron Andersen
ac4327c025
nixos/awstats: replace usage of deprecated services.httpd.extraSubservices
2019-08-15 21:00:27 -04:00
Franz Pletz
376b5fd000
Merge pull request #64463 from Ma27/graylog-test
...
nixos/graylog: minor fixes, add test
2019-07-21 20:53:39 +00:00
Maximilian Bosch
beff2f8d75
nixos/graylog: use types.lines
for extraConfig
...
The `types.lines` type makes it possible to define `extraConfig` in
multiple files and simply concat the contents.
2019-07-07 14:49:39 +02:00
Maximilian Bosch
3464c602e8
nixos/graylog: fix startup
...
Until now the startup failed with an error like this:
```
com.github.joschi.jadconfig.ValidationException: Parent path /var/lib/graylog/server for Node ID file at /var/lib/graylog/server/node-id is not a directory
```
This happens since `graylog.service` ensures that `/var/lib/graylog`
exists, however it doesn't take care of the directory for
`cfg.nodeIdFile`.
2019-07-06 20:42:56 +02:00
Aaron Andersen
65f449fe33
nixos/graylog: replace deprecated usage of PermissionsStartOnly
...
see https://github.com/NixOS/nixpkgs/issues/53852
2019-05-26 07:20:57 -04:00
Aaron Andersen
191e4b0755
nixos/heartbeat: replace deprecated usage of PermissionsStartOnly
...
see https://github.com/NixOS/nixpkgs/issues/53852
2019-05-25 13:48:41 -04:00
Robin Gloster
6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull
...
treewide: Remove usage of isNull
2019-05-18 09:36:24 +00:00
Bas van Dijk
477c552c7d
nixos/journalbeat: support journalbeat >= 6 & add test
2019-05-10 15:41:41 +02:00
Daniel Schaefer
786f02f7a4
treewide: Remove usage of isNull
...
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
Florian Jacob
e916cdf02d
nixos/journalwatch: permissionsStartOnly is deprecated
...
See #53852 for details,
related to the efforts in #56265
2019-04-24 21:26:29 +02:00
Symphorien Gibol
a915b33315
nixos: add preferLocalBuild=true; on derivations for config files
2019-02-22 20:11:27 +01:00
Vincent Ambo
5ead27394d
journaldriver: 1.0.0 -> 1.1.0 ( #48106 )
...
Included changes:
* upstream repository has moved, URLs changed accordingly
* journaldriver bumped to new upstream release
The new release includes an important workaround for an issue that
could cause log-forwarding to fail after service restarts due to
invalid journal cursors being persisted.
2018-10-09 23:45:43 +02:00
Bas van Dijk
551fec4467
Merge branch 'master' into es6
2018-08-23 23:41:27 +02:00
Izorkin
e4f4589186
syslog-ng: fix reload service
2018-08-16 18:23:58 +03:00
Izorkin
300fe1cc9a
syslog-ng: fix reload service
2018-08-16 00:05:35 +03:00
Izorkin
c2b24892b0
syslog-ng: enable reload service
2018-08-15 19:46:47 +03:00
Jörg Thalheim
13db07a092
logstash: update default version to v6
2018-08-03 12:06:45 +01:00
volth
2e979e8ceb
[bot] nixos/*: remove unused arguments in lambdas
2018-07-20 20:56:59 +00:00
volth
6f1134ff8b
nixos/journalwatch: fix evaluation
2018-07-09 04:43:41 +00:00
Florian Klink
fff5923686
nixos/modules: users.(extraUsers|extraGroup->users|group)
2018-06-30 03:02:58 +02:00
Vincent Ambo
59e5aabee6
nixos/journaldriver: add module for journaldriver log forwarder
...
Adds a module for running the journaldriver log forwarding agent via
systemd.
The agent can be deployed on both GCP instances and machines hosted
elsewhere to forward all logs from journald to Stackdriver Logging.
Consult the module options and upstream documentation for more
information.
Implementation notes:
* The service unit is configured to use systemd's dynamic user feature
which will let systemd set up the state directory and appropriate
user configuration at unit launch time instead of hardcoding it.
* The module depends on `network-online.target` to prevent a situation
where journaldriver is failing and restarting multiple times before
the network is online.
2018-06-18 20:36:44 +02:00
Robin Gloster
fa347164b6
graylog: use jre_headless
2018-03-22 02:29:27 +01:00
Philipp Dörfler
4b0c9418c0
nixos/logcheck: replace rm with rm -r to delete the empty logcheck.logfiles.d/
...
Fixes #29906
2017-12-17 04:02:26 +00:00
Sarah Brofeldt
b694fa0054
nixos/logstash: Listen on 127.0.0.1 instead of 0.0.0.0
2017-12-09 11:32:14 +01:00
Tristan Helmich
aa8e60d934
graylog module: adapt to Graylog version 2.3.0
2017-08-11 13:07:30 +02:00
Dan Peebles
b48ffa332b
services.fluentd: add plugins option
...
This allows us to pass in additional ad-hoc fluentd plugins for custom
output formats and other goodness.
2017-08-08 22:02:56 +00:00
Florian Jacob
63bb133373
journalwatch & journalwatch service: init at 1.1.0
2017-07-16 00:14:19 +02:00
Tristan Helmich
97e8422541
heartbeat service: init
2017-07-02 10:45:59 +02:00
Bas van Dijk
2444eab485
ELK: update kibana and the elastic beats to 5.4 ( #26252 )
...
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
(see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00
Mateusz Kowalczyk
80918692e1
SystemdJournal2Gelf.service: new service
2017-05-25 19:04:40 +01:00
Franz Pletz
3ab45f4b36
treewide: use boolToString function
2017-04-11 18:18:53 +02:00
Franz Pletz
fb50cde71e
nixos/treewide: systemd.time is in manvolume 7
...
cc #23396
2017-03-21 08:28:53 +01:00
Joachim Fasting
15da23d5c1
nixos/modules: use defaultText/literalExample where applicable
...
Primarily to fix rendering of default values/examples but also
to avoid unnecessary work.
2017-03-07 14:06:08 +01:00
Tristan Helmich
7420922806
graylog module: add plugin support
2017-02-23 15:21:29 +01:00
Joachim F
6dbe55ca68
Merge pull request #20456 from ericsagnes/feat/loaf-dep-1
...
Use attrsOf in place of loaOf when relevant
2017-02-19 15:49:25 +01:00
Parnell Springmeyer
6777e6f812
Merging with upstream
2017-01-29 05:54:01 -06:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead
2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback
2017-01-28 20:48:03 -08:00
Dan Peebles
ced27b2966
fluentd module: add configurable package option
2017-01-27 15:08:23 +00:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy
2017-01-26 02:00:04 -08:00
Robin Gloster
117e5547d1
Merge pull request #21311 from makefu/services/logstash
...
services.logstash: default options, examples and address update
2017-01-25 22:11:40 +01:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Marius Bergmann
00444cbf25
journalbeat service: init at 5.1.2
...
Journalbeat is a log shipper from systemd/journald to
Logstash/Elasticsearch. I added a package as well as a NixOS service
module for it.
2017-01-23 18:28:55 +01:00
makefu
e9c6cf02e6
services.logstash: rename address to listenAddress
2017-01-13 10:19:32 +01:00
makefu
10303e9e47
services.logstash: update example and default filter
2017-01-13 10:19:19 +01:00
Joachim Fasting
fafb6657c1
syslogd service: assert conflict with rsyslogd
...
Enabling both these at the same time fails because they implement the
same interface.
2016-12-10 20:35:39 +01:00
Eric Sagnes
418901a906
logcheck module: ignore, ignoreCron option loaOf -> attrsOf
2016-11-16 16:29:58 +09:00
Eric Sagnes
986510de45
logcheck module: use enum
2016-11-05 13:24:53 +09:00
Eric Sagnes
c1cad56c6e
logcheck module: optionSet -> submodule
2016-09-13 12:53:09 +09:00
Parnell Springmeyer
98c058a1ee
Adapting everything for the merged permissions wrappers work.
2016-09-01 19:21:06 -05:00
Christian Lask
6d68a1fbf3
logstash: 1.5.3 -> 2.3.4
...
Note: the option to configure the watchdog timeout seems to be gone
in the 2.3 series of Logstash. It complains about an unknown option
and it is not in the source anymore. I am thus removing this
configuration option to adjust the service to these changes, too.
2016-07-27 17:45:38 +02:00
Sheena Artrip
e5fc302b1a
logstash: fix examples in service file
2016-06-24 14:36:18 -04:00
Tristan Helmich
e48580c083
graylog service: Initial graylog service
2016-04-28 23:27:57 +02:00
Nikolay Amiantov
dfe608c8a2
symlinkJoin: accept set as an argument with additional options
2016-04-26 15:37:42 +03:00
Vladimír Čunát
6f9fe31b42
awstats: init at 7.4, including a simple service
2016-03-11 10:37:06 +01:00
Thomas Strobel
2d6696fc0a
nixos-modules: Fixes related to "literalExample" and "defaultText".
2016-02-29 01:47:12 +01:00
Robin Gloster
e1493f2ba7
logstash module: use literalExample
2016-02-13 15:03:09 +00:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
Eelco Dolstra
89e983786a
Manual: Remove store path references
2015-09-24 11:50:58 +02:00
Jaka Hudoklin
77356690fb
logstash service: fix startup
2015-09-06 15:20:56 +02:00
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Jaka Hudoklin
f6bb49ad4a
nixos/fluentd: add support for config reload
2015-04-25 14:21:27 +02:00
Jaka Hudoklin
fca0aa7077
Add fluentd package and module
2015-03-18 21:18:47 +01:00
Rickard Nilsson
71f64ded06
Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
...
This reverts commit 8e1072fd60
.
2014-11-06 21:59:04 +01:00
William A. Kennington III
8e1072fd60
Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
...
This reverts commit e2ada42623
.
2014-11-02 17:22:28 -08:00
Rickard Nilsson
e2ada42623
syslog-ng: Update from 3.5.6 to 3.6.1
...
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
2014-10-27 12:22:22 +01:00
lethalman
40b5aa1d33
Merge pull request #4506 from cstrahan/logstash-config
...
logstash service: make log verbosity configurable.
2014-10-26 20:10:03 +01:00
Rickard Nilsson
135d677690
nixos/logrotate: Fix spelling mistake
2014-10-16 08:20:43 +02:00
Rickard Nilsson
cdba59d0f2
nixos/syslog-ng: Add option configHeader
2014-10-16 08:14:45 +02:00
Rickard Nilsson
2ffe274486
nixos/logrotate: Specify type for config option
2014-10-15 16:52:50 +02:00
Rickard Nilsson
54a0ac090c
nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation
2014-10-14 15:38:42 +02:00
Charles Strahan
dc2fac7c0c
logstash service: make log verbosity configurable.
2014-10-13 15:48:41 -04:00
Charles Strahan
fc7098abf7
logstash service improvements
...
* add logstash-contrib plugins package
* add additional options to the logstash service
2014-10-05 21:53:05 -04:00
Rickard Nilsson
8fc777ffd6
syslog-ng module: Add package option
2014-09-17 19:48:51 +02:00
Eelco Dolstra
b0855d59a1
Improve option descriptions a bit
2014-09-05 15:28:24 +02:00
aszlig
8a56a55bb4
nixos/manual: Use literalExample when feasible.
...
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.
Thanks to @devhell for reporting.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
Rickard Nilsson
7b5829c314
Add NixOS module for syslog-ng
2014-08-11 15:06:11 +02:00
System administrator
5355d3d30b
logrotate: use systemd instead of cron
2014-08-07 08:58:50 +02:00
William Roe
8f31b13938
Fix service to use logstash new directory layout
2014-07-21 16:24:18 +01:00
Jaka Hudoklin
db8de47ce7
nixos/logstash: add enableWeb option to enable kibana web interface
2014-06-18 13:37:13 +02:00
Eelco Dolstra
29027fd1e1
Rewrite ‘with pkgs.lib’ -> ‘with lib’
...
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
2014-04-14 16:26:48 +02:00
Pascal Wittmann
884190a238
nixos: add uid for logcheck and only create a user for the default user
2014-02-11 14:19:06 +01:00
Eelco Dolstra
2b1f212494
Disable various services when running inside a container
2013-11-26 18:19:45 +01:00
Jaka Hudoklin
1453be4740
nixos/logstash: add option examples
2013-11-01 17:15:54 +01:00
Jaka Hudoklin
10e61f53d8
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-01 17:15:53 +01:00
Eelco Dolstra
408b8b5725
Add lots of missing option types
2013-10-30 18:47:43 +01:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
d5047faede
Remove uses of the "merge" option attribute
...
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00