Merge pull request #17 from evertrue/eherot/log_shipping

Do remote logging
evertrue · Jul 22, 2016 · 159ce3b · 159ce3b
2 parents cbe1caa + bbe3b51
commit 159ce3b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 0 deletions.
diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
@@ -36,7 +36,10 @@ suites:
       - recipe[et_cassandra::opscenter]
       - recipe[et_cassandra::backups]
       - recipe[cassandra_fake_data::default]
+      - recipe[et_logger::forwarder]
     attributes:
+      et_logger:
+        generate_cert: true
       et_cassandra:
         snapshot:
           data_bag: false

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -17,7 +17,10 @@ suites:
       - recipe[et_cassandra::default]
       - recipe[et_cassandra::opscenter]
       - recipe[et_cassandra::backups]
+      - recipe[et_logger::forwarder]
     attributes:
+      et_logger:
+        generate_cert: true
       ec2:
         placement_availability_zone: us-east-1b
       et_cassandra:

diff --git a/Berksfile b/Berksfile
@@ -1,8 +1,10 @@
+source :chef_server
 source 'https://supermarket.chef.io'
 
 metadata
 
 group :integration do
+  cookbook 'et_logger'
   cookbook 'ec2test', path: 'test/integration/cookbooks/ec2test'
   cookbook 'cassandra_fake_data', path: 'test/integration/cookbooks/cassandra_fake_data'
 end
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -15,3 +15,4 @@
 include_recipe 'java'
 include_recipe 'et_cassandra::install'
 include_recipe 'et_cassandra::repair_jobs'
+include_recipe 'et_cassandra::logging'
diff --git a/recipes/logging.rb b/recipes/logging.rb
@@ -0,0 +1,10 @@
+#
+# Cookbook Name:: et_cassandra
+# Recipe:: logging
+#
+# Copyright (c) 2016 EverTrue, Inc., All Rights Reserved.
+
+node.override['filebeat']['prospectors']['cassandra_system']['filebeat']['prospectors'] = {
+  'paths' => ["#{node['et_cassandra']['log_dir']}/system.log"],
+  'document_type' => 'cassandra_system'
+}
diff --git a/test/integration/data_bags/certificates/logstash.json b/test/integration/data_bags/certificates/logstash.json
@@ -0,0 +1,4 @@
+{
+  "id": "logstash",
+  "data": {}
+}
diff --git a/test/integration/nodes/_default-logs.json b/test/integration/nodes/_default-logs.json
@@ -0,0 +1,24 @@
+{
+  "name": "_default-logs",
+  "chef_environment": "_default",
+  "run_list": [
+    "recipe[et_base]",
+    "recipe[logserver]",
+    "role[loghost]"
+  ],
+  "automatic": {
+    "ipaddress": "10.99.5.247",
+    "fqdn": "_default-logs",
+    "cloud": {
+      "local_ipv4": "10.99.5.247"
+    },
+    "recipes": [
+      "rsyslog::default",
+      "rsyslog::server",
+      "logserver::default"
+    ],
+    "roles": [
+      "loghost"
+    ]
+  }
+}