blazer 1.2.1 → 1.3.0

data/lib/blazer/data_source.rb

@@ -79,7 +79,16 @@ module Blazer
 
         in_transaction do
           begin
-            connection_model.connection.execute("SET statement_timeout = #{timeout.to_i * 1000}") if timeout && (postgresql? || redshift?)
+            if timeout
+              if postgresql? || redshift?
+                connection_model.connection.execute("SET statement_timeout = #{timeout.to_i * 1000}")
+              elsif mysql?
+                connection_model.connection.execute("SET max_execution_time = #{timeout.to_i * 1000}")
+              else
+                raise Blazer::TimeoutNotSupported, "Timeout not supported for #{adapter_name} adapter"
+              end
+            end
+
             result = connection_model.connection.select_all("#{statement} /*#{comment}*/")
             result.each do |untyped_row|
               row = {}
@@ -90,7 +99,7 @@ module Blazer
             end
           rescue ActiveRecord::StatementInvalid => e
             error = e.message.sub(/.+ERROR: /, "")
-            error = Blazer::TIMEOUT_MESSAGE if error.include?("canceling statement due to statement timeout") || error.include?("cancelled on user's request") || error.include?("system requested abort query")
+            error = Blazer::TIMEOUT_MESSAGE if Blazer::TIMEOUT_ERRORS.any? { |e| error.include?(e) }
           end
         end
 
@@ -119,23 +128,28 @@ module Blazer
     end
 
     def postgresql?
-      connection_model.connection.adapter_name == "PostgreSQL"
+      ["PostgreSQL", "PostGIS"].include?(adapter_name)
     end
 
     def redshift?
-      connection_model.connection.adapter_name == "Redshift"
+      ["Redshift"].include?(adapter_name)
+    end
+
+    def mysql?
+      ["MySQL", "Mysql2", "Mysql2Spatial"].include?(adapter_name)
     end
 
     protected
 
+    def adapter_name
+      connection_model.connection.adapter_name
+    end
+
     def in_transaction
       if use_transaction?
         connection_model.transaction do
-          begin
-            yield
-          ensure
-            raise ActiveRecord::Rollback
-          end
+          yield
+          raise ActiveRecord::Rollback
         end
       else
         yield

data/lib/blazer/engine.rb

@@ -19,7 +19,13 @@ module Blazer
         Blazer.user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"
       end
 
-      Blazer::Query.belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_class
+      Blazer.check_schedules = Blazer.settings["check_schedules"] if Blazer.settings.key?("check_schedules")
+
+      if Blazer.user_class
+        Blazer::Query.belongs_to :creator, class_name: Blazer.user_class.to_s
+        Blazer::Dashboard.belongs_to :creator, class_name: Blazer.user_class.to_s
+        Blazer::Check.belongs_to :creator, class_name: Blazer.user_class.to_s
+      end
 
       Blazer.cache ||= Rails.cache
     end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/generators/blazer/templates/config.yml

@@ -5,7 +5,6 @@ data_sources:
     url: <%%= ENV["BLAZER_DATABASE_URL"] %>
 
     # statement timeout, in seconds
-    # applies to PostgreSQL only
     # none by default
     # timeout: 15
 
@@ -45,3 +44,8 @@ audit: true
 
 # email to send checks from
 # from_email: blazer@example.org
+
+check_schedules:
+  - "1 day"
+  - "1 hour"
+  - "5 minutes"

data/lib/generators/blazer/templates/install.rb

@@ -18,6 +18,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     end
 
     create_table :blazer_dashboards do |t|
+      t.refrences :creator
       t.text :name
       t.timestamps
     end
@@ -30,9 +31,13 @@ class <%= migration_class_name %> < ActiveRecord::Migration
     end
 
     create_table :blazer_checks do |t|
+      t.references :creator
       t.references :query
       t.string :state
+      t.string :schedule
       t.text :emails
+      t.boolean :invert
+      t.timestamp :last_run_at
       t.timestamps
     end
   end

data/lib/{blazer/tasks.rb → tasks/blazer.rake}

@@ -1,9 +1,7 @@
-require "rake"
-
 namespace :blazer do
   desc "run checks"
-  task run_checks: :environment do
-    Blazer.run_checks
+  task :run_checks, [:schedule] => :environment do |t, args|
+    Blazer.run_checks(schedule: args[:schedule] || ENV["SCHEDULE"])
   end
 
   task send_failing_checks: :environment do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - app/assets/fonts/blazer/glyphicons-halflings-regular.ttf
 - app/assets/fonts/blazer/glyphicons-halflings-regular.woff
 - app/assets/fonts/blazer/glyphicons-halflings-regular.woff2
+- app/assets/javascripts/blazer/Chart.js
 - app/assets/javascripts/blazer/Sortable.js
 - app/assets/javascripts/blazer/ace/ace.js
 - app/assets/javascripts/blazer/ace/ext-language_tools.js
@@ -135,7 +136,6 @@ files:
 - app/views/blazer/dashboards/new.html.erb
 - app/views/blazer/dashboards/show.html.erb
 - app/views/blazer/queries/_form.html.erb
-- app/views/blazer/queries/_index.html.erb
 - app/views/blazer/queries/_tables.html
 - app/views/blazer/queries/edit.html.erb
 - app/views/blazer/queries/home.html.erb
@@ -148,11 +148,11 @@ files:
 - lib/blazer.rb
 - lib/blazer/data_source.rb
 - lib/blazer/engine.rb
-- lib/blazer/tasks.rb
 - lib/blazer/version.rb
 - lib/generators/blazer/install_generator.rb
 - lib/generators/blazer/templates/config.yml
 - lib/generators/blazer/templates/install.rb
+- lib/tasks/blazer.rake
 homepage: https://github.com/ankane/blazer
 licenses:
 - MIT

data/app/views/blazer/queries/_index.html.erb

@@ -1,32 +0,0 @@
-<% (@dashboards + @my_queries + @queries).each do |query| %>
-  <% is_query = query.is_a?(Blazer::Query) %>
-  <tr>
-    <td class="query <%= "dashboard" unless is_query %>">
-      <%= link_to query.name, query %>
-      <% if is_query %>
-        <span style="color: #ccc;"><%= extract_vars(query.statement).join(", ") %></span>
-        <% if @queries.size < 1000 && query.created_at > 2.days.ago %>
-          <small style="font-weight: bold; color: #5cb85c;">NEW</small>
-        <% end %>
-        <% if @trending_queries[query.id] %>
-          <small style="font-weight: bold; color: #f60;">TRENDING</small>
-        <% end %>
-        <% if @checks[query.id] %>
-          <small style="font-weight: bold; color: #f60;">CHECK</small>
-        <% end %>
-        <div class="hide"><%= query.name.gsub(/\s+/, "") %></div>
-      <% end %>
-    </td>
-    <td class="creator text-right text-muted">
-      <% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %>
-        <% name = creator.send(Blazer.user_name) %>
-        <% if creator == blazer_user %>
-          You
-          <div class="hide">me <%= name %></div>
-        <% else %>
-          <%= name %>
-        <% end %>
-      <% end %>
-    </td>
-  </tr>
-<% end %>