sql-jarvis 2.0.1 → 2.0.2

data/lib/blazer/engine.rb

@@ -6,6 +6,7 @@ module Blazer
       # use a proc instead of a string
       app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }
       app.config.assets.precompile << proc { |path| path =~ /\Ablazer\/.+\.(eot|svg|ttf|woff)\z/ }
+      app.config.assets.precompile << proc { |path| path == "blazer/favicon.png" }
 
       Blazer.time_zone ||= Blazer.settings["time_zone"] || Time.zone
       Blazer.audit = Blazer.settings.key?("audit") ? Blazer.settings["audit"] : true
@@ -31,12 +32,15 @@ module Blazer
       Blazer.cache ||= Rails.cache
 
       Blazer.anomaly_checks = Blazer.settings["anomaly_checks"] || false
+      Blazer.forecasting = Blazer.settings["forecasting"] || false
       Blazer.async = Blazer.settings["async"] || false
       if Blazer.async
         require "blazer/run_statement_job"
       end
 
       Blazer.images = Blazer.settings["images"] || false
+      Blazer.override_csp = Blazer.settings["override_csp"] || false
+      Blazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"]
     end
   end
 end

data/lib/blazer/result.rb

@@ -1,6 +1,6 @@
 module Blazer
   class Result
-    attr_reader :data_source, :columns, :rows, :error, :cached_at, :just_cached
+    attr_reader :data_source, :columns, :rows, :error, :cached_at, :just_cached, :forecast_error
 
     def initialize(data_source, columns, rows, error, cached_at, just_cached)
       @data_source = data_source
@@ -69,6 +69,8 @@ module Blazer
           "line"
         elsif column_types == ["time", "string", "numeric"]
           "line2"
+        elsif column_types == ["string", "numeric"] && @columns.last == "pie"
+          "pie"
         elsif column_types.compact.size >= 2 && column_types == ["string"] + (column_types.compact.size - 1).times.map { "numeric" }
           "bar"
         elsif column_types == ["string", "string", "numeric"]
@@ -79,6 +81,32 @@ module Blazer
       end
     end
 
+    def forecastable?
+      @forecastable ||= Blazer.forecasting && column_types == ["time", "numeric"] && @rows.size >= 10
+    end
+
+    def forecast
+      # TODO cache it?
+      # don't want to put result data (even hashed version)
+      # into cache without developer opt-in
+      forecast = Trend.forecast(Hash[@rows], count: 30)
+      @rows.each do |row|
+        row[2] = nil
+      end
+      @rows.unshift(*forecast.map { |k, v| [k, nil, v] })
+      @columns << "forecast"
+
+      # reset cache
+      @column_types = nil
+      @chart_type = nil
+
+      forecast
+    rescue => e
+      @forecast_error = String.new("Error generating forecast")
+      @forecast_error << ": #{e.message.sub("Invalid parameter: ", "")}"
+      nil
+    end
+
     def detect_anomaly
       anomaly = nil
       message = nil
@@ -131,39 +159,44 @@ module Blazer
     def anomaly?(series)
       series = series.reject { |v| v[0].nil? }.sort_by { |v| v[0] }
 
-      csv_str =
-        CSV.generate do |csv|
-          csv << ["timestamp", "count"]
-          series.each do |row|
-            csv << row
+      if Blazer.anomaly_checks == "trend"
+        anomalies = Trend.anomalies(Hash[series])
+        anomalies.include?(series.last[0])
+      else
+        csv_str =
+          CSV.generate do |csv|
+            csv << ["timestamp", "count"]
+            series.each do |row|
+              csv << row
+            end
           end
-        end
 
-      r_script = %x[which Rscript].chomp
-      type = series.any? && series.last.first.to_time - series.first.first.to_time >= 2.weeks ? "ts" : "vec"
-      args = [type, csv_str]
-      raise "R not found" if r_script.empty?
-      command = "#{r_script} --vanilla #{File.expand_path("../detect_anomalies.R", __FILE__)} #{args.map { |a| Shellwords.escape(a) }.join(" ")}"
-      output = %x[#{command}]
-      if output.empty?
-        raise "Unknown R error"
-      end
+        r_script = %x[which Rscript].chomp
+        type = series.any? && series.last.first.to_time - series.first.first.to_time >= 2.weeks ? "ts" : "vec"
+        args = [type, csv_str]
+        raise "R not found" if r_script.empty?
+        command = "#{r_script} --vanilla #{File.expand_path("../detect_anomalies.R", __FILE__)} #{args.map { |a| Shellwords.escape(a) }.join(" ")}"
+        output = %x[#{command}]
+        if output.empty?
+          raise "Unknown R error"
+        end
 
-      rows = CSV.parse(output, headers: true)
-      error = rows.first && rows.first["x"]
-      raise error if error
+        rows = CSV.parse(output, headers: true)
+        error = rows.first && rows.first["x"]
+        raise error if error
 
-      timestamps = []
-      if type == "ts"
-        rows.each do |row|
-          timestamps << Time.parse(row["timestamp"])
-        end
-        timestamps.include?(series.last[0].to_time)
-      else
-        rows.each do |row|
-          timestamps << row["index"].to_i
+        timestamps = []
+        if type == "ts"
+          rows.each do |row|
+            timestamps << Time.parse(row["timestamp"])
+          end
+          timestamps.include?(series.last[0].to_time)
+        else
+          rows.each do |row|
+            timestamps << row["index"].to_i
+          end
+          timestamps.include?(series.length)
         end
-        timestamps.include?(series.length)
       end
     end
   end

data/lib/blazer/run_statement_job.rb

@@ -1,18 +1,15 @@
-require "sucker_punch"
-
 module Blazer
-  class RunStatementJob
-    include SuckerPunch::Job
-    workers 4
+  class RunStatementJob < ActiveJob::Base
+    self.queue_adapter = :async
 
-    def perform(result, data_source, statement, options)
+    def perform(data_source_id, statement, options)
+      data_source = Blazer.data_sources[data_source_id]
       begin
         ActiveRecord::Base.connection_pool.with_connection do
-          result << Blazer::RunStatement.new.perform(data_source, statement, options)
+          Blazer::RunStatement.new.perform(data_source, statement, options)
         end
       rescue Exception => e
-        result.clear
-        result << Blazer::Result.new(data_source, [], [], "Unknown error", nil, false)
+        Blazer::Result.new(data_source, [], [], "Unknown error", nil, false)
         Blazer.cache.write(data_source.run_cache_key(options[:run_id]), Marshal.dump([[], [], "Unknown error", nil]), expires_in: 30.seconds)
         raise e
       end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

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

@@ -53,13 +53,24 @@ audit: true
 # email to send checks from
 # from_email: blazer@example.org
 
+# webhook for Slack
+# slack_webhook_url: <%%= ENV["BLAZER_SLACK_WEBHOOK_URL"] %>
+
 # subdomain: admin
 
-mapbox_access_token: <%= ENV["MAPBOX_ACCESS_TOKEN"] %>
+# mapbox_access_token: <%= ENV["MAPBOX_ACCESS_TOKEN"] %>
 
-#assignees: 'SELECT id, name FROM users ORDER BY id ASC'
+# assignees: 'SELECT id, name FROM users ORDER BY id ASC'
 
 check_schedules:
   - "1 day"
   - "1 hour"
   - "5 minutes"
+
+# enable anomaly detection
+# note: with trend, time series are sent to https://trendapi.org
+# anomaly_checks: trend / r
+
+# enable forecasting
+# note: with trend, time series are sent to https://trendapi.org
+# forecasting: trend

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

@@ -37,6 +37,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version
       t.string :state
       t.string :schedule
       t.text :emails
+      t.text :slack_channels
       t.string :check_type
       t.text :message
       t.timestamp :last_run_at

data/lib/tasks/blazer.rake

@@ -4,6 +4,7 @@ namespace :blazer do
     Blazer.run_checks(schedule: args[:schedule] || ENV["SCHEDULE"])
   end
 
+  desc "send failing checks"
   task send_failing_checks: :environment do
     Blazer.send_failing_checks
   end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: sql-jarvis
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
-- ThanhKhoaIT
+- Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zip-zip
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: axlsx_rails
+  name: zip-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: axlsx_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chartkick
   requirement: !ruby/object:Gem::Requirement
@@ -112,51 +112,46 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: 
-email:
-- thanhkhoait@gmail.com
+email: andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - app/assets/fonts/blazer/glyphicons-halflings-regular.eot
 - app/assets/fonts/blazer/glyphicons-halflings-regular.svg
 - 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/images/blazer/favicon.png
 - app/assets/javascripts/blazer/Chart.js
 - app/assets/javascripts/blazer/Sortable.js
 - app/assets/javascripts/blazer/ace.js
@@ -171,11 +166,11 @@ files:
 - app/assets/javascripts/blazer/chartkick.js
 - app/assets/javascripts/blazer/daterangepicker.js
 - app/assets/javascripts/blazer/fuzzysearch.js
-- app/assets/javascripts/blazer/highlight.pack.js
+- app/assets/javascripts/blazer/highlight.min.js
+- app/assets/javascripts/blazer/jquery-ujs.js
 - app/assets/javascripts/blazer/jquery.js
 - app/assets/javascripts/blazer/jquery.stickytableheaders.js
-- app/assets/javascripts/blazer/jquery_ujs.js
-- app/assets/javascripts/blazer/moment-timezone.js
+- app/assets/javascripts/blazer/moment-timezone-with-data.js
 - app/assets/javascripts/blazer/moment.js
 - app/assets/javascripts/blazer/queries.js
 - app/assets/javascripts/blazer/routes.js
@@ -185,7 +180,7 @@ files:
 - app/assets/javascripts/blazer/vue.js
 - app/assets/stylesheets/blazer/application.css
 - app/assets/stylesheets/blazer/bootstrap.css.erb
-- app/assets/stylesheets/blazer/daterangepicker-bs3.css
+- app/assets/stylesheets/blazer/daterangepicker.css
 - app/assets/stylesheets/blazer/github.css
 - app/assets/stylesheets/blazer/select2.min.css
 - app/assets/stylesheets/blazer/selectize.default.css
@@ -195,6 +190,7 @@ files:
 - app/controllers/blazer/queries_controller.rb
 - app/helpers/blazer/base_helper.rb
 - app/mailers/blazer/check_mailer.rb
+- app/mailers/blazer/slack_notifier.rb
 - app/models/blazer/audit.rb
 - app/models/blazer/check.rb
 - app/models/blazer/connection.rb
@@ -215,6 +211,7 @@ 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/docs.html.erb
 - app/views/blazer/queries/edit.html.erb
 - app/views/blazer/queries/home.html.erb
 - app/views/blazer/queries/new.html.erb
@@ -222,7 +219,6 @@ files:
 - app/views/blazer/queries/schema.html.erb
 - app/views/blazer/queries/show.html.erb
 - app/views/layouts/blazer/application.html.erb
-- blazer.gemspec
 - config/routes.rb
 - lib/blazer.rb
 - lib/blazer/adapters/athena_adapter.rb
@@ -260,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitattributes

@@ -1 +0,0 @@
-app/assets/* linguist-vendored

data/.github/ISSUE_TEMPLATE.md

@@ -1,7 +0,0 @@
-Hi,
-
-Before creating an issue, please check out the Contributing Guide:
-
-https://github.com/ankane/blazer/blob/master/CONTRIBUTING.md
-
-Thanks!

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log