Business intelligence made simple
Added schedule for checks
Andrew Kaneea2e544503fe
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 9e7ea13f..965439a5 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -1,3 +1,7 @@+## 1.3.0 [unreleased]++- Added schedule for checks+## 1.2.1- Fixed checksdiff --git a/app/controllers/blazer/checks_controller.rb b/app/controllers/blazer/checks_controller.rbindex c9ee8f3b..673de010 100644--- a/app/controllers/blazer/checks_controller.rb+++ b/app/controllers/blazer/checks_controller.rb@@ -41,7 +41,7 @@ module Blazerprivatedef check_params- params.require(:check).permit(:query_id, :emails, :invert)+ params.require(:check).permit(:query_id, :emails, :invert, :schedule)enddef set_checkdiff --git a/app/models/blazer/check.rb b/app/models/blazer/check.rbindex ae35daf2..2976ab90 100644--- a/app/models/blazer/check.rb+++ b/app/models/blazer/check.rb@@ -19,6 +19,8 @@ module Blazerinvert ? "failing" : "passing"end+ self.last_run_at = Time.now if self.respond_to?(:last_run_at=)+# do not notify on creation, except when not passingif (state_was || state != "passing") && state != state_was && emails.present?Blazer::CheckMailer.state_change(self, state, state_was, rows.size, error).deliver_laterdiff --git a/app/views/blazer/checks/_form.html.erb b/app/views/blazer/checks/_form.html.erbindex 3e94b472..e14e4ebc 100644--- a/app/views/blazer/checks/_form.html.erb+++ b/app/views/blazer/checks/_form.html.erb@@ -17,17 +17,29 @@</script></div>-<% if @check.respond_to?(:invert) %>- <div class="form-group">- <%= f.label "Fails if" %>- <div class="hide">- <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]], {}, {id: "select-invert"} %>+ <% if @check.respond_to?(:invert) %>+ <div class="form-group">+ <%= f.label :invert, "Fails if" %>+ <div class="hide">+ <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]] %>+ </div>+ <script>+ $("#check_invert").selectize({}).parent().removeClass("hide");+ </script></div>- <script>- $("#select-invert").selectize({}).parent().removeClass("hide");- </script>- </div>-<% end %>+ <% end %>++ <% if @check.respond_to?(:schedule) %>+ <div class="form-group">+ <%= f.label :schedule, "Run every" %>+ <div class="hide">+ <%= f.select :schedule, ["1 day", "1 hour", "5 minutes"].map { |v| [v, v] } %>+ </div>+ <script>+ $("#check_schedule").selectize({}).parent().removeClass("hide");+ </script>+ </div>+ <% end %><div class="form-group"><%= f.label :emails %>diff --git a/app/views/blazer/checks/index.html.erb b/app/views/blazer/checks/index.html.erbindex a969c097..d8809898 100644--- a/app/views/blazer/checks/index.html.erb+++ b/app/views/blazer/checks/index.html.erb@@ -8,7 +8,8 @@<thead><tr><th>Query</th>- <th style="width: 15%;">State</th>+ <th style="width: 10%;">State</th>+ <th style="width: 10%;">Run</th><th style="width: 20%;">Emails</th><th style="width: 15%;"></th></tr>@@ -22,6 +23,7 @@<small style="font-weight: bold; color: <%= colors[check.state.to_sym] %>;"><%= check.state.upcase %></small><% end %></td>+ <td><%= check.schedule if check.respond_to?(:schedule) %></td><td><ul class="list-unstyled" style="margin-bottom: 0;"><% check.split_emails.each do |email| %>diff --git a/lib/blazer.rb b/lib/blazer.rbindex ab050007..8517b590 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -50,8 +50,10 @@ module Blazerendend- def self.run_checks- Blazer::Check.includes(:query).find_each do |check|+ def self.run_checks(schedule: nil)+ checks = Blazer::Check.includes(:query)+ checks = checks.where(schedule: schedule) if schedule+ checks.find_each do |check|rows = nilerror = niltries = 0diff --git a/lib/blazer/tasks.rb b/lib/blazer/tasks.rbindex cd45b661..253c246c 100644--- a/lib/blazer/tasks.rb+++ b/lib/blazer/tasks.rb@@ -3,7 +3,7 @@ require "rake"namespace :blazer dodesc "run checks"task run_checks: :environment do- Blazer.run_checks+ Blazer.run_checks(schedule: ENV["SCHEDULE"])endtask send_failing_checks: :environment dodiff --git a/lib/generators/blazer/templates/install.rb b/lib/generators/blazer/templates/install.rbindex 5e9b17b1..568551fe 100644--- a/lib/generators/blazer/templates/install.rb+++ b/lib/generators/blazer/templates/install.rb@@ -32,7 +32,10 @@ class <%= migration_class_name %> < ActiveRecord::Migrationcreate_table :blazer_checks do |t|t.references :queryt.string :state+ t.string :schedulet.text :emails+ t.boolean :invert+ t.timestamp :last_run_att.timestampsendend