sql-jarvis 2.0.1 → 2.0.2

data/app/helpers/blazer/base_helper.rb

@@ -12,7 +12,7 @@ module Blazer
     BLAZER_IMAGE_EXT = %w[png jpg jpeg gif]
 
     def blazer_format_value(key, value)
-      if value.is_a?(Integer) && !key.to_s.end_with?("id") && !key.to_s.start_with?("id")
+      if value.is_a?(Numeric) && !key.to_s.end_with?("id") && !key.to_s.start_with?("id")
         number_with_delimiter(value)
       elsif value =~ BLAZER_URL_REGEX
         # see if image or link

data/app/mailers/blazer/slack_notifier.rb

@@ -0,0 +1,76 @@
+require "net/http"
+
+module Blazer
+  class SlackNotifier
+    def self.state_change(check, state, state_was, rows_count, error, check_type)
+      check.split_slack_channels.each do |channel|
+        text =
+          if error
+            error
+          elsif rows_count > 0 && check_type == "bad_data"
+            pluralize(rows_count, "row")
+          end
+
+        payload = {
+          channel: channel,
+          attachments: [
+            {
+              title: escape("Check #{state.titleize}: #{check.query.name}"),
+              title_link: query_url(check.query_id),
+              text: escape(text),
+              color: state == "passing" ? "good" : "danger"
+            }
+          ]
+        }
+
+        post(Blazer.slack_webhook_url, payload)
+      end
+    end
+
+    def self.failing_checks(channel, checks)
+      text =
+        checks.map do |check|
+          "<#{query_url(check.query_id)}|#{escape(check.query.name)}> #{escape(check.state)}"
+        end
+
+      payload = {
+        channel: channel,
+        attachments: [
+          {
+            title: escape("#{pluralize(checks.size, "Check")} Failing"),
+            text: text.join("\n"),
+            color: "warning"
+          }
+        ]
+      }
+
+      post(Blazer.slack_webhook_url, payload)
+    end
+
+    # https://api.slack.com/docs/message-formatting#how_to_escape_characters
+    # - Replace the ampersand, &, with &amp;
+    # - Replace the less-than sign, < with &lt;
+    # - Replace the greater-than sign, > with &gt;
+    # That's it. Don't HTML entity-encode the entire message.
+    def self.escape(str)
+      str.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;") if str
+    end
+
+    def self.pluralize(*args)
+      ActionController::Base.helpers.pluralize(*args)
+    end
+
+    def self.query_url(id)
+      Blazer::Engine.routes.url_helpers.query_url(id, ActionMailer::Base.default_url_options)
+    end
+
+    def self.post(url, payload)
+      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)
+    end
+  end
+end

data/app/models/blazer/check.rb

@@ -14,6 +14,14 @@ module Blazer
       emails.to_s.downcase.split(",").map(&:strip)
     end
 
+    def split_slack_channels
+      if Blazer.slack?
+        slack_channels.to_s.downcase.split(",").map(&:strip)
+      else
+        []
+      end
+    end
+
     def update_state(result)
       check_type =
         if respond_to?(:check_type)
@@ -61,6 +69,7 @@ module Blazer
       # do not notify on creation, except when not passing
       if (state_was != "new" || state != "passing") && state != state_was && emails.present?
         Blazer::CheckMailer.state_change(self, state, state_was, result.rows.size, message, result.columns, result.rows.first(10).as_json, result.column_types, check_type).deliver_now
+        Blazer::SlackNotifier.state_change(self, state, state_was, result.rows.size, message, check_type)
       end
       save! if changed?
     end

data/app/views/blazer/_nav.html.erb

@@ -5,7 +5,6 @@
     <span class="sr-only">Toggle Dropdown</span>
   </button>
   <ul class="dropdown-menu">
-    <li><%= link_to "Dashboards", dashboards_path %></li>
     <li><%= link_to "Checks", checks_path %></li>
     <li role="separator" class="divider"></li>
     <li><%= link_to "New Query", new_query_path %></li>

data/app/views/blazer/_variables.html.erb

@@ -1,5 +1,14 @@
 <% if @bind_vars.any? %>
-  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 10px;">
+  <script>
+    <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
+    var now = moment.tz(timeZone)
+    var format = "YYYY-MM-DD"
+
+    function toDate(time) {
+      return moment.tz(time.format(format), timeZone)
+    }
+  </script>
+  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;">
     <% date_vars = ["start_time", "end_time"] %>
     <% if (date_vars - @bind_vars).empty? %>
       <% @bind_vars = @bind_vars - date_vars %>
@@ -16,18 +25,39 @@
             create: true
           });
         </script>
+      <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
+        <%= hidden_field_tag var, params[var] %>
+
+        <div class="selectize-control single" style="width: 200px;">
+          <div id="<%= var %>-select" class="selectize-input" style="display: inline-block;">
+            <span>Select a date</span>
+          </div>
+        </div>
+
+        <script>
+          (function() {
+            var input = $("#<%= var %>")
+            var datePicker = $("#<%= var %>-select")
+            datePicker.daterangepicker({
+              singleDatePicker: true,
+              locale: {format: format},
+              autoUpdateInput: false,
+              startDate: input.val().length > 0 ? moment.tz(input.val(), timeZone) : now
+            })
+            // hack to start with empty date
+            datePicker.on("apply.daterangepicker", function(ev, picker) {
+              datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+              input.val(toDate(picker.startDate).utc().format())
+              submitIfCompleted($("#<%= var %>").closest("form"))
+            })
+            if (input.val().length > 0) {
+              var picker = datePicker.data("daterangepicker")
+              datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+            }
+          })()
+        </script>
       <% else %>
         <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>
-        <% if var.end_with?("_at") %>
-          <script>
-            $("#<%= var %>").daterangepicker({singleDatePicker: true, locale: {format: "YYYY-MM-DD"}, autoUpdateInput: false});
-            // hack to start with empty date
-            $("#<%= var %>").on("apply.daterangepicker", function(ev, picker) {
-              $(this).val(picker.startDate.format("YYYY-MM-DD"));
-              $(this).change();
-            });
-          </script>
-        <% end %>
       <% end %>
     <% end %>
 
@@ -44,18 +74,10 @@
       </div>
 
       <script>
-        <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
-        var format = "YYYY-MM-DD"
-        var now = moment.tz(timeZone)
-
         function dateStr(daysAgo) {
           return now.clone().subtract(daysAgo || 0, "days").format(format)
         }
 
-        function toDate(time) {
-          return moment.tz(time.format(format), timeZone)
-        }
-
         function setTimeInputs(start, end) {
           $("#start_time").val(toDate(start).utc().format())
           $("#end_time").val(toDate(end).endOf("day").utc().format())

data/app/views/blazer/checks/_form.html.erb

@@ -1,12 +1,12 @@
-<% unless @check.respond_to?(:invert) %>
-  <p class="text-muted">Checks are designed to identify bad data. A check fails if there are any results.</p>
-<% end %>
+<%= form_for @check, html: {class: "small-form"} do |f| %>
+  <% unless @check.respond_to?(:check_type) || @check.respond_to?(:invert) %>
+    <p class="text-muted">Checks are designed to identify bad data. A check fails if there are any results.</p>
+  <% end %>
 
-<% if @check.errors.any? %>
-  <div class="alert alert-danger"><%= @check.errors.full_messages.first %></div>
-<% end %>
+  <% if @check.errors.any? %>
+    <div class="alert alert-danger"><%= @check.errors.full_messages.first %></div>
+  <% end %>
 
-<%= form_for @check do |f| %>
   <div class="form-group">
     <%= f.label :query_id, "Query" %>
     <div class="hide">
@@ -60,7 +60,15 @@
     <%= f.label :emails %>
     <%= f.text_field :emails, placeholder: "Optional, comma separated", class: "form-control" %>
   </div>
-  <p class="text-muted">Emails are sent when a check starts failing, and when it starts passing again.
+
+  <% if Blazer.slack? %>
+    <div class="form-group">
+      <%= f.label :slack_channels %>
+      <%= f.text_field :slack_channels, placeholder: "Optional, comma separated", class: "form-control" %>
+    </div>
+  <% end %>
+
+  <p class="text-muted">Emails <%= Blazer.slack? ? "and Slack notifications " : nil %>are sent when a check starts failing, and when it starts passing again.
   <p>
     <% if @check.persisted? %>
       <%= link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>

data/app/views/blazer/checks/edit.html.erb

@@ -1 +1,3 @@
+<% blazer_title "Edit Check" %>
+
 <%= render partial: "form" %>

data/app/views/blazer/checks/index.html.erb

@@ -1,15 +1,32 @@
 <% blazer_title "Checks" %>
 
-<p style="float: right;"><%= link_to "New Check", new_check_path, class: "btn btn-info" %></p>
-<%= render partial: "blazer/nav" %>
+<div id="header">
+  <div class="pull-right" style="line-height: 34px;">
+    <div class="btn-group">
+      <%= link_to "New Check", new_check_path, class: "btn btn-info" %>
+      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <span class="caret"></span>
+        <span class="sr-only">Toggle Dropdown</span>
+      </button>
+      <ul class="dropdown-menu">
+        <li><%= link_to "Home", root_path %></li>
+        <li role="separator" class="divider"></li>
+        <li><%= link_to "New Query", new_query_path %></li>
+        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
+      </ul>
+    </div>
+  </div>
 
-<table class="table">
+  <input id="search" type="text" placeholder="Start typing a query or state" style="width: 300px; display: inline-block;" class="search form-control" />
+</div>
+
+<table id="checks" class="table">
   <thead>
     <tr>
       <th>Query</th>
       <th style="width: 10%;">State</th>
       <th style="width: 10%;">Run</th>
-      <th style="width: 20%;">Emails</th>
+      <th style="width: 20%;">Notify</th>
       <th style="width: 15%;"></th>
     </tr>
   </thead>
@@ -28,6 +45,9 @@
             <% check.split_emails.each do |email| %>
               <li><%= email %></li>
             <% end %>
+            <% check.split_slack_channels.each do |channel| %>
+              <li><%= channel %></li>
+            <% end %>
           </ul>
         </td>
         <td style="text-align: right; padding: 1px;">
@@ -38,3 +58,12 @@
     <% end %>
   </tbody>
 </table>
+
+<script>
+  $("#search").on("keyup", function() {
+    var value = $(this).val().toLowerCase()
+    $("#checks tbody tr").filter( function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    })
+  }).focus()
+</script>

data/app/views/blazer/checks/new.html.erb

@@ -1 +1,3 @@
+<% blazer_title "New Check" %>
+
 <%= render partial: "form" %>

data/app/views/blazer/dashboards/_form.html.erb

@@ -1,8 +1,8 @@
-<% if @dashboard.errors.any? %>
-  <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
-<% end %>
+<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)), html: {id: "app", class: "small-form"} do |f| %>
+  <% if @dashboard.errors.any? %>
+    <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
+  <% end %>
 
-<%= form_for @dashboard, url: (@dashboard.persisted? ? dashboard_path(@dashboard, variable_params) : dashboards_path(variable_params)), html: {id: "app"} do |f| %>
   <div class="form-group">
     <%= f.label :name %>
     <%= f.text_field :name, class: "form-control" %>

data/app/views/blazer/dashboards/edit.html.erb

@@ -1 +1,3 @@
+<% blazer_title "Edit Dashboard" %>
+
 <%= render partial: "form" %>

data/app/views/blazer/dashboards/new.html.erb

@@ -1 +1,3 @@
+<% blazer_title "New Dashboard" %>
+
 <%= render partial: "form" %>

data/app/views/blazer/dashboards/show.html.erb

@@ -5,7 +5,7 @@
     <div class="row" style="padding-top: 13px;">
       <div class="col-sm-9">
         <%= render partial: "blazer/nav" %>
-        <h3 style="margin: 0; line-height: 34px; display: inline;">
+        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
           <%= @dashboard.name %>
         </h3>
       </div>
@@ -25,7 +25,11 @@
   </p>
 <% end %>
 
-<%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
+<% if @bind_vars.any? %>
+  <%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
+<% else %>
+  <div style="padding-bottom: 15px;"></div>
+<% end %>
 
 <% @queries.each_with_index do |query, i| %>
   <div class="chart-container">
@@ -35,7 +39,7 @@
     </div>
   </div>
   <script>
-    <%= blazer_js_var "data", {statement: query.statement, query_id: query.id, only_chart: true} %>
+    <%= blazer_js_var "data", {statement: query.statement, query_id: query.id, data_source: query.data_source, only_chart: true} %>
 
     runQuery(data, function (data) {
       $("#chart-<%= i %>").html(data)

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

@@ -12,11 +12,13 @@
             <div id="editor" :style="{ height: editorHeight }"><%= @query.statement %></div>
           </div>
         </div>
-        <div class="form-group text-right">
-          <div class="pull-left" style="margin-top: 9px;">
+        <div class="form-group text-right" style="margin-bottom: 8px;">
+          <div class="pull-left" style="margin-top: 8px;">
             <%= link_to "Back", :back %>
+            <a :href="docsPath" target="_blank" style="margin-left: 40px;">Docs</a>
+            <a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a>
           </div>
-          <a :href="dataSourcePath" target="_blank" style="margin-right: 10px;">Schema</a>
+
           <%= f.select :data_source, Blazer.data_sources.values.select { |ds| q = @query.dup; q.data_source = ds.id; q.editable?(blazer_user) }.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1), style: "width: 140px;" %>
           <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;">
             <select id="table_names" style="width: 240px;" placeholder="Preview table"></select>
@@ -40,7 +42,7 @@
             <%= f.collection_select :assignee_ids, @assignees, :first, :last, {}, { placeholder: "Assignees", style: "height: 80px;", class: "form-control", multiple: true } %>
           </div>
         <%- end -%>
-        <div class="text-right">
+        <div class="form-group text-right">
           <%= f.submit "For Enter Press", class: "hide" %>
           <% if @query.persisted? %>
             <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
@@ -55,7 +57,7 @@
           <% words << pluralize(dashboards_count, "dashboard") if dashboards_count > 0 %>
           <% words << pluralize(checks_count, "check") if checks_count > 0 %>
           <% if words.any? %>
-            <div class="alert alert-info" style="margin-top: 10px; padding: 8px 12px;">
+            <div class="alert alert-info" style="margin-bottom: 0;">
               Part of <%= words.to_sentence %>. Be careful when editing.
             </div>
           <% end %>
@@ -85,8 +87,11 @@
       editorHeight: "180px"
     },
     computed: {
-      dataSourcePath: function() {
+      schemaPath: function() {
         return Routes.schema_queries_path({data_source: this.dataSource})
+      },
+      docsPath: function() {
+        return Routes.docs_queries_path({data_source: this.dataSource})
       }
     },
     methods: {

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

@@ -0,0 +1,131 @@
+<% blazer_title "Docs: #{@data_source.name}" %>
+
+<h1>Docs: <%= @data_source.name %></h1>
+
+<hr />
+
+<h2>Smart Variables</h2>
+
+<% if @smart_variables.any? %>
+  <p>Use these variable names to get a dropdown of values.</p>
+
+  <table class="table" style="max-width: 500px;">
+    <thead>
+      <tr>
+        <th>Variable</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @smart_variables.each do |k, _| %>
+        <tr>
+          <td><code>{<%= k %>}</code></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <p>Use <code>{start_time}</code> and <code>{end_time}</code> for a date range selector. End a variable name with <code>_at</code> for a date selector.</p>
+<% else %>
+  <p>None set - add them in <code>config/blazer.yml</code>.</p>
+<% end %>
+
+<h2>Linked Columns</h2>
+
+<% if @linked_columns.any? %>
+  <p>Use these column names to link results to other pages.</p>
+
+  <table class="table" style="max-width: 500px;">
+    <thead>
+      <tr>
+        <th style="width: 20%;">Name</th>
+        <th>URL</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @linked_columns.each do |k, v| %>
+        <tr>
+          <td><%= k %></td>
+          <td><%= v %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <p>Values that match the format of a URL will be linked automatically.</p>
+<% else %>
+  <p>None set - add them in <code>config/blazer.yml</code>.</p>
+<% end %>
+
+<h2>Smart Columns</h2>
+
+<% if @smart_columns.any? %>
+  <p>Use these column names to show additional data.</p>
+
+  <table class="table" style="max-width: 500px;">
+    <thead>
+      <tr>
+        <th>Name</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @smart_columns.each do |k, _| %>
+        <tr>
+          <td><%= k %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <p>None set - add them in <code>config/blazer.yml</code>.</p>
+<% end %>
+
+<h2>Charts</h2>
+
+<p>Use specific combinations of column types to generate charts.</p>
+
+<table class="table" style="max-width: 500px;">
+  <thead>
+    <tr>
+      <th style="width: 20%;">Chart</th>
+      <th>Column Types</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Line</td>
+      <td>2+ columns - timestamp, numeric(s)</td>
+    </tr>
+    <tr>
+      <td>Line</td>
+      <td>3 columns - timestamp, string, numeric</td>
+    </tr>
+    <tr>
+      <td>Column</td>
+      <td>2+ columns - string, numeric(s)</td>
+    </tr>
+    <tr>
+      <td>Column</td>
+      <td>3 columns - string, string, numeric</td>
+    </tr>
+    <tr>
+      <td>Scatter</td>
+      <td>2 columns - both numeric</td>
+    </tr>
+    <tr>
+      <td>Pie</td>
+      <td>2 columns - string, numeric - and last column named <code>pie</code></td>
+    </tr>
+    <tr>
+      <td>Map</td>
+      <td>
+        Named <code>latitude</code> and <code>longitude</code>, or <code>lat</code> and <code>lon</code>, or <code>lat</code> and <code>lng</code>
+        <% if !blazer_maps? %>
+          <br />
+          <strong>Needs configured</strong>
+        <% end %>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
+<p>Use the column name <code>target</code> to draw a line for goals.</p>