From 4a9e3d62868654c732bb07bf5e6152dcc6dcfabc Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sat, 10 Oct 2020 15:52:09 +0900 Subject: [PATCH] Delete `fluentd` cookbook. --- cookbooks/fluentd/attributes.rb | 11 -- cookbooks/fluentd/auth.rb | 0 cookbooks/fluentd/default.rb | 40 ----- .../files/etc/monit/conf.d/td-agent.conf | 4 - .../files/etc/security/limits.d/90-nfile.conf | 6 - .../files/etc/td-agent/conf.d/forwarder.conf | 38 ----- .../td-agent/conf.d/forwarder_aptitude.conf | 20 --- .../etc/td-agent/conf.d/forwarder_auth.conf | 28 ---- .../etc/td-agent/conf.d/forwarder_consul.conf | 30 ---- .../td-agent/conf.d/forwarder_cron-apt.conf | 29 ---- .../etc/td-agent/conf.d/forwarder_monit.conf | 20 --- .../etc/td-agent/conf.d/forwarder_nginx.conf | 21 --- .../td-agent/conf.d/forwarder_td-agent.conf | 29 ---- .../files/etc/td-agent/conf.d/processor.conf | 146 ------------------ .../etc/td-agent/conf.d/processor_consul.conf | 39 ----- .../etc/td-agent/conf.d/processor_nginx.conf | 15 -- .../files/etc/td-agent/conf.d/receiver.conf | 5 - .../etc/td-agent/conf.d/syslog_esxi.conf | 38 ----- .../etc/td-agent/conf.d/syslog_synology.conf | 41 ----- .../etc/td-agent/conf.d/syslog_vyos.conf | 45 ------ .../files/etc/td-agent/conf.d/watcher.conf | 44 ------ .../fluentd/files/etc/td-agent/td-agent.conf | 1 - cookbooks/fluentd/install.rb | 57 ------- cookbooks/fluentd/nginx.rb | 22 --- cookbooks/fluentd/prerequisites.rb | 5 - cookbooks/fluentd/processor.rb | 7 - cookbooks/fluentd/setup.rb | 73 --------- cookbooks/fluentd/slack.rb | 12 -- cookbooks/fluentd/syslog.rb | 15 -- .../apt/sources.list.d/treasure-data.list.erb | 1 - .../etc/consul.d/service-td-agent.json.erb | 7 - cookbooks/fluentd/templates/etc/hosts.erb | 11 -- 32 files changed, 860 deletions(-) delete mode 100644 cookbooks/fluentd/attributes.rb delete mode 100644 cookbooks/fluentd/auth.rb delete mode 100644 cookbooks/fluentd/default.rb delete mode 100644 cookbooks/fluentd/files/etc/monit/conf.d/td-agent.conf delete mode 100644 cookbooks/fluentd/files/etc/security/limits.d/90-nfile.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_aptitude.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_auth.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_consul.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_cron-apt.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_monit.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_nginx.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_td-agent.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/processor.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/processor_consul.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/processor_nginx.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/receiver.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/syslog_esxi.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/syslog_synology.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/syslog_vyos.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/conf.d/watcher.conf delete mode 100644 cookbooks/fluentd/files/etc/td-agent/td-agent.conf delete mode 100644 cookbooks/fluentd/install.rb delete mode 100644 cookbooks/fluentd/nginx.rb delete mode 100644 cookbooks/fluentd/prerequisites.rb delete mode 100644 cookbooks/fluentd/processor.rb delete mode 100644 cookbooks/fluentd/setup.rb delete mode 100644 cookbooks/fluentd/slack.rb delete mode 100644 cookbooks/fluentd/syslog.rb delete mode 100644 cookbooks/fluentd/templates/etc/apt/sources.list.d/treasure-data.list.erb delete mode 100644 cookbooks/fluentd/templates/etc/consul.d/service-td-agent.json.erb delete mode 100644 cookbooks/fluentd/templates/etc/hosts.erb diff --git a/cookbooks/fluentd/attributes.rb b/cookbooks/fluentd/attributes.rb deleted file mode 100644 index df35d4f..0000000 --- a/cookbooks/fluentd/attributes.rb +++ /dev/null @@ -1,11 +0,0 @@ -# ------------------------------------------- -# Specifying the default settings: -# ------------------------------------------- -node.reverse_merge!({ - 'td-agent' => { - 'user' => 'td-agent', - 'group' => 'td-agent', - 'forward' => false, - 'role' => 'primary' - } -}) diff --git a/cookbooks/fluentd/auth.rb b/cookbooks/fluentd/auth.rb deleted file mode 100644 index e69de29..0000000 diff --git a/cookbooks/fluentd/default.rb b/cookbooks/fluentd/default.rb deleted file mode 100644 index 0cac0d9..0000000 --- a/cookbooks/fluentd/default.rb +++ /dev/null @@ -1,40 +0,0 @@ -##################################### -# Common Settings: -##################################### - -include_recipe './attributes.rb' - -include_recipe './prerequisites.rb' -include_recipe './install.rb' - -include_recipe './setup.rb' - -##################################### -# Manager Settings: -##################################### - -if node['td-agent']['forward'] - include_recipe './processor.rb' - include_recipe './syslog.rb' - include_recipe './slack.rb' -end - -##################################### -# monitoring Settings: -##################################### - -include_recipe './nginx.rb' - -%w( aptitude auth cron-apt monit consul ).each do |c| - remote_file "/etc/td-agent/conf.d/forwarder_#{c}.conf" do - owner 'root' - group 'root' - mode '644' - - notifies :restart, 'service[td-agent]' - end -end - -service 'td-agent' do - action :restart -end diff --git a/cookbooks/fluentd/files/etc/monit/conf.d/td-agent.conf b/cookbooks/fluentd/files/etc/monit/conf.d/td-agent.conf deleted file mode 100644 index c7760a3..0000000 --- a/cookbooks/fluentd/files/etc/monit/conf.d/td-agent.conf +++ /dev/null @@ -1,4 +0,0 @@ -check process td-agent - with pidfile /var/run/td-agent/td-agent.pid - start program = "/etc/init.d/td-agent start" - stop program = "/etc/init.d/td-agent stop" diff --git a/cookbooks/fluentd/files/etc/security/limits.d/90-nfile.conf b/cookbooks/fluentd/files/etc/security/limits.d/90-nfile.conf deleted file mode 100644 index 929b7b8..0000000 --- a/cookbooks/fluentd/files/etc/security/limits.d/90-nfile.conf +++ /dev/null @@ -1,6 +0,0 @@ -# - nofile - max number of open files - -root soft nofile 65536 -root hard nofile 65536 -* soft nofile 65536 -* hard nofile 65536 diff --git a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder.conf b/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder.conf deleted file mode 100644 index 48eaad0..0000000 --- a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder.conf +++ /dev/null @@ -1,38 +0,0 @@ - diff --git a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_aptitude.conf b/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_aptitude.conf deleted file mode 100644 index abda2a5..0000000 --- a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_aptitude.conf +++ /dev/null @@ -1,20 +0,0 @@ - - @type tail - path /var/log/apt/history.log - pos_file /var/log/td-agent/aptitude.pos - format none - tag aptitude - - - - @type record_transformer - - hostname ${hostname} - message ${hostname}: ${record["message"]} - - - - - @type relabel - @label @forward - diff --git a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_auth.conf b/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_auth.conf deleted file mode 100644 index 257bae5..0000000 --- a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_auth.conf +++ /dev/null @@ -1,28 +0,0 @@ - - @type tail - path /var/log/auth.log - pos_file /var/log/td-agent/auth.pos - format syslog - tag auth - - - - @type record_transformer - - message ${hostname}: ${record["message"]} - - - - - @type grep - - - key message - pattern (CRON|Did not receive identification string from|sudo|pam_unix|seat|Removed session|Received disconnect|New session|Accepted publickey|Disconnected) - - - - - @type relabel - @label @forward - diff --git a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_consul.conf b/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_consul.conf deleted file mode 100644 index e8cd7cc..0000000 --- a/cookbooks/fluentd/files/etc/td-agent/conf.d/forwarder_consul.conf +++ /dev/null @@ -1,30 +0,0 @@ - - @type tail - path /var/log/supervisor/consul.log - pos_file /var/log/td-agent/consul.pos - format /^( (?