blazer 2.4.8 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af432d074376958f2b9f7efdeaae05a0f0c0a1fe34cc38ce537a0511985edfd1
-  data.tar.gz: dd0fab9ec30db7b870ae6a8afd352093cccf3be75d2c1a0e320ba7106df11f00
+  metadata.gz: fad6bd2d76ea45a8ec72956177648848a6dede796354a01f27359b4cb7cfeedb
+  data.tar.gz: a8f81985d77b110c850d421ac86376bbf71cf5f2b318cfea496e8cedb1f1a108
 SHA512:
-  metadata.gz: 7a78f82ce3d5544598ad363c4d31f2c676bf4be76844d81b0b02bc778072f8557c1da458cd1040fb1c9464b61fd677c4fbece3e310068acb6c09f769bf032aa7
-  data.tar.gz: ca0eb25f4e9a5826116d4f2a76d5fe55f71772633b557accea0aa85678e3ff4895623e0832a85de4894f18c3620180d2b04e5f9f03db51730684198e8f914a8f
+  metadata.gz: 6fd612ec162dc5b6a23ef1f6b3580da0de7f1cec8788520557e8a25ef0bdf4337df775b0cacb4e292003e1a4565460c411a67951a5ea27048a994fb1178463d7
+  data.tar.gz: 4a5e760ca38fb96fa54df64469f3fd3223d6b23698da0491c43dc8bc3ef92f7f83b14bea028821ba5708adf209bc147975edaf6d4dc76ecb5916d51905e7f2f0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.5.0 (2022-01-04)
+
+- Added support for Slack OAuth tokens
+- Added experimental support for AnomalyDetection.rb
+- Improved table preview for MySQL
+- Fixed cohort analysis for MySQL
+
 ## 2.4.8 (2021-12-07)
 
 - Added support for OpenSearch

data/README.md

@@ -10,6 +10,8 @@ Blazer is also available as a [Docker image](https://github.com/ankane/blazer-do
 
 :tangerine: Battle-tested at [Instacart](https://www.instacart.com/opensource)
 
+[![Build Status](https://github.com/ankane/blazer/workflows/build/badge.svg?branch=master)](https://github.com/ankane/blazer/actions)
+
 ## Features
 
 - **Multiple data sources** - PostgreSQL, MySQL, Redshift, and [many more](#full-list)
@@ -37,7 +39,7 @@ Blazer is also available as a [Docker image](https://github.com/ankane/blazer-do
 Add this line to your application’s Gemfile:
 
 ```ruby
-gem 'blazer'
+gem "blazer"
 ```
 
 Run:
@@ -412,7 +414,7 @@ SELECT users.id AS user_id, orders.created_at AS conversion_time, users.created_
 FROM users LEFT JOIN orders ON orders.user_id = users.id
 ```
 
-This feature requires PostgreSQL or MySQL.
+This feature requires PostgreSQL or MySQL 8.
 
 ## Anomaly Detection
 
@@ -423,7 +425,7 @@ Blazer supports three different approaches to anomaly detection.
 Add [prophet-rb](https://github.com/ankane/prophet) to your Gemfile:
 
 ```ruby
-gem 'prophet-rb'
+gem "prophet-rb"
 ```
 
 And add to `config/blazer.yml`:
@@ -439,7 +441,7 @@ anomaly_checks: prophet
 Add [trend](https://github.com/ankane/trend) to your Gemfile:
 
 ```ruby
-gem 'trend'
+gem "trend"
 ```
 
 And add to `config/blazer.yml`:
@@ -454,46 +456,20 @@ For the [self-hosted API](https://github.com/ankane/trend-api), create an initia
 Trend.url = "http://localhost:8000"
 ```
 
-### R
-
-R uses Twitter’s [AnomalyDetection](https://github.com/twitter/AnomalyDetection) library.
+### AnomalyDetection.rb (experimental)
 
-First, [install R](https://cloud.r-project.org/). Then, run:
+Add [anomaly_detection](https://github.com/ankane/AnomalyDetection.rb) to your Gemfile:
 
-```R
-install.packages("remotes")
-remotes::install_github("twitter/AnomalyDetection")
+```ruby
+gem "anomaly_detection"
 ```
 
 And add to `config/blazer.yml`:
 
 ```yml
-anomaly_checks: r
-```
-
-If upgrading from version 1.4 or below, also follow the [upgrade instructions](#15).
-
-If you’re on Heroku, follow the additional instructions below.
-
-### R on Heroku
-
-Add the [R buildpack](https://github.com/virtualstaticvoid/heroku-buildpack-r) to your app.
-
-```sh
-heroku buildpacks:add --index 1 https://github.com/virtualstaticvoid/heroku-buildpack-r.git
+anomaly_checks: anomaly_detection
 ```
 
-And create an `init.R` with:
-
-```r
-if (!"AnomalyDetection" %in% installed.packages()) {
-  install.packages("remotes")
-  remotes::install_github("twitter/AnomalyDetection")
-}
-```
-
-Commit and deploy away. The first deploy may take a few minutes.
-
 ## Forecasting
 
 Blazer supports for two different forecasting methods. [Example](https://blazer.dokkuapp.com/queries/18-forecast?forecast=t)
@@ -502,10 +478,10 @@ A forecast link will appear for queries that return 2 columns with types timesta
 
 ### Prophet
 
-Add [prophet](https://github.com/ankane/prophet) to your Gemfile:
+Add [prophet-rb](https://github.com/ankane/prophet) to your Gemfile:
 
 ```ruby
-gem 'prophet-rb', '>= 0.2.1'
+gem "prophet-rb", ">= 0.2.1"
 ```
 
 And add to `config/blazer.yml`:
@@ -516,12 +492,12 @@ forecasting: prophet
 
 ### Trend
 
-[Trend](https://trendapi.org/) uses an external service.
+[Trend](https://trendapi.org/) uses an external service by default, but you can run it on your own infrastructure as well.
 
 Add [trend](https://github.com/ankane/trend) to your Gemfile:
 
 ```ruby
-gem 'trend'
+gem "trend"
 ```
 
 And add to `config/blazer.yml`:
@@ -530,6 +506,12 @@ And add to `config/blazer.yml`:
 forecasting: trend
 ```
 
+For the [self-hosted API](https://github.com/ankane/trend-api), create an initializer with:
+
+```ruby
+Trend.url = "http://localhost:8000"
+```
+
 ## Uploads
 
 Creating database tables from CSV files. [Example](https://blazer.dokkuapp.com/uploads)

data/lib/blazer/adapters/sql_adapter.rb

@@ -146,7 +146,7 @@ module Blazer
             date_sql = "CAST(DATE_FORMAT(#{time_sql}, '%Y-%m-01') AS DATE)"
             date_params = [tzname]
           end
-          bucket_sql = "CAST(CEIL(TIMESTAMPDIFF(SECOND, cohorts.cohort_time, query.conversion_time) / ?) AS INTEGER)"
+          bucket_sql = "CAST(CEIL(TIMESTAMPDIFF(SECOND, cohorts.cohort_time, query.conversion_time) / ?) AS SIGNED)"
         else
           date_sql = "date_trunc(?, cohorts.cohort_time::timestamptz AT TIME ZONE ?)::date"
           date_params = [period, tzname]
@@ -238,6 +238,9 @@ module Blazer
         if settings["schemas"]
           where = "table_schema IN (?)"
           schemas = settings["schemas"]
+        elsif mysql?
+          where = "table_schema IN (?)"
+          schemas = [default_schema]
         else
           where = "table_schema NOT IN (?)"
           schemas = ["information_schema"]

data/lib/blazer/engine.rb

@@ -36,6 +36,7 @@ module Blazer
 
       Blazer.images = Blazer.settings["images"] || false
       Blazer.override_csp = Blazer.settings["override_csp"] || false
+      Blazer.slack_oauth_token = Blazer.settings["slack_oauth_token"] || ENV["BLAZER_SLACK_OAUTH_TOKEN"]
       Blazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"]
       Blazer.mapbox_access_token = Blazer.settings["mapbox_access_token"] || ENV["MAPBOX_ACCESS_TOKEN"]
     end

data/lib/blazer/result.rb

@@ -189,6 +189,10 @@ module Blazer
       when "trend"
         anomalies = Trend.anomalies(Hash[series])
         anomalies.include?(series.last[0])
+      when "anomaly_detection"
+        period = 7 # TODO determine period
+        anomalies = AnomalyDetection.detect(Hash[series], period: period)
+        anomalies.include?(series.last[0])
       else
         csv_str =
           CSV.generate do |csv|

data/lib/blazer/slack_notifier.rb

@@ -23,7 +23,7 @@ module Blazer
           ]
         }
 
-        post(Blazer.slack_webhook_url, payload)
+        post(payload)
       end
     end
 
@@ -44,7 +44,7 @@ module Blazer
         ]
       }
 
-      post(Blazer.slack_webhook_url, payload)
+      post(payload)
     end
 
     # https://api.slack.com/docs/message-formatting#how_to_escape_characters
@@ -67,13 +67,25 @@ module Blazer
       Blazer::Engine.routes.url_helpers.query_url(id, ActionMailer::Base.default_url_options)
     end
 
-    def self.post(url, payload)
+    def self.post(payload)
+      if Blazer.slack_webhook_url.present?
+        post_api(Blazer.slack_webhook_url, payload, {})
+      else
+        headers = {
+          "Authorization" => "Bearer #{Blazer.slack_oauth_token}",
+          "Content-type" => "application/json"
+        }
+        post_api("https://slack.com/api/chat.postMessage", payload, headers)
+      end
+    end
+
+    def self.post_api(url, payload, headers)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.open_timeout = 3
       http.read_timeout = 5
-      http.post(uri.request_uri, payload.to_json)
+      http.post(uri.request_uri, payload.to_json, headers)
     end
   end
 end

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.4.8"
+  VERSION = "2.5.0"
 end

data/lib/blazer.rb

@@ -63,6 +63,7 @@ module Blazer
     attr_accessor :query_viewable
     attr_accessor :query_editable
     attr_accessor :override_csp
+    attr_accessor :slack_oauth_token
     attr_accessor :slack_webhook_url
     attr_accessor :mapbox_access_token
   end
@@ -213,7 +214,7 @@ module Blazer
   end
 
   def self.slack?
-    slack_webhook_url.present?
+    slack_oauth_token.present? || slack_webhook_url.present?
   end
 
   def self.uploads?
@@ -240,6 +241,14 @@ module Blazer
   def self.register_adapter(name, adapter)
     adapters[name] = adapter
   end
+
+  def self.archive_queries
+    raise "Audits must be enabled to archive" unless Blazer.audit
+    raise "Missing status column - see https://github.com/ankane/blazer#23" unless Blazer::Query.column_names.include?("status")
+
+    viewed_query_ids = Blazer::Audit.where("created_at > ?", 90.days.ago).group(:query_id).count.keys.compact
+    Blazer::Query.active.where.not(id: viewed_query_ids).update_all(status: "archived")
+  end
 end
 
 Blazer.register_adapter "athena", Blazer::Adapters::AthenaAdapter

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

@@ -63,7 +63,7 @@ check_schedules:
 
 # enable anomaly detection
 # note: with trend, time series are sent to https://trendapi.org
-# anomaly_checks: prophet / trend / r
+# anomaly_checks: prophet / trend / anomaly_detection
 
 # enable forecasting
 # note: with trend, time series are sent to https://trendapi.org

data/lib/tasks/blazer.rake

@@ -11,10 +11,10 @@ namespace :blazer do
 
   desc "archive queries"
   task archive_queries: :environment do
-    abort "Audits must be enabled to archive" unless Blazer.audit
-    abort "Missing status column - see https://github.com/ankane/blazer#23" unless Blazer::Query.column_names.include?("status")
-
-    viewed_query_ids = Blazer::Audit.where("created_at > ?", 90.days.ago).group(:query_id).count.keys.compact
-    Blazer::Query.active.where.not(id: viewed_query_ids).update_all(status: "archived")
+    begin
+      Blazer.archive_queries
+    rescue => e
+      abort e.message
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.5.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties