fluentd-ui 1.0.0.alpha.2 → 1.0.0.alpha.3

data/spec/lib/regexp_preview/single_line_spec.rb

@@ -2,123 +2,109 @@ require 'spec_helper'
 
 describe RegexpPreview::SingleLine do
   describe ".initialize" do
-    subject { RegexpPreview::SingleLine.new("log_file.log", format, params) }
-
-    describe "format" do
-      let :params do
-        {
-          regexp: "(?<category>\[.+\])",
-          time_format: "%y/%m/%d",
-        }
-      end
+    subject { RegexpPreview::SingleLine.new("log_file.log", plugin_name, plugin_config) }
 
-      shared_examples "should set regexp and time_format from selected format" do
-        it do
-          expect(subject.regexp).to eq regexp
-          expect(subject.time_format).to eq time_format
-          expect(subject.params).to eq params
-        end
+    describe "parse" do
+      let :plugin_config do
+        {}
       end
 
-      shared_examples "should set params only" do
-        include_examples "should set regexp and time_format from selected format" do
-          let(:regexp) { nil }
-          let(:time_format) { nil }
+      shared_examples "should create parser plugin instance from selected plugin name" do
+        it do
+          expect(subject.plugin).to(be_an_instance_of(plugin_class))
         end
       end
 
       context "regexp" do
-        let(:format) { "regexp" }
-
-        it 'should set regexp from params' do
-          expect(subject.regexp).to eq /#{params[:regexp]}/
-          expect(subject.time_format).to be_nil
-          expect(subject.params).to eq params
+        let(:plugin_name) { "regexp" }
+        let(:plugin_class) { Fluent::Plugin::RegexpParser }
+        let :plugin_config do
+          {
+            "expression" => "(?<category>\[.+\])",
+            "time_format" => "%y/%m/%d",
+          }
         end
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "ltsv" do
-        let(:format) { "ltsv" }
+        let(:plugin_name) { "ltsv" }
+        let(:plugin_class) { Fluent::Plugin::LabeledTSVParser }
 
-        include_examples "should set params only"
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "json" do
-        let(:format) { "json" }
+        let(:plugin_name) { "json" }
+        let(:plugin_class) { Fluent::Plugin::JSONParser }
 
-        include_examples "should set params only"
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "csv" do
-        let(:format) { "csv" }
+        let(:plugin_name) { "csv" }
+        let(:plugin_class) { Fluent::Plugin::CSVParser }
+        let(:plugin_config) do
+          {
+            "keys" => "column1,column2"
+          }
+        end
 
-        include_examples "should set params only"
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "tsv" do
-        let(:format) { "tsv" }
+        let(:plugin_name) { "tsv" }
+        let(:plugin_class) { Fluent::Plugin::TSVParser }
+        let(:plugin_config) do
+          {
+            "keys" => "column1,column2"
+          }
+        end
 
-        include_examples "should set params only"
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "syslog" do # "apache", "nginx", etc
-        let(:format) { "syslog" }
+        let(:plugin_name) { "syslog" }
+        let(:plugin_class) { Fluent::Plugin::SyslogParser }
 
-        include_examples "should set regexp and time_format from selected format" do
-          let(:regexp) do
-            /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\[]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
-          end
-          let(:time_format) { "%b %d %H:%M:%S" }
-        end
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "apache" do
-        let(:format) { "apache" }
+        let(:plugin_name) { "apache" }
+        let(:plugin_class) { Fluent::Plugin::ApacheParser }
 
-        include_examples "should set regexp and time_format from selected format" do
-          let(:regexp) do
-            /^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/
-          end
-          let(:time_format) { "%d/%b/%Y:%H:%M:%S %z" }
-        end
+        include_examples("should create parser plugin instance from selected plugin name")
       end
 
       context "nginx" do
-        let(:format) { "nginx" }
+        let(:plugin_name) { "nginx" }
+        let(:plugin_class) { Fluent::Plugin::NginxParser }
 
-        include_examples "should set regexp and time_format from selected format" do
-          let(:regexp) do
-            /^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)"(?:\s+(?<http_x_forwarded_for>[^ ]+))?)?$/
-          end
-          let(:time_format) { "%d/%b/%Y:%H:%M:%S %z" }
-        end
+        include_examples("should create parser plugin instance from selected plugin name")
       end
     end
   end
 
-  describe "#matches_json" do
+  describe "#matches" do
     let(:logfile) { File.expand_path(logfile_path, Rails.root) }
-    let :params do
-      {
-        regexp: "(?<regexp>bar)", # bar from error0.log
-        time_format: "time_format",
-      }
-    end
-
-    subject { RegexpPreview::SingleLine.new(logfile, format, params).matches_json }
+    subject { RegexpPreview::SingleLine.new(logfile, plugin_name, plugin_config).matches }
 
-    describe "format" do
+    describe "parse" do
       context "regexp" do
-        let(:format) { "regexp" }
+        let(:plugin_name) { "regexp" }
         let(:logfile_path) { "./spec/support/fixtures/error0.log" }
-
-        it 'should have regexp only in [:params][:setting]' do
-          setting_json = {
-            regexp: params[:regexp],
-            time_format: nil
+        let :plugin_config do
+          {
+            "expression" => "(?<regexp>bar)", # bar from error0.log
+            "time_format" => "time_format",
           }
+        end
 
-          expect(subject[:params][:setting]).to eq setting_json
+        it 'should have regexp only in [:params][:setting]' do
+          expect(subject[:pluginConfig]).to eq plugin_config
         end
 
         it 'should include matches info' do
@@ -133,16 +119,12 @@ describe RegexpPreview::SingleLine do
       end
 
       context "csv" do
-        let(:format) { "csv" }
+        let(:plugin_name) { "csv" }
         let(:logfile_path) { "./spec/support/fixtures/error0.log" }
-
-        it 'should not have regexp and time_format in [:params][:setting]' do
-          setting_json = {
-            regexp: nil,
-            time_format: nil
+        let :plugin_config do
+          {
+            "keys" => "column1,column2"
           }
-
-          expect(subject[:params][:setting]).to eq setting_json
         end
 
         it 'should not have matches_info' do
@@ -151,26 +133,46 @@ describe RegexpPreview::SingleLine do
       end
 
       context "syslog" do
-        let(:format) { "syslog" }
         let(:logfile_path) { "./spec/support/fixtures/error4.log" }
+        let(:plugin_name) { "syslog" }
+        let(:plugin_config) do
+          {
+            "time_format" => "%Y-%m-%d %H:%M:%S %z",
+            "keep_time_key" => true
+          }
+        end
 
-        it 'should set regexp and time_format from syslog format' do
-          setting_json = {
-            regexp: "^(?<time>[^ ]*\\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\\[]*)(?:\\[(?<pid>[0-9]+)\\])?(?:[^\\:]*\\:)? *(?<message>.*)$",
-            time_format: "%b %d %H:%M:%S",
+        it 'should include matches info' do
+          matches_info = {
+            whole: "2014-05-27 10:54:37 +0900 [info]: listening fluent socket on 0.0.0.0:24224",
+            matches: [
+              { key: "time", matched: "2014-05-27 10:54:37 +0900", pos: [0, 25] },
+              { key: "host", matched: "[info]:", pos: [26, 33] },
+              { key: "ident", matched: "listening", pos: [34, 43] },
+              { key: "message", matched: "24224", pos: [69, 74] }
+            ]
           }
 
-          expect(subject[:params][:setting]).to eq setting_json
+          expect(subject[:matches]).to include matches_info
+        end
+      end
+
+      context "syslog when keep_time_key is false" do
+        let(:logfile_path) { "./spec/support/fixtures/error4.log" }
+        let(:plugin_name) { "syslog" }
+        let(:plugin_config) do
+          {
+            "time_format" => "%Y-%m-%d %H:%M:%S %z",
+            "keep_time_key" => false
+          }
         end
 
         it 'should include matches info' do
           matches_info = {
             whole: "2014-05-27 10:54:37 +0900 [info]: listening fluent socket on 0.0.0.0:24224",
             matches: [
-              { key: "time", matched: "2014-05-27 10:54:37 +0900", pos: [0, 25] },
               { key: "host", matched: "[info]:", pos: [26, 33] },
               { key: "ident", matched: "listening", pos: [34, 43] },
-              { key: "pid", matched: nil, pos: [nil, nil] },
               { key: "message", matched: "24224", pos: [69, 74] }
             ]
           }

data/spec/models/fluentd/setting/in_forward_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Fluentd::Setting::InForward do
+  let(:klass) { described_class }
+  let(:instance) { klass.new(valid_attributes) }
+  let(:valid_attributes) {
+    {}
+  }
+
+  describe "#valid?" do
+    it "should be valid" do
+      params = valid_attributes.dup
+      klass.new(params).should be_valid
+    end
+  end
+
+  describe "#plugin_name" do
+    subject { instance.plugin_name }
+    it { should == "forward" }
+  end
+
+  describe "#plugin_type" do
+    subject { instance.plugin_type }
+    it { should == "input" }
+  end
+
+  describe "#to_config" do
+    subject { instance.to_config.to_s }
+    it { should include("@type forward") }
+  end
+
+  describe "with security section" do
+    let(:valid_attributes) {
+      {
+        security: {
+          "0" => {
+            self_hostname: "test.fluentd",
+            shared_key: "secretsharedkey",
+          }
+        }
+      }
+    }
+    let(:expected) {
+      <<-CONFIG
+<source>
+  @type forward
+  <security>
+    self_hostname test.fluentd
+    shared_key secretsharedkey
+  </security>
+</source>
+      CONFIG
+    }
+    subject { instance.to_config.to_s }
+    it { should == expected }
+  end
+
+  describe "with invalid security section" do
+    let(:valid_attributes) {
+      {
+        security: {
+          "0" => {
+            self_hostname: "test.fluentd",
+          }
+        }
+      }
+    }
+    it { instance.should_not be_valid }
+    it {
+      instance.validate
+      instance.errors.full_messages.should include("Security Shared key can't be blank")
+    }
+  end
+end
+

data/spec/models/fluentd/setting/in_http_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Fluentd::Setting::InHttp do
+  let(:klass) { described_class }
+  let(:instance) { klass.new(valid_attributes) }
+  let(:valid_attributes) {
+    {}
+  }
+
+  describe "#valid?" do
+    it "should be valid" do
+      params = valid_attributes.dup
+      klass.new(params).should be_valid
+    end
+  end
+
+  describe "#plugin_name" do
+    subject { instance.plugin_name }
+    it { should == "http" }
+  end
+
+  describe "#plugin_type" do
+    subject { instance.plugin_type }
+    it { should == "input" }
+  end
+
+  describe "#to_config" do
+    subject { instance.to_config.to_s }
+    it { should include("@type http") }
+  end
+end

data/spec/models/fluentd/setting/in_monitor_agent_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Fluentd::Setting::InMonitorAgent do
+  let(:klass) { described_class }
+  let(:instance) { klass.new(valid_attributes) }
+  let(:valid_attributes) {
+    {}
+  }
+
+  describe "#valid?" do
+    it "should be valid" do
+      params = valid_attributes.dup
+      klass.new(params).should be_valid
+    end
+  end
+
+  describe "#plugin_name" do
+    subject { instance.plugin_name }
+    it { should == "monitor_agent" }
+  end
+
+  describe "#plugin_type" do
+    subject { instance.plugin_type }
+    it { should == "input" }
+  end
+
+  describe "#to_config" do
+    subject { instance.to_config.to_s }
+    it { should include("@type monitor_agent") }
+  end
+end

data/spec/models/fluentd/setting/in_syslog_spec.rb

@@ -17,19 +17,77 @@ describe Fluentd::Setting::InSyslog do
     end
   end
 
-  describe "#plugin_type_name" do
-    subject { instance.plugin_type_name }
+  describe "#plugin_name" do
+    subject { instance.plugin_name }
     it { should == "syslog" }
   end
 
-  describe "#input_plugin" do
-    it { instance.should be_input_plugin }
-    it { instance.should_not be_output_plugin }
+  describe "#plugin_type" do
+    subject { instance.plugin_type }
+    it { should == "input" }
   end
 
   describe "#to_config" do
-    subject { instance.to_config }
-    it { should include("type syslog") }
+    subject { instance.to_config.to_s }
+    it { should include("@type syslog") }
+  end
+
+  describe "with parse section" do
+    let(:valid_attributes) {
+      {
+        tag: "test",
+        parse: {
+          "0" => {
+            "@type" => "syslog",
+            "message_format" => "rfc5424"
+          }
+        }
+      }
+    }
+    let(:expected) {
+      <<-CONFIG
+<source>
+  @type syslog
+  tag test
+  <parse>
+    @type syslog
+    message_format rfc5424
+  </parse>
+</source>
+      CONFIG
+    }
+    subject { instance.to_config.to_s }
+    it { should == expected }
+  end
+
+  describe "with @log_level" do
+    let(:valid_attributes) {
+      {
+        tag: "test",
+        log_level: "debug",
+        parse: {
+          "0" => {
+            "@type" => "syslog",
+            "message_format" => "rfc5424"
+          }
+        }
+      }
+    }
+    let(:expected) {
+      <<-CONFIG
+<source>
+  @type syslog
+  tag test
+  @log_level debug
+  <parse>
+    @type syslog
+    message_format rfc5424
+  </parse>
+</source>
+      CONFIG
+    }
+    subject { instance.to_config.to_s }
+    it { should == expected }
   end
 end