diff options
| author | mo khan <mo@mokhan.ca> | 2015-02-07 12:53:45 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2015-02-07 12:53:45 -0700 |
| commit | 9c84576258e05b05abee5eac36f8fc565c35bb8a (patch) | |
| tree | eee22b52f54779044fc94aa71161e2aad9ffeec8 /app | |
| parent | 65145e6be87df7b0440fb98c11abc23a2b3c49ed (diff) | |
use single table inheritance for events table.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/agents/events_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/agents/files_controller.rb | 8 | ||||
| -rw-r--r-- | app/models/detection.rb | 2 | ||||
| -rw-r--r-- | app/models/modified.rb | 2 | ||||
| -rw-r--r-- | app/views/agents/events/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/agents/events/index.html.erb | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/app/controllers/agents/events_controller.rb b/app/controllers/agents/events_controller.rb index 8b1d158..6827938 100644 --- a/app/controllers/agents/events_controller.rb +++ b/app/controllers/agents/events_controller.rb @@ -12,7 +12,7 @@ module Agents def create message = event_params.merge({agent_id: @agent.id}) - routing_key = "events.#{event_params[:name]}.#{@agent.id}" + routing_key = "events.#{event_params[:type]}.#{@agent.id}" Publisher.publish(routing_key, message) redirect_to agent_events_url, notice: 'Event was successfully created.' end diff --git a/app/controllers/agents/files_controller.rb b/app/controllers/agents/files_controller.rb index 3c2e47b..95421e0 100644 --- a/app/controllers/agents/files_controller.rb +++ b/app/controllers/agents/files_controller.rb @@ -11,15 +11,9 @@ module Agents def show @fingerprint = params[:id] @file = Disposition.find_by(fingerprint: params[:id]) - Publisher.publish("queries", { - agent_id: params[:id], - name: params[:name], - data: params[:data] - }) - message = { agent_id: params[:id], - name: params[:name], + type: 'lookup', data: params[:data] } Publisher.publish("events.scanned.#{@agent.id}", message) diff --git a/app/models/detection.rb b/app/models/detection.rb new file mode 100644 index 0000000..c42e7b4 --- /dev/null +++ b/app/models/detection.rb @@ -0,0 +1,2 @@ +class Detection < Event +end diff --git a/app/models/modified.rb b/app/models/modified.rb new file mode 100644 index 0000000..46e0f14 --- /dev/null +++ b/app/models/modified.rb @@ -0,0 +1,2 @@ +class Modified < Event +end diff --git a/app/views/agents/events/_form.html.erb b/app/views/agents/events/_form.html.erb index 2215f6c..aa0dafb 100644 --- a/app/views/agents/events/_form.html.erb +++ b/app/views/agents/events/_form.html.erb @@ -12,8 +12,8 @@ <% end %> <div class="field"> - <%= f.label :name %><br> - <%= f.text_field :name %> + <%= f.label :type %><br> + <%= f.text_field :type %> </div> <div class="field"> <%= f.label :data %><br> diff --git a/app/views/agents/events/index.html.erb b/app/views/agents/events/index.html.erb index 223e74e..f609dbf 100644 --- a/app/views/agents/events/index.html.erb +++ b/app/views/agents/events/index.html.erb @@ -17,7 +17,7 @@ <tbody> <% @events.each do |event| %> <tr> - <td><%= event.name %></td> + <td><%= event.type %></td> <td> <ul> <% event.data.each do |key, value| %> @@ -43,7 +43,7 @@ <div class="small-12 columns"> <h2>Events by category</h2> - <%= pie_chart @agent.events.group(:name).count %> + <%= pie_chart @agent.events.group(:type).count %> </div> </div> |
