-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #87 from jordiprats/master
journald management
- Loading branch information
Showing
8 changed files
with
218 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| class systemd::journald ( | ||
| $manage_service = true, | ||
| $manage_docker_service = true, | ||
| $service_ensure = 'running', | ||
| $service_enable = true, | ||
| $compress = true, | ||
| $forward_to_console = false, | ||
| $forward_to_kmsg = false, | ||
| $forward_to_syslog = true, | ||
| $forward_to_wall = true, | ||
| $max_file_sec = '1month', | ||
| $max_level_console = 'info', | ||
| $max_level_kmsg = 'notice', | ||
| $max_level_store = 'debug', | ||
| $max_level_syslog = 'debug', | ||
| $max_level_wall = 'emerg', | ||
| $max_retention_sec = undef, | ||
| $rate_limit_burst = 1000, | ||
| $rate_limit_interval = '30s', | ||
| $runtime_keep_free = undef, | ||
| $runtime_max_files_size = undef, | ||
| $runtime_max_use = undef, | ||
| $seal = true, | ||
| $split_mode = 'uid', | ||
| $storage = 'auto', | ||
| $sync_interval_sec = '5m', | ||
| $system_keep_free = undef, | ||
| $system_max_file_size = undef, | ||
| $system_max_use = undef, | ||
| $tty_path = '/dev/console' | ||
| ) inherits systemd::params { | ||
|
|
||
| validate_bool($forward_to_console, $forward_to_kmsg, | ||
| $forward_to_syslog, $forward_to_wall, $seal) | ||
|
|
||
| validate_integer($rate_limit_burst) | ||
|
|
||
| validate_re($max_level_console, ['^emerg$', '^alert$', '^crit$', '^err$', | ||
| '^warning$', '^notice$', '^info$', '^debug$']) | ||
|
|
||
| validate_re($max_level_kmsg, ['^emerg$', '^alert$', '^crit$', '^err$', | ||
| '^warning$', '^notice$', '^info$', '^debug$']) | ||
|
|
||
| validate_re($max_level_store, ['^emerg$', '^alert$', '^crit$', '^err$', | ||
| '^warning$', '^notice$', '^info$', '^debug$']) | ||
|
|
||
| validate_re($max_level_syslog, ['^emerg$', '^alert$', '^crit$', '^err$', | ||
| '^warning$', '^notice$', '^info$', '^debug$']) | ||
|
|
||
| validate_re($max_level_wall, ['^emerg$', '^alert$', '^crit$', '^err$', | ||
| '^warning$', '^notice$', '^info$', '^debug$']) | ||
|
|
||
| class { '::systemd::journald::config': } ~> | ||
| class { '::systemd::journald::service': } -> | ||
| Class['::systemd::journald'] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| class systemd::journald::config inherits systemd::journald { | ||
|
|
||
| Exec { | ||
| path => '/bin:/sbin:/usr/bin:/usr/sbin', | ||
| } | ||
|
|
||
| file { '/etc/systemd/journald.conf': | ||
| ensure => 'present', | ||
| owner => 'root', | ||
| group => 'root', | ||
| mode => '0644', | ||
| content => template("${module_name}/journald.erb"), | ||
| } | ||
|
|
||
| if($systemd::journald::seal) | ||
| { | ||
| # TODO: FSS interval | ||
| # chmod 2755 /var/log/journal/ | ||
| # [root@centos7 ~]# ls -ld /var/log/journal/ | ||
| # drwxr-sr-x+ 3 root systemd-journal 46 Apr 11 11:34 /var/log/journal/ | ||
| # [root@centos7 ~]# journalctl --interval=30s --setup-keys | ||
|
|
||
| file { '/var/log/journal': | ||
| ensure => 'directory', | ||
| owner => 'root', | ||
| group => 'systemd-journal', | ||
| mode => '2755', | ||
| require => File['/etc/systemd/journald.conf'], | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| class systemd::journald::service inherits systemd::journald { | ||
|
|
||
| $is_docker_container_var=getvar('::eyp_docker_iscontainer') | ||
| $is_docker_container=str2bool($is_docker_container_var) | ||
|
|
||
| if( $is_docker_container==false or | ||
| $systemd::journald::manage_docker_service) | ||
| { | ||
| if($systemd::journald::manage_service) | ||
| { | ||
| service { 'systemd-journald': | ||
| ensure => $systemd::journald::service_ensure, | ||
| enable => $systemd::journald::service_enable, | ||
| hasstatus => true, | ||
| hasrestart => true, | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| ### puppet managed file | ||
| # | ||
| # This file is part of systemd. | ||
| # | ||
| # systemd is free software; you can redistribute it and/or modify it | ||
| # under the terms of the GNU Lesser General Public License as published by | ||
| # the Free Software Foundation; either version 2.1 of the License, or | ||
| # (at your option) any later version. | ||
| # | ||
| # See journald.conf(5) for details | ||
| <%- | ||
|
|
||
| var_to_systemd_directives = { | ||
| 'compress' => 'Compress', | ||
| 'forward_to_console' => 'ForwardToConsole', | ||
| 'forward_to_kmsg' => 'ForwardToKMsg', | ||
| 'forward_to_syslog' => 'ForwardToSyslog', | ||
| 'forward_to_wall' => 'ForwardToWall', | ||
| 'max_file_sec' => 'MaxFileSec', | ||
| 'max_level_console' => 'MaxLevelConsole', | ||
| 'max_level_kmsg' => 'MaxLevelKMsg', | ||
| 'max_level_store' => 'MaxLevelStore', | ||
| 'max_level_syslog' => 'MaxLevelSyslog', | ||
| 'max_level_wall' => 'MaxLevelWall', | ||
| 'max_retention_sec' => 'MaxRetentionSec', | ||
| 'rate_limit_burst' => 'RateLimitBurst', | ||
| 'rate_limit_interval' => 'RateLimitInterval', | ||
| 'run_time_keep_free' => 'RuntimeKeepFree', | ||
| 'run_time_max_file_size' => 'RuntimeMaxFileSize', | ||
| 'run_time_max_use' => 'RuntimeMaxUse', | ||
| 'seal' => 'Seal', | ||
| 'split_mode' => 'SplitMode', | ||
| 'storage' => 'Storage', | ||
| 'sync_interval_sec' => 'SyncIntervalSec', | ||
| 'system_keep_free' => 'SystemKeepFree', | ||
| 'system_max_file_size' => 'SystemMaxFileSize', | ||
| 'system_max_use' => 'SystemMaxUse', | ||
| 'tty_path' => 'TTYPath', | ||
| } | ||
|
|
||
| -%> | ||
|
|
||
| [Journal] | ||
| <% | ||
| all_var_names = %w( compress forward_to_console forward_to_kmsg | ||
| forward_to_syslog forward_to_wall max_file_sec | ||
| max_level_console max_level_kmsg max_level_store | ||
| max_level_syslog max_level_wall max_retention_sec | ||
| rate_limit_burst rate_limit_interval run_time_keep_free | ||
| run_time_max_file_size run_time_max_use seal | ||
| split_mode storage sync_interval_sec system_keep_free | ||
| system_max_file_size system_max_use tty_path) | ||
|
|
||
| bool_var_names = %w(compress forward_to_console forward_to_kmsg | ||
| forward_to_syslog forward_to_wall seal) | ||
|
|
||
| all_var_names.each do | variableName | -%> | ||
| <%- if scope[variableName].to_s != 'undef' and !scope[variableName].nil? | ||
| if bool_var_names.include? variableName | ||
| myvalue = scope.function_bool2yesno([scope[variableName]]) | ||
| elsif scope[variableName].is_a?(Array) | ||
| next if scope[variableName].empty? | ||
| myvalue = scope[variableName].join(' ') | ||
| else | ||
| myvalue = scope[variableName] | ||
| end | ||
| -%> | ||
| <%= var_to_systemd_directives[variableName] -%>=<%= myvalue %> | ||
| <%- end -%> | ||
| <% end -%> |